summary refs log tree commit diff
path: root/pkgs/tools/admin/credhub-cli
diff options
context:
space:
mode:
authorColin L Rice <colin@daedrum.net>2020-12-30 00:12:25 -0500
committerColin L Rice <colin@daedrum.net>2021-04-30 21:59:02 -0400
commit36a44c4e8d07bee733ea1e9fe336854164ba13f4 (patch)
treea8b1daed924840159706550dd64d1b621d5d2689 /pkgs/tools/admin/credhub-cli
parentbd64a6221f18a24c79b879c0441f4420f0f2d47e (diff)
downloadnixpkgs-36a44c4e8d07bee733ea1e9fe336854164ba13f4.tar
nixpkgs-36a44c4e8d07bee733ea1e9fe336854164ba13f4.tar.gz
nixpkgs-36a44c4e8d07bee733ea1e9fe336854164ba13f4.tar.bz2
nixpkgs-36a44c4e8d07bee733ea1e9fe336854164ba13f4.tar.lz
nixpkgs-36a44c4e8d07bee733ea1e9fe336854164ba13f4.tar.xz
nixpkgs-36a44c4e8d07bee733ea1e9fe336854164ba13f4.tar.zst
nixpkgs-36a44c4e8d07bee733ea1e9fe336854164ba13f4.zip
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
Diffstat (limited to 'pkgs/tools/admin/credhub-cli')
-rw-r--r--pkgs/tools/admin/credhub-cli/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix
index 55af1679d7a..0c71850f849 100644
--- a/pkgs/tools/admin/credhub-cli/default.nix
+++ b/pkgs/tools/admin/credhub-cli/default.nix
@@ -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