git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #60386 from rvolosatovs/update/echoip

Update echoip, switch to buildGoModule

commit19bf73d82624b122762ea6e6beadafccfbb6f769 authorworldofpeace <worldofpeace@protonmail.ch> dateTue 10 Sep 2019, 10:19 (7 years ago) parent748046d463faed
2 files changed+9−85
pkgs/servers/echoip/default.nix+9−11 pkgs/servers/echoip/deps.nix−74
pkgs/servers/echoip/default.nix+9−11
@@ -1,25 +1,23 @@
1−{ lib, buildGoPackage, fetchFromGitHub }:
1+{ lib, buildGoModule, fetchFromGitHub }:
22
3−buildGoPackage {
3+buildGoModule {
44 pname = "echoip";
5− version = "unstable-2018-11-20";
6−
7− goPackagePath = "github.com/mpolden/echoip";
5+ version = "unstable-2019-07-12";
86
97 src = fetchFromGitHub {
108 owner = "mpolden";
119 repo = "echoip";
12− rev = "4bfaf671b9f75a7b2b37543b2991401cbf57f1f0";
13− sha256 = "0n5d9i8cc5lqgy5apqd3zhyl3h1xjacf612z8xpvbm75jnllcvxy";
10+ rev = "fb5fac92d2173c2a5b07ed4ecc7b5fefe8484ed2";
11+ sha256 = "17gkh1qfxasvxy25lmjdwk5fsjkcp7lmw9si3xzf01m7qnj5zi4b";
1412 };
1513
16− goDeps = ./deps.nix;
14+ modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly";
1715
18− outputs = [ "bin" "out" ];
16+ outputs = [ "out" "index" ];
1917
2018 postInstall = ''
21− mkdir -p $out
22− cp $src/index.html $out/index.html
19+ mkdir -p $index
20+ cp $src/index.html $index/index.html
2321 '';
2422
2523 meta = with lib; {
pkgs/servers/echoip/deps.nixdeleted−74
@@ -1,74 +0,0 @@
1−# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
2−[
3−
4− {
5− goPackagePath = "github.com/davecgh/go-spew";
6− fetch = {
7− type = "git";
8− url = "https://github.com/davecgh/go-spew";
9− rev = "v1.1.1";
10− sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
11− };
12− }
13−
14− {
15− goPackagePath = "github.com/jessevdk/go-flags";
16− fetch = {
17− type = "git";
18− url = "https://github.com/jessevdk/go-flags";
19− rev = "v1.4.0";
20− sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a";
21− };
22− }
23−
24− {
25− goPackagePath = "github.com/oschwald/geoip2-golang";
26− fetch = {
27− type = "FromGitHub";
28− owner = "oschwald";
29− repo = "geoip2-golang";
30− rev = "v1.2.1";
31− sha256 = "0zpgpz577rghvgis6ji9l99pq87z5izbgzmnbyn3dy533bayrgpw";
32− };
33− }
34−
35− {
36− goPackagePath = "github.com/oschwald/maxminddb-golang";
37− fetch = {
38− type = "git";
39− url = "https://github.com/oschwald/maxminddb-golang";
40− rev = "v1.2.1";
41− sha256 = "0nlip5a2yiig0sv9y3ky4kn8730236wal3zjcs4yfgnw6nxl3rjr";
42− };
43− }
44−
45− {
46− goPackagePath = "github.com/pmezard/go-difflib";
47− fetch = {
48− type = "git";
49− url = "https://github.com/pmezard/go-difflib";
50− rev = "v1.0.0";
51− sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
52− };
53− }
54−
55− {
56− goPackagePath = "github.com/stretchr/testify";
57− fetch = {
58− type = "git";
59− url = "https://github.com/stretchr/testify";
60− rev = "v1.2.2";
61− sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
62− };
63− }
64−
65− {
66− goPackagePath = "golang.org/x/sys";
67− fetch = {
68− type = "git";
69− url = "https://go.googlesource.com/sys";
70− rev = "37707fdb30a5";
71− sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg";
72− };
73− }
74−]