From 3be7ea8c891b3209e92e961fe689649fb0333bcc Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 29 Jan 2023 08:54:13 +0100
Subject: [PATCH] top-level/pkg-config: Make tests easy to find

---
 pkgs/test/default.nix                         | 17 +--------------
 pkgs/top-level/all-packages.nix               |  2 +-
 .../defaultPkgConfigPackages.nix}             |  2 +-
 .../test-defaultPkgConfigPackages.nix}        |  2 ++
 pkgs/top-level/pkg-config/tests.nix           | 21 +++++++++++++++++++
 5 files changed, 26 insertions(+), 18 deletions(-)
 rename pkgs/top-level/{pkg-config-packages.nix => pkg-config/defaultPkgConfigPackages.nix} (95%)
 rename pkgs/{test/pkg-config-packages.nix => top-level/pkg-config/test-defaultPkgConfigPackages.nix} (97%)
 create mode 100644 pkgs/top-level/pkg-config/tests.nix

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 72b22f7f6865..39039c5950e4 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 cde388312abf..1638192c33df 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
similarity index 95%
rename from pkgs/top-level/pkg-config-packages.nix
rename to pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix
index b5cda4939156..b3cf3cdca2fc 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
similarity index 97%
rename from pkgs/test/pkg-config-packages.nix
rename to pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix
index 8cb6cc57753f..e34e1435c3c5 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 000000000000..bcc8e7b4ee3e
--- /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 { };
+}