Commit 07c9ae7a authored by Adam Joseph's avatar Adam Joseph
Browse files

test-defaultPkgConfigPackages.nix: filter out recurseForDerivations

The command at the top of this file fails to evaluate:

```
$ nix-build -A tests.pkg-config.defaultPkgConfigPackages
in job ‘nixpkgs.tests.pkg-config.defaultPkgConfigPackages.tests-combined.x86_64-linux’:
error: pkg-config module `recurseForDerivations` is not defined to be a derivation. Please check the attribute value for `recurseForDerivations` in `pkgs/top-level/pkg-config-packages.nix` in Nixpkgs.
```

This is also causing eval errors on Hydra:

  https://hydra.nixos.org/jobset/nixos/pr-209870-gcc-external-bootstrap#tabs-errors

Let's filter out `recurseForDerivations=true` from the attrset,
since it exists mainly as a flag to signal special handling when
recursing.
parent f012515e
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@
let
  inherit (lib.strings) escapeNixIdentifier;

  allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) defaultPkgConfigPackages;
  allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v)
    (builtins.removeAttrs defaultPkgConfigPackages ["recurseForDerivations"]);

  # nix-build rejects attribute names with periods
  # This will build those regardless.