diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-07-26 13:08:52 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-07-26 13:11:42 +1000 |
commit | 59484f4d99db183fea9eace97a2f4679b1dc460c (patch) | |
tree | 9ab241cd89af313b67c6097f591c35ffaee13199 /pkgs/servers/gobetween | |
parent | ba979da06014f415ddc985ea849834463569952f (diff) |
gobetween: 0.7.0 -> 0.8.0
https://github.com/yyyar/gobetween/releases/tag/0.8.0
Diffstat (limited to 'pkgs/servers/gobetween')
-rw-r--r-- | pkgs/servers/gobetween/default.nix | 13 | ||||
-rw-r--r-- | pkgs/servers/gobetween/gomod.patch | 21 |
2 files changed, 6 insertions, 28 deletions
diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index 2b474d818ad2..09af704db2be 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -1,16 +1,15 @@ -{ rsync, buildGoModule, fetchFromGitHub, lib, runCommand, enableStatic ? false }: +{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }: buildGoModule rec { pname = "gobetween"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "yyyar"; repo = "gobetween"; rev = version; - sha256 = "f01593509ccece063acd47002c4fc52261fbbbcdbf14b088d813b7d8e38fcca8"; + sha256 = "0bxf89l53sqan9qq23rwawjkcanv9p61sw56zjqhyx78f0bh0zbc"; }; - patches = [ ./gomod.patch ]; deleteVendor = true; @@ -21,8 +20,8 @@ buildGoModule rec { lxd = fetchFromGitHub { owner = "lxc"; repo = "lxd"; - rev = "41efd98813f3b42f1752ff6c2c7569a054924623"; - sha256 = "02vnvjjkzl7b0i2cn03f1lb3jgj5rd3wdkii4pqi9bvmhzszg0l2"; + rev = "814c96fcec7478c9cac9582fead011b2dee0af5b"; + sha256 = "03k2mwkfzgqmgzgxw46mymgkidbjlfv70pzw8hlyi18ag8jj4g5j"; }; overrideModAttrs = (_: { @@ -32,7 +31,7 @@ buildGoModule rec { ''; }); - vendorSha256 = "1pd0zrjwpw6yv2s86a818yy2ma2fkazd3sb2h6zfp9mvyixgxgri"; + vendorSha256 = "1nnz75mv27iwl5z7wa986gs8mhyn10452vini5x90yfx523bg589"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/gobetween/gomod.patch b/pkgs/servers/gobetween/gomod.patch deleted file mode 100644 index 98181e3fe794..000000000000 --- a/pkgs/servers/gobetween/gomod.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/go.mod b/go.mod -index 536631a..f91e862 100644 ---- a/go.mod -+++ b/go.mod -@@ -7,7 +7,7 @@ require ( - github.com/burntsushi/toml v0.3.1 - github.com/elgs/gojq v0.0.0-20160421194050-81fa9a608a13 - github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 // indirect -- github.com/flosch/pongo2 v0.0.0-20181225140029-79872a7b2769 // indirect -+ github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4 // indirect - github.com/fsouza/go-dockerclient v1.3.6 - github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a - github.com/gin-gonic/gin v1.3.0 -@@ -20,7 +20,6 @@ require ( - github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect - github.com/juju/persistent-cookiejar v0.0.0-20171026135701-d5e5a8405ef9 // indirect - github.com/juju/schema v0.0.0-20181210140654-64a6158e9071 // indirect -- github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d // indirect - github.com/juju/webbrowser v0.0.0-20180907093207-efb9432b2bcb // indirect - github.com/julienschmidt/httprouter v1.2.0 // indirect - github.com/lxc/lxd v0.0.0-20190314233831-41efd98813f3 |