Commit ca6ce52e authored by Silvan Mosberger's avatar Silvan Mosberger
Browse files

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
parent b513ab81

ci/eval/compare/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -158,8 +158,10 @@ let 
      }

    );



  getMaintainers = callPackage ./maintainers.nix { };



  inherit

    (callPackage ./maintainers.nix {

    (getMaintainers {

      affectedAttrPaths = map (a: a.packagePath) (

        convertToPackagePlatformAttrs (diffAttrs.changed ++ diffAttrs.removed)

      );

ci/eval/compare/maintainers.nix

+7 −2
Original line number Diff line number Diff line
@@ -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 ../../.. + "/";