releaseTools: no-op expression cleanup
No functional change, was just reading through these and cleaning/sanitizing them a bit while I'm here.
This commit is contained in:
parent
b0c75e811a
commit
79d875ae77
|
@ -51,20 +51,16 @@ stdenv.mkDerivation (
|
|||
configureFlags="--prefix=$prefix $configureFlags"
|
||||
dontAddPrefix=1
|
||||
prefix=$TMPDIR/inst$prefix
|
||||
''; # */
|
||||
|
||||
'';
|
||||
|
||||
doDist = true;
|
||||
|
||||
distPhase =
|
||||
''
|
||||
distPhase = ''
|
||||
mkdir -p $out/tarballs
|
||||
tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst .
|
||||
'';
|
||||
|
||||
|
||||
finalPhase =
|
||||
''
|
||||
finalPhase = ''
|
||||
for i in $out/tarballs/*; do
|
||||
echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
|
||||
done
|
||||
|
@ -74,7 +70,6 @@ stdenv.mkDerivation (
|
|||
test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name)
|
||||
'';
|
||||
|
||||
|
||||
meta = (if args ? meta then args.meta else {}) // {
|
||||
description = "Build of a generic binary distribution";
|
||||
};
|
||||
|
|
|
@ -88,7 +88,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
|
|||
done
|
||||
|
||||
eval "$postInstall"
|
||||
''; # */
|
||||
'';
|
||||
|
||||
meta = (if args ? meta then args.meta else {}) // {
|
||||
description = "Deb package for ${diskImage.fullName}";
|
||||
|
|
|
@ -44,7 +44,7 @@ vmTools.buildRPM (
|
|||
for rpmdir in $extraRPMs ; do
|
||||
echo "file rpm-extra $(ls $rpmdir/rpms/*/*.rpm | grep -v 'src\.rpm' | sort | head -1)" >> $out/nix-support/hydra-build-products
|
||||
done
|
||||
''; # */
|
||||
'';
|
||||
|
||||
meta = (if args ? meta then args.meta else {}) // {
|
||||
description = "RPM package for ${diskImage.fullName}";
|
||||
|
|
Loading…
Reference in New Issue
Block a user