Merge pull request #121263 from regnat/update-nix-unstable

nixUnstable: pre20210326_dd77f71 -> pre20210429_d15a196
This commit is contained in:
Eelco Dolstra 2021-05-03 17:04:02 +02:00 committed by GitHub
commit 946cc38f70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -2,12 +2,12 @@
{
hydra-unstable = callPackage ./common.nix {
version = "2021-03-29";
version = "2021-04-29";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "9bb04ed97af047968196bad1728f927f7a6d905f";
sha256 = "sha256-gN/zNI2hGDMnYUjeGnU7SAuXP4KCmNqG+AYOVfINaQE=";
rev = "6047b1dd04d44acff9343b6b971ab609b73099d5";
sha256 = "sha256-E7JOHhSd4gIzE6FvSZVMxZE9WagbBkrfZVoibkanaYE=";
};
nix = nixFlakes;

View File

@ -215,13 +215,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix";
version = "2.4${suffix}";
suffix = "pre20210326_dd77f71";
suffix = "pre20210503_6d2553a";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "dd77f71afe6733e9790dd001125c423cb648b7ce";
sha256 = "rVHzrsCtdiWjyLuHnDplG2mx+7dw5VyzZ9ReXxuCvHY=";
rev = "6d2553ae1496288554e871c530836428f405fd67";
sha256 = "sha256-YeSeyOKhBAXHlkzo4mwYr8QIjIP9AgdpJ7YdhqOO2CA=";
};
inherit storeDir stateDir confDir boehmgc;