diff options
| -rw-r--r-- | pkgs/build-support/channel.nix | 12 | ||||
| -rw-r--r-- | release.nix | 1 |
2 files changed, 5 insertions, 8 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 diff --git a/release.nix b/release.nix index 0632b1c3..3f6e72c5 100644 --- a/release.nix +++ b/release.nix @@ -26,7 +26,6 @@ in with pkgsUpstream.lib; with builtins; { channel = root.pkgs.mkChannel rec { name = "vuizvui-channel-${version}"; - channelName = "generic"; version = "${toString vuizvui.revCount}.${vuizvui.shortRev}"; src = vuizvui; }; |