From 6b7b8ae98a3ef0fe38d53beef0959eca9bd3e402 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 2 Oct 2009 09:49:53 +0000 Subject: give extraRPMs/-Debs file type rpm-extra or deb-extra in build products svn path=/nixpkgs/trunk/; revision=17592 --- pkgs/build-support/release/debian-build.nix | 2 +- pkgs/build-support/release/rpm-build.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index b763fea13579..2dae9742467f 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -71,7 +71,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( done for i in $extraDebs; do - echo "file deb $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products + echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products done eval "$postInstall" diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index edcec2168686..e758db24665e 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -30,7 +30,7 @@ vmTools.buildRPM ( echo "file rpm $i" >> $out/nix-support/hydra-build-products done for rpmdir in $extraRPMs ; do - echo "file rpm $(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 ''; # */ -- cgit 1.4.1