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

Merge pull request #60386 from rvolosatovs/update/echoip

Browse source 
Update echoip, switch to buildGoModule
This commit is contained in:
worldofpeace 2019-09-10 10:19:00 -04:00 committed by GitHub
commit 19bf73d826
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/servers/echoip/default.nix
View file

@ -1,25 +1,23 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage {
buildGoModule {
pname = "echoip";
version = "unstable-2018-11-20";
goPackagePath = "github.com/mpolden/echoip";
version = "unstable-2019-07-12";
src = fetchFromGitHub {
owner = "mpolden";
repo = "echoip";
rev = "4bfaf671b9f75a7b2b37543b2991401cbf57f1f0";
sha256 = "0n5d9i8cc5lqgy5apqd3zhyl3h1xjacf612z8xpvbm75jnllcvxy";
rev = "fb5fac92d2173c2a5b07ed4ecc7b5fefe8484ed2";
sha256 = "17gkh1qfxasvxy25lmjdwk5fsjkcp7lmw9si3xzf01m7qnj5zi4b";
};
goDeps = ./deps.nix;
modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly";
outputs = [ "bin" "out" ];
outputs = [ "out" "index" ];
postInstall = ''
mkdir -p $out
cp $src/index.html $out/index.html
mkdir -p $index
cp $src/index.html $index/index.html
'';
meta = with lib; {

74
pkgs/servers/echoip/deps.nix generated
View file

@ -1,74 +0,0 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "v1.1.1";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/jessevdk/go-flags";
fetch = {
type = "git";
url = "https://github.com/jessevdk/go-flags";
rev = "v1.4.0";
sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a";
};
}
{
goPackagePath = "github.com/oschwald/geoip2-golang";
fetch = {
type = "FromGitHub";
owner = "oschwald";
repo = "geoip2-golang";
rev = "v1.2.1";
sha256 = "0zpgpz577rghvgis6ji9l99pq87z5izbgzmnbyn3dy533bayrgpw";
};
}
{
goPackagePath = "github.com/oschwald/maxminddb-golang";
fetch = {
type = "git";
url = "https://github.com/oschwald/maxminddb-golang";
rev = "v1.2.1";
sha256 = "0nlip5a2yiig0sv9y3ky4kn8730236wal3zjcs4yfgnw6nxl3rjr";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.2.2";
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "37707fdb30a5";
sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg";
};
}
]