gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #315858 from NixOS/revert-315262-nix-upgrade

Browse Source 
Revert "nix: 2.18 -> 2.22"
This commit is contained in:
Jörg Thalheim
2024-05-30 13:05:55 +02:00
committed by GitHub
parent d8a5a620da 2b5736a2fe
commit bebc70c2e7
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/package-management/nix/default.nix
+1 -11
View File
@@ -174,16 +174,6 @@ in lib.makeExtensible (self: ({
version = "2.22.1";
hash = "sha256-5Q1WkpTWH7fkVfYhHDc5r0A+Vc+K5xB1UhzrLzBCrB8=";
self_attribute_name = "nix_2_22";
patches = [
(fetchpatch {
url = "https://github.com/NixOS/nix/commit/e5f509ef0b5c364544c904faa0bfda57dba03611.patch"; # fix for nix edit
sha256 = "sha256-E0QBD4h6MkGj5ye6Ba08MFR3drOOQu36t6xLXukm7a0=";
})
(fetchpatch {
url = "https://github.com/NixOS/nix/commit/bb1a4ea21a6af3c37c7d1c948e36678c96c3f499.patch"; # fix for nix edit
sha256 = "sha256-rgK+wus9qccVIKdhbKiDcvcngLvFk6SjjAnRQ6fAMno=";
})
];
};
git = common rec {
@@ -217,7 +207,7 @@ in lib.makeExtensible (self: ({
else
nix;
stable = addFallbackPathsCheck self.nix_2_22;
stable = addFallbackPathsCheck self.nix_2_18;
} // lib.optionalAttrs config.allowAliases (
lib.listToAttrs (map (
minor: