colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-defaultPkgConfigPackages.nix: filter out recurseForDerivations

Browse Source 
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.
This commit is contained in:
Adam Joseph 2023-03-17 20:42:55 -07:00
parent 3b49fb2ab6
commit 410271448c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix
View File

@ -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.