From 204f19ede1b72dbfa09aff692d64df1429e23243 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 31 Aug 2016 22:37:38 +0300 Subject: [PATCH] all-packages.nix: Remove '.bin // { outputs = [ "bin" ] }' hacks from Go packages Not needed in the new multiple-outputs infra. --- pkgs/top-level/all-packages.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca4ab18864e..bd7fff480b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3117,7 +3117,7 @@ in platformioPackages = callPackage ../development/arduino/platformio { }; platformio = platformioPackages.platformio-chrootenv.override {}; - platinum-searcher = (callPackage ../tools/text/platinum-searcher { }).bin // { outputs = [ "bin" ]; }; + platinum-searcher = callPackage ../tools/text/platinum-searcher { }; plex = callPackage ../servers/plex { enablePlexPass = config.plex.enablePlexPass or false; }; @@ -3221,7 +3221,7 @@ in pytrainer = callPackage ../applications/misc/pytrainer { }; - remarshal = (callPackage ../development/tools/remarshal { }).bin // { outputs = [ "bin" ]; }; + remarshal = callPackage ../development/tools/remarshal { }; rtaudio = callPackage ../development/libraries/audio/rtaudio { }; @@ -10216,7 +10216,7 @@ in bird = callPackage ../servers/bird { }; bird6 = bird.override { enableIPv6 = true; }; - bosun = (callPackage ../servers/monitoring/bosun { }).bin // { outputs = [ "bin" ]; }; + bosun = callPackage ../servers/monitoring/bosun { }; scollector = bosun; charybdis = callPackage ../servers/irc/charybdis {}; @@ -10300,13 +10300,13 @@ in gofish = callPackage ../servers/gopher/gofish { }; - grafana = (callPackage ../servers/monitoring/grafana { }).bin // { outputs = ["bin"]; }; + grafana = callPackage ../servers/monitoring/grafana { }; groovebasin = callPackage ../applications/audio/groovebasin { nodejs = nodejs-0_10; }; haka = callPackage ../tools/security/haka { }; - heapster = (callPackage ../servers/monitoring/heapster { }).bin // { outputs = ["bin"]; }; + heapster = callPackage ../servers/monitoring/heapster { }; hbase = callPackage ../servers/hbase {}; @@ -10466,9 +10466,9 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; - influxdb = (callPackage ../servers/nosql/influxdb/v0.nix { }).bin // { outputs = [ "bin" ]; }; + influxdb = callPackage ../servers/nosql/influxdb/v0.nix { }; - influxdb10 = (callPackage ../servers/nosql/influxdb/v1.nix { }).bin // { outputs = [ "bin" ]; }; + influxdb10 = callPackage ../servers/nosql/influxdb/v1.nix { }; hyperdex = callPackage ../servers/nosql/hyperdex { }; @@ -17316,9 +17316,7 @@ in sqsh = callPackage ../development/tools/sqsh { }; - terraform = - (callPackage ../applications/networking/cluster/terraform {}).bin // - { outputs = [ "bin" ]; }; + terraform = callPackage ../applications/networking/cluster/terraform {}; tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };