diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-24 11:02:23 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-24 11:03:55 +0200 |
| commit | 438b9c543d535f525ac50affd045bdf41a3239d6 (patch) | |
| tree | e9c90dc09ce11309910a754cc39a5c66a7bda353 /pkgs | |
| parent | 14f48dd5c2c4f4f4a2409d4ced1dd4ca2cab5e74 (diff) | |
| download | nixlib-438b9c543d535f525ac50affd045bdf41a3239d6.tar nixlib-438b9c543d535f525ac50affd045bdf41a3239d6.tar.gz nixlib-438b9c543d535f525ac50affd045bdf41a3239d6.tar.bz2 nixlib-438b9c543d535f525ac50affd045bdf41a3239d6.tar.lz nixlib-438b9c543d535f525ac50affd045bdf41a3239d6.tar.xz nixlib-438b9c543d535f525ac50affd045bdf41a3239d6.tar.zst nixlib-438b9c543d535f525ac50affd045bdf41a3239d6.zip | |
Nixpkgs manual: Add a Nix expression to build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 29 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 2 |
2 files changed, 3 insertions, 28 deletions
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 9856586a1832..356368d137d3 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -14,14 +14,7 @@ releaseTools.sourceTarball rec { version = builtins.readFile ../../.version; versionSuffix = "pre${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; - buildInputs = [ - lzma - libxml2 # Needed for the release notes. - libxslt - w3m - nix # Needed to check whether the expressions are valid. - tetex dblatex - ]; + buildInputs = [ nix ]; configurePhase = '' eval "$preConfigure" @@ -32,13 +25,6 @@ releaseTools.sourceTarball rec { dontBuild = false; - buildPhase = '' - echo "building docs..." - export VARTEXFONTS=$TMPDIR/texfonts - make -C doc docbookxsl=${docbook5_xsl}/xml/xsl/docbook - ln -s doc/NEWS.txt NEWS - ''; - doCheck = true; checkPhase = '' @@ -87,19 +73,6 @@ releaseTools.sourceTarball rec { cp -prd . ../$releaseName echo nixpkgs > ../$releaseName/channel-name (cd .. && tar cfa $out/tarballs/$releaseName.tar.xz $releaseName) || false - - mkdir -p $out/release-notes - cp doc/NEWS.html $out/release-notes/index.html - cp doc/style.css $out/release-notes/ - echo "doc release-notes $out/release-notes" >> $out/nix-support/hydra-build-products - - mkdir -p $out/manual - cp doc/manual.html $out/manual/index.html - cp doc/style.css $out/manual/ - echo "doc manual $out/manual" >> $out/nix-support/hydra-build-products - - cp doc/manual.pdf $out/manual.pdf - echo "doc-pdf manual $out/manual.pdf" >> $out/nix-support/hydra-build-products ''; meta = { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index ff66756aa8b4..be76c63685bc 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -22,6 +22,8 @@ let jobs = { tarball = import ./make-tarball.nix { inherit nixpkgs officialRelease; }; + manual = import ../../doc; + unstable = pkgs.releaseTools.aggregate { name = "nixpkgs-${jobs.tarball.version}"; meta.description = "Release-critical builds for the Nixpkgs unstable channel"; |