summary refs log tree commit diff
path: root/pkgs/tools/package-management/nix
diff options
context:
space:
mode:
authorBernardo Meurer <bernardo@meurer.org>2022-01-26 10:44:03 -0800
committerBernardo Meurer <bernardo@meurer.org>2022-01-26 10:48:29 -0800
commita1be7cb1c3efe7006984fb15a72afc83889ea356 (patch)
tree04c8581ebf6883eddf07ceb3f8af8e24c45ea69b /pkgs/tools/package-management/nix
parente4d25f9d5a762dd4682796f2bd1b3ca8403919b8 (diff)
downloadnixpkgs-a1be7cb1c3efe7006984fb15a72afc83889ea356.tar
nixpkgs-a1be7cb1c3efe7006984fb15a72afc83889ea356.tar.gz
nixpkgs-a1be7cb1c3efe7006984fb15a72afc83889ea356.tar.bz2
nixpkgs-a1be7cb1c3efe7006984fb15a72afc83889ea356.tar.lz
nixpkgs-a1be7cb1c3efe7006984fb15a72afc83889ea356.tar.xz
nixpkgs-a1be7cb1c3efe7006984fb15a72afc83889ea356.tar.zst
nixpkgs-a1be7cb1c3efe7006984fb15a72afc83889ea356.zip
nixVersions: init
Diffstat (limited to 'pkgs/tools/package-management/nix')
-rw-r--r--pkgs/tools/package-management/nix/default.nix38
1 files changed, 20 insertions, 18 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index c600bca83e7..3d9f393e76d 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -43,21 +43,12 @@ let
       inherit boehmgc patches Security;
       inherit storeDir stateDir confDir;
     };
-in {
-  nix_2_3 = buildNix rec {
-    version = "2.3.16";
-    src = fetchurl {
-      url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz";
-      sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw=";
-    };
-    boehmgc = boehmgc_nix_2_3;
-  };
+in rec {
+  stable = nix_2_6;
 
-  nix_2_4 = buildNix {
-    version = "2.4";
-    sha256 = "sha256-op48CCDgLHK0qV1Batz4Ln5FqBiRjlE6qHTiZgt3b6k=";
-    # https://github.com/NixOS/nix/pull/5537
-    patches = [ ./patches/install-nlohmann_json-headers.patch ];
+  nix_2_6 = buildNix {
+    version = "2.6.0";
+    sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=";
   };
 
   nix_2_5 = buildNix {
@@ -67,12 +58,23 @@ in {
     patches = [ ./patches/install-nlohmann_json-headers.patch ];
   };
 
-  nix_2_6 = buildNix {
-    version = "2.6.0";
-    sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=";
+  nix_2_4 = buildNix {
+    version = "2.4";
+    sha256 = "sha256-op48CCDgLHK0qV1Batz4Ln5FqBiRjlE6qHTiZgt3b6k=";
+    # https://github.com/NixOS/nix/pull/5537
+    patches = [ ./patches/install-nlohmann_json-headers.patch ];
+  };
+
+  nix_2_3 = buildNix rec {
+    version = "2.3.16";
+    src = fetchurl {
+      url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz";
+      sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw=";
+    };
+    boehmgc = boehmgc_nix_2_3;
   };
 
-  nixUnstable = lib.lowPrio (buildNix rec {
+  unstable = lib.lowPrio (buildNix rec {
     version = "2.7";
     suffix = "pre20220124_${lib.substring 0 7 src.rev}";
     src = fetchFromGitHub {