From e66898141d3b851473db5169d8621f5c0325c60a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 19 Jul 2025 11:47:33 +0200
Subject: [PATCH] ci/eval: don't evaluate variants

This removes pkgsx86_64Darwin from the top-level attributes when
generating attrpaths for evaluation on Linux. Needed for attrpaths
generation to succeed without silently catching eval errors.

Variants are still available during actual Eval for references from
other packages, just not during attrpath generation. To remove it from
Eval as well, issues around pkgsLLVM will have to be fixed first.

(cherry picked from commit fc45a5f2c9fe7881f44877b861ae6c3ee8a3fba3)
---
 pkgs/by-name/bm/bmake/package.nix   | 4 ++--
 pkgs/top-level/release-outpaths.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix
index 74c546e1e84f..75a0da3750b3 100644
--- a/pkgs/by-name/bm/bmake/package.nix
+++ b/pkgs/by-name/bm/bmake/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   getopt,
   ksh,
-  pkgsMusl,
+  pkgsMusl ? { },
   stdenv,
   tzdata,
 }:
@@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests = {
-      bmakeMusl = pkgsMusl.bmake;
+      bmakeMusl = pkgsMusl.bmake or null;
     };
   };
 
diff --git a/pkgs/top-level/release-outpaths.nix b/pkgs/top-level/release-outpaths.nix
index 731c65da73e3..18840848c185 100644
--- a/pkgs/top-level/release-outpaths.nix
+++ b/pkgs/top-level/release-outpaths.nix
@@ -29,6 +29,7 @@ let
             allowBroken = includeBroken;
             allowUnfree = true;
             allowInsecurePredicate = x: true;
+            allowVariants = !attrNamesOnly;
             checkMeta = checkMeta;
 
             handleEvalIssue =