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

releaseTools.aggregate: Rename ‘members’ to ‘constituents’

Browse Source
This commit is contained in:
Eelco Dolstra 2013-08-15 02:29:08 +02:00
parent d46858d5b8
commit 68469ca342
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,17 +40,17 @@ rec {
} // args); } // args);
aggregate = aggregate =
{ name, members, meta ? { } }: { name, constituents, meta ? { } }:
pkgs.runCommand name pkgs.runCommand name
{ inherit members meta; { inherit constituents meta;
_hydraAggregate = true; _hydraAggregate = true;
} }
'' ''
mkdir -p $out/nix-support mkdir -p $out/nix-support
echo $members > $out/nix-support/hydra-aggregate-members echo $constituents > $out/nix-support/hydra-aggregate-constituents
# Propagate build failures. # Propagate build failures.
for i in $members; do for i in $constituents; do
if [ -e $i/nix-support/failed ]; then if [ -e $i/nix-support/failed ]; then
touch $out/nix-support/failed touch $out/nix-support/failed
fi fi

2
pkgs/top-level/release.nix
View File

@ -25,7 +25,7 @@ let
unstable = pkgs.releaseTools.aggregate unstable = pkgs.releaseTools.aggregate
{ name = "nixpkgs-${jobs.tarball.version}"; { name = "nixpkgs-${jobs.tarball.version}";
meta.description = "Release-critical builds for the Nixpkgs unstable channel"; meta.description = "Release-critical builds for the Nixpkgs unstable channel";
members = constituents =
[ jobs.tarball [ jobs.tarball
jobs.stdenv.x86_64-linux jobs.stdenv.x86_64-linux
jobs.stdenv.i686-linux jobs.stdenv.i686-linux