buildGoPackage: deps.json -> deps.nix in NIXON

https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages

15 files changed, 123 insertions, 123 deletions

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 3eaf5ae5d1b3..60a7007db195 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   buildInputs = [ ncurses ];
 
-  goDeps = ./deps.json;
+  goDeps = ./deps.nix;
 
   patchPhase = ''
     sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim
diff --git a/pkgs/tools/misc/fzf/deps.json b/pkgs/tools/misc/fzf/deps.json
deleted file mode 100644
index a856d2d5fa81..000000000000
--- a/pkgs/tools/misc/fzf/deps.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "goPackagePath": "github.com/junegunn/go-runewidth",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/junegunn/go-runewidth",
-      "rev": "63c378b851290989b19ca955468386485f118c65",
-      "sha256": "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"
-    }
-  },
-  {
-    "goPackagePath": "github.com/junegunn/go-shellwords",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/junegunn/go-shellwords",
-      "rev": "35d512af75e283aae4ca1fc3d44b159ed66189a4",
-      "sha256": "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7"
-    }
-  }
-]
diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix
new file mode 100644
index 000000000000..985308538321
--- /dev/null
+++ b/pkgs/tools/misc/fzf/deps.nix
@@ -0,0 +1,20 @@
+[
+  {
+    goPackagePath = "github.com/junegunn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/junegunn/go-runewidth";
+      rev = "63c378b851290989b19ca955468386485f118c65";
+      sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d";
+    };
+  }
+  {
+    goPackagePath = "github.com/junegunn/go-shellwords";
+    fetch = {
+      type = "git";
+      url = "https://github.com/junegunn/go-shellwords";
+      rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4";
+      sha256 = "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7";
+    };
+  }
+]
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index 6e3fe1223fc4..7c944ceaab3f 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -15,5 +15,5 @@ buildGoPackage rec {
     sha256 = "0bbmbb1xxdgvqvg1ssn9d4j213li7bbbx3y42iz4fs10xv7x4r0c";
   };
 
-  goDeps = ./deps.json;
+  goDeps = ./deps.nix;
 }
diff --git a/pkgs/tools/misc/gawp/deps.json b/pkgs/tools/misc/gawp/deps.json
deleted file mode 100644
index a51c17253538..000000000000
--- a/pkgs/tools/misc/gawp/deps.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[
-    {
-        "goPackagePath": "golang.org/x/sys",
-        "fetch": {
-            "type": "git",
-            "url": "https://go.googlesource.com/sys",
-            "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f",
-            "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"
-        }
-    },
-    {
-        "goPackagePath": "gopkg.in/fsnotify.v1",
-        "fetch": {
-            "type": "git",
-            "url": "https://gopkg.in/fsnotify.v1",
-            "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0",
-            "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"
-        }
-    },
-    {
-        "goPackagePath": "gopkg.in/yaml.v2",
-        "fetch": {
-            "type": "git",
-            "url": "https://gopkg.in/yaml.v2",
-            "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
-            "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
-        }
-    }
-]
diff --git a/pkgs/tools/misc/gawp/deps.nix b/pkgs/tools/misc/gawp/deps.nix
new file mode 100644
index 000000000000..cf577a30354c
--- /dev/null
+++ b/pkgs/tools/misc/gawp/deps.nix
@@ -0,0 +1,29 @@
+[
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "d9157a9621b69ad1d8d77a1933590c416593f24f";
+      sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/fsnotify.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/fsnotify.v1";
+      rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0";
+      sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
+      sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
+    };
+  }
+]
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
index 1cda3149bb42..52e7793d9744 100644
--- a/pkgs/tools/misc/i3cat/default.nix
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -13,5 +13,5 @@ buildGoPackage rec {
     sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72";
   };
 
-  goDeps = ./deps.json;
+  goDeps = ./deps.nix;
 }
diff --git a/pkgs/tools/misc/i3cat/deps.json b/pkgs/tools/misc/i3cat/deps.json
deleted file mode 100644
index 0db944a83613..000000000000
--- a/pkgs/tools/misc/i3cat/deps.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-    {
-        "goPackagePath": "github.com/vincent-petithory/structfield",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/vincent-petithory/structfield",
-            "rev": "01a738558a47fbf16712994d1737fb31c77e7d11",
-            "sha256": "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw"
-        }
-    }
-]
diff --git a/pkgs/tools/misc/i3cat/deps.nix b/pkgs/tools/misc/i3cat/deps.nix
new file mode 100644
index 000000000000..01e85cbd824d
--- /dev/null
+++ b/pkgs/tools/misc/i3cat/deps.nix
@@ -0,0 +1,11 @@
+[
+  {
+    goPackagePath = "github.com/vincent-petithory/structfield";
+    fetch = {
+      type = "git";
+      url = "https://github.com/vincent-petithory/structfield";
+      rev = "01a738558a47fbf16712994d1737fb31c77e7d11";
+      sha256 = "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw";
+    };
+  }
+]
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
index 113b8b2b4cec..f67fd383f18d 100644
--- a/pkgs/tools/misc/mongodb-tools/default.nix
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -21,7 +21,7 @@ buildGoPackage rec {
     sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm";
   };
 
