Merge pull request #86376 from c00w/vendor_mod

This commit is contained in:
Jörg Thalheim 2020-05-14 08:25:01 +01:00 committed by GitHub
commit 1694c0b3f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
221 changed files with 3365 additions and 508 deletions

View file

@ -36,7 +36,7 @@ pet = buildGoModule rec {
sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s"; sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s";
}; };
modSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; <co xml:id='ex-buildGoModule-1' /> vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; <co xml:id='ex-buildGoModule-1' />
subPackages = [ "." ]; <co xml:id='ex-buildGoModule-2' /> subPackages = [ "." ]; <co xml:id='ex-buildGoModule-2' />
@ -56,7 +56,7 @@ pet = buildGoModule rec {
<calloutlist> <calloutlist>
<callout arearefs='ex-buildGoModule-1'> <callout arearefs='ex-buildGoModule-1'>
<para> <para>
<varname>modSha256</varname> is the hash of the output of the intermediate fetcher derivation. <varname>vendorSha256</varname> is the hash of the output of the intermediate fetcher derivation.
</para> </para>
</callout> </callout>
<callout arearefs='ex-buildGoModule-2'> <callout arearefs='ex-buildGoModule-2'>
@ -68,12 +68,12 @@ pet = buildGoModule rec {
</para> </para>
<para> <para>
<varname>modSha256</varname> can also take <varname>null</varname> as an input. <varname>vendorSha256</varname> can also take <varname>null</varname> as an input.
When `null` is used as a value, the derivation won't be a When `null` is used as a value, rather than fetching the dependencies
fixed-output derivation but disable the build sandbox instead. This can be useful outside and vendoring them, we use the vendoring included within the source repo.
of nixpkgs where re-generating the modSha256 on each mod.sum changes is cumbersome, If you'd like to not have to update this field on dependency changes,
but will fail to build by Hydra, as builds with a disabled sandbox are discouraged. run `go mod vendor` in your source repo and set 'vendorSha256 = null;'
</para> </para>
</section> </section>

View file

@ -98,6 +98,13 @@
</para> </para>
<itemizedlist> <itemizedlist>
<listitem>
<para>
The go-modules builder now uses vendorSha256 instead of modSha256 to pin
fetched version data. This is currently a warning, but will be removed in the next release.
</programlisting>
</para>
</listitem>
<listitem> <listitem>
<para> <para>
Grafana is now built without support for phantomjs by default. Phantomjs support has been Grafana is now built without support for phantomjs by default. Phantomjs support has been

View file

@ -11,7 +11,21 @@ buildGoModule rec {
sha256 = "1yqqflp73yvjy6bp05xd1nv5fc6p1nx7g4spbssxf3ws96pdh425"; 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 = [ subPackages = [
"cmd/abidump" "cmd/abidump"

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1amciz924s2h6qhy7w34jpv1jc25p5ayfxzvjph6hhx0bccrm88w"; sha256 = "1amciz924s2h6qhy7w34jpv1jc25p5ayfxzvjph6hhx0bccrm88w";
}; };
modSha256 = "15i4h3pkvyav9qsbfinzifram0knkylg24j6j0mxs4bnj80j4ycm"; vendorSha256 = "1iyghg11cxvbzi0gl40fvv8pl3d3k52j179w3x5m1f09r5ji223y";
subPackages = ["cmd/lncli" "cmd/lnd"]; subPackages = ["cmd/lncli" "cmd/lnd"];
@ -21,4 +21,4 @@ buildGoModule rec {
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with maintainers; [ cypherpunk2140 ]; maintainers = with maintainers; [ cypherpunk2140 ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0vhl8d7xxqqyl916nh8sgm1xdaf7xlc3r18464bd2av22q9yz68n"; sha256 = "0vhl8d7xxqqyl916nh8sgm1xdaf7xlc3r18464bd2av22q9yz68n";
}; };
modSha256 = "0r0yq7kgz7i1wf4gxxihdrn1c8mi4wcyhadncxbln24s9c5apxsf"; vendorSha256 = "1c16s5xiqr36azh2w90wg14jlw67ca2flbgjijpz7qd0ypxyfqlk";
buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ];
@ -21,4 +21,4 @@ buildGoModule rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ehmry filalex77 ]; maintainers = with maintainers; [ ehmry filalex77 ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0a7d36hzcvj68apzc726r2vqsjyrkcynxif5laarxapm6p67g3z4"; sha256 = "0a7d36hzcvj68apzc726r2vqsjyrkcynxif5laarxapm6p67g3z4";
}; };
modSha256 = "0ak34wr5cbcvblndslsxdd24vfj3h02xqjqnj5amkll5iqn5mzi1"; vendorSha256 = "09alkpfyxapycv6zsaz7prgbr0a1jzd78n7w2mh01mg4hhb2j3k7";
subPackages = [ "cmd/pdfcpu" ]; subPackages = [ "cmd/pdfcpu" ];
@ -22,5 +22,4 @@ buildGoModule rec {
maintainers = with maintainers; [ doronbehar ]; maintainers = with maintainers; [ doronbehar ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

View file

@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "1yr2jhidqvbwh1y08lpqaidwpr5yx3bhvznm5fc9pk64s7z5kq3h"; sha256 = "1yr2jhidqvbwh1y08lpqaidwpr5yx3bhvznm5fc9pk64s7z5kq3h";
}; };
modSha256 = "1mrfqhd0zb78rlqlj2ncb0srwjfl7rzhy2p9mwa82pgysvlp08gv"; vendorSha256 = "1ikrgl03r9zkn86kxkqi2kf540g3qzzz24i5wvh6g3d5q49nygl9";
meta = with lib; { meta = with lib; {
description = "Easily create & extract archives, and compress & decompress files of various formats"; description = "Easily create & extract archives, and compress & decompress files of various formats";
@ -23,4 +23,4 @@ buildGoModule rec {
maintainers = with maintainers; [ kalbasit ]; maintainers = with maintainers; [ kalbasit ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

View file

@ -20,7 +20,7 @@ buildGoModule rec {
installShellCompletion scripts/cheat.{bash,fish,zsh} installShellCompletion scripts/cheat.{bash,fish,zsh}
''; '';
modSha256 = "1z4za3rivc3vqv59p5yb5c9dcpmq669rzmf4z7zilbvmgm0pbgfp"; vendorSha256 = null;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Create and view interactive cheatsheets on the command-line"; description = "Create and view interactive cheatsheets on the command-line";

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "17gvz9a0sn4p36hf4l77bxhhfipf4x998iay31layqwbnzmb4xy7"; sha256 = "17gvz9a0sn4p36hf4l77bxhhfipf4x998iay31layqwbnzmb4xy7";
}; };
modSha256 = "0pg0hxrr6jjd03wbjn5y65x02md3h352mnm1gr6vyiv7hn4ws14m"; vendorSha256 = "0b2m9xkac60k5rbxmb03cxf530m23av14pnsjk8067l998sm4vqi";
subPackages = [ "./exercism" ]; subPackages = [ "./exercism" ];
@ -21,4 +21,4 @@ buildGoModule rec {
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.rbasso ]; maintainers = [ maintainers.rbasso ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "057f9kp8g3wixjh9dm58g0qvzfcmhwbk1d573ldly4g5404r9bvf"; sha256 = "057f9kp8g3wixjh9dm58g0qvzfcmhwbk1d573ldly4g5404r9bvf";
}; };
modSha256 = "1bypanvrkcqp8rk84cv2569671irgaf3cy27lcrknyina4pdvir5"; vendorSha256 = "0q4byhvs1c1xm4qjvs2vyf98vdv121qn0z51arcf7k4ayrys5xcx";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Automatic GeoIP database updater"; description = "Automatic GeoIP database updater";
@ -20,4 +20,4 @@ buildGoModule rec {
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ das_j ]; maintainers = with maintainers; [ das_j ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1wq55rvpyz0gjn8kiwwj49awsmi86zy1fdjcphzgb7883xalgr2m"; sha256 = "1wq55rvpyz0gjn8kiwwj49awsmi86zy1fdjcphzgb7883xalgr2m";
}; };
modSha256 = "13higizadnf4ypk8qn1b5s6mdg7n6l3indb43mjp1b4cfzjsyl91"; vendorSha256 = "1yw0gph4zfg8w4343882l6b9lggwyak2zz8ic1l1m2m44p3aq169";
meta = with lib; { meta = with lib; {
description = ''Displays "The Matrix" in a terminal''; description = ''Displays "The Matrix" in a terminal'';
@ -19,4 +19,4 @@ buildGoModule rec {
maintainers = with maintainers; [ skykanin ]; maintainers = with maintainers; [ skykanin ];
homepage = "https://github.com/GeertJohan/gomatrix"; homepage = "https://github.com/GeertJohan/gomatrix";
}; };
} }

View file

