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:
Benjamin Hipple 2020-03-21 20:15:09 -04:00
parent b0c75e811a
commit 79d875ae77
5 changed files with 30 additions and 35 deletions

View file

@ -51,29 +51,24 @@ stdenv.mkDerivation (
configureFlags="--prefix=$prefix $configureFlags"
dontAddPrefix=1
prefix=$TMPDIR/inst$prefix
''; # */
'';
doDist = true;
distPhase =
''
mkdir -p $out/tarballs
tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst .
'';
distPhase = ''
mkdir -p $out/tarballs
tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst .
'';
finalPhase = ''
for i in $out/tarballs/*; do
echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
done
finalPhase =
''
for i in $out/tarballs/*; do
echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
done
# Propagate the release name of the source tarball. This is
# to get nice package names in channels.
test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name)
'';
# Propagate the release name of the source tarball. This is
# to get nice package names in channels.
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";

View file

@ -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}";

View file

@ -1,4 +1,4 @@
{pkgs}:
{ pkgs }:
with pkgs;

View file

@ -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}";