mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 11:45:45 +03:00
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.
This commit is contained in:
parent
eccd9564ab
commit
d87d760dfa
3 changed files with 7 additions and 13 deletions
|
@ -1,10 +1,10 @@
|
||||||
{
|
{
|
||||||
|
callPackage,
|
||||||
lib,
|
lib,
|
||||||
jq,
|
jq,
|
||||||
runCommand,
|
runCommand,
|
||||||
writeText,
|
writeText,
|
||||||
python3,
|
python3,
|
||||||
...
|
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
beforeResultDir,
|
beforeResultDir,
|
||||||
|
@ -127,7 +127,7 @@ let
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
maintainers = import ./maintainers.nix {
|
maintainers = callPackage ./maintainers.nix { } {
|
||||||
changedattrs = lib.attrNames (lib.groupBy (a: a.name) rebuildsPackagePlatformAttrs);
|
changedattrs = lib.attrNames (lib.groupBy (a: a.name) rebuildsPackagePlatformAttrs);
|
||||||
changedpathsjson = touchedFilesJson;
|
changedpathsjson = touchedFilesJson;
|
||||||
inherit byName;
|
inherit byName;
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
}:
|
||||||
# Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix
|
# Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix
|
||||||
{
|
{
|
||||||
changedattrs,
|
changedattrs,
|
||||||
|
@ -10,7 +13,6 @@ let
|
||||||
config = { };
|
config = { };
|
||||||
overlays = [ ];
|
overlays = [ ];
|
||||||
};
|
};
|
||||||
inherit (pkgs) lib;
|
|
||||||
|
|
||||||
changedpaths = builtins.fromJSON (builtins.readFile changedpathsjson);
|
changedpaths = builtins.fromJSON (builtins.readFile changedpathsjson);
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{
|
{
|
||||||
|
callPackage,
|
||||||
lib,
|
lib,
|
||||||
runCommand,
|
runCommand,
|
||||||
writeShellScript,
|
writeShellScript,
|
||||||
|
@ -227,16 +228,7 @@ let
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
compare = import ./compare {
|
compare = callPackage ./compare { };
|
||||||
inherit
|
|
||||||
lib
|
|
||||||
jq
|
|
||||||
runCommand
|
|
||||||
writeText
|
|
||||||
supportedSystems
|
|
||||||
python3
|
|
||||||
;
|
|
||||||
};
|
|
||||||
|
|
||||||
full =
|
full =
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue