ngrok: Move to go-packages

This commit is contained in:
William A. Kennington III 2015-09-02 17:18:40 -07:00
parent 5b13442747
commit dea4d952ae
3 changed files with 31 additions and 56 deletions

View file

@ -1,43 +0,0 @@
{ stdenv, git, fetchFromGitHub, goPackages }:
with goPackages;
buildGoPackage rec {
name = "ngrok-1.7";
goPackagePath = "ngrok";
src = fetchFromGitHub {
rev = "b7d5571aa7f12ac304b8f8286b855cc64dd9bab8";
owner = "inconshreveable";
repo = "ngrok";
sha256 = "0a5iq9l9f2xdg6gnc9pj0iczhycv1w5iwcqgzzap83xfpy01xkh4";
};
subPackages = [ "main/ngrok" "main/ngrokd" ];
preConfigure = ''
sed -e '/jteeuwen\/go-bindata/d' \
-e '/export GOPATH/d' \
-e 's/go get/#go get/' \
-e 's|bin/go-bindata|go-bindata|' -i Makefile
make assets BUILDTAGS=release
export sourceRoot=$sourceRoot/src/ngrok
'';
buildInputs = [ git log4go websocket go-vhost mousetrap termbox-go rcrowley.go-metrics
yaml-v1 go-bindata.bin go-update binarydist osext ];
buildFlags = "-tags release";
dontInstallSrc = true;
meta = with stdenv.lib; {
description = "Reverse proxy that creates a secure tunnel between from a public endpoint t
o a locally running web service";
homepage = https://ngrok.com/;
license = licenses.asl20;
maintainers = with maintainers; [ iElectric cstrahan ];
platforms = with platforms; linux ++ darwin;
};
}

View file

@ -2385,7 +2385,7 @@ let
inherit gnumake3;
};
ngrok = callPackage ../tools/misc/ngrok { };
ngrok = pkgs.goPackages.ngrok.bin // { outputs = [ "bin" ]; };
noip = callPackage ../tools/networking/noip { };

View file

@ -1279,19 +1279,13 @@ let
buildInputs = [ dbus ];
};
go-update = buildGoPackage rec {
rev = "c1385108bc3a016f1c88b75ea7d2e2a356a1571d";
name = "go-update-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/inconshreveable/go-update";
go-update-v0 = buildFromGitHub {
rev = "d8b0b1d421aa1cbf392c05869f8abbc669bb7066";
owner = "inconshreveable";
repo = "go-update";
sha256 = "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa";
goPackagePath = "gopkg.in/inconshreveable/go-update.v0";
buildInputs = [ osext binarydist ];
src = fetchFromGitHub {
inherit rev;
owner = "inconshreveable";
repo = "go-update";
sha256 = "16zaxa0i07ismxdmkvjj4dpyc9lgp6wa94q090m9a48si40w9sjn";
};
};
go-uuid = buildFromGitHub {
@ -1781,6 +1775,30 @@ let
propagatedBuildInputs = [ ugorji.go ];
};
ngrok = buildFromGitHub {
rev = "1.7.1";
owner = "inconshreveable";
repo = "ngrok";
sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4";
goPackagePath = "ngrok";
preConfigure = ''
sed -e '/jteeuwen\/go-bindata/d' \
-e '/export GOPATH/d' \
-e 's/go get/#go get/' \
-e 's|bin/go-bindata|go-bindata|' -i Makefile
make assets BUILDTAGS=release
export sourceRoot=$sourceRoot/src/ngrok
'';
buildInputs = [
git log4go websocket go-vhost mousetrap termbox-go rcrowley.go-metrics
yaml-v1 go-bindata.bin go-update-v0 binarydist osext
];
buildFlags = [ "-tags release" ];
};
ntp = buildFromGitHub {
rev = "0a5264e2563429030eb922f258229ae3fee5b5dc";
owner = "beevik";