From 68469ca342a16b1573c2892fad50b15b6bd649e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Aug 2013 02:29:08 +0200
Subject: [PATCH] =?UTF-8?q?releaseTools.aggregate:=20Rename=20=E2=80=98mem?=
 =?UTF-8?q?bers=E2=80=99=20to=20=E2=80=98constituents=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/build-support/release/default.nix | 8 ++++----
 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