Merge pull request #168480 from NixOS/drop/go116

go1.16: remove
NixOS · May 22, 2022 · 3f39d66 · 3f39d66
2 parents 3e7f627 + 3217850
commit 3f39d66
Show file tree

Hide file tree

Showing 15 changed files with 93 additions and 386 deletions.
diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, darwin, libiconv, alsa-lib, stdenv }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, libiconv, alsa-lib, stdenv }:
 
 buildGoModule rec {
   pname = "sampler";
@@ -11,7 +11,15 @@ buildGoModule rec {
     sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z";
   };
 
-  vendorSha256 = "04nywhkil5xkipcibrp6vi63rfcvqgv7yxbxmmrhqys2cdxfvazv";
+  patches = [
+    # fix build with go 1.17
+    (fetchpatch {
+      url = "https://github.com/sqshq/sampler/commit/97a4a0ebe396a780d62f50f112a99b27044e832b.patch";
+      sha256 = "1czns7jc85mzdf1mg874jimls8x32l35x3lysxfgfah7cvvwznbk";
+    })
+  ];
+
+  vendorSha256 = "02cfzqadpsk2vkzsp7ciji9wisjza0yp35pw42q44navhbzcb4ji";
 
   doCheck = false;
 

diff --git a/pkgs/applications/networking/cluster/nomad/1.1.nix b/pkgs/applications/networking/cluster/nomad/1.1.nix
diff --git a/pkgs/applications/networking/utahfs/default.nix b/pkgs/applications/networking/utahfs/default.nix
@@ -19,5 +19,7 @@ buildGoPackage rec {
     license = licenses.bsd3;
     maintainers = [ maintainers.snglth ];
     platforms = platforms.unix;
+    # does not build with go 1.17: https://github.com/cloudflare/utahfs/issues/46
+    broken = true;
   };
 }
diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix
@@ -120,5 +120,8 @@ in buildBazelPackage rec {
     license = licenses.asl20;
     maintainers = with maintainers; [ andrew-d ];
     platforms = [ "x86_64-linux" ];
+    # The version we have right now does not compile with go 1.17
+    # See https://github.com/NixOS/nixpkgs/pull/174003 if you want to upgrade gvisor
+    broken = true;
   };
 }
diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix
@@ -1,27 +1,33 @@
-{ lib, buildGoPackage, fetchFromGitHub, sqlite }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch, sqlite }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "textql";
-  version = "2.0.3";
-
-  goPackagePath = "github.com/dinedal/textql";
+  version = "unstable-2021-07-06";
 
   src = fetchFromGitHub {
     owner  = "dinedal";
     repo   = "textql";
-    rev    = version;
-    sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3";
+    rev    = "fca00ecc76c8d9891b195ad2c1359d39f0213604";
+    sha256 = "1v1nq7q2jr7d7kimlbykmh9d73cw750ybcz7v7l091qxjsii3irm";
   };
 
+  patches = [
+    # fix build with go 1.17
+    (fetchpatch {
+      url = "https://github.com/jawn-smith/textql/commit/a0d7038c8c30671dfd618f47322814ab492c11a1.patch";
+      sha256 = "1yjdbwipjxxhfcqlj1z6ngsm7dr8gfp4l61jynn2iw7f02cn1yck";
+    })
+  ];
+
+  vendorSha256 = "1h77wfs3plgcsysb13jk526gnbcw2j0xbbrvc68mz6nk1mj6scgw";
+
   postInstall = ''
     install -Dm644 -t $out/share/man/man1 ${src}/man/textql.1
   '';
 
   # needed for tests
   nativeBuildInputs = [ sqlite ];
 
-  goDeps = ./deps.nix;
-
   doCheck = true;
 
   meta = with lib; {

diff --git a/pkgs/development/tools/textql/deps.nix b/pkgs/development/tools/textql/deps.nix