2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-19 04:03:56 +00:00
Commit Graph

14 Commits

Author SHA1 Message Date
John Ericson
420f7d5ed7 pkg-config-data.json: Avoid an alias 2023-09-21 10:33:47 -04:00
sternenseemann
af60e68744 testers.hasPkgConfigModules: allow checking multiple pkg-config mods
This is very useful in conjunction with meta.pkgConfigModules, as the
new tester can use the list provided by this meta attribute as a default
value for moduleNames, making its usage in passthru.tests very
convenient.

For backwards compatibility, a shim under the old name is maintained
with a warning.
2023-08-08 19:16:48 +02:00
Nick Cao
d2c39ba0b0
tests.pkg-config.defaultPkgConfigPackages: fix cross compilation 2023-05-13 12:55:22 +08:00
Adam Joseph
07c9ae7a65 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.
2023-03-17 20:44:31 -07:00
sternenseemann
c5a0a5ac5e curl: add pkg-config metadata for libcurl.pc
I did not add the validatePkgConfig setup hook to curl, as I suspect it
may cause trouble when bootstrapping.
2023-02-15 13:52:15 +01:00
Robert Hensing
9520feaf76 Revert "Revert "tests.defaultPkgConfigPackages: Add recurseIntoAttrs""
This reverts commit deed04ab81.
2023-01-31 15:12:04 +01:00
K900
deed04ab81 Revert "tests.defaultPkgConfigPackages: Add recurseIntoAttrs"
This reverts commit f192e96d07.
2023-01-30 21:02:30 +03:00
Robert Hensing
b6bec17eb9 testers.hasPkgConfigModule: Extract and add tests, docs 2023-01-30 00:35:34 +01:00
Robert Hensing
f192e96d07 tests.defaultPkgConfigPackages: Add recurseIntoAttrs 2023-01-30 00:35:34 +01:00
Robert Hensing
974d331e14 pkg-config-data.json: Remove m and pthread
These aren't actually pkg-config packages, but packages that
happen to be in cabal2nix's mapping for cabal reasons. They do not
belong in this file.
2023-01-29 09:51:55 +01:00
Robert Hensing
3be7ea8c89 top-level/pkg-config: Make tests easy to find 2023-01-29 09:51:55 +01:00
Robert Hensing
811bf8ade0 pkg-config-data.json: Add version 2023-01-29 09:51:55 +01:00
Robert Hensing
09eb09b9c5 pkg-config-data.json: Encode platform support 2023-01-29 09:51:55 +01:00
Robert Hensing
81a541e6b6 defaultPkgConfigPackages: Make it JSON
With a bit of help from:

```
nix-repl> :b (formats.json {}).generate "hi" { modules = lib.mapAttrs (k: v: { attrPath = v; }) (p (paths [] pkgs // { stdenv = { isDarwin = false; isLinux = false; };})); }
```
2023-01-29 09:51:55 +01:00