diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-08-15 15:43:27 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-08-20 08:01:43 +1000 |
commit | 7dec299b89c159853aa88d2ad5572dd640db6798 (patch) | |
tree | 8b39c3dfae7b745e7e0d68be8c77854876ba420a /pkgs | |
parent | 4dd782f5ddc03253713875944fe1f4be6a3329be (diff) |
buildGoModule/vend: use upstream instead of fork
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/mailreaders/aerc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/vend/default.nix | 32 | ||||
-rw-r--r-- | pkgs/servers/mautrix-whatsapp/default.nix | 2 |
3 files changed, 23 insertions, 13 deletions
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 8236525ef9ce6..9a607b54b9cc0 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { }; runVend = true; - vendorSha256 = "0avdvbhv1jlisiicpi5vshz28a2p2fgnlrag9zngzglcrbhdd1rn"; + vendorSha256 = "13zs5113ip85yl6sw9hzclxwlnrhy18d39vh9cwbq97dgnh9rz89"; doCheck = false; diff --git a/pkgs/development/tools/vend/default.nix b/pkgs/development/tools/vend/default.nix index 7a25711032751..ef59ea8dd65c3 100644 --- a/pkgs/development/tools/vend/default.nix +++ b/pkgs/development/tools/vend/default.nix @@ -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; }; } diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 782491a302339..813d1f18e8b70 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { buildInputs = [ olm ]; - vendorSha256 = "05cqwprd1rcciw27wyz7lj1s3zmz2vq093vw1cx3kkjyf6lq8sk6"; + vendorSha256 = "1dmlqhhwmc0k9nbab5j8sl20b8d6b5yrmcdf7ibaiqh7i16zrp3s"; doCheck = false; |