diff options
Diffstat (limited to 'pkgs/top-level/make-tarball.nix')
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 2e5d92b8ed25..b50f064af0c6 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -1,4 +1,4 @@ -/* Hydra job to build a tarball for Nixpkgs from a SVN checkout. It +/* Hydra job to build a tarball for Nixpkgs from a Git checkout. It also builds the documentation and tests whether the Nix expressions evaluate correctly. */ @@ -6,13 +6,13 @@ with import nixpkgs.outPath {}; -releaseTools.sourceTarball { +releaseTools.sourceTarball rec { name = "nixpkgs-tarball"; src = nixpkgs; - inherit officialRelease; - version = builtins.readFile ../../VERSION; - versionSuffix = if officialRelease then "" else "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}"; + inherit officialRelease; + version = builtins.readFile ../../.version; + versionSuffix = "pre${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; buildInputs = [ lzma @@ -26,8 +26,8 @@ releaseTools.sourceTarball { configurePhase = '' eval "$preConfigure" releaseName=nixpkgs-$VERSION$VERSION_SUFFIX + echo -n $VERSION_SUFFIX > .version-suffix echo "release name is $releaseName" - echo $releaseName > relname ''; dontBuild = false; @@ -47,14 +47,14 @@ releaseTools.sourceTarball { nix-store --init # Run the regression tests in `lib'. - res="$(nix-instantiate --eval-only --strict --show-trace pkgs/lib/tests.nix)" + res="$(nix-instantiate --eval-only --strict --show-trace lib/tests.nix)" if test "$res" != "[ ]"; then echo "regression tests for lib failed, got: $res" exit 1 fi # Check that all-packages.nix evaluates on a number of platforms. - for platform in i686-linux x86_64-linux powerpc-linux i686-freebsd; do + for platform in i686-linux x86_64-linux x86_64-darwin i686-freebsd x86_64-freebsd; do header "checking pkgs/top-level/all-packages.nix on $platform" nix-env --readonly-mode -f pkgs/top-level/all-packages.nix \ --show-trace --argstr system "$platform" \ @@ -63,8 +63,7 @@ releaseTools.sourceTarball { done header "checking eval-release.nix" - nix-instantiate --eval-only --strict --xml --show-trace ./maintainers/scripts/eval-release.nix > $TMPDIR/out.xml - xmllint --noout $TMPDIR/out.xml + nix-instantiate --eval-only --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null stopNest ''; |