build-support/release: Simplify meta.description

Phrases like "Build of a ..." are redundant because everything is a
build.
This commit is contained in:
Eelco Dolstra 2013-03-01 12:50:29 +01:00
parent 7af6f82d2f
commit a1c5d6642b
4 changed files with 6 additions and 6 deletions

View File

@ -83,7 +83,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
''; # */ ''; # */
meta = (if args ? meta then args.meta else {}) // { meta = (if args ? meta then args.meta else {}) // {
description = "Build of a Deb package on ${diskImage.fullName} (${diskImage.name})"; description = "Deb package for ${diskImage.fullName}";
}; };
} }

View File

@ -111,7 +111,7 @@ stdenv.mkDerivation (
(stdenv.lib.optional doCoverageAnalysis "coverageReportPhase") ++ ["finalPhase"]; (stdenv.lib.optional doCoverageAnalysis "coverageReportPhase") ++ ["finalPhase"];
meta = (if args ? meta then args.meta else {}) // { meta = (if args ? meta then args.meta else {}) // {
description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}"; description = if doCoverageAnalysis then "Coverage analysis" else "Nix package for ${stdenv.system}";
}; };
} }

View File

@ -33,21 +33,21 @@ vmTools.buildRPM (
rpm -Up ''${rpms[*]} --excludepath /nix/store rpm -Up ''${rpms[*]} --excludepath /nix/store
eval "$postRPMInstall" eval "$postRPMInstall"
echo "uninstalling ''${rpmNames[*]}..." echo "uninstalling ''${rpmNames[*]}..."
rpm -e ''${rpmNames[*]} --nodeps rpm -e ''${rpmNames[*]} --nodeps
for i in $out/rpms/*/*.src.rpm; do for i in $out/rpms/*/*.src.rpm; do
echo "file srpm $i" >> $out/nix-support/hydra-build-products echo "file srpm $i" >> $out/nix-support/hydra-build-products
done done
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 = "Build of an RPM package on ${diskImage.fullName} (${diskImage.name})"; description = "RPM package for ${diskImage.fullName}";
}; };
} }

View File

@ -126,7 +126,7 @@ stdenv.mkDerivation (
}; };
meta = (if args ? meta then args.meta else {}) // { meta = (if args ? meta then args.meta else {}) // {
description = "Build of a source distribution from a checkout"; description = "Source distribution";
# Tarball builds are generally important, so give them a high # Tarball builds are generally important, so give them a high
# default priority. # default priority.