diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-04-15 18:39:27 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-04-15 18:39:27 +0200 |
| commit | 08a2e95eafe73b47f6beba8c915515079c3d328a (patch) | |
| tree | f78800737aab4ea68d40e9e561e0584e943c57da /pkgs/build-support | |
| parent | 40d5244cf3842282aef0a1c19c7bdb508677baae (diff) | |
mkChannel: Remove channelName attribute.
The third argument in hydra-build-products is actually the base directory and not a name, Alzheimer's near! Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/channel.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/build-support/channel.nix b/pkgs/build-support/channel.nix index ff0fecb3..de75c4f5 100644 --- a/pkgs/build-support/channel.nix +++ b/pkgs/build-support/channel.nix @@ -1,9 +1,9 @@ { stdenv }: -{ name, channelName ? null, src, constituents ? [], meta ? {}, ... }@args: +{ name, src, constituents ? [], meta ? {}, ... }@args: stdenv.mkDerivation { - inherit name channelName src constituents meta; + inherit name src constituents meta; _hydraAggregate = true; phases = [ "unpackPhase" "installPhase" ]; @@ -13,11 +13,9 @@ stdenv.mkDerivation { tar cJf "$out/tarballs/nixexprs.tar.xz" \ --owner=0 --group=0 --mtime="1970-01-01 00:00:00 UTC" \ --transform='s!^\.!${name}!' . - if [ -z "$channelName" ]; then - echo "file channel $out/tarballs/nixexprs.tar.xz" - else - echo "file channel \"$channelName\" $out/tarballs/nixexprs.tar.xz" - fi > "$out/nix-support/hydra-build-products" + + echo "file channel $out/tarballs/nixexprs.tar.xz" \ + > "$out/nix-support/hydra-build-products" echo $constituents > "$out/nix-support/hydra-aggregate-constituents" for i in $constituents; do |