-  goDeps = ./deps.json;
+  goDeps = ./deps.nix;
 
   # Mongodb incorrectly names all of their binaries main
   # Let's work around this with our own installer
diff --git a/pkgs/tools/misc/mongodb-tools/deps.json b/pkgs/tools/misc/mongodb-tools/deps.json
deleted file mode 100644
index c1cc7f96f750..000000000000
--- a/pkgs/tools/misc/mongodb-tools/deps.json
+++ /dev/null
@@ -1,47 +0,0 @@
-[
-    {
-        "goPackagePath": "golang.org/x/crypto",
-        "fetch": {
-            "type": "git",
-            "url": "https://go.googlesource.com/crypto",
-            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
-            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
-        }
-    },
-    {
-        "goPackagePath": "github.com/howeyc/gopass",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/howeyc/gopass",
-            "rev": "2c70fa70727c953c51695f800f25d6b44abb368e",
-            "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"
-        }
-    },
-    {
-        "goPackagePath": "gopkg.in/mgo.v2",
-        "fetch": {
-            "type": "git",
-            "url": "https://gopkg.in/mgo.v2",
-            "rev": "c6a7dce14133ccac2dcac3793f1d6e2ef048503a",
-            "sha256": "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"
-        }
-    },
-    {
-        "goPackagePath": "gopkg.in/tomb.v2",
-        "fetch": {
-            "type": "git",
-            "url": "https://gopkg.in/tomb.v2",
-            "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8",
-            "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"
-        }
-    },
-    {
-        "goPackagePath": "github.com/jessevdk/go-flags",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/jessevdk/go-flags",
-            "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539",
-            "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"
-        }
-    }
-]
diff --git a/pkgs/tools/misc/mongodb-tools/deps.nix b/pkgs/tools/misc/mongodb-tools/deps.nix
new file mode 100644
index 000000000000..437dcd649373
--- /dev/null
+++ b/pkgs/tools/misc/mongodb-tools/deps.nix
@@ -0,0 +1,47 @@
+[
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
+      sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
+    };
+  }
+  {
+    goPackagePath = "github.com/howeyc/gopass";
+    fetch = {
+      type = "git";
+      url = "https://github.com/howeyc/gopass";
+      rev = "2c70fa70727c953c51695f800f25d6b44abb368e";
+      sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/mgo.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/mgo.v2";
+      rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a";
+      sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/tomb.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/tomb.v2";
+      rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8";
+      sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5";
+    };
+  }
+  {
+    goPackagePath = "github.com/jessevdk/go-flags";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jessevdk/go-flags";
+      rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539";
+      sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680";
+    };
+  }
+]
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
index d02e2865c8f5..ff8e7873839b 100644
--- a/pkgs/tools/misc/upower-notify/default.nix
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -19,5 +19,5 @@ buildGoPackage rec {
     sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw";
   };
 
-  goDeps = ./deps.json;
+  goDeps = ./deps.nix;
 }
diff --git a/pkgs/tools/misc/upower-notify/deps.json b/pkgs/tools/misc/upower-notify/deps.json
deleted file mode 100644
index 96db25d0c7d5..000000000000
--- a/pkgs/tools/misc/upower-notify/deps.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-    {
-        "goPackagePath": "github.com/godbus/dbus",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/godbus/dbus",
-            "rev": "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15",
-            "sha256": "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3"
-        }
-    }
-]
diff --git a/pkgs/tools/misc/upower-notify/deps.nix b/pkgs/tools/misc/upower-notify/deps.nix
new file mode 100644
index 000000000000..8a729857b819
--- /dev/null
+++ b/pkgs/tools/misc/upower-notify/deps.nix
@@ -0,0 +1,11 @@
+[
+  {
+    goPackagePath = "github.com/godbus/dbus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/godbus/dbus";
+      rev = "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15";
+      sha256 = "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3";
+    };
+  }
+]