MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #93884 from zowoq/gobetween

Browse source 
gobetween: 0.7.0 -> 0.8.0
This commit is contained in:
zimbatm 2020-07-26 13:25:17 +00:00 committed by GitHub
commit dad2f74082
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/servers/gobetween/default.nix
View file

@ -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

21
pkgs/servers/gobetween/gomod.patch
View file

@ -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