Skip to content

Commit

Permalink
go-modules: Update files to use vendorSha256
Browse files Browse the repository at this point in the history
  • Loading branch information
c00w authored and Mic92 committed May 14, 2020
1 parent a0ddea1 commit d6162da
Show file tree
Hide file tree
Showing 215 changed files with 3,251 additions and 423 deletions.
16 changes: 15 additions & 1 deletion pkgs/applications/blockchains/go-ethereum.nix
Expand Up @@ -11,7 +11,21 @@ buildGoModule rec {
sha256 = "1yqqflp73yvjy6bp05xd1nv5fc6p1nx7g4spbssxf3ws96pdh425";
};

modSha256 = "07xrw3fivfpbkg4mp8ghrj1bishfas82dbd780fymgs2h74iigf3";
usb = fetchFromGitHub {
owner = "karalabe";
repo = "usb";
rev = "911d15fe12a9c411cf5d0dd5635231c759399bed";
sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2";
};

vendorSha256 = "12aw8b8ci7nssidh1yz8d2hk43csdacq5jca9y70rjakpl3zndsz";

overrideModAttrs = (_: {
postBuild = ''
cp -r --reflink=auto ${usb}/libusb vendor/github.com/karalabe/usb
cp -r --reflink=auto ${usb}/hidapi vendor/github.com/karalabe/usb
'';
});

subPackages = [
"cmd/abidump"
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/blockchains/lnd.nix
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1amciz924s2h6qhy7w34jpv1jc25p5ayfxzvjph6hhx0bccrm88w";
};

modSha256 = "15i4h3pkvyav9qsbfinzifram0knkylg24j6j0mxs4bnj80j4ycm";
vendorSha256 = "1iyghg11cxvbzi0gl40fvv8pl3d3k52j179w3x5m1f09r5ji223y";

subPackages = ["cmd/lncli" "cmd/lnd"];

Expand All @@ -21,4 +21,4 @@ buildGoModule rec {
license = lib.licenses.mit;
maintainers = with maintainers; [ cypherpunk2140 ];
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/editors/glow/default.nix
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0vhl8d7xxqqyl916nh8sgm1xdaf7xlc3r18464bd2av22q9yz68n";
};

modSha256 = "0r0yq7kgz7i1wf4gxxihdrn1c8mi4wcyhadncxbln24s9c5apxsf";
vendorSha256 = "1c16s5xiqr36azh2w90wg14jlw67ca2flbgjijpz7qd0ypxyfqlk";

buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ];

Expand All @@ -21,4 +21,4 @@ buildGoModule rec {
license = licenses.mit;
maintainers = with maintainers; [ ehmry filalex77 ];
};
}
}
5 changes: 2 additions & 3 deletions pkgs/applications/graphics/pdfcpu/default.nix
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0a7d36hzcvj68apzc726r2vqsjyrkcynxif5laarxapm6p67g3z4";
};

modSha256 = "0ak34wr5cbcvblndslsxdd24vfj3h02xqjqnj5amkll5iqn5mzi1";
vendorSha256 = "09alkpfyxapycv6zsaz7prgbr0a1jzd78n7w2mh01mg4hhb2j3k7";

subPackages = [ "cmd/pdfcpu" ];

Expand All @@ -22,5 +22,4 @@ buildGoModule rec {
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.all;
};
}

}
4 changes: 2 additions & 2 deletions pkgs/applications/misc/archiver/default.nix
Expand Up @@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "1yr2jhidqvbwh1y08lpqaidwpr5yx3bhvznm5fc9pk64s7z5kq3h";
};

modSha256 = "1mrfqhd0zb78rlqlj2ncb0srwjfl7rzhy2p9mwa82pgysvlp08gv";
vendorSha256 = "1ikrgl03r9zkn86kxkqi2kf540g3qzzz24i5wvh6g3d5q49nygl9";