@ -1,10 +1,10 @@
{ stdenv, buildGoModule, fetchFromGitHub }: { stdenv, buildGoModule, fetchFromGitHub, libsass }:
buildGoModule rec { buildGoModule rec {
pname = "hugo"; pname = "hugo";
version = "0.70.0"; version = "0.70.0";
goPackagePath = "github.com/gohugoio/hugo"; buildInputs = [ libsass ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gohugoio"; owner = "gohugoio";
@ -13,7 +13,21 @@ buildGoModule rec {
sha256 = "14g1x95jh91z9xm3xkv2psw2jn7z6bv2009miyv727df4d58nh6m"; 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" ]; buildFlags = [ "-tags" "extended" ];

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z"; sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z";
}; };
modSha256 = "02ai193lpzsxdn1hpbndkfxdc88nyl4kcgbadhy122kgx13crcy8"; vendorSha256 = "04nywhkil5xkipcibrp6vi63rfcvqgv7yxbxmmrhqys2cdxfvazv";
subPackages = [ "." ]; subPackages = [ "." ];
@ -24,4 +24,4 @@ buildGoModule rec {
maintainers = with maintainers; [ uvnikita ]; maintainers = with maintainers; [ uvnikita ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722";
}; };
modSha256 = "01i8fim9z2l8rpdgfaih9ldvbap7gcx5767a15miv8q7sxpr90cp"; vendorSha256 = "1qalnhhq3fmyzj0hkzc5gk9wbypr558mz3ik5msw7fid68k2i48c";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Shows colorful, animated party parrot in your terminial"; description = "Shows colorful, animated party parrot in your terminial";
@ -20,4 +20,4 @@ buildGoModule rec {
platforms = platforms.all; platforms = platforms.all;
maintainers = [ maintainers.heel ]; maintainers = [ maintainers.heel ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0d3c621jaqxd6i58xm6nvi0avrh5mk23r169i95bn73igzw62w33"; sha256 = "0d3c621jaqxd6i58xm6nvi0avrh5mk23r169i95bn73igzw62w33";
}; };
modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp"; vendorSha256 = "0cznb8glh36dwyyn1gx1ggkwa9zffrrxg52k78brnaczsl0rsmky";
meta = { meta = {
homepage = "https://github.com/sachaos/todoist"; homepage = "https://github.com/sachaos/todoist";
@ -19,4 +19,4 @@ buildGoModule rec {
license = lib.licenses.mit; license = lib.licenses.mit;
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

View file

@ -16,7 +16,7 @@ buildGoModule rec {
sha256 = "0v6yafpz3sycq6yb7w4dyxqclszvdgwbyhqs5ii8ckynqcf6ifn7"; sha256 = "0v6yafpz3sycq6yb7w4dyxqclszvdgwbyhqs5ii8ckynqcf6ifn7";
}; };
modSha256 = "0csxc5q7i2iq8z71ysfan2kwf4mghi89i5zja5g1a4cvmcabiq1g"; vendorSha256 = "1q54bl1z9ljpsf63i5r6vzv7f143slja0n8lyppaxxdcg18h8gn0";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
@ -36,4 +36,4 @@ buildGoModule rec {
maintainers = with maintainers; [ kalbasit ]; maintainers = with maintainers; [ kalbasit ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub }: { stdenv, buildGoModule, fetchFromGitHub, runCommand }:
buildGoModule rec { buildGoModule rec {
pname = "cloudflared"; pname = "cloudflared";
@ -11,7 +11,8 @@ buildGoModule rec {
sha256 = "1vbxm5z72y9zfg4carmja3fc1vhkanmc25pgnlw550p1l14y6404"; sha256 = "1vbxm5z72y9zfg4carmja3fc1vhkanmc25pgnlw550p1l14y6404";
}; };
modSha256 = "1mnfp8nhbllv8msglci1hq4026rqsc1yibrh2xnwwbf2f3yqx8h0"; vendorSha256 = "14w2iz3ycbzfvlr8a6qn86aaa8687cm203d73wpfkfskp277hwz0";
deleteVendor = true;
buildFlagsArray = "-ldflags=-X main.Version=${version}"; buildFlagsArray = "-ldflags=-X main.Version=${version}";

View file

@ -28,7 +28,7 @@ buildGoModule rec {
sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf"; sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf";
}; };
modSha256 = "1394bav1k1xv9n1rvji0j9a09mibk97xpha24640jkgmy9bnmg45"; vendorSha256 = "0dhzr62x2lzf3w0j2r496cr7jvkdcavfqaqr2xh972k3qqc9caky";
subPackages = [ "cmd/argo" ]; subPackages = [ "cmd/argo" ];
@ -46,4 +46,4 @@ buildGoModule rec {
maintainers = with maintainers; [ groodt ]; maintainers = with maintainers; [ groodt ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -12,7 +12,7 @@ buildGoModule rec {
sha256 = "01vsyrks1k5yfvrarv8ia0isr7snilr21b7lfiy860si82r2r8hj"; sha256 = "01vsyrks1k5yfvrarv8ia0isr7snilr21b7lfiy860si82r2r8hj";
}; };
modSha256 = "1qivg7yy7ymmgkrvl365x29d8jnsphbz18j1ykgwwysyw3n4jkdg"; vendorSha256 = "0r2nh7v00m6zbdnhsgjn01q9pkiz41ckkqgfnpqmkxaqmjz31iyj";
nativeBuildInputs = [ packr ]; nativeBuildInputs = [ packr ];
@ -37,4 +37,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ shahrukh330 ]; maintainers = with maintainers; [ shahrukh330 ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "16zz4xwpqipdmszbz93xxw31hbh7s8pfa9dm64ybyni7wc4lvdy6"; sha256 = "16zz4xwpqipdmszbz93xxw31hbh7s8pfa9dm64ybyni7wc4lvdy6";
}; };
modSha256 = "18f7cf61yn5jkji5a4v6xw6c7xl40nj32n5w34xmcmszzf64cwkn"; vendorSha256 = null;
subPackages = [ "." ]; subPackages = [ "." ];
@ -22,4 +22,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ jpotier ]; maintainers = with maintainers; [ jpotier ];
}; };
} }

View file

@ -1,7 +1,7 @@
{ lib, buildGoModule, minikube }: { lib, buildGoModule, minikube }:
buildGoModule rec { buildGoModule rec {
inherit (minikube) version src nativeBuildInputs buildInputs modSha256 commit; inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit;
pname = "docker-machine-hyperkit"; pname = "docker-machine-hyperkit";
@ -20,4 +20,4 @@ buildGoModule rec {
maintainers = with maintainers; [ atkinschang ]; maintainers = with maintainers; [ atkinschang ];
platforms = platforms.darwin; platforms = platforms.darwin;
}; };
} }

View file

@ -1,7 +1,7 @@
{ lib, buildGoModule, minikube }: { lib, buildGoModule, minikube }:
buildGoModule rec { buildGoModule rec {
inherit (minikube) version src nativeBuildInputs buildInputs modSha256 commit; inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit;
pname = "docker-machine-kvm2"; pname = "docker-machine-kvm2";
@ -24,4 +24,4 @@ buildGoModule rec {
maintainers = with maintainers; [ tadfisher atkinschang ]; maintainers = with maintainers; [ tadfisher atkinschang ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1w6ndp0nrpps6pkxnq38hikbnzwahi6j9gn8l0bxd0qkf7cjc5w0"; sha256 = "1w6ndp0nrpps6pkxnq38hikbnzwahi6j9gn8l0bxd0qkf7cjc5w0";
}; };
modSha256 = "0zwq7n1lggj27j5yxgfplbaccw5fhbm7vm0sja839r1jamrn3ips"; vendorSha256 = "0w5l1lkzx4frllflkbilj8qqwf54wkz7hin7q8xn1vflkv3lxcnp";
subPackages = [ "cmd/fluxctl" ]; subPackages = [ "cmd/fluxctl" ];
@ -23,4 +23,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ Gonzih filalex77 ]; maintainers = with maintainers; [ Gonzih filalex77 ];
}; };
} }

View file

@ -10,7 +10,7 @@ buildGoModule rec {
rev = "v${version}"; rev = "v${version}";
sha256 = "1x05xnc3czk7vpn9qnfdavdjy5agv800nh7jyqczpiw125l9jfyd"; sha256 = "1x05xnc3czk7vpn9qnfdavdjy5agv800nh7jyqczpiw125l9jfyd";
}; };
modSha256 = "000knqwsajlqika4abp3fh721mn1vykcsnv3c1qw0mzffkmzwsqd"; vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl";
subPackages = [ "cmd/helm" ]; subPackages = [ "cmd/helm" ];
buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];
@ -28,4 +28,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman ]; maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman ];
}; };
} }

View file

@ -15,7 +15,7 @@ buildGoModule {
goPackagePath = "github.com/roboll/helmfile"; goPackagePath = "github.com/roboll/helmfile";
modSha256 = "0j7w12rrnsv2h5v0bqh6sjq9anm51zs0p3nzlhwsksw9c98r9avk"; vendorSha256 = "0m16l3px2ykdsrmlirf7c4lwgmigs6p3rdr61l49acwsmniz2m8a";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -36,4 +36,4 @@ buildGoModule {
maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; maintainers = with lib.maintainers; [ pneumaticat yurrriq ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0i7sg3iwxb07gjxcz6chpdcx3fqykzldmf7s1c9m02hkps910ca8"; sha256 = "0i7sg3iwxb07gjxcz6chpdcx3fqykzldmf7s1c9m02hkps910ca8";
}; };
modSha256 = "19qdrrwmjc32nw8m0zi251z32wqj2d956wgd1dkcvx1x0n4p435g"; vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl";
meta = with lib; { meta = with lib; {
description = "Helm Charts (k8s applications) as Code tool"; description = "Helm Charts (k8s applications) as Code tool";

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1iqgpmljqx6rhmvsir2675waj78amcfiw08knwvlmavjgpxx2ysw"; sha256 = "1iqgpmljqx6rhmvsir2675waj78amcfiw08knwvlmavjgpxx2ysw";
}; };
modSha256 = "0jjrk93wdi13wrb5gchhqk7rgwm74kcizrbqsibgkgs2dszwfazh"; vendorSha256 = "1jh2f66ys6rmrrwrf5zqfprgcvziyq6l4z8bfqwxgf1ysnxx525h";
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=
@ -25,4 +25,4 @@ buildGoModule rec {
maintainers = with lib.maintainers; [ eliasp ]; maintainers = with lib.maintainers; [ eliasp ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

View file

@ -1,36 +0,0 @@
From 40b8eaacb3a24c466c17c8a65938330d5805b112 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 8 Mar 2019 14:10:11 -0800
Subject: [PATCH] chore: fix the location of thrift
Thrift is no longer available at the git.apache.org and it's now
distributed on GitHub at github.com/apache/thrift.
fixes #3320
---
go.mod | 2 ++
go.sum | 1 +
2 files changed, 3 insertions(+)
diff --git a/go.mod b/go.mod
index 04bcc84cc..e26c4cf1d 100644
--- a/go.mod
+++ b/go.mod
@@ -184,3 +184,5 @@ replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d
replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7
replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible
+
+replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
diff --git a/go.sum b/go.sum
index c9fdf8768..6ed69e69d 100644
--- a/go.sum
+++ b/go.sum
@@ -87,6 +87,7 @@ github.com/antham/chyle v1.4.0/go.mod h1:D94Z4aE/ECudyNoTHwkhqu77mjGPZtfPG8dNoeI
github.com/antham/envh v1.2.0/go.mod h1:ocIRPHuwwjyBVBtuUJOJc2TYzGg+d23xSAZexl4y9hQ=
github.com/antham/strumt v0.0.0-20171215230529-6776189777d3/go.mod h1:sE7EYIUE0nQzPiv5zQAmw2aVkei0j2xmb4gTIIqSFSI=
github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ=
+github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I=

View file

@ -1,22 +1,17 @@
{ buildGoModule, fetchFromGitHub, lib }: { buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec { buildGoModule rec {
name = "jx"; pname = "jx";
version = "1.3.967"; version = "2.1.31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jenkins-x"; owner = "jenkins-x";
repo = "jx"; repo = "jx";
rev = "v${version}"; rev = "v${version}";
sha256 = "0a25m7sz134kch21bg6l86kvwl4cg6babqf57kqidq6kid1zgdaq"; sha256 = "1rbdmqi6m042jxd3hhqw821l567s9zzzgp0cvx8467yfi449qipn";
}; };
patches = [ vendorSha256 = "1jn636sv6ak6hngw4fpgxqm6gfay2ip6g3gafjb3m4adcc5n9f8s";
# https://github.com/jenkins-x/jx/pull/3321
./3321-fix-location-of-thrift.patch
];
modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac";
subPackages = [ "cmd/jx" ]; subPackages = [ "cmd/jx" ];

View file

@ -18,7 +18,7 @@ buildGoModule rec {
-X github.com/derailed/k9s/cmd.commit=${src.rev} -X github.com/derailed/k9s/cmd.commit=${src.rev}
''; '';
modSha256 = "11jxyzajlk6b5j19sg1kjr7qdzpxkwjwrvyhx9mwy6jb5sgqbzv8"; vendorSha256 = "0vvzv5v7j77v809h2ial9n23244j1sy3xhkarsv0wwkifc3swvq5";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Kubernetes CLI To Manage Your Clusters In Style."; description = "Kubernetes CLI To Manage Your Clusters In Style.";
@ -26,4 +26,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ Gonzih ]; maintainers = with maintainers; [ Gonzih ];
}; };
} }

