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"
|
configureFlags="--prefix=$prefix $configureFlags"
|
||||||
dontAddPrefix=1
|
dontAddPrefix=1
|
||||||
prefix=$TMPDIR/inst$prefix
|
prefix=$TMPDIR/inst$prefix
|
||||||
''; # */
|
'';
|
||||||
|
|
||||||
|
|
||||||
doDist = true;
|
doDist = true;
|
||||||
|
|
||||||
distPhase =
|
distPhase = ''
|
||||||
''
|
|
||||||
mkdir -p $out/tarballs
|
mkdir -p $out/tarballs
|
||||||
tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst .
|
tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst .
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
finalPhase = ''
|
||||||
finalPhase =
|
|
||||||
''
|
|
||||||
for i in $out/tarballs/*; do
|
for i in $out/tarballs/*; do
|
||||||
echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
|
echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
|
||||||
done
|
done
|
||||||
|
@ -74,7 +70,6 @@ stdenv.mkDerivation (
|
||||||
test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name)
|
test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
meta = (if args ? meta then args.meta else {}) // {
|
meta = (if args ? meta then args.meta else {}) // {
|
||||||
description = "Build of a generic binary distribution";
|
description = "Build of a generic binary distribution";
|
||||||
};
|
};
|
||||||
|
|
|
@ -88,7 +88,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
|
||||||
done
|
done
|
||||||
|
|
||||||
eval "$postInstall"
|
eval "$postInstall"
|
||||||
''; # */
|
'';
|
||||||
|
|
||||||
meta = (if args ? meta then args.meta else {}) // {
|
meta = (if args ? meta then args.meta else {}) // {
|
||||||
description = "Deb package for ${diskImage.fullName}";
|
description = "Deb package for ${diskImage.fullName}";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{pkgs}:
|
{ pkgs }:
|
||||||
|
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ vmTools.buildRPM (
|
||||||
for rpmdir in $extraRPMs ; do
|
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
|
echo "file rpm-extra $(ls $rpmdir/rpms/*/*.rpm | grep -v 'src\.rpm' | sort | head -1)" >> $out/nix-support/hydra-build-products
|
||||||
done
|
done
|
||||||
''; # */
|
'';
|
||||||
|
|
||||||
meta = (if args ? meta then args.meta else {}) // {
|
meta = (if args ? meta then args.meta else {}) // {
|
||||||
description = "RPM package for ${diskImage.fullName}";
|
description = "RPM package for ${diskImage.fullName}";
|
||||||
|
|
Loading…
Reference in a new issue