diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-06-04 04:12:17 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-06-04 04:12:17 +0000 |
| commit | 887c89cc33706d47351fa143626d5af2bc48f210 (patch) | |
| tree | c1ff1ac46017d3b40fc6ce501c264c21581de1b1 /pkgs/top-level/make-tarball.nix | |
| parent | 3761afc91a4e104db239e16ed3c59113d9d81a11 (diff) | |
| download | nixpkgs-887c89cc33706d47351fa143626d5af2bc48f210.tar nixpkgs-887c89cc33706d47351fa143626d5af2bc48f210.tar.gz nixpkgs-887c89cc33706d47351fa143626d5af2bc48f210.tar.bz2 nixpkgs-887c89cc33706d47351fa143626d5af2bc48f210.tar.lz nixpkgs-887c89cc33706d47351fa143626d5af2bc48f210.tar.xz nixpkgs-887c89cc33706d47351fa143626d5af2bc48f210.tar.zst nixpkgs-887c89cc33706d47351fa143626d5af2bc48f210.zip | |
* Include the Git shortrev in the version number.
* Less verbose output in the tarball job. svn path=/nixpkgs/trunk/; revision=34335
Diffstat (limited to 'pkgs/top-level/make-tarball.nix')
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index b3c29c26746..d2f74fe74c0 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -2,17 +2,20 @@ also builds the documentation and tests whether the Nix expressions evaluate correctly. */ -{ nixpkgs ? {outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; rev = 1234;} +{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false }: with import nixpkgs.outPath {}; -releaseTools.makeSourceTarball { +releaseTools.sourceTarball { name = "nixpkgs-tarball"; src = nixpkgs; inherit officialRelease; + version = builtins.readFile ../../VERSION; + versionSuffix = if officialRelease then "" else "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}"; + buildInputs = [ lzma libxml2 # Needed for the release notes. @@ -24,7 +27,7 @@ releaseTools.makeSourceTarball { configurePhase = '' eval "$preConfigure" - releaseName=nixpkgs-$(cat $src/VERSION)$VERSION_SUFFIX + releaseName=nixpkgs-$VERSION$VERSION_SUFFIX echo "release name is $releaseName" echo $releaseName > relname ''; @@ -57,7 +60,7 @@ releaseTools.makeSourceTarball { 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" \ - -qa \* --drv-path --system-filter \* --system --meta --xml + -qa \* --drv-path --system-filter \* --system --meta --xml > /dev/null stopNest done |