From 3d17802d1c5d2e1e6b2c53f65b8dedaf0f5678fe Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 14 Jan 2011 10:43:47 +0000 Subject: [PATCH] hydra/release.nix: move manual to tarball build, restore version in store path for tarball build --- release.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/release.nix b/release.nix index 19f04e11..ad009a80 100644 --- a/release.nix +++ b/release.nix @@ -13,13 +13,20 @@ rec { name = "hydra-tarball"; src = hydraSrc; inherit officialRelease; + version = builtins.readFile ./version; - buildInputs = [ perl libxslt dblatex tetex ] ; + buildInputs = [ perl libxslt dblatex tetex nukeReferences ] ; preConfigure = '' # TeX needs a writable font cache. export VARTEXFONTS=$TMPDIR/texfonts ''; + + postHook = '' + cp doc/manual/manual.pdf $out + nuke-refs $out/manual.pdf + echo "doc-pdf manual $out/share/doc/hydra/manual/manual.pdf" >> $out/nix-support/hydra-build-products + ''; }; build = @@ -42,8 +49,7 @@ rec { hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [ libxslt sqlite subversion openssh nix coreutils findutils - gzip bzip2 lzma gnutar unzip git mercurial - gnused graphviz + gzip bzip2 lzma gnutar unzip git mercurial gnused graphviz ] ++ ( if stdenv.isLinux then [rpm dpkg cdrkit] else [] ))); postInstall = '' @@ -62,8 +68,6 @@ rec { --set HYDRA_HOME $out/libexec/hydra \ --set NIX_RELEASE ${nix.name} done - - echo "doc-pdf manual $out/share/doc/hydra/manual/manual.pdf" >> $out/nix-support/hydra-build-products ''; # */ meta = {