public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #133519 from NixOS/backport-132739-to-release-21.05

Browse Source 
[Backport release-21.05] nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb
This commit is contained in:
Timothy DeHerrera 2021-08-11 09:46:03 -06:00 committed by GitHub
commit dca7265b6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/misc/hydra/default.nix
View File

@ -2,12 +2,12 @@
{ {
hydra-unstable = callPackage ./common.nix { hydra-unstable = callPackage ./common.nix {
version = "2021-05-03"; version = "2021-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "hydra"; repo = "hydra";
rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468"; rev = "9bce425c3304173548d8e822029644bb51d35263";
sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0="; sha256 = "sha256-tGzwKNW/odtAYcazWA9bPVSmVXMGKfXsqCA1UYaaxmU=";
}; };
nix = nixUnstable; nix = nixUnstable;

6
pkgs/tools/package-management/nix/default.nix
View File

@ -228,13 +228,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec { nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix"; pname = "nix";
version = "2.4${suffix}"; version = "2.4${suffix}";
suffix = "pre20210707_02dd6bb"; suffix = "pre20210802_47e96bb";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2"; rev = "47e96bb533f8cacc171bec9b688b134de31a48a9";
sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA="; sha256 = "sha256-vwj1fAGn3Pl9Vr/qSL+oDxuwbRzEdI3dsEg6o3xTmWg=";
}; };
boehmgc = boehmgc_nixUnstable; boehmgc = boehmgc_nixUnstable;