public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Include the Git shortrev in the version number.

Browse Source 
* Less verbose output in the tarball job.

svn path=/nixpkgs/trunk/; revision=34335
This commit is contained in:
Eelco Dolstra 2012-06-04 04:12:17 +00:00
parent 3761afc91a
commit 887c89cc33
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/top-level/make-tarball.nix
View File

@ -2,17 +2,20 @@
also builds the documentation and tests whether the Nix expressions also builds the documentation and tests whether the Nix expressions
evaluate correctly. */ 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 , officialRelease ? false
}: }:
with import nixpkgs.outPath {}; with import nixpkgs.outPath {};
releaseTools.makeSourceTarball { releaseTools.sourceTarball {
name = "nixpkgs-tarball"; name = "nixpkgs-tarball";
src = nixpkgs; src = nixpkgs;
inherit officialRelease; inherit officialRelease;
version = builtins.readFile ../../VERSION;
versionSuffix = if officialRelease then "" else "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}";
buildInputs = [ buildInputs = [
lzma lzma
libxml2 # Needed for the release notes. libxml2 # Needed for the release notes.
@ -24,7 +27,7 @@ releaseTools.makeSourceTarball {
configurePhase = '' configurePhase = ''
eval "$preConfigure" eval "$preConfigure"
releaseName=nixpkgs-$(cat $src/VERSION)$VERSION_SUFFIX releaseName=nixpkgs-$VERSION$VERSION_SUFFIX
echo "release name is $releaseName" echo "release name is $releaseName"
echo $releaseName > relname echo $releaseName > relname
''; '';
@ -57,7 +60,7 @@ releaseTools.makeSourceTarball {
header "checking pkgs/top-level/all-packages.nix on $platform" header "checking pkgs/top-level/all-packages.nix on $platform"
nix-env --readonly-mode -f pkgs/top-level/all-packages.nix \ nix-env --readonly-mode -f pkgs/top-level/all-packages.nix \
--show-trace --argstr system "$platform" \ --show-trace --argstr system "$platform" \
-qa \* --drv-path --system-filter \* --system --meta --xml -qa \* --drv-path --system-filter \* --system --meta --xml > /dev/null
stopNest stopNest
done done