lol

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

authored by

ajs124 and committed by
Jörg Thalheim
ff95455a 5c46ce19

+16 -23
+15 -9
pkgs/development/tools/textql/default.nix
··· 1 - { lib, buildGoPackage, fetchFromGitHub, sqlite }: 1 + { lib, buildGoModule, fetchFromGitHub, fetchpatch, sqlite }: 2 2 3 - buildGoPackage rec { 3 + buildGoModule rec { 4 4 pname = "textql"; 5 - version = "2.0.3"; 6 - 7 - goPackagePath = "github.com/dinedal/textql"; 5 + version = "unstable-2021-07-06"; 8 6 9 7 src = fetchFromGitHub { 10 8 owner = "dinedal"; 11 9 repo = "textql"; 12 - rev = version; 13 - sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3"; 10 + rev = "fca00ecc76c8d9891b195ad2c1359d39f0213604"; 11 + sha256 = "1v1nq7q2jr7d7kimlbykmh9d73cw750ybcz7v7l091qxjsii3irm"; 14 12 }; 15 13 14 + patches = [ 15 + # fix build with go 1.17 16 + (fetchpatch { 17 + url = "https://github.com/jawn-smith/textql/commit/a0d7038c8c30671dfd618f47322814ab492c11a1.patch"; 18 + sha256 = "1yjdbwipjxxhfcqlj1z6ngsm7dr8gfp4l61jynn2iw7f02cn1yck"; 19 + }) 20 + ]; 21 + 22 + vendorSha256 = "1h77wfs3plgcsysb13jk526gnbcw2j0xbbrvc68mz6nk1mj6scgw"; 23 + 16 24 postInstall = '' 17 25 install -Dm644 -t $out/share/man/man1 ${src}/man/textql.1 18 26 ''; 19 27 20 28 # needed for tests 21 29 nativeBuildInputs = [ sqlite ]; 22 - 23 - goDeps = ./deps.nix; 24 30 25 31 doCheck = true; 26 32
-11
pkgs/development/tools/textql/deps.nix
··· 1 - [ 2 - { 3 - goPackagePath = "github.com/mattn/go-sqlite3"; 4 - fetch = { 5 - type = "git"; 6 - url = "https://github.com/mattn/go-sqlite3"; 7 - rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; 8 - sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; 9 - }; 10 - } 11 - ]
+1 -3
pkgs/top-level/all-packages.nix
··· 11473 11473 11474 11474 testdisk-qt = testdisk.override { enableQt = true; }; 11475 11475 11476 - textql = callPackage ../development/tools/textql { 11477 - buildGoPackage = buildGo116Package; 11478 - }; 11476 + textql = callPackage ../development/tools/textql { }; 11479 11477 11480 11478 html2text = callPackage ../tools/text/html2text { }; 11481 11479