diff options
| author | Timothy DeHerrera <tim.deh@pm.me> | 2021-08-11 09:46:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 09:46:03 -0600 |
| commit | dca7265b6d912ef6666b71bcc18c604bd137289c (patch) | |
| tree | b053eb1a7244df6d2c00f89b1316e7be1d4dc38b | |
| parent | clojure: fix clj script (diff) | |
| parent | hydra-unstable: 2021-05-03 -> 2021-08-11 (diff) | |
| download | nixpkgs-dca7265b6d912ef6666b71bcc18c604bd137289c.tar.gz | |
Merge pull request #133519 from NixOS/backport-132739-to-release-21.05
[Backport release-21.05] nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb
| -rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index a124b4a5c6e2..ac5600519b49 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -2,12 +2,12 @@ { hydra-unstable = callPackage ./common.nix { - version = "2021-05-03"; + version = "2021-08-11"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468"; - sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0="; + rev = "9bce425c3304173548d8e822029644bb51d35263"; + sha256 = "sha256-tGzwKNW/odtAYcazWA9bPVSmVXMGKfXsqCA1UYaaxmU="; }; nix = nixUnstable; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index bc743a3c54ee..f9a476f6be6b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -228,13 +228,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210707_02dd6bb"; + suffix = "pre20210802_47e96bb"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2"; - sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA="; + rev = "47e96bb533f8cacc171bec9b688b134de31a48a9"; + sha256 = "sha256-vwj1fAGn3Pl9Vr/qSL+oDxuwbRzEdI3dsEg6o3xTmWg="; }; boehmgc = boehmgc_nixUnstable; |