From d87d760dfa6128c51e8248458029b08778726a69 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 19 May 2025 22:37:05 +0200
Subject: [PATCH] ci/eval.compare: use lib from pinned nixpkgs

compare/maintainers.nix needs to access the current checkout to check
attrpaths, but makes the mistake of using lib from that checkout as
well. All other code in ci/ uses the pinned nixpkgs instance, so
maintainers.nix should do so as well.
---
 ci/eval/compare/default.nix     |  4 ++--
 ci/eval/compare/maintainers.nix |  4 +++-
 ci/eval/default.nix             | 12 ++----------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 267cab8c0986..68456135629a 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -1,10 +1,10 @@
 {
+  callPackage,
   lib,
   jq,
   runCommand,
   writeText,
   python3,
-  ...
 }:
 {
   beforeResultDir,
@@ -127,7 +127,7 @@ let
       }
     );
 
-  maintainers = import ./maintainers.nix {
+  maintainers = callPackage ./maintainers.nix { } {
     changedattrs = lib.attrNames (lib.groupBy (a: a.name) rebuildsPackagePlatformAttrs);
     changedpathsjson = touchedFilesJson;
     inherit byName;
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 9b641d6ec60f..43ae050acba4 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -1,3 +1,6 @@
+{
+  lib,
+}:
 # Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix
 {
   changedattrs,
@@ -10,7 +13,6 @@ let
     config = { };
     overlays = [ ];
   };
-  inherit (pkgs) lib;
 
   changedpaths = builtins.fromJSON (builtins.readFile changedpathsjson);
 
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index d2d4ebe0db67..cb6bef8d0dca 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -1,4 +1,5 @@
 {
+  callPackage,
   lib,
   runCommand,
   writeShellScript,
@@ -227,16 +228,7 @@ let
         done
       '';
 
-  compare = import ./compare {
-    inherit
-      lib
-      jq
-      runCommand
-      writeText
-      supportedSystems
-      python3
-      ;
-  };
+  compare = callPackage ./compare { };
 
   full =
     {