From 7eb671ebcdd41d86980aa4826fa7b06f31a2ea0a Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Mon, 6 Jun 2016 02:28:52 +0200 Subject: [PATCH] no more goPackages --- pkgs/applications/misc/wego/default.nix | 5 +- .../networking/cluster/terraform/default.nix | 7 +- .../applications/networking/drive/default.nix | 5 +- .../instant-messengers/pond/default.nix | 4 +- .../xmpp-client/default.nix | 5 +- .../networking/syncthing012/default.nix | 5 +- .../git-and-tools/default.nix | 2 +- .../git-annex-remote-b2/default.nix | 17 +++ .../git-annex-remote-b2/deps.json | 9 ++ .../version-management/git-lfs/default.nix | 5 +- pkgs/build-support/docker/default.nix | 4 +- .../go-modules/generic/default.nix | 2 +- pkgs/development/go-modules/libs.json | 119 +++++++++++++++++- pkgs/development/tools/deis/default.nix | 5 +- pkgs/development/tools/glide/default.nix | 6 +- pkgs/development/tools/go-bindata/default.nix | 5 +- .../tools/go-repo-root/default.nix | 7 +- pkgs/development/tools/go2nix/default.nix | 5 +- pkgs/development/tools/gocode/default.nix | 5 +- pkgs/development/tools/goimports/default.nix | 5 +- pkgs/development/tools/golint/default.nix | 5 +- pkgs/development/tools/gotags/default.nix | 5 +- pkgs/development/tools/gotools/default.nix | 44 +++++++ pkgs/development/tools/gotools/deps.json | 8 ++ pkgs/development/tools/govers/default.nix | 5 +- pkgs/development/tools/gox/default.nix | 5 +- pkgs/development/tools/packer/default.nix | 6 +- pkgs/development/tools/packer/deps.nix | 7 +- pkgs/development/tools/pup/default.nix | 5 +- pkgs/development/tools/remarshal/default.nix | 6 +- pkgs/development/tools/remarshal/deps.json | 9 ++ pkgs/development/tools/textql/default.nix | 5 +- pkgs/servers/caddy/default.nix | 7 +- pkgs/servers/consul/default.nix | 7 +- pkgs/servers/etcd/default.nix | 5 +- pkgs/servers/gotty/default.nix | 5 +- pkgs/servers/interlock/default.nix | 5 +- pkgs/servers/mesos-dns/default.nix | 5 +- pkgs/servers/monitoring/bosun/default.nix | 4 +- .../monitoring/consul-alerts/default.nix | 7 +- pkgs/servers/monitoring/grafana/default.nix | 4 +- pkgs/servers/monitoring/heapster/default.nix | 4 +- .../monitoring/prometheus/alertmanager.nix | 5 +- pkgs/servers/monitoring/prometheus/cli.nix | 5 +- .../prometheus/collectd-exporter.nix | 5 +- .../servers/monitoring/prometheus/default.nix | 5 +- .../prometheus/haproxy-exporter.nix | 5 +- .../monitoring/prometheus/mesos-exporter.nix | 5 +- .../monitoring/prometheus/mysqld-exporter.nix | 5 +- .../monitoring/prometheus/nginx-exporter.nix | 5 +- .../monitoring/prometheus/node-exporter.nix | 5 +- .../monitoring/prometheus/prom2json.nix | 5 +- .../monitoring/prometheus/pushgateway.nix | 5 +- .../monitoring/prometheus/statsd-bridge.nix | 5 +- pkgs/servers/nosql/influxdb/default.nix | 9 +- pkgs/servers/nosql/influxdb/deps.json | 21 ++++ pkgs/servers/nsq/default.nix | 5 +- pkgs/servers/oauth2_proxy/default.nix | 5 +- pkgs/servers/serf/default.nix | 5 +- pkgs/servers/skydns/default.nix | 5 +- pkgs/servers/skydns/deps.json | 1 + pkgs/shells/oh/default.nix | 5 +- pkgs/tools/X11/go-sct/default.nix | 5 +- pkgs/tools/admin/lxd/default.nix | 5 +- pkgs/tools/filesystems/go-mtpfs/default.nix | 5 +- pkgs/tools/misc/asciinema/default.nix | 5 +- pkgs/tools/misc/fzf/default.nix | 5 +- pkgs/tools/misc/gawp/default.nix | 4 +- pkgs/tools/misc/i3cat/default.nix | 5 +- pkgs/tools/misc/mongodb-tools/default.nix | 5 +- pkgs/tools/misc/upower-notify/default.nix | 5 +- pkgs/tools/networking/flannel/default.nix | 5 +- pkgs/tools/networking/ngrok/default.nix | 5 +- pkgs/tools/networking/s3gof3r/default.nix | 5 +- pkgs/tools/security/hologram/default.nix | 5 +- pkgs/tools/security/vault/default.nix | 7 +- pkgs/tools/system/confd/default.nix | 5 +- pkgs/tools/system/consul-template/default.nix | 7 +- pkgs/tools/text/platinum-searcher/default.nix | 49 +------- pkgs/tools/text/platinum-searcher/deps.json | 16 +++ pkgs/top-level/all-packages.nix | 26 +--- 81 files changed, 340 insertions(+), 340 deletions(-) create mode 100644 pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix create mode 100644 pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json create mode 100644 pkgs/development/tools/gotools/default.nix create mode 100644 pkgs/development/tools/gotools/deps.json create mode 100644 pkgs/development/tools/remarshal/deps.json create mode 100644 pkgs/servers/nosql/influxdb/deps.json create mode 100644 pkgs/tools/text/platinum-searcher/deps.json diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 2ce62783100..5918f3ef378 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/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 = "wego-${version}"; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index cacfaf15a21..44e6a10963a 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/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 = "terraform-${version}"; version = "0.6.15"; rev = "v${version}"; diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index a85247f7e1e..3b64d7af43b 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/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 = "drive-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index f40bf77bb71..3b7b96b778f 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -1,8 +1,6 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, +{ stdenv, lib, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, fetchgit, fetchhg, fetchbzr, fetchsvn }: -with goPackages; let isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64; gui = true; # Might be implemented with nixpkgs config. diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index 6ce338d3a45..de8d0c19b4f 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/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 = "xmpp-client-${version}"; diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix index dcf5e30551c..6f6336eef70 100644 --- a/pkgs/applications/networking/syncthing012/default.nix +++ b/pkgs/applications/networking/syncthing012/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 = "syncthing-${version}"; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index ab111a7f2f7..0732b0d7329 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -40,7 +40,7 @@ rec { git-annex = pkgs.haskell.packages.lts.git-annex-with-assistant; gitAnnex = git-annex; - git-annex-remote-b2 = pkgs.goPackages.git-annex-remote-b2; + git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { }; # support for bugzilla git-bz = callPackage ./git-bz { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix new file mode 100644 index 00000000000..4ede1b352ea --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -0,0 +1,17 @@ +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "git-annex-remote-b2-${version}"; + version = "20151212-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; + + goPackagePath = "github.com/encryptio/git-annex-remote-b2"; + + src = fetchgit { + inherit rev; + url = "https://github.com/encryptio/git-annex-remote-b2"; + sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2"; + }; + + goDeps = ./deps.json; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json new file mode 100644 index 00000000000..b04422768a5 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json @@ -0,0 +1,9 @@ +[ + { + "include": "../../libs.json", + "packages": [ + "github.com/pquerna/ffjson", + "gopkg.in/kothar/go-backblaze.v0" + ] + } +] diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 5186d2a5ba9..089997342c0 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/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 = "git-lfs-${version}"; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 5ead82dee8b..4c5378ea73f 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, callPackage, runCommand, writeReferencesToFile, writeText, vmTools, writeScript -, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, goPackages, pigz }: +, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, go, pigz }: # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. @@ -10,7 +10,7 @@ rec { # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions ecc. tarsum = runCommand "tarsum" { - buildInputs = [ goPackages.go ]; + buildInputs = [ go ]; } '' mkdir tarsum cd tarsum diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index cc355c6e5d7..07cc42cfcdf 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -52,7 +52,7 @@ let fetchhg { inherit (goDep.fetch) url rev sha256; } - else {}; + else abort "Unrecognized package fetch type"; }; importGodeps = { depsFile, filterPackages ? [] }: diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json index 84a211e68e0..520c1fd8e5c 100644 --- a/pkgs/development/go-modules/libs.json +++ b/pkgs/development/go-modules/libs.json @@ -32,7 +32,7 @@ "type": "git", "url": "https://github.com/docopt/docopt-go", "rev": "784ddc588536785e7299f7272f39101f7faccc3f", - "sha256": "13x00cnady5znysfwca3x59dl04m8rvnk2yprgyqqpg2y4v0xmbf" + "sha256": "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj" } }, { @@ -1411,5 +1411,122 @@ "rev": "c8748311a7528d0ba7330d302adbc5a677ef9c9e", "sha256": "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac" } + }, + { + "goPackagePath": "github.com/hashicorp/raft", + "fetch": { + "type": "git", + "url": "https://github.com/hashicorp/raft", + "rev": "a8065f298505708bf60f518c09178149f3c06f21", + "sha256": "122mjijphas7ybbvssxv1r36sb8i907gdr9kvplnx6yg9w52j3mn" + } + }, + { + "goPackagePath": "github.com/hashicorp/raft-boltdb", + "fetch": { + "type": "git", + "url": "https://github.com/hashicorp/raft-boltdb", + "rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee", + "sha256": "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia" + } + }, + { + "goPackagePath": "github.com/rakyll/statik", + "fetch": { + "type": "git", + "url": "https://github.com/rakyll/statik", + "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465", + "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp" + } + }, + { + "goPackagePath": "gopkg.in/fatih/pool.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/fatih/pool.v2", + "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715", + "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0" + } + }, + { + "goPackagePath": "github.com/bmizerany/pat", + "fetch": { + "type": "git", + "url": "https://github.com/bmizerany/pat", + "rev": "b8a35001b773c267eb260a691f4e5499a3531600", + "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz" + } + }, + { + "goPackagePath": "github.com/kimor79/gollectd", + "fetch": { + "type": "git", + "url": "https://github.com/kimor79/gollectd", + "rev": "cf6dec97343244b5d8a5485463675d42f574aa2d", + "sha256": "1f3ml406cprzjc192csyr2af4wcadkc74kg8n4c0zdzglxxfsqxa" + } + }, + { + "goPackagePath": "github.com/monochromegane/conflag", + "fetch": { + "type": "git", + "url": "https://github.com/monochromegane/conflag", + "rev": "6d68c9aa4183844ddc1655481798fe4d90d483e9", + "sha256": "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa" + } + }, + { + "goPackagePath": "github.com/monochromegane/go-home", + "fetch": { + "type": "git", + "url": "https://github.com/monochromegane/go-home", + "rev": "25d9dda593924a11ea52e4ffbc8abdb0dbe96401", + "sha256": "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww" + } + }, + { + "goPackagePath": "github.com/monochromegane/terminal", + "fetch": { + "type": "git", + "url": "https://github.com/monochromegane/terminal", + "rev": "2da212063ce19aed90ee5bbb00ad1ad7393d7f48", + "sha256": "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh" + } + }, + { + "goPackagePath": "github.com/monochromegane/go-gitignore", + "fetch": { + "type": "git", + "url": "https://github.com/monochromegane/go-gitignore", + "rev": "38717d0a108ca0e5af632cd6845ca77d45b50729", + "sha256": "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7" + } + }, + { + "goPackagePath": "github.com/shiena/ansicolor", + "fetch": { + "type": "git", + "url": "https://github.com/shiena/ansicolor", + "rev": "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b", + "sha256": "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p" + } + }, + { + "goPackagePath": "github.com/pquerna/ffjson", + "fetch": { + "type": "git", + "url": "https://github.com/pquerna/ffjson", + "rev": "674bc015b5b3f50f9bb2561179778586b9af68c5", + "sha256": "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a" + } + }, + { + "goPackagePath": "gopkg.in/kothar/go-backblaze.v0", + "fetch": { + "type": "git", + "url": "https://gopkg.in/kothar/go-backblaze.v0", + "rev": "373819725fc560fa962c6cd883b533d2ebec4844", + "sha256": "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx" + } } ] diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 5336a14c5a1..449af618cb1 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "deis-${version}"; diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index cc63921976f..9489f5a7bac 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -1,9 +1,7 @@ # 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 = "glide-${version}"; version = "0.10.2"; rev = "${version}"; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index cb9e51dfdfb..4b87e74a630 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/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 = "go-bindata-${version}"; diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index 15aa1504d93..d6ae032f078 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, gotools, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "go-repo-root-${version}"; @@ -16,5 +13,5 @@ buildGoPackage rec { sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; }; - buildInputs = [ tools ]; + buildInputs = [ gotools ]; } diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index bb0000d9e73..757dc8cb379 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -1,9 +1,6 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, go-bindata, goimports, nix-prefetch-git, git, makeWrapper, +{ stdenv, lib, buildGoPackage, go-bindata, goimports, nix-prefetch-git, git, makeWrapper, fetchgit, fetchhg, fetchbzr, fetchsvn }: -with goPackages; - buildGoPackage rec { name = "go2nix-${version}"; version = "20160307-${stdenv.lib.strings.substring 0 7 rev}"; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 0a2b908c9fd..8485a2c346b 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/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 = "gocode-${version}"; diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix index bcc82e80cbf..5c69f34e28b 100644 --- a/pkgs/development/tools/goimports/default.nix +++ b/pkgs/development/tools/goimports/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 = "goimports-${version}"; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 1e63eb73449..29e5b28ad57 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/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 = "lint-${version}"; diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index 65d0d29e158..ad22d4ea407 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/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 = "gotags-${version}"; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix new file mode 100644 index 00000000000..f00794a7eb0 --- /dev/null +++ b/pkgs/development/tools/gotools/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "gotools-${version}"; + version = "20160519-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + + goPackagePath = "golang.org/x/tools"; + goPackageAliases = [ "code.google.com/p/go.tools" ]; + + src = fetchgit { + inherit rev; + url = "https://go.googlesource.com/tools"; + sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + }; + + goDeps = ./deps.json; + + preConfigure = '' + # Make the builtin tools available here + mkdir -p $bin/bin + eval $(go env | grep GOTOOLDIR) + find $GOTOOLDIR -type f | while read x; do + ln -sv "$x" "$bin/bin" + done + export GOTOOLDIR=$bin/bin + ''; + + excludedPackages = "\\(" + + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ]) + + "\\)"; + + # Do not copy this without a good reason for enabling + # In this case tools is heavily coupled with go itself and embeds paths. + allowGoReference = true; + + # Set GOTOOLDIR for derivations adding this to buildInputs + postInstall = '' + mkdir -p $bin/nix-support + substituteAll ${../../go-modules/tools/setup-hook.sh} $bin/nix-support/setup-hook.tmp + cat $bin/nix-support/setup-hook.tmp >> $bin/nix-support/setup-hook + rm $bin/nix-support/setup-hook.tmp + ''; +} diff --git a/pkgs/development/tools/gotools/deps.json b/pkgs/development/tools/gotools/deps.json new file mode 100644 index 00000000000..76e8fd93aa7 --- /dev/null +++ b/pkgs/development/tools/gotools/deps.json @@ -0,0 +1,8 @@ +[ + { + "include": "../../libs.json", + "packages": [ + "golang.org/x/net" + ] + } +] diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix index b3e2b921bd2..bd4dd28f599 100644 --- a/pkgs/development/tools/govers/default.nix +++ b/pkgs/development/tools/govers/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 = "govers-${version}"; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 7b58bafcd62..030a59ed20c 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/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 = "gox-${version}"; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index fc8ef5ff964..7d566254633 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, gox, goPackages, fetchFromGitHub +{ stdenv, lib, go, gox, gotools, buildGoPackage, fetchFromGitHub , fetchgit, fetchhg, fetchbzr, fetchsvn }: stdenv.mkDerivation rec { @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { version = "0.10.1"; src = import ./deps.nix { - inherit stdenv lib go gox goPackages fetchgit fetchhg fetchbzr fetchsvn; + inherit stdenv lib go gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn; }; - buildInputs = [ go gox goPackages.tools ]; + buildInputs = [ go gox gotools ]; configurePhase = '' export GOPATH=$PWD/share/go diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix index 2be1911cf91..5ed606ad6c6 100644 --- a/pkgs/development/tools/packer/deps.nix +++ b/pkgs/development/tools/packer/deps.nix @@ -1,14 +1,11 @@ -# This file was generated by go2nix. -{ stdenv, lib, go, gox, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, go, gox, gotools, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "packer-${version}"; version = "20160507-${stdenv.lib.strings.substring 0 7 rev}"; rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0"; - buildInputs = [ go gox goPackages.tools ]; + buildInputs = [ go gox gotools ]; goPackagePath = "github.com/mitchellh/packer"; diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix index 23ced868bd3..772178dd84c 100644 --- a/pkgs/development/tools/pup/default.nix +++ b/pkgs/development/tools/pup/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 = "pup-${version}"; diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 048604beab9..49de886654c 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -1,6 +1,6 @@ -{ lib, goPackages, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -goPackages.buildGoPackage rec { +buildGoPackage rec { name = "remarshal-${rev}"; rev = "0.3.0"; goPackagePath = "github.com/dbohdan/remarshal"; @@ -12,7 +12,7 @@ goPackages.buildGoPackage rec { sha256 = "0lhsqca3lq3xvdwsmrngv4p6b7k2lkbfnxnk5qj6jdd5y7f4b496"; }; - buildInputs = with goPackages; [ toml yaml-v2 ]; + goDeps = ./deps.json; meta = with lib; { description = "Convert between TOML, YAML and JSON"; diff --git a/pkgs/development/tools/remarshal/deps.json b/pkgs/development/tools/remarshal/deps.json new file mode 100644 index 00000000000..3b43c0e5ff6 --- /dev/null +++ b/pkgs/development/tools/remarshal/deps.json @@ -0,0 +1,9 @@ +[ + { + "include": "../../libs.json", + "packages": [ + "github.com/BurntSushi/toml", + "gopkg.in/yaml.v2" + ] + } +] diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index abc9312c9e2..65fbbcb9e04 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/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 = "textql-${version}"; 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", diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index 3c8b2c89524..c6d3ad06df4 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/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 = "oh-${version}"; diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index 18877917d0d..197a7b80af3 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, xorg, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, xorg, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "go-sct-${version}"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index e1adb6ccf90..c8717ad1f6c 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, pkgconfig, lxc, goPackages, fetchFromGitHub }: - -with goPackages; +{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "lxd-${version}"; diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 55be2dd9e73..0bb92f14e15 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, pkgconfig, libusb1, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, pkgconfig, libusb1, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "go-mtpfs-${version}"; diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 9a1269815af..cee4ec925c0 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/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 = "asciinema-${version}"; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d1fd3ac0afc..f9cf313b774 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, ncurses, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, ncurses, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "fzf-${version}"; diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 552d0104131..618d6c752e6 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -1,8 +1,6 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit }: +{ stdenv, lib, buildGoPackage, fetchgit }: with builtins; -with goPackages; buildGoPackage rec { name = "gawp-${version}"; diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index c0333a14ed4..1cda3149bb4 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/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 = "i3cat-${version}"; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 74240a859c8..723410183f1 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/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 }: let tools = [ diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index fef1707d505..d02e2865c8f 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/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 }: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index be2f10b3a35..c80f5d36567 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/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 = "flannel-${version}"; diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok/default.nix index d7c4bcf0437..9644fa06972 100644 --- a/pkgs/tools/networking/ngrok/default.nix +++ b/pkgs/tools/networking/ngrok/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, pkgconfig, goPackages, go-bindata, fetchFromGitHub }: - -with goPackages; +{ stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub }: buildGoPackage rec { name = "ngrok-${version}"; diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index e751d991542..6231d5005dc 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/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 = "s3gof3r-${version}"; diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index d73827f636b..5e8d260d693 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/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 = "hologram-${version}"; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 18f33da8ea1..8470441f530 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/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 = "vault-${version}"; version = "0.5.2"; rev = "v${version}"; diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix index 416c856a5ae..5e5e0edcfe5 100644 --- a/pkgs/tools/system/confd/default.nix +++ b/pkgs/tools/system/confd/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 = "confd-${version}"; diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 989ad2b51a1..7c4bda8a569 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/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-template-${version}"; version = "0.14.0"; rev = "v${version}"; diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index ca4ac0b8a9a..9eae37c6d1a 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -1,14 +1,10 @@ -{ stdenv, lib, go, goPackages, fetchFromGitHub }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "the_platinum_searcher-${version}"; version = "2.1.1"; rev = "v2.1.1"; - buildInputs = [ go go-flags ansicolor text toml yaml-v2 ]; - goPackagePath = "github.com/monochromegane/the_platinum_searcher"; src = fetchFromGitHub { @@ -18,48 +14,7 @@ buildGoPackage rec { sha256 = "06cs936w3l64ikszcysdm9ijn52kwgi1ffjxkricxbdb677gsk23"; }; - extraSrcs = [ - { - goPackagePath = "github.com/monochromegane/conflag"; - - src = fetchFromGitHub { - owner = "monochromegane"; - repo = "conflag"; - rev = "6d68c9aa4183844ddc1655481798fe4d90d483e9"; - sha256 = "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa"; - }; - } - { - goPackagePath = "github.com/monochromegane/go-gitignore"; - - src = fetchFromGitHub { - owner = "monochromegane"; - repo = "go-gitignore"; - rev = "38717d0a108ca0e5af632cd6845ca77d45b50729"; - sha256 = "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7"; - }; - } - { - goPackagePath = "github.com/monochromegane/go-home"; - - src = fetchFromGitHub { - owner = "monochromegane"; - repo = "go-home"; - rev = "25d9dda593924a11ea52e4ffbc8abdb0dbe96401"; - sha256 = "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww"; - }; - } - { - goPackagePath = "github.com/monochromegane/terminal"; - - src = fetchFromGitHub { - owner = "monochromegane"; - repo = "terminal"; - rev = "2da212063ce19aed90ee5bbb00ad1ad7393d7f48"; - sha256 = "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh"; - }; - } - ]; + goDeps = ./deps.json; meta = with stdenv.lib; { homepage = https://github.com/monochromegane/the_platinum_searcher; diff --git a/pkgs/tools/text/platinum-searcher/deps.json b/pkgs/tools/text/platinum-searcher/deps.json new file mode 100644 index 00000000000..fc137e26298 --- /dev/null +++ b/pkgs/tools/text/platinum-searcher/deps.json @@ -0,0 +1,16 @@ +[ + { + "include": "../../libs.json", + "packages": [ + "github.com/BurntSushi/toml", + "github.com/monochromegane/conflag", + "github.com/monochromegane/go-home", + "github.com/monochromegane/terminal", + "github.com/monochromegane/go-gitignore", + "github.com/shiena/ansicolor", + "golang.org/x/text", + "gopkg.in/yaml.v2", + "github.com/jessevdk/go-flags" + ] + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2db3a392fc8..f856d938e59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7086,8 +7086,6 @@ in gio-sharp = callPackage ../development/libraries/gio-sharp { }; - icon-lang = callPackage ../development/interpreters/icon-lang { }; - libgit2 = callPackage ../development/libraries/git2 ( stdenv.lib.optionalAttrs stdenv.isDarwin { inherit (darwin) libiconv; @@ -9418,8 +9416,6 @@ in xgboost = callPackage ../development/libraries/xgboost { }; - xgeometry-select = callPackage ../tools/X11/xgeometry-select { }; - # Avoid using this. It isn't really a wrapper anymore, but we keep the name. xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { packages = [ @@ -9599,31 +9595,19 @@ in ### DEVELOPMENT / GO MODULES - go14Packages = callPackage ./go-packages.nix { + buildGo14Package = callPackage ../development/go-modules/generic { go = go_1_4; - buildGoPackage = callPackage ../development/go-modules/generic { - go = go_1_4; - }; - overrides = (config.goPackageOverrides or (p: {})) pkgs; }; - go15Packages = callPackage ./go-packages.nix { + buildGo15Package = callPackage ../development/go-modules/generic { go = go_1_5; - buildGoPackage = callPackage ../development/go-modules/generic { - go = go_1_5; - }; - overrides = (config.goPackageOverrides or (p: {})) pkgs; }; - go16Packages = callPackage ./go-packages.nix { + buildGo16Package = callPackage ../development/go-modules/generic { go = go_1_6; - buildGoPackage = callPackage ../development/go-modules/generic { - go = go_1_6; - }; - overrides = (config.goPackageOverrides or (p: {})) pkgs; }; - goPackages = go16Packages; + buildGoPackage = buildGo15Package; go2nix = callPackage ../development/tools/go2nix { }; @@ -11166,6 +11150,8 @@ in govers = callPackage ../development/tools/govers { }; + gotools = callPackage ../development/tools/gotools { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { };