dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge #276696: nixVersions.nix_2_3: fix build against current gcc

Browse Source 
...into staging-next
This commit is contained in:
Vladimír Čunát 2024-01-04 14:48:50 +01:00
commit c33b4961cb
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/package-management/nix/default.nix
View File

@ -8,7 +8,6 @@
, fetchpatch2 , fetchpatch2
, runCommand , runCommand
, Security , Security
, pin-to-gcc12-if-gcc13
, storeDir ? "/nix/store" , storeDir ? "/nix/store"
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
@ -152,16 +151,14 @@ let
pkg; pkg;
in lib.makeExtensible (self: ({ in lib.makeExtensible (self: ({
nix_2_3 = pin-to-gcc12-if-gcc13 ((common { nix_2_3 = (common {
version = "2.3.17"; version = "2.3.17";
hash = "sha256-EK0pgHDekJFqr0oMj+8ANIjq96WPjICe2s0m4xkUdH4="; hash = "sha256-EK0pgHDekJFqr0oMj+8ANIjq96WPjICe2s0m4xkUdH4=";
patches = [ patches = [
patch-monitorfdhup patch-monitorfdhup
]; ];
maintainers = with lib.maintainers; [ flokli raitobezarius ]; maintainers = with lib.maintainers; [ flokli raitobezarius ];
}).override { }).override { boehmgc = boehmgc-nix_2_3; };
boehmgc = boehmgc-nix_2_3;
});
nix_2_10 = common { nix_2_10 = common {
version = "2.10.3"; version = "2.10.3";