buildGoModule/vend: use upstream instead of fork

This commit is contained in:
zowoq 2020-08-15 15:43:27 +10:00
parent 4dd782f5dd
commit 7dec299b89
3 changed files with 23 additions and 13 deletions

View file

@ -14,7 +14,7 @@ buildGoModule rec {
};
runVend = true;
vendorSha256 = "0avdvbhv1jlisiicpi5vshz28a2p2fgnlrag9zngzglcrbhdd1rn";
vendorSha256 = "13zs5113ip85yl6sw9hzclxwlnrhy18d39vh9cwbq97dgnh9rz89";
doCheck = false;

View file

@ -1,27 +1,37 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule {
buildGoModule rec {
pname = "vend";
version = "unstable-2020-06-04";
patches = [./remove_tidy.patch];
/*
This package is used to generate vendor folders for
packages that use the `runVend` option with `buildGoModule`.
Do not update this package without checking that the vendorSha256
hashes of packages using the `runVend` option are unchanged
or updating their vendorSha256 hashes if necessary.
*/
version = "1.0.2";
# Disable the bot
# nixpkgs-update: no auto update
# Disable `mod tidy`, patch was refused upstream
# https://github.com/nomad-software/vend/pull/9
patches = [ ./remove_tidy.patch ];
# A permanent fork from master is maintained to avoid non deterministic go tidy
src = fetchFromGitHub {
owner = "c00w";
owner = "nomad-software";
repo = "vend";
rev = "24fdebfdb2c3cc0516321a9cf33a3fd81c209c04";
sha256 = "112p9dz9by2h2m3jha2bv1bvzn2a86bpg1wphgmf9gksjpwy835l";
rev = "v${version}";
sha256 = "0h9rwwb56nzs46xsvl92af71i8b3wz3pf9ngi8v0i2bpk7p3p89d";
};
vendorSha256 = null;
doCheck = false;
meta = with stdenv.lib; {
homepage = "https://github.com/c00w/vend";
homepage = "https://github.com/nomad-software/vend";
description = "A utility which vendors go code including c dependencies";
maintainers = with maintainers; [ c00w ];
maintainers = with maintainers; [ c00w mic92 zowoq ];
license = licenses.mit;
};
}

View file

@ -13,7 +13,7 @@ buildGoModule rec {
buildInputs = [ olm ];
vendorSha256 = "05cqwprd1rcciw27wyz7lj1s3zmz2vq093vw1cx3kkjyf6lq8sk6";
vendorSha256 = "1dmlqhhwmc0k9nbab5j8sl20b8d6b5yrmcdf7ibaiqh7i16zrp3s";
doCheck = false;