meta = with lib; {
description = "Easily create & extract archives, and compress & decompress files of various formats";
Expand All @@ -23,4 +23,4 @@ buildGoModule rec {
maintainers = with maintainers; [ kalbasit ];
platforms = platforms.all;
};
}
}
2 changes: 1 addition & 1 deletion pkgs/applications/misc/cheat/default.nix
Expand Up @@ -20,7 +20,7 @@ buildGoModule rec {
installShellCompletion scripts/cheat.{bash,fish,zsh}
'';

modSha256 = "1z4za3rivc3vqv59p5yb5c9dcpmq669rzmf4z7zilbvmgm0pbgfp";
vendorSha256 = null;

meta = with stdenv.lib; {
description = "Create and view interactive cheatsheets on the command-line";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/exercism/default.nix
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "17gvz9a0sn4p36hf4l77bxhhfipf4x998iay31layqwbnzmb4xy7";
};

modSha256 = "0pg0hxrr6jjd03wbjn5y65x02md3h352mnm1gr6vyiv7hn4ws14m";
vendorSha256 = "0b2m9xkac60k5rbxmb03cxf530m23av14pnsjk8067l998sm4vqi";

subPackages = [ "./exercism" ];

Expand All @@ -21,4 +21,4 @@ buildGoModule rec {
license = licenses.mit;
maintainers = [ maintainers.rbasso ];
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/misc/geoipupdate/default.nix
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "057f9kp8g3wixjh9dm58g0qvzfcmhwbk1d573ldly4g5404r9bvf";
};

modSha256 = "1bypanvrkcqp8rk84cv2569671irgaf3cy27lcrknyina4pdvir5";
vendorSha256 = "0q4byhvs1c1xm4qjvs2vyf98vdv121qn0z51arcf7k4ayrys5xcx";

meta = with stdenv.lib; {
description = "Automatic GeoIP database updater";
Expand All @@ -20,4 +20,4 @@ buildGoModule rec {
platforms = platforms.all;
maintainers = with maintainers; [ das_j ];
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/misc/gomatrix/default.nix
Expand Up @@ -11,12 +11,12 @@ buildGoModule rec {
sha256 = "1wq55rvpyz0gjn8kiwwj49awsmi86zy1fdjcphzgb7883xalgr2m";
};

modSha256 = "13higizadnf4ypk8qn1b5s6mdg7n6l3indb43mjp1b4cfzjsyl91";
vendorSha256 = "1yw0gph4zfg8w4343882l6b9lggwyak2zz8ic1l1m2m44p3aq169";

meta = with lib; {
description = ''Displays "The Matrix" in a terminal'';
license = licenses.bsd2;
maintainers = with maintainers; [ skykanin ];
homepage = "https://github.com/GeertJohan/gomatrix";
};
}
}
20 changes: 17 additions & 3 deletions pkgs/applications/misc/hugo/default.nix
@@ -1,10 +1,10 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub, libsass }:

buildGoModule rec {
pname = "hugo";
version = "0.70.0";

goPackagePath = "github.com/gohugoio/hugo";
buildInputs = [ libsass ];

src = fetchFromGitHub {
owner = "gohugoio";
Expand All @@ -13,7 +13,21 @@ buildGoModule rec {
sha256 = "14g1x95jh91z9xm3xkv2psw2jn7z6bv2009miyv727df4d58nh6m";
};

modSha256 = "015ha8pjz1fv8qg558xa6hl52fp2qd486ir9m01dvxw63xqx76ss";
golibsass = fetchFromGitHub {
owner = "bep";
repo = "golibsass";
rev = "8a04397f0baba474190a9f58019ff499ec43057a";
sha256 = "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3";
};

overrideModAttrs = (_: {
postBuild = ''
rm -rf vendor/github.com/bep/golibsass/
cp -r --reflink=auto ${golibsass} vendor/github.com/bep/golibsass
'';
});

vendorSha256 = "1wl9pg5wf1n5n7gq6lyz0l5ij4icjpfinl4myxwj93l2hqqyx2lf";

buildFlags = [ "-tags" "extended" ];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/sampler/default.nix
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z";
};

modSha256 = "02ai193lpzsxdn1hpbndkfxdc88nyl4kcgbadhy122kgx13crcy8";
vendorSha256 = "04nywhkil5xkipcibrp6vi63rfcvqgv7yxbxmmrhqys2cdxfvazv";

subPackages = [ "." ];

Expand All @@ -24,4 +24,4 @@ buildGoModule rec {
maintainers = with maintainers; [ uvnikita ];
platforms = platforms.unix;
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/misc/terminal-parrot/default.nix
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722";
};

modSha256 = "01i8fim9z2l8rpdgfaih9ldvbap7gcx5767a15miv8q7sxpr90cp";
vendorSha256 = "1qalnhhq3fmyzj0hkzc5gk9wbypr558mz3ik5msw7fid68k2i48c";

meta = with stdenv.lib; {
description = "Shows colorful, animated party parrot in your terminial";
Expand All @@ -20,4 +20,4 @@ buildGoModule rec {
platforms = platforms.all;
maintainers = [ maintainers.heel ];
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/misc/todoist/default.nix
Expand Up @@ -11,12 +11,12 @@ buildGoModule rec {
sha256 = "0d3c621jaqxd6i58xm6nvi0avrh5mk23r169i95bn73igzw62w33";
};

modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp";
vendorSha256 = "0cznb8glh36dwyyn1gx1ggkwa9zffrrxg52k78brnaczsl0rsmky";

meta = {
homepage = "https://github.com/sachaos/todoist";
description = "Todoist CLI Client";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/misc/wtf/default.nix
Expand Up @@ -16,7 +16,7 @@ buildGoModule rec {
sha256 = "0v6yafpz3sycq6yb7w4dyxqclszvdgwbyhqs5ii8ckynqcf6ifn7";
};

modSha256 = "0csxc5q7i2iq8z71ysfan2kwf4mghi89i5zja5g1a4cvmcabiq1g";
vendorSha256 = "1q54bl1z9ljpsf63i5r6vzv7f143slja0n8lyppaxxdcg18h8gn0";

buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

Expand All @@ -36,4 +36,4 @@ buildGoModule rec {
maintainers = with maintainers; [ kalbasit ];
platforms = platforms.linux ++ platforms.darwin;
};
}
}
5 changes: 3 additions & 2 deletions pkgs/applications/networking/cloudflared/default.nix
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub, runCommand }:

buildGoModule rec {
pname = "cloudflared";
Expand All @@ -11,7 +11,8 @@ buildGoModule rec {
sha256 = "1vbxm5z72y9zfg4carmja3fc1vhkanmc25pgnlw550p1l14y6404";
};

modSha256 = "1mnfp8nhbllv8msglci1hq4026rqsc1yibrh2xnwwbf2f3yqx8h0";
vendorSha256 = "14w2iz3ycbzfvlr8a6qn86aaa8687cm203d73wpfkfskp277hwz0";
deleteVendor = true;

buildFlagsArray = "-ldflags=-X main.Version=${version}";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/argo/default.nix
Expand Up @@ -28,7 +28,7 @@ buildGoModule rec {
sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf";
};

modSha256 = "1394bav1k1xv9n1rvji0j9a09mibk97xpha24640jkgmy9bnmg45";
vendorSha256 = "0dhzr62x2lzf3w0j2r496cr7jvkdcavfqaqr2xh972k3qqc9caky";

subPackages = [ "cmd/argo" ];

Expand All @@ -46,4 +46,4 @@ buildGoModule rec {
maintainers = with maintainers; [ groodt ];
platforms = platforms.unix;
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/argocd/default.nix
Expand Up @@ -12,7 +12,7 @@ buildGoModule rec {
sha256 = "01vsyrks1k5yfvrarv8ia0isr7snilr21b7lfiy860si82r2r8hj";
};

modSha256 = "1qivg7yy7ymmgkrvl365x29d8jnsphbz18j1ykgwwysyw3n4jkdg";
vendorSha256 = "0r2nh7v00m6zbdnhsgjn01q9pkiz41ckkqgfnpqmkxaqmjz31iyj";

nativeBuildInputs = [ packr ];

Expand All @@ -37,4 +37,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ shahrukh330 ];
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/atlantis/default.nix
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "16zz4xwpqipdmszbz93xxw31hbh7s8pfa9dm64ybyni7wc4lvdy6";
};

modSha256 = "18f7cf61yn5jkji5a4v6xw6c7xl40nj32n5w34xmcmszzf64cwkn";
vendorSha256 = null;

subPackages = [ "." ];

Expand All @@ -22,4 +22,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ jpotier ];
};
}
}
@@ -1,7 +1,7 @@
{ lib, buildGoModule, minikube }:

buildGoModule rec {
inherit (minikube) version src nativeBuildInputs buildInputs modSha256 commit;
inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit;

pname = "docker-machine-hyperkit";

Expand All @@ -20,4 +20,4 @@ buildGoModule rec {
maintainers = with maintainers; [ atkinschang ];
platforms = platforms.darwin;
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@@ -1,7 +1,7 @@
{ lib, buildGoModule, minikube }:

buildGoModule rec {
inherit (minikube) version src nativeBuildInputs buildInputs modSha256 commit;
inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit;

pname = "docker-machine-kvm2";

Expand All @@ -24,4 +24,4 @@ buildGoModule rec {
maintainers = with maintainers; [ tadfisher atkinschang ];
platforms = platforms.linux;
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/fluxctl/default.nix
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1w6ndp0nrpps6pkxnq38hikbnzwahi6j9gn8l0bxd0qkf7cjc5w0";
};

modSha256 = "0zwq7n1lggj27j5yxgfplbaccw5fhbm7vm0sja839r1jamrn3ips";
vendorSha256 = "0w5l1lkzx4frllflkbilj8qqwf54wkz7hin7q8xn1vflkv3lxcnp";

subPackages = [ "cmd/fluxctl" ];

Expand All @@ -23,4 +23,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ Gonzih filalex77 ];
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/helm/default.nix
Expand Up @@ -10,7 +10,7 @@ buildGoModule rec {
rev = "v${version}";
sha256 = "1x05xnc3czk7vpn9qnfdavdjy5agv800nh7jyqczpiw125l9jfyd";
};
modSha256 = "000knqwsajlqika4abp3fh721mn1vykcsnv3c1qw0mzffkmzwsqd";
vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl";

subPackages = [ "cmd/helm" ];
buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];
Expand All @@ -28,4 +28,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman ];
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/helmfile/default.nix
Expand Up @@ -15,7 +15,7 @@ buildGoModule {

goPackagePath = "github.com/roboll/helmfile";

modSha256 = "0j7w12rrnsv2h5v0bqh6sjq9anm51zs0p3nzlhwsksw9c98r9avk";
vendorSha256 = "0m16l3px2ykdsrmlirf7c4lwgmigs6p3rdr61l49acwsmniz2m8a";

nativeBuildInputs = [ makeWrapper ];

Expand All @@ -36,4 +36,4 @@ buildGoModule {
maintainers = with lib.maintainers; [ pneumaticat yurrriq ];
platforms = lib.platforms.unix;
};
}
}
2 changes: 1 addition & 1 deletion pkgs/applications/networking/cluster/helmsman/default.nix
Expand Up @@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0i7sg3iwxb07gjxcz6chpdcx3fqykzldmf7s1c9m02hkps910ca8";
};

modSha256 = "19qdrrwmjc32nw8m0zi251z32wqj2d956wgd1dkcvx1x0n4p435g";
vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl";

meta = with lib; {
description = "Helm Charts (k8s applications) as Code tool";
Expand Down

0 comments on commit d6162da

Please sign in to comment.