diff --git a/jobsets.json b/jobsets.json index 136361e..68c4638 100644 --- a/jobsets.json +++ b/jobsets.json @@ -10,7 +10,7 @@ "emailoverride": "astro@spaceboyz.net", "keepnr": 10, "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 } }, "type": 0 diff --git a/jobsets.nix b/jobsets.nix index 80e9c58..1132a0f 100644 --- a/jobsets.nix +++ b/jobsets.nix @@ -19,7 +19,7 @@ let }; nixpkgs = { 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; }; } // (builtins.mapAttrs (_: gitUrl: { @@ -61,8 +61,6 @@ let gitUrls = { mateamt = "https://github.com/nek0/mateamt.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 = { nix-config = "https://gitea.c3d2.de/C3D2/nix-config.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"; }; };