alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

top-level/pkg-config: Make tests easy to find

Browse source
This commit is contained in:
Robert Hensing 2023-01-29 08:54:13 +01:00
parent 811bf8ade0
commit 3be7ea8c89
5 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/test/default.nix
View file

@ -51,22 +51,7 @@ with pkgs;
php = recurseIntoAttrs (callPackages ./php {});
defaultPkgConfigPackages =
let
# defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform
# in order to filter out the unsupported packages without throwing any errors
# tryEval would be too fragile, masking different problems as if they're
# unsupported platform problems.
allPkgs = import ../top-level {
system = pkgs.stdenv.hostPlatform.system;
localSystem = pkgs.stdenv.hostPlatform.system;
config = {
allowUnsupportedSystem = true;
};
overlays = [];
};
in
allPkgs.callPackage ./pkg-config-packages.nix { };
pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { });
rustCustomSysroot = callPackage ./rust-sysroot {};
buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { };

2
pkgs/top-level/all-packages.nix
View file

@ -112,7 +112,7 @@ with pkgs;
tests = callPackages ../test {};
defaultPkgConfigPackages = import ./pkg-config-packages.nix pkgs;
defaultPkgConfigPackages = import ./pkg-config/defaultPkgConfigPackages.nix pkgs;
### Nixpkgs maintainer tools

2
pkgs/top-level/pkg-config-packages.nix → pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix
View file

@ -21,7 +21,7 @@ let
importJSON
;
data = importJSON ./pkg-config/pkg-config-data.json;
data = importJSON ./pkg-config-data.json;
inherit (data) modules;
platform = pkgs.stdenv.hostPlatform;

2
pkgs/test/pkg-config-packages.nix → pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix
View file

@ -1,3 +1,5 @@
# cd nixpkgs
# nix-build -A tests.pkg-config.defaultPkgConfigPackages
{ lib, pkg-config, defaultPkgConfigPackages, runCommand }:
let
inherit (lib.strings) escapeNixIdentifier;

21
pkgs/top-level/pkg-config/tests.nix Normal file
View file

@ -0,0 +1,21 @@
# cd nixpkgs
# nix-build -A tests.pkg-config
{ lib, stdenv, ... }:
let
# defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform
# in order to filter out the unsupported packages without throwing any errors
# tryEval would be too fragile, masking different problems as if they're
# unsupported platform problems.
allPkgs = import ../default.nix {
system = stdenv.hostPlatform.system;
localSystem = stdenv.hostPlatform.system;
config = {
allowUnsupportedSystem = true;
};
overlays = [];
};
in
lib.recurseIntoAttrs {
defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { };
}