Merge pull request #2300 from MagnusS/nix2505-2

alfreb · web-flow · commit 5d3368506dc6 · 2025-09-19T10:37:10.000+02:00
Update to nixpkgs 25.05
diff --git a/deps/botan/default.nix b/deps/botan/default.nix
@@ -10,12 +10,6 @@ pkgs.botan2.overrideAttrs (oldAttrs: {
     ln -sr "$out/include/botan-2/botan" "$out/include"
   '';
 
-  configurePhase = ''
-    runHook preConfigure
-    python3 configure.py --prefix=$out --with-bzip2 --with-zlib --build-targets=static --cpu=${cpuFlag} --os=linux
-    runHook postConfigure
-  '';
-
   buildPhase = ''
     runHook preBuild
 
diff --git a/pinned.nix b/pinned.nix
@@ -1,6 +1,6 @@
 import (
   builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/24.05.tar.gz";
-    sha256 = "1lr1h35prqkd1mkmzriwlpvxcb34kmhc9dnr48gkm8hh089hifmx";
+    url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/25.05.tar.gz";
+    sha256 = "1r4fhp3apf1qggsrm60ni820gxzpm04q9xdk1w3dap9qymi6bpdk";
   }
 )

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import (`
`2`	`2`	`builtins.fetchTarball {`
`3`		`- url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/24.05.tar.gz";`
`4`		`- sha256 = "1lr1h35prqkd1mkmzriwlpvxcb34kmhc9dnr48gkm8hh089hifmx";`
	`3`	`+ url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/25.05.tar.gz";`
	`4`	`+ sha256 = "1r4fhp3apf1qggsrm60ni820gxzpm04q9xdk1w3dap9qymi6bpdk";`
`5`	`5`	`}`
`6`	`6`	`)`