From a010129bf87c2afcb2f60db410cc535fef299f8c Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 25 Jan 2023 17:09:33 +0100
Subject: [PATCH] pkg-configPackages -> defaultPkgConfigPackages

This better reflects the purpose of the package set, while leaving
room for a fancier, more complete implementation of the concept,
with a nicer name.
---
 doc/languages-frameworks/pkg-config.section.md | 2 +-
 pkgs/test/default.nix                          | 4 ++--
 pkgs/test/pkg-config-packages.nix              | 4 ++--
 pkgs/top-level/all-packages.nix                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/languages-frameworks/pkg-config.section.md b/doc/languages-frameworks/pkg-config.section.md
index f19f56840345..ee0a471be3e5 100644
--- a/doc/languages-frameworks/pkg-config.section.md
+++ b/doc/languages-frameworks/pkg-config.section.md
@@ -6,4 +6,4 @@ Nixpkgs provides a couple of facilities for working with this tool.
 
  - A [setup hook](#setup-hook-pkg-config) bundled with in the `pkg-config` package, to bring a derivation's declared build inputs into the environment.
  - The [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), for packages that provide pkg-config modules.
- - The `pkg-configPackages` package set: a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. Hand-written packages should use the normal Nixpkgs attribute name instead.
+ - The `defaultPkgConfigPackages` package set: a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. Hand-written packages should use the normal Nixpkgs attribute name instead.
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 82134b051d4e..72b22f7f6865 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -51,9 +51,9 @@ with pkgs;
 
   php = recurseIntoAttrs (callPackages ./php {});
 
-  pkg-configPackages =
+  defaultPkgConfigPackages =
     let
-      # pkg-configPackages test needs a Nixpkgs with allowUnsupportedPlatform
+      # 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.
diff --git a/pkgs/test/pkg-config-packages.nix b/pkgs/test/pkg-config-packages.nix
index be046c8cacca..8cb6cc57753f 100644
--- a/pkgs/test/pkg-config-packages.nix
+++ b/pkgs/test/pkg-config-packages.nix
@@ -1,8 +1,8 @@
-{ lib, pkg-config, pkg-configPackages, runCommand }:
+{ lib, pkg-config, defaultPkgConfigPackages, runCommand }:
 let
   inherit (lib.strings) escapeNixIdentifier;
 
-  allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) pkg-configPackages;
+  allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) defaultPkgConfigPackages;
 
   # nix-build rejects attribute names with periods
   # This will build those regardless.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b61bcccee60..cde388312abf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -112,7 +112,7 @@ with pkgs;
 
   tests = callPackages ../test {};
 
-  pkg-configPackages = import ./pkg-config-packages.nix pkgs;
+  defaultPkgConfigPackages = import ./pkg-config-packages.nix pkgs;
 
   ### Nixpkgs maintainer tools