From acfc1c15352a88af7077af8581898a85f5935827 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 4 Feb 2019 23:56:39 +0100 Subject: [PATCH] hydra: don't support Nix 1.x The component `hydra-evaluator` requires `pool.hh` from Nix which isn't provided by Nix 1.x and thus fails with the following error in this case: ``` hydra-evaluator.cc:3:10: fatal error: pool.hh: No such file or directory #include "pool.hh" ^~~~~~~~~ compilation terminated. make[3]: *** [Makefile:443: hydra_evaluator-hydra-evaluator.o] Error 1 ``` As the commit is from 2016 and fairly hard to revert for Nix 1.x support, it's easier to drop that. This has been tested with fixed perl-bindings for Nix1 as done in #55146. --- pkgs/development/tools/misc/hydra/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 395ab5349c2..00f679cfdac 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -8,6 +8,10 @@ with stdenv; +if lib.versions.major nix.version == "1" + then throw "This Hydra version doesn't support Nix 1.x" +else + let isGreaterNix20 = with lib.versions; let