View file

@ -21,7 +21,7 @@ buildGoModule rec {
-X github.com/rancher/k3d/version.K3sVersion=v${k3sVersion} -X github.com/rancher/k3d/version.K3sVersion=v${k3sVersion}
''; '';
modSha256 = "0c8bfl0hz5cfhi6jzhhylz051jiix6s7s20fn23w7wri4xaqrjn8"; vendorSha256 = null;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/rancher/k3d"; homepage = "https://github.com/rancher/k3d";
@ -30,4 +30,4 @@ buildGoModule rec {
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ kuznero jlesquembre ngerstle ]; maintainers = with maintainers; [ kuznero jlesquembre ngerstle ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0z51iwdc4m0y8wyyx3mcvbzxlrgws7n5wkcd0g7nr73irnsld4lh"; sha256 = "0z51iwdc4m0y8wyyx3mcvbzxlrgws7n5wkcd0g7nr73irnsld4lh";
}; };
modSha256 = "029h0zr3fpzlsv9hf1d1x5j7aalxkcsyszsxjz8fqrhjafqc7zvq"; vendorSha256 = null;
subPackages = [ "cmd/kubeseal" ]; subPackages = [ "cmd/kubeseal" ];
@ -21,4 +21,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ groodt ]; maintainers = with maintainers; [ groodt ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0"; sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0";
}; };
modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y"; vendorSha256 = "1kpwvi84i3h1yjprd6m6hn8l9j235931871y3qk9cl0g8q0hv9ja";
meta = with lib; { meta = with lib; {
description = "Validate your Kubernetes configuration files"; description = "Validate your Kubernetes configuration files";
@ -20,4 +20,4 @@ buildGoModule rec {
maintainers = with maintainers; [ johanot nicknovitski ]; maintainers = with maintainers; [ johanot nicknovitski ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

View file

@ -2,16 +2,16 @@
buildGoModule { buildGoModule {
pname = "linkerd-unstablle"; pname = "linkerd-unstablle";
version = "2019-07-26"; version = "2020-05-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linkerd"; owner = "linkerd";
repo = "linkerd2"; repo = "linkerd2";
rev = "065dd3ec9d4b84c90383b31be16ccadd34a8ab0d"; rev = "9e9f3bb1e2aeab8cf20f98f5cad159bbb6f24883";
sha256 = "01m8g627sd126as0a74fy9svmymwd41sifd897nhn6kz78a21gq8"; sha256 = "1pvj31wz1klwhcqga1m8kixdqsxwmppp9ix6r3wpp4dwfig45fm0";
}; };
modSha256 = "0gahhywpcj16ww4l8s3wjwvavq24fpy258snhyf94ipy6lb797sl"; vendorSha256 = "0vls58ld50jca5yn73kvg3lx4z83cc7skky54a90pkbj737y58pz";
subPackages = [ "cli/cmd" ]; subPackages = [ "cli/cmd" ];
@ -21,4 +21,4 @@ buildGoModule {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ Gonzih ]; maintainers = with maintainers; [ Gonzih ];
}; };
} }

View file

@ -16,7 +16,7 @@ buildGoModule rec {
# for -ldflags # for -ldflags
commit = "63ab801ac27e5742ae442ce36dff7877dcccb278"; commit = "63ab801ac27e5742ae442ce36dff7877dcccb278";
modSha256 = "1g94jjwr5higg1b297zwp6grkj7if3mrdafjq9vls9y2svh11xr8"; vendorSha256 = "1l9dxn7yy21x4b3cg6l5a08wx2ng8qf531ilg8yf1rznwfwjajrv";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes"; owner = "kubernetes";

View file

@ -11,14 +11,7 @@ buildGoModule rec {
sha256 = "02avknglmkr9k933a64hkw0rjfxvyh4sc3x70p41b8q2g6vzv2gs"; sha256 = "02avknglmkr9k933a64hkw0rjfxvyh4sc3x70p41b8q2g6vzv2gs";
}; };
# Project upstream recommends building through vendoring vendorSha256 = null;
overrideModAttrs = (_: {
buildCommand = ''
echo "Skipping go.mod, using vendoring instead." && touch $out
'';
});
modSha256 = "0ip26j2h11n1kgkz36rl4akv694yz65hr72q4kv4b3lxcbi65b3p";
# Optionally, a log counter binary can be created to parse journald logs. # Optionally, a log counter binary can be created to parse journald logs.
# The binary is dynamically linked against systemd libraries, making it a # The binary is dynamically linked against systemd libraries, making it a
@ -47,4 +40,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ lbpdt ]; maintainers = with maintainers; [ lbpdt ];
}; };
} }

View file

@ -13,7 +13,7 @@ buildGoModule rec {
sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4"; sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4";
}; };
modSha256 = "1xajdg10a27icc7g1y3ym4pkgg64rp4afybbjlhbg3k3whir9xa1"; vendorSha256 = "16fdc5r28andm8my4fxj0f1yygx6j2mvn92i6xdfhbcra0lvr4ql";
subPackages = [ subPackages = [
"prow/cmd/admission" "prow/cmd/admission"
@ -63,4 +63,4 @@ buildGoModule rec {
maintainers = with maintainers; [ kalbasit ]; maintainers = with maintainers; [ kalbasit ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0krdfaha19wzi10rh0wfhki5nknbd5mndaxhrq7y9m840xy43d6d"; sha256 = "0krdfaha19wzi10rh0wfhki5nknbd5mndaxhrq7y9m840xy43d6d";
}; };
modSha256 = "1wb15vrkb4ryvrjp68ygmadnf78s354106ya210pnmsbb53rbhaz"; vendorSha256 = "1cyr621fb6hxwswz9lf75brc9qjy1n9rqjkwi6r8s3y6nhw20db6";
meta = with lib; { meta = with lib; {
description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io";
@ -19,4 +19,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ groodt ]; maintainers = with maintainers; [ groodt ];
}; };
} }

View file

@ -10,7 +10,7 @@ buildGoModule rec {
sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v"; sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v";
}; };
modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p"; vendorSha256 = "1rdvyypdl3fk6af66gfjhyl271cnlx5xgrl1w68sc6sbvq00bqkd";
subPackages = [ "." ]; subPackages = [ "." ];
@ -24,4 +24,4 @@ buildGoModule rec {
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ basvandijk ]; maintainers = with maintainers; [ basvandijk ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1k54021178zybh9dqly2ly8ji9x5rka8dn9xd6rv7gkcl5w3y6fv"; sha256 = "1k54021178zybh9dqly2ly8ji9x5rka8dn9xd6rv7gkcl5w3y6fv";
}; };
modSha256 = "1h95ng9by3i3v15s1ws1fv86a47vglivn42xbffdy94s108g0908"; vendorSha256 = "1shdpl1zsbbpc3mfs0l65ykq2h15ggvqylaixcap4j4lfl7m9my0";
postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}"; postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}";
@ -22,4 +22,4 @@ buildGoModule rec {
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ gila ]; maintainers = with maintainers; [ gila ];
}; };
} }

View file

@ -10,7 +10,7 @@ buildGoModule rec {
hash = "sha256-+6jRjcManQdoKh7ewOJI1UaulY5OSbkIUHmtrBI33u4="; hash = "sha256-+6jRjcManQdoKh7ewOJI1UaulY5OSbkIUHmtrBI33u4=";
}; };
modSha256 = "sha256-gz+t50uHFj4BQnJg6kOJI/joJVE+usLpVzTqziek2wY="; vendorSha256 = "0j90fnzba23mwf9bzf9w5h0hszkl3h61p5i780s9v9c0hbzhbqsh";
subPackages = [ "." ]; subPackages = [ "." ];
@ -24,4 +24,4 @@ buildGoModule rec {
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ zimbatm ]; maintainers = with maintainers; [ zimbatm ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1znb9d4n9zv3dq10dw17kb1h04gj8iz6gwx1a741fcf4ygp8zpy1"; sha256 = "1znb9d4n9zv3dq10dw17kb1h04gj8iz6gwx1a741fcf4ygp8zpy1";
}; };
modSha256 = "0pjqsb6lxk73prc6jxj07iwd1wyy5gqz24kigb308r3n0c2vcnky"; vendorSha256 = "0h737h25f80zfx84vm6ry0581c32ylcb5h9givqk5k5kh5qgkbgx";
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
@ -30,4 +30,4 @@ buildGoModule rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
}; };
} }

View file

