no more goPackages

8 years ago · 7eb671ebcd
parent 6f51fdd81c
commit 7eb671ebcd
81 changed files with 340 additions and 340 deletions
--- 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}";
--- 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}";
--- 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}";
--- 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.
--- 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}";
--- 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}";
--- 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 { };
--- 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
@ -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;
+}
--- 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
@ -0,0 +1,9 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/pquerna/ffjson",
+      "gopkg.in/kothar/go-backblaze.v0"
+    ]
+  }
+]
--- 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}";
--- 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
--- 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 ? [] }:
--- 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"
+    }
  }
 ]
--- 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}";
--- 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}";
--- 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}";
--- 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 ];
 }
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- a/pkgs/development/tools/gotools/default.nix
+++ 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
+  '';
+}
--- a/pkgs/development/tools/gotools/deps.json
+++ b/pkgs/development/tools/gotools/deps.json
@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "golang.org/x/net"
+    ]
+  }
+]
--- 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}";
--- 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}";
--- 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
--- 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";

--- 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}";
--- 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";
--- a/pkgs/development/tools/remarshal/deps.json
+++ b/pkgs/development/tools/remarshal/deps.json
@ -0,0 +1,9 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/BurntSushi/toml",
+      "gopkg.in/yaml.v2"
+    ]
+  }
+]
--- 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}";
--- 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";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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";

--- 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}";
--- 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";
--- 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";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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";
--- a/pkgs/servers/nosql/influxdb/deps.json
+++ 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"
+    ]
+  }
+]
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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",
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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 = [
--- 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:
 #
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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}";
--- 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;
--- a/pkgs/tools/text/platinum-searcher/deps.json
+++ 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"
+    ]
+  }
+]
--- 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 { };