diff options
| author | cameronfyfe <cameron.j.fyfe@gmail.com> | 2022-01-19 01:23:14 -0700 |
|---|---|---|
| committer | cameronfyfe <cameron.j.fyfe@gmail.com> | 2022-02-01 18:27:08 -0700 |
| commit | 8d2537a820ccf0201f050a3d4f775f2662ca5058 (patch) | |
| tree | 01d7ba6687de819ec4bb81261a24cb0a65a7131f /pkgs/tools/misc/ets | |
| parent | 9a9a5b4087935b4461694cbedc40764389aeb58f (diff) | |
| download | nixpkgs-8d2537a820ccf0201f050a3d4f775f2662ca5058.tar nixpkgs-8d2537a820ccf0201f050a3d4f775f2662ca5058.tar.gz nixpkgs-8d2537a820ccf0201f050a3d4f775f2662ca5058.tar.bz2 nixpkgs-8d2537a820ccf0201f050a3d4f775f2662ca5058.tar.lz nixpkgs-8d2537a820ccf0201f050a3d4f775f2662ca5058.tar.xz nixpkgs-8d2537a820ccf0201f050a3d4f775f2662ca5058.tar.zst nixpkgs-8d2537a820ccf0201f050a3d4f775f2662ca5058.zip | |
ets: use fetchpatch instead of local patch file
Diffstat (limited to 'pkgs/tools/misc/ets')
| -rw-r--r-- | pkgs/tools/misc/ets/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/misc/ets/go-mod.patch | 21 |
2 files changed, 6 insertions, 23 deletions
diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/tools/misc/ets/default.nix index 9451a5a043e..cccd0db35e2 100644 --- a/pkgs/tools/misc/ets/default.nix +++ b/pkgs/tools/misc/ets/default.nix @@ -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="; diff --git a/pkgs/tools/misc/ets/go-mod.patch b/pkgs/tools/misc/ets/go-mod.patch deleted file mode 100644 index 50998e35927..00000000000 --- a/pkgs/tools/misc/ets/go-mod.patch +++ /dev/null @@ -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= |