@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "08q4yjfbwlldirf3j5db18l8kn6sf288wd364s50jlcx2ka8w50j"; sha256 = "08q4yjfbwlldirf3j5db18l8kn6sf288wd364s50jlcx2ka8w50j";
}; };
modSha256 = "1c7dk6l8lkq2j04cp5g97hwkwfmmyn5r0vpr5zpavvalxgjidsf4"; vendorSha256 = "0qp8n7z3vcsbc6safp7i18i0i3r4hy4nidzwl85i981sg12vcg6b";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Declarative configuration for Gmail filters"; description = "Declarative configuration for Gmail filters";
@ -23,5 +23,4 @@ buildGoModule rec {
maintainers = [ maintainers.doronbehar ]; maintainers = [ maintainers.doronbehar ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0d8wjyzmw89yhrszz487f7i19rcz7xlx4w2wd4c69k5nsdrs6dys"; sha256 = "0d8wjyzmw89yhrszz487f7i19rcz7xlx4w2wd4c69k5nsdrs6dys";
}; };
modSha256 = "0888ikywclhjb4n7xqxc7hvzlhx1qhf4c3skaddqs3nrxm171jwn"; vendorSha256 = "0d8yfmsl8rycbq8gjnvc657j14644lq0zmr9l88ik360szw6v6gc";
subPackages = [ "cmd/hydroxide" ]; subPackages = [ "cmd/hydroxide" ];
@ -22,4 +22,4 @@ buildGoModule rec {
maintainers = with maintainers; [ filalex77 ]; maintainers = with maintainers; [ filalex77 ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -5,6 +5,7 @@ buildGoModule rec {
version = "2020-03-20"; version = "2020-03-20";
goPackagePath = "maunium.net/go/gomuks"; goPackagePath = "maunium.net/go/gomuks";
patches = [ ./gomod.patch ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tulir"; owner = "tulir";
@ -13,7 +14,7 @@ buildGoModule rec {
sha256 = "0f7i88vrvl1xl4hmjplq3wwihqwijbgxy6nk5fkvc8pfmm5hsjcs"; sha256 = "0f7i88vrvl1xl4hmjplq3wwihqwijbgxy6nk5fkvc8pfmm5hsjcs";
}; };
modSha256 = "10w0bjhnf6bbqx5jbgfv2jxxyqswzx25p64kkjmvh5qamjzpbjz2"; vendorSha256 = "0awiw41nzgp4gj9fd8lcgk880aa07n535jksn0ya1cmsgavcfbvc";
postInstall = '' postInstall = ''
cp -r ${ cp -r ${
@ -37,4 +38,4 @@ buildGoModule rec {
maintainers = with maintainers; [ tilpner emily ]; maintainers = with maintainers; [ tilpner emily ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -0,0 +1,20 @@
diff --git a/go.mod b/go.mod
index 75d4a09..ef2a7ef 100644
--- a/go.mod
+++ b/go.mod
@@ -9,13 +9,14 @@ require (
github.com/lithammer/fuzzysearch v1.1.0
github.com/lucasb-eyer/go-colorful v1.0.3
github.com/mattn/go-runewidth v0.0.8
+ github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
github.com/pkg/errors v0.9.1
github.com/rivo/uniseg v0.1.0
github.com/russross/blackfriday/v2 v2.0.1
github.com/sasha-s/go-deadlock v0.2.0
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
- github.com/stretchr/testify v1.5.1
+ github.com/stretchr/testify v1.3.0
go.etcd.io/bbolt v1.3.3
golang.org/x/image v0.0.0-20200119044424-58c23975cae1
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e

View file

@ -5,7 +5,7 @@ buildGoModule rec {
version = "0.12.1"; version = "0.12.1";
rev = "v${version}"; rev = "v${version}";
modSha256 = "0bn47lcb9plzvl2vqqj7p33ishz6bbqpsgf2i6p34g13bwwpq647"; vendorSha256 = "1n0zb3v83wsy8y3k7xbpjc2ykh1b2n6p10d5wkflhga49q7rf64h";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ipfs"; owner = "ipfs";
@ -21,5 +21,4 @@ buildGoModule rec {
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ jglukasik ]; maintainers = with maintainers; [ jglukasik ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "18pjxkxfbsbbj4hs4xyzfmmz991h31785ldx41dll6wa9zx4lsnm"; sha256 = "18pjxkxfbsbbj4hs4xyzfmmz991h31785ldx41dll6wa9zx4lsnm";
}; };
modSha256 = "1magqgbb6prnihr8lr6jc2fcgsbqqc9y317mkdnvq9qs6bj0a6qj"; vendorSha256 = null;
subPackages = [ "." ]; subPackages = [ "." ];
@ -22,4 +22,4 @@ buildGoModule rec {
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ elitak ]; maintainers = with maintainers; [ elitak ];
}; };
} }

View file

@ -1,29 +1,30 @@
{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: { stdenv, buildGoModule, fetchurl, nixosTests }:
buildGoModule rec { buildGoModule rec {
pname = "ipfs"; pname = "ipfs";
version = "0.5.1"; version = "0.5.1";
rev = "v${version}"; rev = "v${version}";
src = fetchFromGitHub { # go-ipfs makes changes to it's source tarball that don't match the git source.
owner = "ipfs"; src = fetchurl {
repo = "go-ipfs"; url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz";
inherit rev; sha256 = "0lpilycjbc1g9adp4d5kryfprixj18hg3235fnivakmv7fy2akkm";
sha256 = "11l55hlbixv1i25d3n216pkrwgcgac99fa88lyy3dailvminqxw7";
}; };
postPatch = '' # tarball contains multiple files/directories
rm -rf test/dependencies postUnpack = ''
patchShebangs plugin/loader/preload.sh mkdir ipfs-src
mv * ipfs-src || true
cd ipfs-src
''; '';
buildPhase = '' sourceRoot = ".";
make install
''; subPackages = [ "cmd/ipfs" ];
passthru.tests.ipfs = nixosTests.ipfs; passthru.tests.ipfs = nixosTests.ipfs;
modSha256 = "13mpva3r6r2amw08g0bdggbxn933jjimngkvzgq1q5dksp4mivfk"; vendorSha256 = null;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A global, versioned, peer-to-peer filesystem"; description = "A global, versioned, peer-to-peer filesystem";

View file

@ -1,6 +1,7 @@
{ stdenv, buildGoModule, fetchurl { stdenv, buildGoModule, fetchurl
, go, ncurses, notmuch, scdoc , go, ncurses, notmuch, scdoc
, python3, perl, w3m, dante , python3, perl, w3m, dante
, fetchFromGitHub
}: }:
let let
@ -14,7 +15,21 @@ in buildGoModule rec {
sha256 = "1bx2fypw053v3bzalfgyi6a0s5fvv040z8jy4i63s7p53m8gmzs9"; sha256 = "1bx2fypw053v3bzalfgyi6a0s5fvv040z8jy4i63s7p53m8gmzs9";
}; };
modSha256 = "127xrah6xxrvc224g5dxn432sagrssx8v7phzapcsdajsnmagq6x"; libvterm = fetchFromGitHub {
owner = "ddevault";
repo = "go-libvterm";
rev = "b7d861da381071e5d3701e428528d1bfe276e78f";
sha256 = "06vv4pgx0i6hjdjcar4ch18hp9g6q6687mbgkvs8ymmbacyhp7s6";
};
vendorSha256 = "0rnyjjlsxsi0y23m6ckyd52562m33qr35fvdcdzy31mbfpi8kl2k";
overrideModAttrs = (_: {
postBuild = ''
cp -r --reflink=auto ${libvterm}/libvterm vendor/github.com/ddevault/go-libvterm
cp -r --reflink=auto ${libvterm}/encoding vendor/github.com/ddevault/go-libvterm
'';
});
nativeBuildInputs = [ nativeBuildInputs = [
scdoc scdoc
@ -60,4 +75,4 @@ in buildGoModule rec {
license = licenses.mit; license = licenses.mit;
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -19,7 +19,7 @@ buildGoModule rec {
sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1";
}; };
modSha256 = "0z3asz7v1izg81f9xifx9s2sp5hly173hajsn9idi3bkv0h78is2"; vendorSha256 = "0sblgjmn3i3k31jfq5zy3bx7bv5z2cg6rjzr7aj87c57yhzzcmk7";
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
@ -38,4 +38,4 @@ buildGoModule rec {
maintainers = with maintainers; [ doronbehar ]; maintainers = with maintainers; [ doronbehar ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1622xcl5v67lrnkjwbg7g5b5ikrawx7p91jxbj3ixc1za2f3a3fn"; sha256 = "1622xcl5v67lrnkjwbg7g5b5ikrawx7p91jxbj3ixc1za2f3a3fn";
}; };
modSha256 = "193n323xaypm9xkpray68nqcgyf141x8qzpxzwjnrmsgfz8p6wgk"; vendorSha256 = "0g4m0jnpy0q64xnflphyc0lmhni0q9448h7grbbr7f1s9lpqsjml";
nativeBuildInputs = [ go-bindata ]; nativeBuildInputs = [ go-bindata ];
buildPhase = '' buildPhase = ''
@ -30,4 +30,4 @@ buildGoModule rec {
badPlatforms = platforms.darwin; badPlatforms = platforms.darwin;
maintainers = with maintainers; [ rnhmjoj ]; maintainers = with maintainers; [ rnhmjoj ];
}; };
} }

View file

@ -13,7 +13,7 @@ let
sha256 = "0yy31rfvr9d6kidfvvy36ljxlc14x5ir3ln19zg4k02hdqn0xkpj"; sha256 = "0yy31rfvr9d6kidfvvy36ljxlc14x5ir3ln19zg4k02hdqn0xkpj";
}; };
modSha256 = "1vs7lxlqd7jr4r9xkk7w7k6gxzjmm7ic0a1scfpx8rcr5swa9cq1"; vendorSha256 = "03df08nghcf6k3a7xxgw03cq2mvvkmrrzzai0w18mrga0aa700c9";
patches = [ patches = [
./add-stcli-target.patch ./add-stcli-target.patch
@ -103,4 +103,4 @@ in {
--replace /usr/bin/strelaysrv $out/bin/strelaysrv --replace /usr/bin/strelaysrv $out/bin/strelaysrv
''; '';
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1qc4yi4kwy7bfi3fb17w58ff0i95yi6m4syldh8j79930syr5y8q"; sha256 = "1qc4yi4kwy7bfi3fb17w58ff0i95yi6m4syldh8j79930syr5y8q";
}; };
modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs"; vendorSha256 = "05k31z4h3b327mh940zh52im4xfk7kf5phb8b7xp4l9bgckhz4lb";
meta = with lib; { meta = with lib; {
description = "Turn any program that uses STDIN/STDOUT into a WebSocket server"; description = "Turn any program that uses STDIN/STDOUT into a WebSocket server";
@ -19,4 +19,4 @@ buildGoModule rec {
maintainers = [ maintainers.bjornfor ]; maintainers = [ maintainers.bjornfor ];
license = licenses.bsd2; license = licenses.bsd2;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "08fy3677yq52x40rab49ijhw4r25ls2807dbv9wpna6w07n7r8v7"; sha256 = "08fy3677yq52x40rab49ijhw4r25ls2807dbv9wpna6w07n7r8v7";
}; };
modSha256 = "0v33x9bnwjfg4425vralnsb4i22c0g1rcmaga9911v0i7d51k0fn"; vendorSha256 = "0s99bjmsafnzhl3s2lcybxgsw1s4i1h3vh6p40gz4vsfhndidqrq";
buildFlagsArray = [ buildFlagsArray = [
"-ldflags=-s -w -X github.com/cli/cli/command.Version=${version}" "-ldflags=-s -w -X github.com/cli/cli/command.Version=${version}"
@ -33,4 +33,4 @@ buildGoModule rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ zowoq ]; maintainers = with maintainers; [ zowoq ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1i0q9lxdxbyj0l0510cbkwkbycawrx8cxlbdrhb2p2fnk0vqnyiv"; sha256 = "1i0q9lxdxbyj0l0510cbkwkbycawrx8cxlbdrhb2p2fnk0vqnyiv";
}; };
modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41"; vendorSha256 = "1r8lvy2xk0gvlwy6k86wh14ajb6hgs9f1fwfqk17ra1cb404l2lz";
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=
@ -29,4 +29,4 @@ buildGoModule rec {
maintainers = with stdenv.lib.maintainers; [ sigma ]; maintainers = with stdenv.lib.maintainers; [ sigma ];
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
}; };
} }

View file

@ -13,7 +13,7 @@ buildGoModule rec {
sha256 = "01ab3mlwh5g1vr3x85fppflg18gb8ip9mjfsp2b5rfigd9lxyyns"; sha256 = "01ab3mlwh5g1vr3x85fppflg18gb8ip9mjfsp2b5rfigd9lxyyns";
}; };
modSha256 = "05wxvzsbhvz15596019vs7h09kynfsfjx3i5xyrl5xjzdxbaqbrq"; vendorSha256 = "0c8b47lj4wl3s21lm0vx4z7hznylm8c4fb8b8gxm278kn3zys607";
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=
@ -35,4 +35,4 @@ buildGoModule rec {
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ royneary ]; maintainers = with maintainers; [ royneary ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1nj950r38sxzrgw69m1xphm7a4km2g29iw2897gfx4wx57jl957k"; sha256 = "1nj950r38sxzrgw69m1xphm7a4km2g29iw2897gfx4wx57jl957k";
}; };
modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs"; vendorSha256 = "1ccwbhzwys8sl3m2rs2lp70snzsi2a0ahnnq8kn15rrlvsv5qahf";
meta = with lib; { meta = with lib; {
description = "Keep the content for your git submodules all in one place: the parent repo"; description = "Keep the content for your git submodules all in one place: the parent repo";
@ -19,4 +19,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.marsam ]; maintainers = [ maintainers.marsam ];
}; };
} }

