cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ets: use fetchpatch instead of local patch file

Browse source
This commit is contained in:
cameronfyfe 2022-01-19 01:23:14 -07:00
parent 9a9a5b4087
commit 8d2537a820
2 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/misc/ets/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles }:
buildGoModule rec {
pname = "ets";
@ -11,7 +11,11 @@ buildGoModule rec {
sha256 = "sha256-XWIDo5msTMTLr60x1R9cwsiZIDG6G+uHWx8idt4F2iA=";
};
patches = [ ./go-mod.patch ];
# https://github.com/zmwangx/ets/pull/18/
patches = [ (fetchpatch {
url = "https://github.com/zmwangx/ets/commit/600ec17a9c86ca63cd022d00439cdc4978e2afa9.patch";
sha256 = "sha256-SGCISHkWNFubgKkQYx8Vf5/fknNDfPNYkSuw1mMhZaE=";
}) ];
vendorSha256 = "sha256-+8dXfqOu8XTw2uEx3GAynQSHtzifejZtddr1CdxrupA=";

21
pkgs/tools/misc/ets/go-mod.patch
View file

@ -1,21 +0,0 @@
diff --git a/go.mod b/go.mod
index 3b5d491..b658c8e 100644
--- a/go.mod
+++ b/go.mod
@@ -8,4 +8,5 @@ require (
github.com/mattn/go-runewidth v0.0.9
github.com/riywo/loginshell v0.0.0-20190610082906-2ed199a032f6
github.com/spf13/pflag v1.0.5
+ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
)
diff --git a/go.sum b/go.sum
index c795477..05ea136 100644
--- a/go.sum
+++ b/go.sum
@@ -24,4 +24,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=