From 7eb671ebcdd41d86980aa4826fa7b06f31a2ea0a Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 6 Jun 2016 02:28:52 +0200
Subject: no more goPackages

---
 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 +++++++++
 18 files changed, 36 insertions(+), 112 deletions(-)
 create mode 100644 pkgs/tools/text/platinum-searcher/deps.json

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
index 18877917d0d36..197a7b80af362 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 e1adb6ccf90dc..c8717ad1f6cb1 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 55be2dd9e73bd..0bb92f14e15cc 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 9a1269815afb8..cee4ec925c01d 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 d1fd3ac0afce3..f9cf313b77488 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 552d01041310a..618d6c752e6ee 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 c0333a14ed47d..1cda3149bb426 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 74240a859c899..723410183f1b9 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 fef1707d50524..d02e2865c8f51 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 be2f10b3a35ec..c80f5d36567d0 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 d7c4bcf04378f..9644fa069722e 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 e751d991542da..6231d5005dc9a 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 d73827f636b45..5e8d260d69369 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 18f33da8ea102..8470441f530b6 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 416c856a5ae46..5e5e0edcfe58f 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 989ad2b51a186..7c4bda8a56998 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 ca4ac0b8a9a54..9eae37c6d1a7d 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 0000000000000..fc137e2629831
--- /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"
+    ]
+  }
+]
-- 
cgit 1.4.1