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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
 pkgs/development/tools/kubie/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-21 10:39:34 -07:00
parent 929b12e7b5 fba98bad71
commit 5cd5b9b97f
31 changed files with 1960 additions and 1695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
{ fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }:
{ fetchFromGitHub, nixStable, callPackage, nixUnstable, nixosTests }:
{
hydra-unstable = callPackage ./common.nix {
@@ -9,7 +9,7 @@
rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468";
sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0=";
};
nix = nixFlakes;
nix = nixUnstable;
tests = {
basic = nixosTests.hydra.hydra-unstable;