diff options
Diffstat (limited to 'pkgs/tools/package-management/nix/default.nix')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b91ee5c9ee600..24e93a6d66e2a 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,6 +1,7 @@ { lib , aws-sdk-cpp , boehmgc +, curl , callPackage , fetchFromGitHub , fetchurl @@ -31,7 +32,7 @@ let common = args: callPackage - (import ./common.nix ({ inherit lib fetchFromGitHub; } // args)) + (import ./common.nix ({ inherit lib fetchFromGitHub curl; } // args)) { inherit Security storeDir stateDir confDir; boehmgc = boehmgc-nix; @@ -86,29 +87,19 @@ in lib.makeExtensible (self: { }; nix_2_9 = common { - version = "2.9.0"; - sha256 = "sha256-W6aTsTpCTb+vXQEXDjnKqetOuJmEfSuK2CXvAMqwo74="; + version = "2.9.1"; + sha256 = "sha256-qNL3lQPBsnStkru3j1ajN/H+knXI+X3dku8/dBfSw3g="; patches = [ - # can be removed when updated to 2.9.1 + # add missing --git-dir flags + # remove once 2.9.2 is out (fetchpatch { - name = "fix-segfault-in-git-fetcher"; - url = "https://github.com/NixOS/nix/commit/bc4759345538c89e1f045aaabcc0cafe4ecca12a.patch"; - sha256 = "sha256-UrfH4M7a02yfE9X3tA1Pwhw4RacBW+rShYkl7ybG64I="; + url = "https://github.com/NixOS/nix/commit/1a994cc35b33dcfd484e7a96be0e76e23bfb9029.patch"; + sha256 = "sha256-7rDlqWRSVPijbvrTm4P+YykbMWyJryorXqGLEgg8/Wo="; }) ]; }; stable = self.nix_2_9; - # remember to backport updates to the stable branch! - unstable = lib.lowPrio (common rec { - version = "2.8"; - suffix = "pre20220530_${lib.substring 0 7 src.rev}"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - rev = "af23d38019a47e5bb4cd6585a1678b37c957130c"; - sha256 = "sha256-RH77Y4IhbTofNYlLQSGKLL0fJAG9iHSwRNvMEZ4M0VQ="; - }; - }); + unstable = self.stable; }) |