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

6 files changed, 51 insertions, 51 deletions

diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 021d4f074edd..884f34dcf022 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "1xwhjbw0y6j5xy19hz39456l0v6vjg2icd7c1jx4h1cydk3yn39f";
   };
 
-  goDeps = ./deps.json;
+  goDeps = ./deps.nix;
 
   meta = with stdenv.lib; {
     description = "A Novel unix shell in go language";
diff --git a/pkgs/shells/elvish/deps.json b/pkgs/shells/elvish/deps.json
deleted file mode 100644
index d1a4ceebe99d..000000000000
--- a/pkgs/shells/elvish/deps.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-    {
-        "goPackagePath": "github.com/elves/getopt",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/elves/getopt",
-            "rev": "f91a7bf920995832d55a1182f26657bc975b9c24",
-            "sha256": "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za"
-        }
-    },
-    {
-        "goPackagePath": "github.com/mattn/go-sqlite3",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/mattn/go-sqlite3",
-            "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42",
-            "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"
-        }
-    }
-]
diff --git a/pkgs/shells/elvish/deps.nix b/pkgs/shells/elvish/deps.nix
new file mode 100644
index 000000000000..cff60bad0a9b
--- /dev/null
+++ b/pkgs/shells/elvish/deps.nix
@@ -0,0 +1,20 @@
+[
+  {
+    goPackagePath = "github.com/elves/getopt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/elves/getopt";
+      rev = "f91a7bf920995832d55a1182f26657bc975b9c24";
+      sha256 = "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
+      sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
+    };
+  }
+]
diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix
index c6d3ad06df46..c118cea11729 100644
--- a/pkgs/shells/oh/default.nix
+++ b/pkgs/shells/oh/default.nix
@@ -13,5 +13,5 @@ buildGoPackage rec {
     sha256 = "0ajidzs0aisbw74nri9ks6sx6644nmwkisc9mvxm3f89zmnlsgwr";
   };
 
-  goDeps = ./deps.json;
+  goDeps = ./deps.nix;
 }
diff --git a/pkgs/shells/oh/deps.json b/pkgs/shells/oh/deps.json
deleted file mode 100644
index 5aabd0e6dba8..000000000000
--- a/pkgs/shells/oh/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": "github.com/michaelmacinnis/adapted",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/michaelmacinnis/adapted",
-            "rev": "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978",
-            "sha256": "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv"
-        }
-    },
-    {
-        "goPackagePath": "github.com/peterh/liner",
-        "fetch": {
-            "type": "git",
-            "url": "https://github.com/peterh/liner",
-            "rev": "ad1edfd30321d8f006ccf05f1e0524adeb943060",
-            "sha256": "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317"
-        }
-    }
-]
diff --git a/pkgs/shells/oh/deps.nix b/pkgs/shells/oh/deps.nix
new file mode 100644
index 000000000000..b4b98f10c3aa
--- /dev/null
+++ b/pkgs/shells/oh/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 = "github.com/michaelmacinnis/adapted";
+    fetch = {
+      type = "git";
+      url = "https://github.com/michaelmacinnis/adapted";
+      rev = "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978";
+      sha256 = "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv";
+    };
+  }
+  {
+    goPackagePath = "github.com/peterh/liner";
+    fetch = {
+      type = "git";
+      url = "https://github.com/peterh/liner";
+      rev = "ad1edfd30321d8f006ccf05f1e0524adeb943060";
+      sha256 = "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317";
+    };
+  }
+]