m4rie: 20200125 -> 20250103 (#370480)

NixOS · Jan 5, 2025 · 8075165 · 8075165
2 parents 5db9bf3 + f0f1c5c
commit 8075165
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/pkgs/by-name/m4/m4ri/package.nix b/pkgs/by-name/m4/m4ri/package.nix
@@ -1,19 +1,22 @@
 {
   lib,
   stdenv,
-  fetchFromBitbucket,
+  fetchFromGitHub,
   autoreconfHook,
 }:
 
 stdenv.mkDerivation rec {
-  version = "20200125";
+  version = "20240729";
   pname = "m4ri";
 
-  src = fetchFromBitbucket {
+  src = fetchFromGitHub {
     owner = "malb";
     repo = "m4ri";
-    rev = "release-${version}";
-    sha256 = "1dxgbv6zdyki3h61qlv7003wzhy6x14zmcaz9x19md1i7ng07w1k";
+    # 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=";
   };
 
   doCheck = true;

diff --git a/pkgs/by-name/m4/m4rie/package.nix b/pkgs/by-name/m4/m4rie/package.nix
@@ -7,14 +7,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "20200125";
+  version = "20250103";
   pname = "m4rie";
 
   src = fetchFromBitbucket {
     owner = "malb";
     repo = "m4rie";
     rev = "release-${version}";
-    sha256 = "sha256-bjAcxfXsC6+jPYC472CN78jm4UljJQlkWyvsqckCDh0=";
+    hash = "sha256-CbzDLSqdtQ+CLKoKycznKzD3VCa+gfuh8TLvRC1fVz0=";
   };
 
   doCheck = true;