From 338d9466208ead994d60f3d2059e3afd180e137b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Oct 2020 12:15:18 +0200 Subject: [PATCH] Remove nix from hydra-perl-deps Also add nix to passthru. This makes it easier to override nix in 'nix develop', e.g. $ nix develop \ --redirect .#hydraJobs.build.x86_64-linux.nix ~/Dev/nix/outputs/out \ --redirect .#hydraJobs.build.x86_64-linux.nix.dev ~/Dev/nix/outputs/dev --- flake.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 75b8b574..0f9f7d99 100644 --- a/flake.nix +++ b/flake.nix @@ -148,7 +148,6 @@ TextTable XMLSimple YAML - final.nix final.nix.perl-bindings git ]; @@ -163,7 +162,7 @@ buildInputs = [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig libpqxx gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt - perlDeps perl final.nix + final.nix perlDeps perl boost postgresql_11 (if lib.versionAtLeast lib.version "20.03pre" @@ -222,7 +221,7 @@ dontStrip = true; meta.description = "Build of Hydra on ${system}"; - passthru.perlDeps = perlDeps; + passthru = { inherit perlDeps; inherit (final) nix; }; }; };