cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #107940 from c00w/credhub

Browse source 
credhub-cli: fix build under go1.15
This commit is contained in:
Sandro 2021-05-01 14:51:04 +02:00 committed by GitHub
commit 783f5cd8bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/admin/credhub-cli/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
buildGoModule rec {
pname = "credhub-cli";
@ -11,6 +11,14 @@ buildGoModule rec {
sha256 = "1j0i0b79ph2i52cj0qln8wvp6gwhl73akkn026h27vvmlw9sndc2";
};
patches = [
# Fix test with Go 1.15
(fetchpatch {
url = "https://github.com/cloudfoundry-incubator/credhub-cli/commit/4bd1accd513dc5e163e155c4b428878ca0bcedbc.patch";
sha256 = "180n3q3d19aw02q7xsn7dxck18jgndz5garj2mb056cwa7mmhw0j";
})
];
# these tests require network access that we're not going to give them
postPatch = ''
rm commands/api_test.go

4
pkgs/top-level/all-packages.nix
View file

@ -2196,9 +2196,7 @@ in
cppclean = callPackage ../development/tools/cppclean {};
credhub-cli = callPackage ../tools/admin/credhub-cli {
buildGoModule = buildGo114Module;
};
credhub-cli = callPackage ../tools/admin/credhub-cli {};
crex = callPackage ../tools/misc/crex { };