about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-04-06 01:13:07 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2020-04-07 14:11:12 +0200
commit0f5c38feed3044845d3ab7378a6d81a1f34b93da (patch)
tree5263b694b3b8dbe80fbde5195634c5897577cf5e /pkgs/top-level
parente2b327cd4e84dfaa8b77a612ae22c7998f0bc084 (diff)
downloadnixlib-0f5c38feed3044845d3ab7378a6d81a1f34b93da.tar
nixlib-0f5c38feed3044845d3ab7378a6d81a1f34b93da.tar.gz
nixlib-0f5c38feed3044845d3ab7378a6d81a1f34b93da.tar.bz2
nixlib-0f5c38feed3044845d3ab7378a6d81a1f34b93da.tar.lz
nixlib-0f5c38feed3044845d3ab7378a6d81a1f34b93da.tar.xz
nixlib-0f5c38feed3044845d3ab7378a6d81a1f34b93da.tar.zst
nixlib-0f5c38feed3044845d3ab7378a6d81a1f34b93da.zip
hydra: 2020-03-24 -> 2020-04-07
Also removed `pkgs.hydra-flakes` since flake-support has been merged
into master[1]. Because of that, `pkgs.hydra-unstable` is now compiled
against `pkgs.nixFlakes` and currently requires a patch since Hydra's
master doesn't compile[2] atm.

[1] https://github.com/NixOS/hydra/pull/730
[2] https://github.com/NixOS/hydra/pull/732
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39db9e9e04fe..fdf72f3e94e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12100,7 +12100,12 @@ in
   hwloc = callPackage ../development/libraries/hwloc {};
 
   inherit (callPackage ../development/tools/misc/hydra { })
-    hydra-migration hydra-unstable hydra-flakes;
+    hydra-migration hydra-unstable;
+
+  hydra-flakes = throw ''
+    Flakes support has been merged into Hydra's master. Please use
+    `pkgs.hydra-unstable` now.
+  '';
 
   hydra-cli = callPackage ../development/tools/misc/hydra-cli { };