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
This commit is contained in:
Eelco Dolstra 2020-10-20 12:15:18 +02:00
parent 4e05acc471
commit 338d946620

View file

@ -148,7 +148,6 @@
TextTable TextTable
XMLSimple XMLSimple
YAML YAML
final.nix
final.nix.perl-bindings final.nix.perl-bindings
git git
]; ];
@ -163,7 +162,7 @@
buildInputs = buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig libpqxx [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig libpqxx
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
perlDeps perl final.nix final.nix perlDeps perl
boost boost
postgresql_11 postgresql_11
(if lib.versionAtLeast lib.version "20.03pre" (if lib.versionAtLeast lib.version "20.03pre"
@ -222,7 +221,7 @@
dontStrip = true; dontStrip = true;
meta.description = "Build of Hydra on ${system}"; meta.description = "Build of Hydra on ${system}";
passthru.perlDeps = perlDeps; passthru = { inherit perlDeps; inherit (final) nix; };
}; };
}; };