diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2022-03-28 10:04:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-28 10:04:54 +0200 |
| commit | 4eb1cd42178e6760513c775c2cf1565677d20e87 (patch) | |
| tree | 0bbd9cde947b25ce7034b01145e172597b0fb099 | |
| parent | d6778e0b5d608eb6738af2a64e26d99cdc5b9e86 (diff) | |
| parent | 7dc8b4b813c4ae6d61b258e5a1a7cb567c33ac43 (diff) | |
Merge pull request #165847 from lheckemann/nix-backport
[21.11] nix_2_7: init
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4bffa88e4220..c62991642efc 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -59,7 +59,7 @@ common = buildInputs = [ curl libsodium openssl sqlite xz bzip2 - brotli boost editline + brotli boost editline nlohmann_json ] ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals is24 [ libarchive gtest lowdown ] @@ -273,4 +273,18 @@ in rec { }); + nix_2_7 = lib.lowPrio (callPackage common rec { + pname = "nix"; + version = "2.7.0"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = version; + sha256 = "sha256-m8tqCS6uHveDon5GSro5yZor9H+sHeh+v/veF1IGw24="; + }; + + boehmgc = boehmgc_nixUnstable; + + inherit storeDir stateDir confDir; + }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e203deba29ed..26380cfd75ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32509,6 +32509,7 @@ with pkgs; nixStable nix_2_3 nix_2_4 + nix_2_7 nixUnstable; nixStatic = pkgsStatic.nix; |