summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Kenji Okada <thiagokokada@gmail.com>2021-11-29 21:13:00 -0300
committerGitHub <noreply@github.com>2021-11-29 21:13:00 -0300
commit8906ff19716fa362fb97f2398717ed99c938645a (patch)
tree4fcbbfeb9f8315b8bb6c455b526795f42d43a7a8
parentMerge pull request #147928 from NixOS/backport-147556-to-release-21.11 (diff)
parentnixUnstable: 2.5pre20211007 -> 2.5pre20211126 (diff)
downloadnixpkgs-8906ff19716fa362fb97f2398717ed99c938645a.tar.gz
Merge pull request #147895 from NixOS/backport-147376-to-release-21.11
[Backport release-21.11] nixUnstable: 2.5pre20211007 -> 2.5pre20211126
-rw-r--r--pkgs/tools/package-management/nix/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 463ebe49f3dc..43ca1623ea3e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -256,13 +256,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix";
version = "2.5${suffix}";
- suffix = "pre20211007_${lib.substring 0 7 src.rev}";
+ suffix = "pre20211126_${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "844dd901a7debe8b03ec93a7f717b6c4038dc572";
- sha256 = "sha256-fe1B4lXkS6/UfpO0rJHwLC06zhOPrdSh4s9PmQ1JgPo=";
+ rev = "55275fcc5966cfad80fb6dc77b8d8939a2f1b8e0";
+ sha256 = "sha256-jr85Z+0TA86mdsi3Y91wM3dFHWemmFHKdNwbx9rGz2U=";
};
boehmgc = boehmgc_nixUnstable;