Merge branch 'master' into hardened-stdenv

3 files changed, 110 insertions, 25 deletions

diff --git a/pkgs/tools/networking/ngrok/deps.json b/pkgs/tools/networking/ngrok/deps.json
index 61dfbf337266..943967b73428 100644
--- a/pkgs/tools/networking/ngrok/deps.json
+++ b/pkgs/tools/networking/ngrok/deps.json
@@ -1,19 +1,101 @@
 [
-  {
-    "include": "../../../go-modules/libs.json",
-    "packages": [
-      "gopkg.in/yaml.v1",
-      "github.com/gorilla/websocket",
-      "github.com/rcrowley/go-metrics",
-      "github.com/inconshreveable/go-vhost",
-      "code.google.com/p/log4go",
-      "github.com/daviddengcn/go-colortext",
-      "gopkg.in/yaml.v1",
-      "github.com/inconshreveable/mousetrap",
-      "github.com/nsf/termbox-go",
-      "gopkg.in/inconshreveable/go-update.v0",
-      "github.com/kardianos/osext",
-      "github.com/kr/binarydist"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/gorilla/websocket",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/gorilla/websocket",
+            "rev": "a622679ebd7a3b813862379232f645f8e690e43f",
+            "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"
+        }
+    },
+    {
+        "goPackagePath": "github.com/rcrowley/go-metrics",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/rcrowley/go-metrics",
+            "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3",
+            "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/inconshreveable/go-vhost",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/inconshreveable/go-vhost",
+            "rev": "c4c28117502e4bf00960c8282b2d1c51c865fe2c",
+            "sha256": "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32"
+        }
+    },
+    {
+        "goPackagePath": "code.google.com/p/log4go",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/ccpaging/log4go",
+            "rev": "cb4cc51cd03958183d3b637d0750497d88c2f7a8",
+            "sha256": "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2"
+        }
+    },
+    {
+        "goPackagePath": "github.com/daviddengcn/go-colortext",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/daviddengcn/go-colortext",
+            "rev": "13eaeb896f5985a1ab74ddea58707a73d875ba57",
+            "sha256": "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/yaml.v1",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/go-yaml/yaml",
+            "rev": "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a",
+            "sha256": "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy"
+        }
+    },
+    {
+        "goPackagePath": "github.com/inconshreveable/mousetrap",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/inconshreveable/mousetrap",
+            "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa",
+            "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"
+        }
+    },
+    {
+        "goPackagePath": "github.com/nsf/termbox-go",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/nsf/termbox-go",
+            "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b",
+            "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/inconshreveable/go-update.v0",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/inconshreveable/go-update",
+            "rev": "d8b0b1d421aa1cbf392c05869f8abbc669bb7066",
+            "sha256": "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/kardianos/osext",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/kardianos/osext",
+            "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc",
+            "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"
+        }
+    },
+    {
+        "goPackagePath": "github.com/kr/binarydist",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/kr/binarydist",
+            "rev": "9955b0ab8708602d411341e55fffd7e0700f86bd",
+            "sha256": "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"
+        }
+    }
 ]
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 6f74df38ad0b..8f56e07403b4 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, sqlite3 }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "7.0.4";
+  version = "7.0.5";
   name = "offlineimap-${version}";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
     owner = "OfflineIMAP";
     repo = "offlineimap";
     rev = "v${version}";
-    sha256 = "1ixm4qp3gljbnbi40h8n6j7c0pzk1ry8hpm4bcf7n68gc07r557n";
+    sha256 = "0gmypc0sribxzglxgymfc5x3saxnkyhbky06dhxanxm6pa1p4blh";
   };
 
   doCheck = false;
diff --git a/pkgs/tools/networking/s3gof3r/deps.json b/pkgs/tools/networking/s3gof3r/deps.json
index d4a41d349b28..e73edde322fc 100644
--- a/pkgs/tools/networking/s3gof3r/deps.json
+++ b/pkgs/tools/networking/s3gof3r/deps.json
@@ -1,8 +1,11 @@
 [
-  {
-    "include": "../../../go-modules/libs.json",
-    "packages": [
-      "github.com/jessevdk/go-flags"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/jessevdk/go-flags",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/jessevdk/go-flags",
+            "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539",
+            "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"
+        }
+    }
 ]