diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-01 13:45:14 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-10 13:28:22 +0200 |
commit | 041da5a6f9dfa39b20a8b4f9743e57c15a131d36 (patch) | |
tree | ef5e0bb8e84f1738e97254c935187ff153f0cbfe /pkgs/top-level/make-tarball.nix | |
parent | 3293421dd3434cd84d660f3c4c3c81baf88bbd3d (diff) |
Unify the Nixpkgs and NixOS version numbers
Diffstat (limited to 'pkgs/top-level/make-tarball.nix')
-rw-r--r-- | pkgs/top-level/make-tarball.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index cea7e6539b0b..62317df4163f 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,7 +47,7 @@ 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 |