Merge pull request #68194 from adisbladis/drop-go-1_10

Drop unsupported go version 1.10

3 files changed, 36 insertions, 9 deletions

diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix
index 97d876da1279..b2ef04dcffc7 100644
--- a/pkgs/tools/backup/diskrsync/default.nix
+++ b/pkgs/tools/backup/diskrsync/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "diskrsync";
-  version = "unstable-2018-02-03";
+  version = "unstable-2019-01-02";
 
   src = fetchFromGitHub {
     owner = "dop251";
     repo = pname;
-    rev = "2f36bd6e5084ce16c12a2ee216ebb2939a7d5730";
-    sha256 = "1rpfk7ds4lpff30aq4d8rw7g9j4bl2hd1bvcwd1pfxalp222zkxn";
+    rev = "e8598ef71038527a8a77d1a6cf2a73cfd96d9139";
+    sha256 = "1dqpmc4hp81knhdk3mrmwdr66xiibsvj5lagbm5ciajg9by45mcs";
   };
 
   goPackagePath = "github.com/dop251/diskrsync";
diff --git a/pkgs/tools/backup/diskrsync/deps.nix b/pkgs/tools/backup/diskrsync/deps.nix
index 684100968e88..8045737164b1 100644
--- a/pkgs/tools/backup/diskrsync/deps.nix
+++ b/pkgs/tools/backup/diskrsync/deps.nix
@@ -1,12 +1,12 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
 [
   {
     goPackagePath = "github.com/dop251/spgz";
     fetch = {
       type = "git";
       url = "https://github.com/dop251/spgz";
-      rev = "d50e5e978e08044da0cf9babc6b42b55ec8fe0d5";
-      sha256 = "11h8z6cwxw272rn5zc4y3w9d6py113iaimy681v6xxv26d30m8bx";
+      rev = "b86304a2b188";
+      sha256 = "1zss1z523qagk99plb0my8m8ng0danl372iyk1pr4i2skp2bf5z7";
     };
   }
   {
@@ -14,8 +14,35 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "1875d0a70c90e57f11972aefd42276df65e895b9";
-      sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q";
+      rev = "9756ffdc2472";
+      sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "eb5bcb51f2a3";
+      sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "97732733099d";
+      sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "v0.3.0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
     };
   }
 ]
diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index 17473b639881..f1a61adabbb6 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
   buildPhase = ''
     runHook preBuild
     cd go/src/github.com/theupdateframework/notary
-    make client GITCOMMIT=${gitcommit}
+    SKIPENVCHECK=1 make client GITCOMMIT=${gitcommit}
     runHook postBuild
   '';