textql: 2.0.3 -> unstable-2021-07-06

pkgs/development/tools/textql/default.nix

@@ -1,18 +1,26 @@
-{ 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
   '';
@@ -20,8 +28,6 @@ buildGoPackage rec {
   # needed for tests
   nativeBuildInputs = [ sqlite ];
 
-  goDeps = ./deps.nix;
-
   doCheck = true;
 
   meta = with lib; {

pkgs/development/tools/textql/deps.nix

@@ -1,11 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/mattn/go-sqlite3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-sqlite3";
-      rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
-      sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
-    };
-  }
-]

pkgs/top-level/all-packages.nix

@@ -11473,9 +11473,7 @@ with pkgs;
 
   testdisk-qt = testdisk.override { enableQt = true; };
 
-  textql = callPackage ../development/tools/textql {
-    buildGoPackage = buildGo116Package;
-  };
+  textql = callPackage ../development/tools/textql { };
 
   html2text = callPackage ../tools/text/html2text { };