diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2022-03-19 22:41:44 +0100 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2022-03-26 18:03:07 +0100 |
| commit | 7dc8b4b813c4ae6d61b258e5a1a7cb567c33ac43 (patch) | |
| tree | d0d3b895b3cfb263f86267845881faedb524f098 | |
| parent | 31aa631dbc496500efd2507baaed39626f6650f2 (diff) | |
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 076eb22f5b86..425f1a4d2b7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32508,6 +32508,7 @@ with pkgs; nixStable nix_2_3 nix_2_4 + nix_2_7 nixUnstable; nixStatic = pkgsStatic.nix; |