summary refs log tree commit diff
path: root/pkgs/build-support/release
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-03-20 16:49:02 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-03-20 16:49:02 +0000
commitd8e436c74211ca05cc0479edc89115acb408639d (patch)
tree797e5aba1d71d719c2364cf52e3522714f1246ac /pkgs/build-support/release
parentf77e783622140c711d9bacc634e8cf99a964dd39 (diff)
parentbec9f4b0c37fa187d7e14723811a51e2c212b97a (diff)
downloadnixlib-d8e436c74211ca05cc0479edc89115acb408639d.tar
nixlib-d8e436c74211ca05cc0479edc89115acb408639d.tar.gz
nixlib-d8e436c74211ca05cc0479edc89115acb408639d.tar.bz2
nixlib-d8e436c74211ca05cc0479edc89115acb408639d.tar.lz
nixlib-d8e436c74211ca05cc0479edc89115acb408639d.tar.xz
nixlib-d8e436c74211ca05cc0479edc89115acb408639d.tar.zst
nixlib-d8e436c74211ca05cc0479edc89115acb408639d.zip
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
Diffstat (limited to 'pkgs/build-support/release')
-rw-r--r--pkgs/build-support/release/make-source-tarball.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/build-support/release/make-source-tarball.nix b/pkgs/build-support/release/make-source-tarball.nix
index 2e40ad2d6231..731c29945275 100644
--- a/pkgs/build-support/release/make-source-tarball.nix
+++ b/pkgs/build-support/release/make-source-tarball.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation (
     
     postHook = ''
       ensureDir $out/nix-support
+      shopt -s nullglob
     '';  
 
     postUnpack = ''
@@ -68,6 +69,11 @@ stdenv.mkDerivation (
     autoconfPhase = ''
       export VERSION=${version}
       export VERSION_SUFFIX=${versionSuffix}
+
+      # `svn-revision' is set for backwards compatibility with the old
+      # Nix buildfarm.  (Stratego/XT's autoxt uses it.  We should
+      # update it eventually.)
+      echo ${versionSuffix} | sed -e s/pre// > svn-revision
     
       eval "$preAutoconf"
     
@@ -87,7 +93,6 @@ stdenv.mkDerivation (
     tarballs = "*.tar.gz *.tar.bz2";
 
     finalPhase = ''
-      shopt -s nullglob
       for i in $out/tarballs/*; do
         echo "file source-dist $i" >> $out/nix-support/hydra-build-products
       done