diff options
-rw-r--r-- | pkgs/test/default.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix (renamed from pkgs/top-level/pkg-config-packages.nix) | 2 | ||||
-rw-r--r-- | pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix (renamed from pkgs/test/pkg-config-packages.nix) | 2 | ||||
-rw-r--r-- | pkgs/top-level/pkg-config/tests.nix | 21 |
5 files changed, 26 insertions, 18 deletions
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 72b22f7f68658..39039c5950e46 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -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 { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cde388312abf8..1638192c33df3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 diff --git a/pkgs/top-level/pkg-config-packages.nix b/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix index b5cda49391565..b3cf3cdca2fcd 100644 --- a/pkgs/top-level/pkg-config-packages.nix +++ b/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix @@ -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; diff --git a/pkgs/test/pkg-config-packages.nix b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix index 8cb6cc57753f2..e34e1435c3c5c 100644 --- a/pkgs/test/pkg-config-packages.nix +++ b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix @@ -1,3 +1,5 @@ +# cd nixpkgs +# nix-build -A tests.pkg-config.defaultPkgConfigPackages { lib, pkg-config, defaultPkgConfigPackages, runCommand }: let inherit (lib.strings) escapeNixIdentifier; diff --git a/pkgs/top-level/pkg-config/tests.nix b/pkgs/top-level/pkg-config/tests.nix new file mode 100644 index 0000000000000..bcc8e7b4ee3e0 --- /dev/null +++ b/pkgs/top-level/pkg-config/tests.nix @@ -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 { }; +} |