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

Revert "nix: 2.18 -> 2.22"
JohnRTitor · May 30, 2024 · bebc70c · bebc70c
2 parents d8a5a62 + 2b5736a
commit bebc70c
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
@@ -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: