diff options
author | Bruno Bigras <bigras.bruno@gmail.com> | 2023-10-26 15:10:05 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-26 15:10:05 -0400 |
commit | c679700f2caf7bbdb51a85c0b00e9500eca24492 (patch) | |
tree | a8a948dc98c68b0d9e1fd2afdb48ce07a326181b /pkgs | |
parent | f9d4f5f23ce7ccb7ad91d6d2150e367baf7014f6 (diff) | |
parent | abb170eac9d84c56c06538b894e12e60e36f9ed9 (diff) |
Merge pull request #263601 from aaronjheng/cue
cue: fix tests
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/cue/default.nix | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 16def898b0516..0ff3e90dc0db5 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -1,4 +1,11 @@ -{ buildGoModule, fetchFromGitHub, lib, installShellFiles, testers, cue }: +{ buildGoModule +, fetchFromGitHub +, fetchpatch +, lib +, installShellFiles +, testers +, cue +}: buildGoModule rec { pname = "cue"; @@ -11,13 +18,21 @@ buildGoModule rec { hash = "sha256-1svWb83xbVZIlI9pviCYfQ6Kkp0QRjZwrauL7PPJLts="; }; + vendorHash = "sha256-ku4tPTXdnKau0kqnAAEHDdSF4oAC/6SDkTq8cECOiEk="; + + patches = [ + # Fix tests with go1.21. See https://github.com/cue-lang/cue/issues/2548. + (fetchpatch { + url = "https://github.com/cue-lang/cue/commit/3bf3dbd655284d3628399a83a703f4849b5f9374.patch"; + hash = "sha256-9Zi2mrqB1JTFvadiqWTgzzi1pffZ3gOmTtrDDQWye1Q="; + }) + ]; + postPatch = '' # Disable script tests rm -f cmd/cue/cmd/script_test.go ''; - vendorHash = "sha256-ku4tPTXdnKau0kqnAAEHDdSF4oAC/6SDkTq8cECOiEk="; - excludedPackages = [ "internal/ci/updatetxtar" "internal/cmd/embedpkg" "internal/cmd/qgo" "pkg/gen" ]; nativeBuildInputs = [ installShellFiles ]; |