From 33c3d1b4523d15fee70674f81a304a4f16a3acf7 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 4 Apr 2022 03:43:41 +0000 Subject: [PATCH 1/2] xurls: 2.3.0 -> 2.4.0 --- pkgs/tools/text/xurls/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 774626561c9..40fd854adca 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -1,18 +1,19 @@ -{ buildGoPackage, lib, fetchFromGitHub }: +{ buildGoModule, lib, fetchFromGitHub }: -buildGoPackage rec { - version = "2.3.0"; +buildGoModule rec { pname = "xurls"; + version = "2.4.0"; src = fetchFromGitHub { owner = "mvdan"; repo = "xurls"; rev = "v${version}"; - sha256 = "sha256-+oWYW7ZigkNS6VADNmVwarIsYyd730RAdDwnNIAYvlA="; + sha256 = "sha256-lyDcwbdVKyFRfsYCcPAgIgvrEEdwK0lxmJTvMJcFBCw="; }; - goPackagePath = "mvdan.cc/xurls/v2"; - subPackages = [ "cmd/xurls" ]; + vendorSha256 = "sha256-lJzgJxW/GW3J09uKQGoEX+UsHnB1pGG71U/zy4b9rXo="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Extract urls from text"; @@ -20,5 +21,6 @@ buildGoPackage rec { maintainers = with maintainers; [ koral ]; platforms = platforms.unix; license = licenses.bsd3; + mainProgram = "xurls"; }; } From 7591fec329e34f31739aea31cbd582174063e737 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 16 May 2022 00:21:26 +0800 Subject: [PATCH 2/2] xurls: remove unnecessary platforms and mainProgram --- pkgs/tools/text/xurls/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 40fd854adca..4da65d9af02 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -19,8 +19,6 @@ buildGoModule rec { description = "Extract urls from text"; homepage = "https://github.com/mvdan/xurls"; maintainers = with maintainers; [ koral ]; - platforms = platforms.unix; license = licenses.bsd3; - mainProgram = "xurls"; }; }