about summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorValentin Gagarin <valentin.gagarin@tweag.io>2024-05-30 12:59:13 +0200
committerGitHub <noreply@github.com>2024-05-30 12:59:13 +0200
commit2b5736a2fe5e27f34a0467e7c4479b510b1d6850 (patch)
treea7aac7e97cd311684878af54e4716123ac0d3f12 /pkgs/tools/package-management
parentd8a5a620da8e1cae5348ede15cd244705e02598c (diff)
Revert "nix: 2.18 -> 2.22"
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/nix/default.nix12
1 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 88bb55da9d06f..1eeecab4e7ec7 100644
--- 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: