diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-15 02:29:08 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-15 02:29:08 +0200 |
| commit | 68469ca342a16b1573c2892fad50b15b6bd649e1 (patch) | |
| tree | 44fbfd7ab04facb63264c86df77b2c54a3e36448 | |
| parent | d46858d5b859a5b70312e9efad2fe9d377871292 (diff) | |
| download | nixpkgs-68469ca342a16b1573c2892fad50b15b6bd649e1.tar nixpkgs-68469ca342a16b1573c2892fad50b15b6bd649e1.tar.gz nixpkgs-68469ca342a16b1573c2892fad50b15b6bd649e1.tar.bz2 nixpkgs-68469ca342a16b1573c2892fad50b15b6bd649e1.tar.lz nixpkgs-68469ca342a16b1573c2892fad50b15b6bd649e1.tar.xz nixpkgs-68469ca342a16b1573c2892fad50b15b6bd649e1.tar.zst nixpkgs-68469ca342a16b1573c2892fad50b15b6bd649e1.zip | |
releaseTools.aggregate: Rename ‘members’ to ‘constituents’
| -rw-r--r-- | pkgs/build-support/release/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index ce5fe44c98c..8875a8594dc 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -40,17 +40,17 @@ rec { } // args); aggregate = - { name, members, meta ? { } }: + { name, constituents, meta ? { } }: pkgs.runCommand name - { inherit members meta; + { inherit constituents meta; _hydraAggregate = true; } '' mkdir -p $out/nix-support - echo $members > $out/nix-support/hydra-aggregate-members + echo $constituents > $out/nix-support/hydra-aggregate-constituents # Propagate build failures. - for i in $members; do + for i in $constituents; do if [ -e $i/nix-support/failed ]; then touch $out/nix-support/failed fi diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 9734adc3497..1aae2ce4ee2 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -25,7 +25,7 @@ let unstable = pkgs.releaseTools.aggregate { name = "nixpkgs-${jobs.tarball.version}"; meta.description = "Release-critical builds for the Nixpkgs unstable channel"; - members = + constituents = [ jobs.tarball jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux |