about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-12-09 01:09:01 +0100
committerGitHub <noreply@github.com>2023-12-09 01:09:01 +0100
commit4bf0db679dd6c1271fb24026066187020e7efff5 (patch)
tree20d79ecc4365509e8c92c0e18e438b658650f0b1
parent08adace709ffa269d893e39179affd05b580323b (diff)
parenta8135a56112128062483b08a4ba26c5d41a55e8a (diff)
Merge pull request #272228 from aaronjheng/cue
cue: 0.6.0 -> 0.7.0
-rw-r--r--pkgs/development/tools/cue/default.nix22
1 files changed, 4 insertions, 18 deletions
diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix
index 0ff3e90dc0db5..1afee9cd7551c 100644
--- a/pkgs/development/tools/cue/default.nix
+++ b/pkgs/development/tools/cue/default.nix
@@ -1,6 +1,5 @@
 { buildGoModule
 , fetchFromGitHub
-, fetchpatch
 , lib
 , installShellFiles
 , testers
@@ -9,31 +8,18 @@
 
 buildGoModule rec {
   pname = "cue";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "cue-lang";
     repo = "cue";
     rev = "v${version}";
-    hash = "sha256-1svWb83xbVZIlI9pviCYfQ6Kkp0QRjZwrauL7PPJLts=";
+    hash = "sha256-L2KEOnUmQ6K+VtyJEha0LBWPVt+FqNh94gi3cMg82x0=";
   };
 
-  vendorHash = "sha256-ku4tPTXdnKau0kqnAAEHDdSF4oAC/6SDkTq8cECOiEk=";
+  vendorHash = "sha256-Eq51sydt2eu3pSCRjepvxpU01T0vr0axx9XEk34db28=";
 
-  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
-  '';
-
-  excludedPackages = [ "internal/ci/updatetxtar" "internal/cmd/embedpkg" "internal/cmd/qgo" "pkg/gen" ];
+  subPackages = [ "cmd/cue" ];
 
   nativeBuildInputs = [ installShellFiles ];