diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-01 12:01:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-01 12:01:23 +0000 |
commit | 992b6af1a405b218a2cf38bf912a7849e080d460 (patch) | |
tree | 39ecaf7190e5148240ffdafec74458e8a44a5d81 /pkgs/tools/package-management/nix/default.nix | |
parent | 41126a9493dced3c29ffca51b7bcad9bc8123251 (diff) | |
parent | 8a23e9931979fe31b76de903816b018da575f6e4 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management/nix/default.nix')
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 8833821a9e4d6..a8006d34b00de 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -170,6 +170,19 @@ in lib.makeExtensible (self: ({ hash = "sha256-Ugcc+lSq8nJP+mddMlGFnoG4Ix1lRFHWOal3299bqR8="; }; + git = common rec { + version = "2.23.0"; + suffix = "pre20240426_${lib.substring 0 8 src.rev}"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "2f678331d59451dd6f1d9512cb6d92e4ecb9750f"; + hash = "sha256-4AwaLB/gTRgvZG4FmFY6OY52yeLAnj0a6rtJCz7TRXA="; + }; + }; + + latest = self.nix_2_21; + # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, # making this package an inaccurate representation of what features are available @@ -188,8 +201,6 @@ in lib.makeExtensible (self: ({ nix; stable = addFallbackPathsCheck self.nix_2_18; - - unstable = self.nix_2_22; } // lib.optionalAttrs config.allowAliases ( lib.listToAttrs (map ( minor: @@ -198,4 +209,7 @@ in lib.makeExtensible (self: ({ in lib.nameValuePair attr (throw "${attr} has been removed") ) (lib.range 4 17)) + // { + unstable = throw "nixVersions.unstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; + } ))) |