about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-04-08 20:08:29 +0200
committerGitHub <noreply@github.com>2020-04-08 20:08:29 +0200
commite8a4b9fe9b6e85b316d732ab90d7ec72d6551a23 (patch)
tree79ffcc47e6efbcba080f7b536900af53bc761b9e /pkgs/top-level
parentb1aca4f66addad9dd03251e271fc7a447f9f4c81 (diff)
parent0f5c38feed3044845d3ab7378a6d81a1f34b93da (diff)
downloadnixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.tar
nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.tar.gz
nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.tar.bz2
nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.tar.lz
nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.tar.xz
nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.tar.zst
nixlib-e8a4b9fe9b6e85b316d732ab90d7ec72d6551a23.zip
Merge pull request #84501 from Ma27/bump-hydra
hydra: 2020-03-24 -> 2020-04-07
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 fcee1bb6ebe8..26a1b1015d92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12097,7 +12097,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 { };