View file

@ -13,7 +13,7 @@ buildGoModule rec {
subPackages = [ "." ]; subPackages = [ "." ];
modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd"; vendorSha256 = "1lrmafvv5zfn9kc0p8g5vdz351n1zbaqwhwk861fxys0rdpqskyc";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
@ -31,4 +31,4 @@ buildGoModule rec {
maintainers = with maintainers; [ marsam dtzWill ]; maintainers = with maintainers; [ marsam dtzWill ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "14rcvbzzrx0m3xijl8qhw5l2h0q10hqzad2hqm3079g893f2qad0"; sha256 = "14rcvbzzrx0m3xijl8qhw5l2h0q10hqzad2hqm3079g893f2qad0";
}; };
modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq"; vendorSha256 = "1pdrw4vwbj9cka2pjbjvxviigfvnrf8sgws27ixwwiblbkj4isc8";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Fast and powerful Git hooks manager for any type of projects"; description = "Fast and powerful Git hooks manager for any type of projects";
@ -19,4 +19,4 @@ buildGoModule rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ rencire ]; maintainers = with maintainers; [ rencire ];
}; };
} }

View file

@ -11,7 +11,7 @@ let
pname = "builds-sr-ht-worker"; pname = "builds-sr-ht-worker";
goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker"; goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker";
modSha256 = "10is7siscids9qz6jh9m1i17749dafqqkg4b3sslmxaxyn16yj97"; vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp";
}; };
in buildPythonPackage rec { in buildPythonPackage rec {
inherit version; inherit version;
@ -57,4 +57,4 @@ in buildPythonPackage rec {
license = licenses.agpl3; license = licenses.agpl3;
maintainers = with maintainers; [ eadwu ]; maintainers = with maintainers; [ eadwu ];
}; };
} }

View file

@ -11,7 +11,7 @@ let
pname = "gitsrht-shell"; pname = "gitsrht-shell";
goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell";
modSha256 = "0lxxxzh39bviab71kfsqqr217338yxn5l2zkak55r6qqs6iz4ccv"; vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5";
}; };
buildDispatcher = src: buildGoModule { buildDispatcher = src: buildGoModule {
@ -19,7 +19,7 @@ let
pname = "gitsrht-dispatcher"; pname = "gitsrht-dispatcher";
goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch";
modSha256 = "1lmgmlin460g09dph2hw6yz25d4agqwjhrjv0qqsis7df9qpf3i1"; vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9";
}; };
buildKeys = src: buildGoModule { buildKeys = src: buildGoModule {
@ -27,7 +27,7 @@ let
pname = "gitsrht-keys"; pname = "gitsrht-keys";
goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-keys"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-keys";
modSha256 = "1pfcw9n63zhlxm9kd3bxa2zqmzd8mgl7yl2ck055j56v3k929w3f"; vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv";
}; };
buildUpdateHook = src: buildGoModule { buildUpdateHook = src: buildGoModule {
@ -35,7 +35,7 @@ let
pname = "gitsrht-update-hook"; pname = "gitsrht-update-hook";
goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook";
modSha256 = "0p8qd6hpgmnlfqk5vw6l41dqs7qjhf6xijzj5iv6wv1cf362b4wp"; vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63";
}; };
in buildPythonPackage rec { in buildPythonPackage rec {
inherit version; inherit version;
@ -79,4 +79,4 @@ in buildPythonPackage rec {
license = licenses.agpl3; license = licenses.agpl3;
maintainers = with maintainers; [ eadwu ]; maintainers = with maintainers; [ eadwu ];
}; };
} }

View file

@ -4,6 +4,8 @@ buildGoModule rec {
pname = "firectl"; pname = "firectl";
version = "0.1.0"; version = "0.1.0";
patches = [ ./gomod.patch ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "firecracker-microvm"; owner = "firecracker-microvm";
repo = pname; repo = pname;
@ -11,7 +13,7 @@ buildGoModule rec {
sha256 = "1ni3yx4rjhrkqk2038c6hkb2jwsdj2llx233wd5wgpvb6c57652p"; sha256 = "1ni3yx4rjhrkqk2038c6hkb2jwsdj2llx233wd5wgpvb6c57652p";
}; };
modSha256 = "1nqjz1afklcxc3xcpmygjdh3lfxjk6zvmghr8z8fr3nw2wvw2ddr"; vendorSha256 = "1xbpck1gvzl75xgrajf5yzl199l4f2f6j3mac5586i7b00b9jxqj";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A command-line tool to run Firecracker microVMs"; description = "A command-line tool to run Firecracker microVMs";
@ -20,4 +22,4 @@ buildGoModule rec {
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ xrelkd ]; maintainers = with maintainers; [ xrelkd ];
}; };
} }

View file

@ -0,0 +1,15 @@
diff --git a/go.mod b/go.mod
index 1044001..7bafeda 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,10 @@
module github.com/firecracker-microvm/firectl
+go 1.14
+
require (
github.com/firecracker-microvm/firecracker-go-sdk v0.15.1
+ github.com/go-openapi/strfmt v0.17.1
github.com/jessevdk/go-flags v1.4.0
github.com/pkg/errors v0.8.0
github.com/sirupsen/logrus v1.1.1

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "077bhrmjrpcxv1z020yxhx2c4asn66j21gxlpa6hz0av3lfck9lm"; sha256 = "077bhrmjrpcxv1z020yxhx2c4asn66j21gxlpa6hz0av3lfck9lm";
}; };
modSha256 = "1jdhgbrn59ahnabwnig99i21f6kimmqx9f3dg10ffwfs3dx0gzlg"; vendorSha256 = "11jai5jl024k7wbhz4a3zzdbvl0si07jwgwmyr8bn4i0nqx8ig2k";
buildPhase = '' buildPhase = ''
make make
@ -33,4 +33,4 @@ buildGoModule rec {
maintainers = with maintainers; [ andrew-d ]; maintainers = with maintainers; [ andrew-d ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0l6cwky2xl7m8nnc9abp76bhkdcf2ldbbv3r8p30xv2yr5wd1j8i"; sha256 = "0l6cwky2xl7m8nnc9abp76bhkdcf2ldbbv3r8p30xv2yr5wd1j8i";
}; };
modSha256 = "1b6hz5a66hhlzpcv1badxr1b4nmk4lw0507d5jks7lqzvvwd0sxq"; vendorSha256 = "1vdv0nq31mjprxzxf8x0diaigissy07vnm338h8jrk5i74x5by39";
subPackages = [ "cmd/jsonnet" ]; subPackages = [ "cmd/jsonnet" ];
@ -21,4 +21,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ nshalman ]; maintainers = with maintainers; [ nshalman ];
}; };
} }

View file

