From 5902512fe65333938580cdf5490cac9dcda82230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 7 Aug 2025 21:56:57 -0400
Subject: [PATCH 1/2] cue: ensure passthru attrs use final overriden package

---
 pkgs/by-name/cu/cue/package.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix
index d81886fcebcf..934516635f78 100644
--- a/pkgs/by-name/cu/cue/package.nix
+++ b/pkgs/by-name/cu/cue/package.nix
@@ -38,17 +38,21 @@ buildGoModule (finalAttrs: {
       --zsh <($out/bin/cue completion zsh)
   '';
 
-  passthru = {
-    writeCueValidator = callPackage ./validator.nix { };
-    tests = {
-      test-001-all-good = callPackage ./tests/001-all-good.nix { };
-      version = testers.testVersion {
-        package = finalAttrs.finalPackage;
-        command = "cue version";
-        version = "v${finalAttrs.version}";
+  passthru =
+    let
+      cue = finalAttrs.finalPackage;
+    in
+    {
+      writeCueValidator = callPackage ./validator.nix { inherit cue; };
+      tests = {
+        test-001-all-good = callPackage ./tests/001-all-good.nix { inherit cue; };
+        version = testers.testVersion {
+          package = cue;
+          command = "cue version";
+          version = "v${finalAttrs.version}";
+        };
       };
     };
-  };
 
   meta = {
     description = "Data constraint language which aims to simplify tasks involving defining and using data";

From e5cea90ef00a8bf9d2a966b846da7b06229085b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 7 Aug 2025 21:58:43 -0400
Subject: [PATCH 2/2] cue: add tests.cue-validation to tests

---
 pkgs/by-name/cu/cue/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix
index 934516635f78..a7e5e3fa0d11 100644
--- a/pkgs/by-name/cu/cue/package.nix
+++ b/pkgs/by-name/cu/cue/package.nix
@@ -5,6 +5,7 @@
   stdenv,
   installShellFiles,
   testers,
+  tests,
   callPackage,
 }:
 
@@ -41,10 +42,16 @@ buildGoModule (finalAttrs: {
   passthru =
     let
       cue = finalAttrs.finalPackage;
+      writeCueValidator = callPackage ./validator.nix { inherit cue; };
     in
     {
-      writeCueValidator = callPackage ./validator.nix { inherit cue; };
+      inherit writeCueValidator;
+
       tests = {
+        validation = tests.cue-validation.override {
+          callPackage = (path: attrs: callPackage path (attrs // { inherit writeCueValidator; }));
+        };
+
         test-001-all-good = callPackage ./tests/001-all-good.nix { inherit cue; };
         version = testers.testVersion {
           package = cue;