From ca6ce52e6a2991753c2d63c2e96d3cf0c91fd07f Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Fri, 13 Mar 2026 16:51:18 +0100
Subject: [PATCH] ci/eval/compare: Fix wrong Nixpkgs being used

See https://github.com/NixOS/nixpkgs/pull/488014#issuecomment-4009775318
and https://github.com/NixOS/nixpkgs/issues/497110
---
 ci/eval/compare/default.nix     | 4 +++-
 ci/eval/compare/maintainers.nix | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index ed1129d75f2e..1717911f5c52 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -158,8 +158,10 @@ let
       }
     );
 
+  getMaintainers = callPackage ./maintainers.nix { };
+
   inherit
-    (callPackage ./maintainers.nix {
+    (getMaintainers {
       affectedAttrPaths = map (a: a.packagePath) (
         convertToPackagePlatformAttrs (diffAttrs.changed ++ diffAttrs.removed)
       );
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 903e42f733f6..0594d13e8b7a 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -11,6 +11,12 @@
 #   nix-instantiate --eval --strict --json test.nix -A result | jq
 #
 # Empty list as an output means success
+
+# Dependencies coming from the CI-pinned Nixpkgs
+{
+  lib,
+}:
+# Function arguments
 {
   # Files that were changed
   # Type: ListOf (Nixpkgs-root-relative path)
@@ -18,7 +24,7 @@
   # Attributes whose value was affected by the change
   # Type: ListOf (ListOf String)
   affectedAttrPaths,
-
+  # Nixpkgs used to check maintainers. Customisable for testing
   pkgs ? import ../../.. {
     system = "x86_64-linux";
     # We should never try to ping maintainers through package aliases, this can only lead to errors.
@@ -27,7 +33,6 @@
     config.allowAliases = false;
     overlays = [ ];
   },
-  lib,
 }:
 let
   nixpkgsRoot = toString ../../.. + "/";