public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83112 from bhipple/dev/reltools-cleanup

Browse Source 
releaseTools: no-op expression cleanup
This commit is contained in:
Matthew Bauer 2020-04-04 17:18:28 -05:00 committed by GitHub
commit eab992b4ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/build-support/release/binary-tarball.nix
View File

@ -51,29 +51,24 @@ 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 = ''
for i in $out/tarballs/*; do
echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
done
finalPhase = # Propagate the release name of the source tarball. This is
'' # to get nice package names in channels.
for i in $out/tarballs/*; do test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name)
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)
'';
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";

2
pkgs/build-support/release/debian-build.nix
View File

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

2
pkgs/build-support/release/default.nix
View File

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

2
pkgs/build-support/release/rpm-build.nix
View File

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