From e6b4af4b169bc8c2b7d3d128096d5e9ea63f2f00 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Mon, 20 Nov 2023 16:57:54 +0100 Subject: [PATCH] Rename pkgconfig to pkg-config The alias pkgconfig has been removed. Reviewed-by: Aleix Roca Nonell --- pkgs/babeltrace/default.nix | 4 ++-- pkgs/babeltrace2/default.nix | 4 ++-- pkgs/groff/default.nix | 4 ++-- pkgs/hwloc/1.11.6/default.nix | 4 ++-- pkgs/libpsm2/default.nix | 4 ++-- pkgs/nix/default.nix | 6 +++--- pkgs/nix/static.nix | 6 +++--- pkgs/nosv/default.nix | 4 ++-- pkgs/perf/default.nix | 4 ++-- pkgs/rdma-core/default.nix | 4 ++-- pkgs/slurm/16.05.8.1/default.nix | 4 ++-- pkgs/slurm/default.nix | 4 ++-- pkgs/slurm/pmi2.nix | 4 ++-- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/babeltrace/default.nix b/pkgs/babeltrace/default.nix index 185fdaf..198d3dc 100644 --- a/pkgs/babeltrace/default.nix +++ b/pkgs/babeltrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, glib, libuuid, popt, elfutils, swig4, python3 }: +{ stdenv, lib, fetchurl, pkg-config, glib, libuuid, popt, elfutils, swig4, python3 }: stdenv.mkDerivation rec { name = "babeltrace-1.5.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libuuid popt elfutils swig4 python3 ]; meta = with lib; { diff --git a/pkgs/babeltrace2/default.nix b/pkgs/babeltrace2/default.nix index 43ae45c..6526c18 100644 --- a/pkgs/babeltrace2/default.nix +++ b/pkgs/babeltrace2/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , glib , libuuid , popt @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libuuid popt elfutils python3 swig4 ncurses breakpointHook ]; hardeningDisable = [ "all" ]; diff --git a/pkgs/groff/default.nix b/pkgs/groff/default.nix index 1b27039..d225f67 100644 --- a/pkgs/groff/default.nix +++ b/pkgs/groff/default.nix @@ -3,7 +3,7 @@ , psutils, netpbm #for html output , buildPackages , autoreconfHook -, pkgconfig +, pkg-config , texinfo }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ ghostscript psutils netpbm perl ]; - nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ]; + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; # Builds running without a chroot environment may detect the presence # of /usr/X11 in the host system, leading to an impure build of the diff --git a/pkgs/hwloc/1.11.6/default.nix b/pkgs/hwloc/1.11.6/default.nix index 1754fe5..5f9bfda 100644 --- a/pkgs/hwloc/1.11.6/default.nix +++ b/pkgs/hwloc/1.11.6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, expat, ncurses +{ stdenv, lib, fetchurl, pkg-config, expat, ncurses , pciutils, numactl }: with lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yl7dm2qplwmnidd712zy12qfvxk28k8ccs694n42ybwdjwzg1bn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # Filter out `null' inputs. This allows users to `.override' the # derivation and set optional dependencies to `null'. diff --git a/pkgs/libpsm2/default.nix b/pkgs/libpsm2/default.nix index e75e8d7..1739496 100644 --- a/pkgs/libpsm2/default.nix +++ b/pkgs/libpsm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, numactl, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, numactl, pkg-config }: let version = "11.2.185"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ numactl pkgconfig ]; + buildInputs = [ numactl pkg-config ]; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/nix/default.nix b/pkgs/nix/default.nix index d31b3c3..31c5f9e 100644 --- a/pkgs/nix/default.nix +++ b/pkgs/nix/default.nix @@ -11,7 +11,7 @@ let common = { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz , bash, coreutils, gzip, gnutar - , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json + , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , jq, libarchive, rustc, cargo # Used by tests @@ -40,7 +40,7 @@ common = outputs = [ "out" "dev" "man" "doc" ]; nativeBuildInputs = - [ pkgconfig ] + [ pkg-config ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq gmock ]; @@ -158,7 +158,7 @@ common = # This is not cross-compile safe, don't have time to fix right now # but noting for future travellers. nativeBuildInputs = - [ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive ]; + [ perl pkg-config curl nix libsodium boost autoreconfHook autoconf-archive ]; configureFlags = [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" diff --git a/pkgs/nix/static.nix b/pkgs/nix/static.nix index 1d4965c..ca4059c 100644 --- a/pkgs/nix/static.nix +++ b/pkgs/nix/static.nix @@ -14,7 +14,7 @@ enableStatic = true; common = { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz , bash, coreutils, gzip, gnutar - , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json + , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , jq, libarchive # Used by tests @@ -41,7 +41,7 @@ common = outputs = [ "out" "dev" "man" "doc" ]; nativeBuildInputs = - [ pkgconfig ] + [ pkg-config ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ]; @@ -164,7 +164,7 @@ common = # This is not cross-compile safe, don't have time to fix right now # but noting for future travellers. nativeBuildInputs = - [ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive ]; + [ perl pkg-config curl nix libsodium boost autoreconfHook autoconf-archive ]; configureFlags = [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" diff --git a/pkgs/nosv/default.nix b/pkgs/nosv/default.nix index 4d34523..d826de6 100644 --- a/pkgs/nosv/default.nix +++ b/pkgs/nosv/default.nix @@ -3,7 +3,7 @@ , lib , autoreconfHook , fetchFromGitHub -, pkgconfig +, pkg-config , numactl , hwloc , ovni ? null @@ -46,7 +46,7 @@ in configureFlags = [ "--with-ovni=${ovni}" ]; buildInputs = [ autoreconfHook - pkgconfig + pkg-config numactl hwloc ovni diff --git a/pkgs/perf/default.nix b/pkgs/perf/default.nix index b4af296..f9e67a4 100644 --- a/pkgs/perf/default.nix +++ b/pkgs/perf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper -, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils +, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils , libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl , zlib, withGtk ? false, gtk2 ? null , babeltrace @@ -42,7 +42,7 @@ stdenv.mkDerivation { # perf refers both to newt and slang nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty audit makeWrapper pkgconfig python3 + flex bison libiberty audit makeWrapper pkg-config python3 ]; buildInputs = [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl diff --git a/pkgs/rdma-core/default.nix b/pkgs/rdma-core/default.nix index e3566f6..84bbf34 100644 --- a/pkgs/rdma-core/default.nix +++ b/pkgs/rdma-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, docutils +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, docutils , pandoc, ethtool, iproute, libnl, udev, python, perl , makeWrapper } : @@ -17,7 +17,7 @@ in stdenv.mkDerivation { sha256 = "1xkmdix6mgv6kjjj6wi844bfddhl0ybalrp5g8pf5izasc43brg7"; }; - nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ]; buildInputs = [ libnl ethtool iproute udev python perl ]; cmakeFlags = [ diff --git a/pkgs/slurm/16.05.8.1/default.nix b/pkgs/slurm/16.05.8.1/default.nix index 4d85ac0..a3f8203 100644 --- a/pkgs/slurm/16.05.8.1/default.nix +++ b/pkgs/slurm/16.05.8.1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, libtool, curl +{ stdenv, lib, fetchFromGitHub, pkg-config, libtool, curl , python3, munge, perl, pam, zlib, shadow, coreutils , ncurses, libmysqlclient, lua, hwloc, numactl , readline, freeipmi, xorg, lz4, rdma-core, nixosTests @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # this doesn't fix tests completely at least makes slurmd to launch hardeningDisable = [ "fortify" "bindnow" ]; - nativeBuildInputs = [ pkgconfig libtool python3 ]; + nativeBuildInputs = [ pkg-config libtool python3 ]; buildInputs = [ curl python3 munge perl pam zlib libmysqlclient ncurses lz4 rdma-core diff --git a/pkgs/slurm/default.nix b/pkgs/slurm/default.nix index d65440e..fd7a43c 100644 --- a/pkgs/slurm/default.nix +++ b/pkgs/slurm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, libtool, curl +{ stdenv, lib, fetchFromGitHub, pkg-config, libtool, curl , python, munge, perl, pam, openssl , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , readline, freeipmi, libssh2, xorg @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # this doesn't fix tests completely at least makes slurmd to launch hardeningDisable = [ "bindnow" ]; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ curl python munge perl pam openssl libmysqlclient ncurses gtk2 diff --git a/pkgs/slurm/pmi2.nix b/pkgs/slurm/pmi2.nix index da9811f..83339c7 100644 --- a/pkgs/slurm/pmi2.nix +++ b/pkgs/slurm/pmi2.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, libtool, curl +{ stdenv, lib, fetchFromGitHub, pkg-config, libtool, curl , python3, munge, perl, pam, openssl , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , readline, freeipmi, libssh2, xorg @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # this doesn't fix tests completely at least makes slurmd to launch hardeningDisable = [ "bindnow" ]; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ curl python3 munge perl pam openssl libmysqlclient ncurses gtk2