credhub-cli: fix build under go1.15

I've sent this upstream at
https://github.com/cloudfoundry-incubator/credhub-cli/pull/107

But this should fix the build so it doesn't require go1.14
This commit is contained in:
Colin L Rice 2020-12-30 00:12:25 -05:00
parent bd64a6221f
commit 36a44c4e8d
2 changed files with 10 additions and 4 deletions

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

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 { };