diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
| commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
| tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/tools/admin/credhub-cli/default.nix | |
| parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
| parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
| download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip | |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/admin/credhub-cli/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/admin/credhub-cli/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix b/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix index 55af1679d7ad..0c71850f849e 100644 --- a/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix +++ b/nixpkgs/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 |