Merge staging-next into staging

2021-05-03 18:25:49 +00:00
parent 7b413bfff9 ab8749a05c
commit 5e177b16b1
60 changed files with 840 additions and 260 deletions
@@ -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;