c3d2/hydra-config
c3d2
/
hydra-config
23
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update from nixpkgs 19.09 to 20.03

This commit is contained in:
Astro 2020-04-21 23:17:39 +02:00
parent 10db91da64
commit a7a63f2adb
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jobsets.json
View File

@ -10,7 +10,7 @@
"emailoverride": "astro@spaceboyz.net", "emailoverride": "astro@spaceboyz.net",
"keepnr": 10, "keepnr": 10,
"inputs": { "inputs": {
"nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git release-19.09 1", "emailresponsible": false }, "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git release-20.03 1", "emailresponsible": false },
"hydra-config": { "type": "git", "value": "https://gitea.c3d2.de/C3D2/hydra-config.git master 1", "emailresponsible": false } "hydra-config": { "type": "git", "value": "https://gitea.c3d2.de/C3D2/hydra-config.git master 1", "emailresponsible": false }
}, },
"type": 0 "type": 0

6
jobsets.nix
View File

@ -19,7 +19,7 @@ let
}; };
nixpkgs = { nixpkgs = {
type = "git"; type = "git";
value = "https://github.com/NixOS/nixpkgs.git release-19.09 1"; value = "https://github.com/NixOS/nixpkgs.git release-20.03 1";
emailresponsible = false; emailresponsible = false;
}; };
} // (builtins.mapAttrs (_: gitUrl: { } // (builtins.mapAttrs (_: gitUrl: {
@ -61,8 +61,6 @@ let
gitUrls = { gitUrls = {
mateamt = "https://github.com/nek0/mateamt.git master 1"; mateamt = "https://github.com/nek0/mateamt.git master 1";
matebeamter = "https://github.com/nek0/matebeamter.git master 1"; matebeamter = "https://github.com/nek0/matebeamter.git master 1";
# A few Haskell dependencies are broken in NixOS 19.09
nixpkgs = "https://github.com/NixOS/nixpkgs.git master";
}; };
}; };
@ -130,7 +128,7 @@ let
gitUrls = { gitUrls = {
nix-config = "https://gitea.c3d2.de/C3D2/nix-config.git"; nix-config = "https://gitea.c3d2.de/C3D2/nix-config.git";
yggdrasil-package-nix = "https://github.com/ehmry/yggdrasil-package-nix.git"; yggdrasil-package-nix = "https://github.com/ehmry/yggdrasil-package-nix.git";
nixpkgs = "https://github.com/NixOS/nixpkgs.git release-19.09"; nixpkgs = "https://github.com/NixOS/nixpkgs.git release-20.03";
nixpkgs-unstable = "https://github.com/NixOS/nixpkgs.git master"; nixpkgs-unstable = "https://github.com/NixOS/nixpkgs.git master";
}; };
}; };