diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-18 22:50:56 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-01-19 01:16:25 -0800 |
commit | 9bb3fccb5b55326cb3c2c507464a8a28d44d1730 (patch) | |
tree | 9d1c0c16cce5e5dcc08115230f6412865487964b /pkgs/top-level/python-packages.nix | |
parent | 200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff) |
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595 pkgconfig was aliased in 2018, however, it remained in all-packages.nix due to its wide usage. This cleans up the remaining references to pkgs.pkgsconfig and moves the entry to aliases.nix. python3Packages.pkgconfig remained unchanged because it's the canonical name of the upstream package on pypi.
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8105cfbe0da4f..9dccc052333ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -541,7 +541,7 @@ in { withPython = true; }); - av = callPackage ../development/python-modules/av { inherit (pkgs) pkgconfig; }; + av = callPackage ../development/python-modules/av { inherit (pkgs) pkg-config; }; avea = callPackage ../development/python-modules/avea { }; @@ -1611,7 +1611,7 @@ in { dbus-next = callPackage ../development/python-modules/dbus-next { }; - dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; + dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkg-config; }; dbutils = callPackage ../development/python-modules/dbutils { }; @@ -2411,7 +2411,7 @@ in { furl = callPackage ../development/python-modules/furl { }; - fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; }; + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkg-config; }; fusepy = callPackage ../development/python-modules/fusepy { }; @@ -2698,7 +2698,7 @@ in { inherit python; }); - gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig; }; + gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkg-config; }; gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; @@ -2777,7 +2777,7 @@ in { gssapi = callPackage ../development/python-modules/gssapi { inherit (pkgs) darwin krb5Full; }; gst-python = callPackage ../development/python-modules/gst-python { - inherit (pkgs) meson pkgconfig; + inherit (pkgs) meson pkg-config; gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; }; @@ -2925,7 +2925,7 @@ in { html5lib = callPackage ../development/python-modules/html5lib { }; - html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkgconfig; }; + html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkg-config; }; htmllaundry = callPackage ../development/python-modules/htmllaundry { }; @@ -3083,7 +3083,7 @@ in { importmagic = callPackage ../development/python-modules/importmagic { }; imread = - callPackage ../development/python-modules/imread { inherit (pkgs) pkgconfig libjpeg libpng libtiff libwebp; }; + callPackage ../development/python-modules/imread { inherit (pkgs) pkg-config libjpeg libpng libtiff libwebp; }; imutils = callPackage ../development/python-modules/imutils { }; @@ -3454,7 +3454,7 @@ in { kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { inherit (pkgs.kmsxx) stdenv; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; withPython = true; }).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; })); @@ -3542,7 +3542,7 @@ in { libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; - libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkgconfig; }; + libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkg-config; }; libcloud = if isPy27 then callPackage ../development/python-modules/libcloud/2.nix { } @@ -3650,13 +3650,13 @@ in { libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; - libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion pkgconfig; }; + libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion pkg-config; }; libvirt = if isPy3k then - (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkgconfig; }) + (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkg-config; }) else (callPackage ../development/python-modules/libvirt/5.9.0.nix { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; libvirt = pkgs.libvirt_5_9_0; }); @@ -3712,8 +3712,8 @@ in { livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; llfuse = callPackage ../development/python-modules/llfuse { - inherit (pkgs) fuse pkgconfig; - }; # use "real" fuse and pkgconfig, not the python modules + inherit (pkgs) fuse pkg-config; + }; # use "real" fuse and pkg-config, not the python modules llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_9; @@ -3899,7 +3899,7 @@ in { in callPackage path { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; matrix-client = callPackage ../development/python-modules/matrix-client { }; @@ -4909,7 +4909,7 @@ in { poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; inherit (pkgs.libsForQt5) poppler; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; portalocker = callPackage ../development/python-modules/portalocker { }; @@ -5121,7 +5121,7 @@ in { pyarlo = callPackage ../development/python-modules/pyarlo { }; - pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkgconfig; }; + pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkg-config; }; pyasn1 = callPackage ../development/python-modules/pyasn1 { }; @@ -5129,7 +5129,7 @@ in { pyatmo = callPackage ../development/python-modules/pyatmo { }; - pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs) pkgconfig; }; + pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs) pkg-config; }; pyatv = callPackage ../development/python-modules/pyatv { }; @@ -5175,7 +5175,7 @@ in { py = callPackage ../development/python-modules/py { }; - pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkgconfig; }); + pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkg-config; }); pycapnp = callPackage ../development/python-modules/pycapnp { }; @@ -5385,19 +5385,19 @@ in { pygmt = callPackage ../development/python-modules/pygmt { }; - pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; }; + pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkg-config; }; pygobject3 = if isPy3k then - callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; } + callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkg-config; } else - callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkgconfig; }; + callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkg-config; }; pygogo = callPackage ../development/python-modules/pygogo { }; pygpgme = callPackage ../development/python-modules/pygpgme { }; pygraphviz = callPackage ../development/python-modules/pygraphviz { - inherit (pkgs) graphviz pkgconfig; + inherit (pkgs) graphviz pkg-config; }; # not the python package pygreat = callPackage ../development/python-modules/pygreat { }; @@ -5407,13 +5407,13 @@ in { pygtail = callPackage ../development/python-modules/pygtail { }; pygtk = callPackage ../development/python-modules/pygtk { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; libglade = null; }; pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome2.libglade; }; - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkgconfig; }; + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkg-config; }; pygtrie = callPackage ../development/python-modules/pygtrie { }; @@ -5708,7 +5708,7 @@ in { pyqrcode = callPackage ../development/python-modules/pyqrcode { }; - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkg-config; }; pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; @@ -5849,7 +5849,7 @@ in { pysmb = callPackage ../development/python-modules/pysmb { }; - pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkgconfig; }; + pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; }; pysmf = callPackage ../development/python-modules/pysmf { }; @@ -6165,7 +6165,7 @@ in { python-editor = callPackage ../development/python-modules/python-editor { }; - pythonefl = callPackage ../development/python-modules/python-efl { inherit (pkgs) pkgconfig; }; + pythonefl = callPackage ../development/python-modules/python-efl { inherit (pkgs) pkg-config; }; python-engineio = callPackage ../development/python-modules/python-engineio { }; @@ -6188,7 +6188,7 @@ in { python-hpilo = callPackage ../development/python-modules/python-hpilo { }; python-igraph = callPackage ../development/python-modules/python-igraph { - pkgconfig = pkgs.pkgconfig; + pkg-config = pkgs.pkg-config; igraph = pkgs.igraph; }; @@ -6250,7 +6250,7 @@ in { pythonnet = callPackage ../development/python-modules/pythonnet { # `mono >= 4.6` required to prevent crashes encountered with earlier versions. mono = pkgs.mono4; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; python-nomad = callPackage ../development/python-modules/python-nomad { }; @@ -6266,7 +6266,7 @@ in { python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { }; - python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkgconfig; }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkg-config; }; python-otr = callPackage ../development/python-modules/python-otr { }; @@ -6706,7 +6706,7 @@ in { robomachine = callPackage ../development/python-modules/robomachine { }; roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package + inherit (pkgs) pkg-config; # use normal pkg-config, not the python package inherit (pkgs.qt5) qtbase; }; @@ -6940,7 +6940,7 @@ in { seccomp = callPackage ../development/python-modules/seccomp { }; - secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig; }; + secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkg-config; }; secretstorage = if isPy3k then callPackage ../development/python-modules/secretstorage { } @@ -6967,7 +6967,7 @@ in { send2trash = callPackage ../development/python-modules/send2trash { }; - sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkgconfig; }; + sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkg-config; }; sentinel = callPackage ../development/python-modules/sentinel { }; @@ -7456,7 +7456,7 @@ in { else callPackage ../development/python-modules/sympy/1_5.nix { }; - systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkgconfig systemd; }; + systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkg-config systemd; }; sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; @@ -7998,7 +7998,7 @@ in { vine = callPackage ../development/python-modules/vine { }; - virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkgconfig; }; + virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkg-config; }; virtual-display = callPackage ../development/python-modules/virtual-display { }; @@ -8187,11 +8187,11 @@ in { wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { wxGTK = pkgs.wxGTK30; - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; wxGTK = pkgs.wxGTK30.override { withGtk2 = false; @@ -8200,7 +8200,7 @@ in { }; wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; wxGTK = pkgs.wxGTK31.override { withGtk2 = false; withWebKit = true; @@ -8456,7 +8456,7 @@ in { zstandard = callPackage ../development/python-modules/zstandard { }; - zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkgconfig; }; + zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkg-config; }; zulip = callPackage ../development/python-modules/zulip { }; |