diff options
| author | ajs124 <git@ajs124.de> | 2022-04-13 12:45:10 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2022-05-22 13:47:12 +0000 |
| commit | ff95455ab2a4cca77f70a62bcb82fe54d20161e1 (patch) | |
| tree | b2b8980f2bf6ad2bbc63f59072b062ed6a74b9fb | |
| parent | 5c46ce199dafce61df441f01f0ed9494f2844827 (diff) | |
| download | nixpkgs-ff95455ab2a4cca77f70a62bcb82fe54d20161e1.tar nixpkgs-ff95455ab2a4cca77f70a62bcb82fe54d20161e1.tar.gz nixpkgs-ff95455ab2a4cca77f70a62bcb82fe54d20161e1.tar.bz2 nixpkgs-ff95455ab2a4cca77f70a62bcb82fe54d20161e1.tar.lz nixpkgs-ff95455ab2a4cca77f70a62bcb82fe54d20161e1.tar.xz nixpkgs-ff95455ab2a4cca77f70a62bcb82fe54d20161e1.tar.zst nixpkgs-ff95455ab2a4cca77f70a62bcb82fe54d20161e1.zip | |
textql: 2.0.3 -> unstable-2021-07-06
| -rw-r--r-- | pkgs/development/tools/textql/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/development/tools/textql/deps.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 16 insertions, 23 deletions
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 7b80192a75e..3a1a6bcd05d 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/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; { diff --git a/pkgs/development/tools/textql/deps.nix b/pkgs/development/tools/textql/deps.nix deleted file mode 100644 index e166e73a61f..00000000000 --- a/pkgs/development/tools/textql/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; - sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; - }; - } -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74000eafbe9..143f12a1fe9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { }; |