no more goPackages

29 files changed, 57 insertions, 107 deletions

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 8ae26640f28..2b0ae98c464 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,9 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
-with go16Packages;
-
-buildGoPackage rec {
+buildGo16Package rec {
   name = "caddy-${version}";
   version = "0.8.3";
   rev = "e2234497b79603388b58ba226abb157aa4aaf065";
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index b98160c6be7..7dfd8b2a32e 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,9 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, go16Packages, consul-ui, fetchFromGitHub }:
+{ stdenv, lib, buildGo16Package, consul-ui, fetchFromGitHub }:
 
-with go16Packages;
-
-buildGoPackage rec {
+buildGo16Package rec {
   name = "consul-${version}";
   version = "0.6.4";
   rev = "v${version}";
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index 05bb6104969..8bb672c286d 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, libpcap, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, libpcap, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "etcd-${version}";
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index c826180d758..5716779fb9a 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "gotty-${version}";
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index 9b49f051ac2..23131553539 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -1,8 +1,5 @@
-# This file was generated by go2nix.
 { stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup,
-  goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+  buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "interlock-${version}";
diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix
index 1fa2a610178..d67aa337476 100644
--- a/pkgs/servers/mesos-dns/default.nix
+++ b/pkgs/servers/mesos-dns/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "mesos-dns-${version}";
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index 77271b26a8d..5b5593d5514 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -1,6 +1,6 @@
-{ lib, fetchFromGitHub, goPackages }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
-goPackages.buildGoPackage rec {
+buildGoPackage rec {
   name = "bosun";
   rev = "0.5.0-alpha";
 
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix
index 98cb3a3db48..ee904dec6eb 100644
--- a/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -1,9 +1,6 @@
-# This file was generated by go2nix.
-{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
-with go16Packages;
-
-buildGoPackage rec {
+buildGo16Package rec {
   name = "consul-alerts-${version}";
   version = "0.3.3";
   rev = "v${version}";
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 55ef139624c..28bf83a247f 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,6 +1,6 @@
-{ lib, goPackages, fetchurl, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchurl, fetchFromGitHub }:
 
-goPackages.buildGoPackage rec {
+buildGoPackage rec {
   version = "3.0.1";
   name = "grafana-v${version}";
   goPackagePath = "github.com/grafana/grafana";
diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix
index f50a52fe280..db3c518c729 100644
--- a/pkgs/servers/monitoring/heapster/default.nix
+++ b/pkgs/servers/monitoring/heapster/default.nix
@@ -1,6 +1,6 @@
-{ lib, goPackages, fetchFromGitHub, docker }:
+{ lib, buildGoPackage, fetchFromGitHub, docker }:
 
-goPackages.buildGoPackage rec {
+buildGoPackage rec {
   rev = "3057a2c07061c8d9ffaf77e5442ffd7512ac0133";
   name = "heapster-${lib.strings.substring 0 7 rev}";
   goPackagePath = "k8s.io/heapster";
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 2bed947aad0..846d1d57277 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "alertmanager-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix
index 5dd7c207f10..20f6e7249ab 100644
--- a/pkgs/servers/monitoring/prometheus/cli.nix
+++ b/pkgs/servers/monitoring/prometheus/cli.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "prometheus_cli-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index 3b22fedfd93..49701505aa6 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "collectd-exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index d6b82c38d01..aa76fdc455a 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "prometheus-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index efb5abd9f9f..140bde2c0cb 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "haproxy_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
index a06c9671f81..0fdff08ca1d 100644
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "mesos_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index 29bf6bdb3bb..d0c1c2073f5 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "mysqld_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index 5da457c0a19..c3b25e2fcc5 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "nginx_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 276ff73d0fc..3b8d6fe1666 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "node_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
index 512cd4ca22c..5f45c63d96e 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "prom2json-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 751748783e4..83ef4e20931 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, go-bindata, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, go, buildGoPackage, go-bindata, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "pushgateway-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
index 4458b668a19..90a35bf4592 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "statsd_bridge-${version}";
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 50abc70bfb7..1372b6a3fc3 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -1,6 +1,6 @@
-{ lib, goPackages, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
-goPackages.buildGoPackage rec {
+buildGoPackage rec {
   name = "influxdb-${rev}";
   rev = "v0.9.4";
   goPackagePath = "github.com/influxdb/influxdb";
@@ -14,10 +14,7 @@ goPackages.buildGoPackage rec {
 
   excludedPackages = "test";
 
-  propagatedBuildInputs = with goPackages; [
-    raft raft-boltdb snappy crypto gogo.protobuf pool pat toml
-    gollectd statik liner
-  ];
+  goDeps = ./deps.json;
 
   meta = with lib; {
     description = "An open-source distributed time series database";
diff --git a/pkgs/servers/nosql/influxdb/deps.json b/pkgs/servers/nosql/influxdb/deps.json
new file mode 100644
index 00000000000..f091b58e8dc
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb/deps.json
@@ -0,0 +1,21 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/peterh/liner",
+      "github.com/BurntSushi/toml",
+      "github.com/kimor79/gollectd",
+      "github.com/bmizerany/pat",
+      "gopkg.in/fatih/pool.v2",
+      "github.com/rakyll/statik",
+      "github.com/armon/go-metrics",
+      "github.com/boltdb/bolt",
+      "github.com/golang/snappy",
+      "github.com/hashicorp/go-msgpack",
+      "github.com/hashicorp/raft-boltdb",
+      "golang.org/x/crypto",
+      "github.com/gogo/protobuf",
+      "github.com/hashicorp/raft"
+    ]
+  }
+]
diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
index 5831340eccd..b716a042577 100644
--- a/pkgs/servers/nsq/default.nix
+++ b/pkgs/servers/nsq/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "nsq-${version}";
diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix
index 9381db95d77..3e3bcea46a2 100644
--- a/pkgs/servers/oauth2_proxy/default.nix
+++ b/pkgs/servers/oauth2_proxy/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "oauth2_proxy-${version}";
diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix
index 5f4c6453de7..4a37213846a 100644
--- a/pkgs/servers/serf/default.nix
+++ b/pkgs/servers/serf/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "serf-${version}";
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
index fc4c82f5042..b02373ef51c 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/pkgs/servers/skydns/default.nix
@@ -1,7 +1,4 @@
-# This file was generated by go2nix.
-{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-with goPackages;
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "skydns-${version}";
diff --git a/pkgs/servers/skydns/deps.json b/pkgs/servers/skydns/deps.json
index 9ddbfa3c434..446f60f3279 100644
--- a/pkgs/servers/skydns/deps.json
+++ b/pkgs/servers/skydns/deps.json
@@ -5,6 +5,7 @@
       "github.com/miekg/dns",
       "github.com/prometheus/client_golang",
       "github.com/prometheus/client_model",
+      "bitbucket.org/ww/goautoneg",
       "github.com/prometheus/common",
       "github.com/prometheus/procfs",
       "github.com/coreos/go-systemd",