m4rie: 20250103 -> 20250128 (#394993)

This commit is contained in:
Mauricio Collares
2025-04-02 10:07:58 -03:00
committed by GitHub
2 changed files with 10 additions and 40 deletions
+3 -35
View File
@@ -6,48 +6,16 @@
}:
stdenv.mkDerivation rec {
version = "20240729";
version = "20250128";
pname = "m4ri";
src = fetchFromGitHub {
owner = "malb";
repo = "m4ri";
# 20240729 has a broken m4ri.pc file, fixed in the next commit.
# TODO: remove if on update
rev =
if version == "20240729" then "775189bfea96ffaeab460513413fcf4fbcd64392" else "release-${version}";
hash = "sha256-untwo0go8O8zNO0EyZ4n/n7mngSXLr3Z/FSkXA8ptnU=";
rev = version;
hash = "sha256-YoCTI4dLy95xuRJyNugIzGxE40B9pCWxRQtsyS/1Pds=";
};
# based on the list in m4/m4_ax_ext.m4
configureFlags = builtins.map (s: "ax_cv_have_${s}_cpu_ext=no") (
[
"sha"
"xop"
]
++ lib.optional (!stdenv.hostPlatform.sse3Support) "sse3"
++ lib.optional (!stdenv.hostPlatform.ssse3Support) "ssse3"
++ lib.optional (!stdenv.hostPlatform.sse4_1Support) "sse41"
++ lib.optional (!stdenv.hostPlatform.sse4_2Support) "sse42"
++ lib.optional (!stdenv.hostPlatform.sse4_aSupport) "sse4a"
++ lib.optional (!stdenv.hostPlatform.aesSupport) "aes"
++ lib.optional (!stdenv.hostPlatform.avxSupport) "avx"
++ lib.optional (!stdenv.hostPlatform.fmaSupport) "fma3"
++ lib.optional (!stdenv.hostPlatform.fma4Support) "fma4"
++ lib.optional (!stdenv.hostPlatform.avx2Support) "avx2"
++ lib.optionals (!stdenv.hostPlatform.avx512Support) [
"avx512f"
"avx512cd"
"avx512pf"
"avx512er"
"avx512vl"
"avx512bw"
"avx512dq"
"avx512ifma"
"avx512vbmi"
]
);
doCheck = true;
nativeBuildInputs = [
+7 -5
View File
@@ -1,20 +1,21 @@
{
lib,
stdenv,
fetchFromBitbucket,
fetchFromGitHub,
autoreconfHook,
pkg-config,
m4ri,
}:
stdenv.mkDerivation rec {
version = "20250103";
version = "20250128";
pname = "m4rie";
src = fetchFromBitbucket {
src = fetchFromGitHub {
owner = "malb";
repo = "m4rie";
rev = "release-${version}";
hash = "sha256-CbzDLSqdtQ+CLKoKycznKzD3VCa+gfuh8TLvRC1fVz0=";
rev = version;
hash = "sha256-tw6ZX8hKfr9wQLF2nuO1dSkkTYZX6pzNWMlWfzLqQNE=";
};
doCheck = true;
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
makeFlags = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "CFLAGS=-O0" ];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
meta = with lib; {