@ -1,6 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, llvm, clang-unwrapped, lld, avrgcc { lib, buildGoModule, fetchFromGitHub, llvm, clang-unwrapped, lld, avrgcc
, avrdude, openocd, gcc-arm-embedded, makeWrapper }: , avrdude, openocd, gcc-arm-embedded, makeWrapper, fetchurl }:
let main = ./main.go;
gomod = ./go.mod;
in
buildGoModule rec { buildGoModule rec {
pname = "tinygo"; pname = "tinygo";
version = "0.13.0"; version = "0.13.0";
@ -11,8 +14,19 @@ buildGoModule rec {
rev = "v${version}"; rev = "v${version}";
sha256 = "0x59j56y704m2hfkg78illgw9f6czrx265x887jfd989lnxphyqa"; sha256 = "0x59j56y704m2hfkg78illgw9f6czrx265x887jfd989lnxphyqa";
}; };
overrideModAttrs = (_: {
patches = [];
preBuild = ''
rm -rf *
cp ${main} main.go
cp ${gomod} go.mod
'';
});
modSha256 = "0y8n4mcr4jhas29ahvk8k4zbj1iz65fdpsgq61qa8kcsm8m5kqa6"; preBuild = "cp ${gomod} go.mod";
vendorSha256 = "19194dlzpl6zzw2gqybma5pwip71rw8z937f104k6c158qzzgy62";
enableParallelBuilding = true; enableParallelBuilding = true;
subPackages = [ "." ]; subPackages = [ "." ];
buildInputs = [ llvm clang-unwrapped makeWrapper ]; buildInputs = [ llvm clang-unwrapped makeWrapper ];

View file

@ -0,0 +1,13 @@
module github.com/tinygo-org/tinygo
go 1.14
require (
github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf
github.com/marcinbor85/gohex v0.0.0-20180128172054-7a43cd876e46
go.bug.st/serial v1.0.0
golang.org/x/tools v0.0.0-20200512001501-aaeff5de670a
google.golang.org/appengine v1.4.0
tinygo.org/x/go-llvm v0.0.0-20200401165421-8d120882fc7a
)

View file

@ -0,0 +1,18 @@
package main
import (
"fmt"
_ "github.com/blakesmith/ar"
_ "github.com/google/shlex"
_ "github.com/marcinbor85/gohex"
_ "go.bug.st/serial"
_ "golang.org/x/tools/go/ast/astutil"
_ "golang.org/x/tools/go/ssa"
_ "google.golang.org/appengine"
_ "tinygo.org/x/go-llvm"
)
func main() {
fmt.Println("vim-go")
}

View file

@ -13,12 +13,15 @@
# path to go.mod and go.sum directory # path to go.mod and go.sum directory
, modRoot ? "./" , modRoot ? "./"
# modSha256 is the sha256 of the vendored dependencies # vendorSha256 is the sha256 of the vendored dependencies
# #
# CAUTION: if `null` is used as a value, the derivation won't be a # if vendorSha256 is null, then we won't fetch any dependencies and
# fixed-output derivation but disable the build sandbox instead. Don't use # rely on the vendor folder within the source.
# this in nixpkgs as Hydra won't build those packages. , vendorSha256 ? null
, modSha256 # Whether to delete the vendor folder supplied with the source.
, deleteVendor ? false
, modSha256 ? null
# We want parallel builds by default # We want parallel builds by default
, enableParallelBuilding ? true , enableParallelBuilding ? true
@ -37,21 +40,26 @@
with builtins; with builtins;
let let
args = removeAttrs args' [ "overrideModAttrs" "modSha256" "disabled" ]; args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "disabled" ];
removeReferences = [ ] ++ lib.optional (!allowGoReference) go; removeReferences = [ ] ++ lib.optional (!allowGoReference) go;
removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
go-modules = go.stdenv.mkDerivation (let modArgs = { deleteFlag = if deleteVendor then "true" else "false";
go-modules = if vendorSha256 != null then go.stdenv.mkDerivation (let modArgs = {
name = "${name}-go-modules"; name = "${name}-go-modules";
nativeBuildInputs = [ go git cacert ]; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ go git cacert ];
inherit (args) src; inherit (args) src;
inherit (go) GOOS GOARCH; inherit (go) GOOS GOARCH;
patches = args.patches or []; patches = args.patches or [];
preBuild = args.preBuild or "";
sourceRoot = args.sourceRoot or "";
GO111MODULE = "on"; GO111MODULE = "on";
@ -64,7 +72,6 @@ let
export GOCACHE=$TMPDIR/go-cache export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go" export GOPATH="$TMPDIR/go"
mkdir -p "''${GOPATH}/pkg/mod/cache/download"
cd "${modRoot}" cd "${modRoot}"
runHook postConfigure runHook postConfigure
''; '';
@ -72,7 +79,16 @@ let
buildPhase = args.modBuildPhase or '' buildPhase = args.modBuildPhase or ''
runHook preBuild runHook preBuild
go mod download if [ ${deleteFlag} == "true" ]; then
rm -rf vendor
fi
if [ -e vendor ]; then
echo "vendor folder exists, please set 'vendorSha256=null;' or 'deleteVendor=true;' in your expression"
exit 10
fi
go mod vendor
mkdir -p vendor
runHook postBuild runHook postBuild
''; '';
@ -81,23 +97,19 @@ let
runHook preInstall runHook preInstall
# remove cached lookup results and tiles # remove cached lookup results and tiles
rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb" cp -r --reflink=auto vendor $out
cp -r "''${GOPATH}/pkg/mod/cache/download" $out
runHook postInstall runHook postInstall
''; '';
dontFixup = true; dontFixup = true;
}; in modArgs // ( }; in modArgs // (
if modSha256 == null then
{ __noChroot = true; }
else
{ {
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = modSha256; outputHash = vendorSha256;
} }
) // overrideModAttrs modArgs); ) // overrideModAttrs modArgs) else "";
package = go.stdenv.mkDerivation (args // { package = go.stdenv.mkDerivation (args // {
nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs; nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs;
@ -105,6 +117,7 @@ let
inherit (go) GOOS GOARCH; inherit (go) GOOS GOARCH;
GO111MODULE = "on"; GO111MODULE = "on";
GOFLAGS = "-mod=vendor";
configurePhase = args.configurePhase or '' configurePhase = args.configurePhase or ''
runHook preConfigure runHook preConfigure
@ -112,9 +125,12 @@ let
export GOCACHE=$TMPDIR/go-cache export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go" export GOPATH="$TMPDIR/go"
export GOSUMDB=off export GOSUMDB=off
export GOPROXY=file://${go-modules} export GOPROXY=off
cd "$modRoot" cd "$modRoot"
if [ -n "${go-modules}" ]; then
rm -rf vendor
ln -s ${go-modules} vendor
fi
runHook postConfigure runHook postConfigure
''; '';
@ -212,7 +228,7 @@ let
disallowedReferences = lib.optional (!allowGoReference) go; disallowedReferences = lib.optional (!allowGoReference) go;
passthru = passthru // { inherit go go-modules modSha256; }; passthru = passthru // { inherit go go-modules vendorSha256 ; };
meta = { meta = {
# Add default meta information # Add default meta information
@ -225,5 +241,8 @@ let
}); });
in if disabled then in if disabled then
throw "${package.name} not supported for go ${go.meta.branch}" throw "${package.name} not supported for go ${go.meta.branch}"
else if modSha256 != null then
lib.warn "modSha256 is deprecated and will be removed in the next release (20.09), use vendorSha256 instead" (
import ./old.nix { inherit go cacert git lib removeReferencesTo stdenv; } args')
else else
package package

View file

@ -0,0 +1,229 @@
{ go, cacert, git, lib, removeReferencesTo, stdenv }:
{ name ? "${args'.pname}-${args'.version}"
, src
, buildInputs ? []
, nativeBuildInputs ? []
, passthru ? {}
, patches ? []
# A function to override the go-modules derivation
, overrideModAttrs ? (_oldAttrs : {})
# path to go.mod and go.sum directory
, modRoot ? "./"
# modSha256 is the sha256 of the vendored dependencies
#
# CAUTION: if `null` is used as a value, the derivation won't be a
# fixed-output derivation but disable the build sandbox instead. Don't use
# this in nixpkgs as Hydra won't build those packages.
, modSha256
# We want parallel builds by default
, enableParallelBuilding ? true
# Disabled flag
, disabled ? false
# Do not enable this without good reason
# IE: programs coupled with the compiler
, allowGoReference ? false
, meta ? {}
, ... }@args':
with builtins;
let
args = removeAttrs args' [ "overrideModAttrs" "modSha256" "disabled" ];
removeReferences = [ ] ++ lib.optional (!allowGoReference) go;
removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
go-modules = go.stdenv.mkDerivation (let modArgs = {
name = "${name}-go-modules";
nativeBuildInputs = [ go git cacert ];
inherit (args) src;
inherit (go) GOOS GOARCH;
patches = args.patches or [];
GO111MODULE = "on";
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
"GIT_PROXY_COMMAND" "SOCKS_SERVER"
];
configurePhase = args.modConfigurePhase or ''
runHook preConfigure
export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go"
mkdir -p "''${GOPATH}/pkg/mod/cache/download"
cd "${modRoot}"
runHook postConfigure
'';
buildPhase = args.modBuildPhase or ''
runHook preBuild
go mod download
runHook postBuild
'';
installPhase = args.modInstallPhase or ''
runHook preInstall
# remove cached lookup results and tiles
rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb"
cp -r "''${GOPATH}/pkg/mod/cache/download" $out
runHook postInstall
'';
dontFixup = true;
}; in modArgs // (
if modSha256 == null then
{ __noChroot = true; }
else
{
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = modSha256;
}
) // overrideModAttrs modArgs);
package = go.stdenv.mkDerivation (args // {
nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs;
inherit (go) GOOS GOARCH;
GO111MODULE = "on";
configurePhase = args.configurePhase or ''
runHook preConfigure
export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go"
export GOSUMDB=off
export GOPROXY=file://${go-modules}
cd "$modRoot"
runHook postConfigure
'';
buildPhase = args.buildPhase or ''
runHook preBuild
buildGoDir() {
local d; local cmd;
cmd="$1"
d="$2"
. $TMPDIR/buildFlagsArray
echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0
[ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
local OUT
if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v -p $NIX_BUILD_CORES $d 2>&1)"; then
if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
echo "$OUT" >&2
return 1
fi
fi
if [ -n "$OUT" ]; then
echo "$OUT" >&2
fi
return 0
}
getGoDirs() {
local type;
type="$1"
if [ -n "$subPackages" ]; then
echo "$subPackages" | sed "s,\(^\| \),\1./,g"
else
find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique
fi
}
if (( "''${NIX_DEBUG:-0}" >= 1 )); then
buildFlagsArray+=(-x)
fi
if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
else
touch $TMPDIR/buildFlagsArray
fi
if [ -z "$enableParallelBuilding" ]; then
export NIX_BUILD_CORES=1
fi
for pkg in $(getGoDirs ""); do
echo "Building subPackage $pkg"
buildGoDir install "$pkg"
done
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
# normalize cross-compiled builds w.r.t. native builds
(
dir=$GOPATH/bin/${go.GOOS}_${go.GOARCH}
if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then
mv $dir/* $dir/..
fi
if [[ -d $dir ]]; then
rmdir $dir
fi
)
'' + ''
runHook postBuild
'';
doCheck = args.doCheck or false;
checkPhase = args.checkPhase or ''
runHook preCheck
for pkg in $(getGoDirs test); do
buildGoDir test "$pkg"
done
runHook postCheck
'';
installPhase = args.installPhase or ''
runHook preInstall
mkdir -p $out
dir="$GOPATH/bin"
[ -e "$dir" ] && cp -r $dir $out
runHook postInstall
'';
preFixup = (args.preFixup or "") + ''
find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
'';
strictDeps = true;
disallowedReferences = lib.optional (!allowGoReference) go;
passthru = passthru // { inherit go go-modules modSha256; };
meta = {
# Add default meta information
platforms = go.meta.platforms or lib.platforms.all;
} // meta // {
# add an extra maintainer to every package
maintainers = (meta.maintainers or []) ++
[ lib.maintainers.kalbasit ];
};
});
in if disabled then
throw "${package.name} not supported for go ${go.meta.branch}"
else
package

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1pxj6flyhf522zjab1dfvxfajyx3v3rzs7l8ma7ma6b8zmwp2wdn"; sha256 = "1pxj6flyhf522zjab1dfvxfajyx3v3rzs7l8ma7ma6b8zmwp2wdn";
}; };
modSha256 = "165mjfjk4x95ckw7wg96bg9pzb3297sggnip38nz2jxxbqr0ff8b"; vendorSha256 = "1rn8ijq3v3fzlbyvm7g4i3qpwcl3vrl4rbcvlbzv05wxrgcw9iqb";
preBuild = '' preBuild = ''
go generate ./... go generate ./...
@ -26,4 +26,4 @@ buildGoModule rec {
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ andrestylianos ]; maintainers = with maintainers; [ andrestylianos ];
}; };
} }

View file

@ -18,7 +18,7 @@ let p2 = buildGoModule rec {
subPackages = [ "packr2" ]; subPackages = [ "packr2" ];
modSha256 = "1xxqyn78074jna0iri7sks6b2l4sdnn5sg57n09vrrf6kh39h2y9"; vendorSha256 = "12yq121b0bn8z12091fyqhhz421kgx4z1nskrkvbxlhyc47bwyrp";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The simple and easy way to embed static files into Go binaries"; description = "The simple and easy way to embed static files into Go binaries";
@ -40,7 +40,7 @@ p1 = buildGoModule rec {
subPackages = [ "packr" ]; subPackages = [ "packr" ];
modSha256 = "045qfdi82yhpghjd0cimxhas4nkj7g30n9qyvkrl9ck01sahx76f"; vendorSha256 = "0m3yj8ww4a16j56p8d8w0sdnyx0g2bkd8zg0l4d8vb72mvg5asga";
meta = with lib; { meta = with lib; {
description = "The simple and easy way to embed static files into Go binaries"; description = "The simple and easy way to embed static files into Go binaries";
@ -53,4 +53,4 @@ in
symlinkJoin{ symlinkJoin{
name = "packr"; name = "packr";
paths = [p1 p2]; paths = [p1 p2];
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0qg26vcqdhgy91p6wiv16dq73ay0fymran3d8ylca9264zwi2vxw"; sha256 = "0qg26vcqdhgy91p6wiv16dq73ay0fymran3d8ylca9264zwi2vxw";
}; };
modSha256 = "1q755ipqsfpr41s5fxzmx50lwcdqc5a7akwx6mzn789w2z07x8lg"; vendorSha256 = "0ap1iwcapvvvmwgdc4zbsp8mglrhbswkdgm4dw8baw8qk0nlci6y";
postInstall = '' postInstall = ''
rm $out/bin/plugin* rm $out/bin/plugin*
@ -23,4 +23,4 @@ buildGoModule rec {
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ groodt ]; maintainers = with maintainers; [ groodt ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0mdxs019vzpfxaqkw4nb79p3rydril0ihbn55n4yyh0fznv6zzxi"; sha256 = "0mdxs019vzpfxaqkw4nb79p3rydril0ihbn55n4yyh0fznv6zzxi";
}; };
modSha256 = "0ksblhra7ln4ryggr2x8fzl8a7ljz5zdjgdxz82c75wd7wdbw8f5"; vendorSha256 = "0kjz9v7r7g4cg11w77ijfmvwnbbkrvrfwwsfsmyxrlhznmb3v0wi";
subPackages = [ "." ]; subPackages = [ "." ];
@ -22,4 +22,4 @@ buildGoModule rec {
license = licenses.mpl20; license = licenses.mpl20;
maintainers = [ maintainers.marsam ]; maintainers = [ maintainers.marsam ];
}; };
} }

View file

@ -13,7 +13,7 @@ buildGoModule rec {
subPackages = [ "." ]; subPackages = [ "." ];
modSha256 = "02c668bp1pfrd994lhg6z3hm1qg3530nk9aw1cahiwj549vxxfhm"; vendorSha256 = "1276k2hpyr7bqp6hdi576xcdcd2c8vz100jpls663z7vb2rbpvxf";
postInstall = '' postInstall = ''
ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy" ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy"
@ -24,4 +24,4 @@ buildGoModule rec {
license = licenses.mit; license = licenses.mit;
description = "The new Azure Storage data transfer utility - AzCopy v10"; description = "The new Azure Storage data transfer utility - AzCopy v10";
}; };
} }

View file

@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "1rw9zq8rmc0zr91kk70xl67dl6jx4dswwisv3bd1f16yncqgv2a1"; sha256 = "1rw9zq8rmc0zr91kk70xl67dl6jx4dswwisv3bd1f16yncqgv2a1";
}; };
modSha256 = "0bfhy0ig8apxb5qzxjdj6q7jr2i6rdq0ffby0pha8viadah8v2rm"; vendorSha256 = null;
subPackages = [ "cmd/gazelle" ]; subPackages = [ "cmd/gazelle" ];
@ -28,4 +28,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ kalbasit ]; maintainers = with maintainers; [ kalbasit ];
}; };
} }

View file

@ -4,6 +4,8 @@ buildGoModule rec {
pname = "bazelisk"; pname = "bazelisk";
version = "1.4.0"; version = "1.4.0";
patches = [ ./gomod.patch ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bazelbuild"; owner = "bazelbuild";
repo = pname; repo = pname;
@ -11,7 +13,7 @@ buildGoModule rec {
sha256 = "14zp0bi0p1rfbx1pxi5y28ndxwbqbvfx0pvy3jh1mnx5qsii1gcq"; sha256 = "14zp0bi0p1rfbx1pxi5y28ndxwbqbvfx0pvy3jh1mnx5qsii1gcq";
}; };
modSha256 = "1w8k659ifapcxbbim0nf7wd7w10bhlagc33q08izh84gcgsh0yyz"; vendorSha256 = "10156k90ky3znb9rxhy7zasskxmlcs5cn9f3xk25ana1c66vxszr";
buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ];
@ -24,4 +26,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ elasticdog ]; maintainers = with maintainers; [ elasticdog ];
}; };
} }

View file

@ -0,0 +1,12 @@
diff --git a/go.mod b/go.mod
index 8eef134..54382cb 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,7 @@ module github.com/bazelbuild/bazelisk
go 1.14
require (
+ github.com/bazelbuild/rules_go v0.22.4
github.com/hashicorp/go-version v1.2.0
github.com/mitchellh/go-homedir v1.1.0
)

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0lazf4r5ps1s04pvz608qaxbrbc6dv0j99n39iv42zwxxh0mbd0p"; sha256 = "0lazf4r5ps1s04pvz608qaxbrbc6dv0j99n39iv42zwxxh0mbd0p";
}; };
modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
buildFlagsArray = [ buildFlagsArray = [
"-ldflags=" "-ldflags="
@ -27,4 +27,4 @@ buildGoModule rec {
maintainers = with maintainers; [ swdunlop ]; maintainers = with maintainers; [ swdunlop ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "15xzldcmnpfg1hd5zr5i7x2zjrgkwnp4nylxbn9kfic2dpjp1a38"; sha256 = "15xzldcmnpfg1hd5zr5i7x2zjrgkwnp4nylxbn9kfic2dpjp1a38";
}; };
modSha256 = "0nwmxmh1pmism5r9zzghfrzizr1fbyc8d4jljrbzjjq1l449r2ja"; vendorSha256 = "1kay7b5rxypj4i0d2iwdlb1mj0qq3zvlrjp34zzv5kywz5gy4144";
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=
@ -25,4 +25,4 @@ buildGoModule rec {
maintainers = with maintainers; [ yurrriq ]; maintainers = with maintainers; [ yurrriq ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

View file

@ -7,7 +7,7 @@ in buildGoModule rec {
revision = "v${version}"; revision = "v${version}";
goPackagePath = "github.com/drone/drone-cli"; goPackagePath = "github.com/drone/drone-cli";
modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b"; vendorSha256 = "1zzx5yy0pp0c8pias4sfxfvdzhhrff9f8j51qf6dkif99xwdq3hb";
preBuild = '' preBuild = ''
buildFlagsArray+=("-ldflags" "-X main.version=${version}") buildFlagsArray+=("-ldflags" "-X main.version=${version}")
@ -25,4 +25,4 @@ in buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
description = "Command line client for the Drone continuous integration server."; description = "Command line client for the Drone continuous integration server.";
}; };
} }

View file

@ -5,7 +5,7 @@ buildGoModule rec {
version = "1.6.5"; version = "1.6.5";
goPackagePath = "github.com/drone/drone"; goPackagePath = "github.com/drone/drone";
modSha256 = "1fyb9218s52w8c6c3v6rgivbyzy5hz4q4z8r75ng2yrmjmmiv2gr"; vendorSha256 = "1dvf8vz3jr9smki3jql0kvd8z8rwdq93y7blbr2yjjfsdvx6lxl1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "drone"; owner = "drone";
@ -19,4 +19,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
description = "Continuous Integration platform built on container technology"; description = "Continuous Integration platform built on container technology";
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0chavwymyh5kv4fkvdjvf3p5jjx4yn9aavq66333xnsl5pn7q9dq"; sha256 = "0chavwymyh5kv4fkvdjvf3p5jjx4yn9aavq66333xnsl5pn7q9dq";
}; };
modSha256 = "1wiyfii4rmj3rp8ls0ill0sjpnpjz7l3q5fzrscm8ap1qn90gvzg"; vendorSha256 = "127mc1wzqhn0l4ni6qxcx06qfdb1cgahzypjrs4vgr6i4sipjxck";
subPackages = [ "fly" ]; subPackages = [ "fly" ];
@ -34,4 +34,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ivanbrennan ]; maintainers = with maintainers; [ ivanbrennan ];
}; };
} }

View file

@ -10,7 +10,7 @@ buildGoModule rec {
sha256 = "1qbnm3qb8jz9bljw2gb5bb9g41s5lbq4xvcaj3zgi4fc3708hlji"; sha256 = "1qbnm3qb8jz9bljw2gb5bb9g41s5lbq4xvcaj3zgi4fc3708hlji";
}; };
modSha256 = "0n9idgishlp4gaq12kngi42rq9rnkas7g6cj7jpkk8p30c74ki6z"; vendorSha256 = "12w2rxp0s3i1ck0qvp2dkg9kk6pyymycdfnfxggcyg4fjshh8afg";
subPackages = [ "cmd/cue" ]; subPackages = [ "cmd/cue" ];
@ -24,4 +24,4 @@ buildGoModule rec {
maintainers = with stdenv.lib.maintainers; [ solson ]; maintainers = with stdenv.lib.maintainers; [ solson ];
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "16grd03r41n0vj5fs7j6jk395zs2q0i878p9nh1ycicy64nzmxky"; sha256 = "16grd03r41n0vj5fs7j6jk395zs2q0i878p9nh1ycicy64nzmxky";
}; };
modSha256 = "1ky6cxpmw93nrk26vyrxz8kqa7247axzaxilm6ciypxf30ad0vdq"; vendorSha256 = "1915h1hi2y2sx5jvx84c1j281zaz100gbhyalvg5jqjr1van5s4d";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Database migration tool"; description = "Database migration tool";
@ -20,4 +20,4 @@ buildGoModule rec {
maintainers = [ maintainers.manveru ]; maintainers = [ maintainers.manveru ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1v69xbkjmyzm5g4wi9amjk65fs4qgxkqc0dvq55vqjigzrranp22"; sha256 = "1v69xbkjmyzm5g4wi9amjk65fs4qgxkqc0dvq55vqjigzrranp22";
}; };
modSha256 = "1y8mqxlzbizra2m9aayp6w07s39gddvm5igdaw9kwxwjwvd1dbfc"; vendorSha256 = "0219q9zjc0i6fbdngqh0wjpmq8wj5bjiz5dls0c1aam0lh4vwkhc";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -25,4 +25,4 @@ buildGoModule rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ marsam spacekookie ]; maintainers = with maintainers; [ marsam spacekookie ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
}; };
modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/golang/protobuf"; homepage = "https://github.com/golang/protobuf";
@ -20,4 +20,4 @@ buildGoModule rec {
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -16,7 +16,7 @@ buildGoModule rec {
sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf";
}; };
modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p"; vendorSha256 = "0nbbngsphklzhcmqafrw1im2l1vnfcma9sb4vskdpdrsadv5ss5r";
meta = with lib; { meta = with lib; {
description = "A collection of tools and libraries for working with Go code, including linters and static analysis"; description = "A collection of tools and libraries for working with Go code, including linters and static analysis";
@ -24,4 +24,4 @@ buildGoModule rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ rvolosatovs kalbasit ]; maintainers = with maintainers; [ rvolosatovs kalbasit ];
}; };
} }

View file

@ -8,7 +8,7 @@ buildGoModule rec {
goPackagePath = "github.com/rogpeppe/godef"; goPackagePath = "github.com/rogpeppe/godef";
subPackages = [ "." ]; subPackages = [ "." ];
modSha256 = "06mi8f2qs54gk2anxqcf70h96s63a99xhnlm294djyv37wy1yffi"; vendorSha256 = null;
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;
@ -23,4 +23,4 @@ buildGoModule rec {
maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ]; maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ];
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1cw9mmavxz8gxzzwsllvf5lwb2wwi19jbc7hcwxsi4ywp7a84gh0"; sha256 = "1cw9mmavxz8gxzzwsllvf5lwb2wwi19jbc7hcwxsi4ywp7a84gh0";
}; };
modSha256 = "1ladpxhr90awnms2qmlm2lz91wyh92fl3rqbfr54qngrkpkpbhr2"; vendorSha256 = "14a3p163xy861xb6x160wy15hzjc75n36jdyzaxl877i17shba8z";
meta = with lib; { meta = with lib; {
description = "A stricter gofmt"; description = "A stricter gofmt";
@ -19,4 +19,4 @@ buildGoModule rec {
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ rvolosatovs ]; maintainers = with maintainers; [ rvolosatovs ];
}; };
} }

View file

@ -8,7 +8,7 @@ buildGoModule rec {
version = "2019-02-28"; version = "2019-02-28";
rev = "b37376c5da6aeb900611837098f40f81972e63e4"; rev = "b37376c5da6aeb900611837098f40f81972e63e4";
modSha256 = "0j6a2b8hx54cnjz1ya65v9czg9ygqj6zwg52ffpz7cqkx0pgl9q4"; vendorSha256 = null;
goPackagePath = "github.com/zmb3/gogetdoc"; goPackagePath = "github.com/zmb3/gogetdoc";
excludedPackages = "\\(testdata\\)"; excludedPackages = "\\(testdata\\)";
@ -30,4 +30,4 @@ buildGoModule rec {
maintainers = with maintainers; [ kalbasit ]; maintainers = with maintainers; [ kalbasit ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1capiw8af4wmx3wpfslb30xivfyh72x5kj12f8p5pwhl6id31931"; sha256 = "1capiw8af4wmx3wpfslb30xivfyh72x5kj12f8p5pwhl6id31931";
}; };
modSha256 = "0adsy71hl6256v40b5gb00kmqswbgfb1576m6lwak1fcfi07hf6b"; vendorSha256 = "16wr8ixicbvdpg5mg6q07sa1b03ydpwdbvbjl3r9qihdqkhhzlr1";
subPackages = [ "cmd/golangci-lint" ]; subPackages = [ "cmd/golangci-lint" ];
meta = with lib; { meta = with lib; {

View file

@ -4,7 +4,7 @@ buildGoModule rec {
pname = "gomodifytags"; pname = "gomodifytags";
version = "1.4.0"; version = "1.4.0";
modSha256 = "0nkdk2zgnwsg9lv20vqk2lshk4g9fqwqxd5bpr78nlahb9xk486s"; vendorSha256 = null;
goPackagePath = "github.com/fatih/gomodifytags"; goPackagePath = "github.com/fatih/gomodifytags";
@ -21,4 +21,4 @@ buildGoModule rec {
maintainers = with stdenv.lib.maintainers; [ vdemeester ]; maintainers = with stdenv.lib.maintainers; [ vdemeester ];
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}; };
} }

View file

@ -15,7 +15,7 @@ buildGoModule rec {
sha256 = "1jak1bg6k5iasscw68ra875k59k3iqhka2ykabsd427k1j3mypln"; sha256 = "1jak1bg6k5iasscw68ra875k59k3iqhka2ykabsd427k1j3mypln";
}; };
modSha256 = "0v9lg5kq3776b2s4kgyi19jy8shjqrr0f5ljrchsj1k7867sxiw7"; vendorSha256 = "1pwsc488ldw039by8nqpni801zry7dnf0rx4hhd73xpv2w7s8n2r";
meta = { meta = {
description = "Tool to get list available Go packages."; description = "Tool to get list available Go packages.";
@ -23,4 +23,4 @@ buildGoModule rec {
maintainers = with stdenv.lib.maintainers; [ vdemeester ]; maintainers = with stdenv.lib.maintainers; [ vdemeester ];
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
}; };
} }

View file

@ -12,7 +12,7 @@ buildGoModule rec {
}; };
modRoot = "gopls"; modRoot = "gopls";
modSha256 = "1p0g28i707xyxz1g6hb56qlc4km9ik7vjky0v80hw7n73vzs5mr9"; vendorSha256 = "1zj0zpyl9wq23vks426vqg5xjwjcaj1079rkc67489h0p7y0aqv5";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Official language server for the Go language"; description = "Official language server for the Go language";
@ -20,4 +20,4 @@ buildGoModule rec {
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ mic92 ]; maintainers = with maintainers; [ mic92 ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0zifha3mj7386q2accrdmd8qniingadxz1v8vg4mciwi723msr44"; sha256 = "0zifha3mj7386q2accrdmd8qniingadxz1v8vg4mciwi723msr44";
}; };
modSha256 = "10zkk4zqla5yqs5sq2qc7x1vhadfyd1l7s29xyjmg4grs8iimk2j"; vendorSha256 = "0d45i8wm35m2cdbk48razkdr49a3hfwnp84inlz7hj054cq6vimi";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
@ -22,4 +22,4 @@ buildGoModule rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ endocrimes ]; maintainers = with maintainers; [ endocrimes ];
}; };
} }

View file

@ -21,7 +21,7 @@ buildGoModule rec {
rm -rf gopls rm -rf gopls
''; '';
modSha256 = "1pijbkp7a9n2naicg21ydii6xc0g4jm5bw42lljwaks7211ag8k9"; vendorSha256 = "0pplmqxrnc8qnr5708igx4dm7rb0hicvhg6lh5hj8zkx38nb19s0";
postConfigure = '' postConfigure = ''
# Make the builtin tools available here # Make the builtin tools available here
@ -47,4 +47,4 @@ buildGoModule rec {
# Do not copy this without a good reason for enabling # Do not copy this without a good reason for enabling
# In this case tools is heavily coupled with go itself and embeds paths. # In this case tools is heavily coupled with go itself and embeds paths.
allowGoReference = true; allowGoReference = true;
} }

View file

@ -13,7 +13,7 @@ buildGoModule rec {
sha256 = "0cxh92df8gdl4bmr22pdvdxdkdjyfy0jv48y0k6awy1xz61r94ap"; sha256 = "0cxh92df8gdl4bmr22pdvdxdkdjyfy0jv48y0k6awy1xz61r94ap";
}; };
modSha256 = "1sdp62q4rnx7dp4i0dhnc8kzi8h6zzjdy7ym0mk9r7xkxxx0s3ds"; vendorSha256 = "1iiqmdnjnrsqgjisb5j5casa2hmqmafn79157skl5zxawndvc2rj";
buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ];
@ -37,4 +37,4 @@ buildGoModule rec {
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.zauberpony ]; maintainers = [ stdenv.lib.maintainers.zauberpony ];
}; };
} }

View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls";
}; };
modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn"; vendorSha256 = "0whqrms5mc7v14p2h1jfvkawm30xaylivijlsghrsaq468qcgg15";
subPackages = [ "." ]; subPackages = [ "." ];
@ -21,4 +21,4 @@ buildGoModule rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ cswank ]; maintainers = with maintainers; [ cswank ];
}; };
} }

Some files were not shown because too many files have changed in this diff Show more