diff options
2134 files changed, 11998 insertions, 6101 deletions
diff --git a/.editorconfig b/.editorconfig index 6625cbf69810b..bc45523451bff 100644 --- a/.editorconfig +++ b/.editorconfig @@ -47,9 +47,10 @@ indent_style = space insert_final_newline = unset trim_trailing_whitespace = unset -[*.{key,ovpn}] +[*.{asc,key,ovpn}] insert_final_newline = unset end_of_line = unset +trim_trailing_whitespace = unset [*.lock] indent_size = unset @@ -62,10 +63,7 @@ insert_final_newline = unset [eggs.nix] trim_trailing_whitespace = unset -[gemset.nix] -insert_final_newline = unset - -[node-{composition,packages,packages-generated}.nix] +[gemset*.nix] insert_final_newline = unset [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] @@ -92,12 +90,6 @@ insert_final_newline = unset indent_style = unset trim_trailing_whitespace = unset -[pkgs/development/mobile/androidenv/generated/{addons,packages}.nix] -trim_trailing_whitespace = unset - -[pkgs/development/node-packages/composition.nix] -insert_final_newline = unset - [pkgs/development/{perl-modules,ocaml-modules,tools/ocaml}/**] indent_style = unset diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md index a5c15b43ac891..d391e038070db 100644 --- a/doc/languages-frameworks/emscripten.section.md +++ b/doc/languages-frameworks/emscripten.section.md @@ -60,7 +60,7 @@ See the `zlib` example: stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: rec { - buildInputs = old.buildInputs ++ [ pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkg-config ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; configurePhase = '' @@ -117,8 +117,8 @@ This `xmlmirror` example features a emscriptenPackage which is defined completel xmlmirror = pkgs.buildEmscriptenPackage rec { name = "xmlmirror"; - buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; - nativeBuildInputs = [ pkgconfig zlib ]; + buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; + nativeBuildInputs = [ pkg-config zlib ]; src = pkgs.fetchgit { url = "https://gitlab.com/odfplugfest/xmlmirror.git"; diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index dda8d485365e7..550f2b576bd93 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -480,7 +480,7 @@ stdenv.mkDerivation { rustc cargo # Example Build-time Additional Dependencies - pkgconfig + pkg-config ]; buildInputs = [ # Example Run-time Additional Dependencies @@ -522,7 +522,7 @@ stdenv.mkDerivation { latest.rustChannels.nightly.rust # Add some extra dependencies from `pkgs` - pkgconfig openssl + pkg-config openssl ]; # Set Environment Variables diff --git a/doc/shell.nix b/doc/shell.nix index 8ac2019f9d66a..5fa2b4424899a 100644 --- a/doc/shell.nix +++ b/doc/shell.nix @@ -1,5 +1,3 @@ -{ pkgs ? import ../. {} }: -(import ./default.nix {}).overrideAttrs (x: { - buildInputs = x.buildInputs ++ [ pkgs.xmloscopy pkgs.ruby ]; - -}) +{ pkgs ? import ../. { } }: +(import ./default.nix { }).overrideAttrs +(x: { buildInputs = (x.buildInputs or [ ]) ++ [ pkgs.xmloscopy pkgs.ruby ]; }) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index fdd127e5541fb..e869de488c14d 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -47,7 +47,6 @@ rec { arch = "armv5te"; }; - kernelMajor = "2.6"; kernelBaseConfig = "multi_v5_defconfig"; kernelArch = "arm"; kernelAutoModules = false; @@ -70,7 +69,6 @@ rec { sheevaplug = { name = "sheevaplug"; - kernelMajor = "2.6"; kernelBaseConfig = "multi_v5_defconfig"; kernelArch = "arm"; kernelAutoModules = false; @@ -182,7 +180,6 @@ rec { raspberrypi = { name = "raspberrypi"; - kernelMajor = "2.6"; kernelBaseConfig = "bcm2835_defconfig"; kernelDTB = true; kernelArch = "arm"; @@ -241,7 +238,6 @@ rec { utilite = { name = "utilite"; - kernelMajor = "2.6"; kernelBaseConfig = "multi_v7_defconfig"; kernelArch = "arm"; kernelAutoModules = false; @@ -294,7 +290,6 @@ rec { armv7l-hf-multiplatform = { name = "armv7l-hf-multiplatform"; - kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. kernelBaseConfig = "multi_v7_defconfig"; kernelArch = "arm"; kernelDTB = true; @@ -342,7 +337,6 @@ rec { aarch64-multiplatform = { name = "aarch64-multiplatform"; - kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. kernelBaseConfig = "defconfig"; kernelArch = "arm64"; kernelDTB = true; @@ -381,7 +375,6 @@ rec { ben_nanonote = { name = "ben_nanonote"; - kernelMajor = "2.6"; kernelArch = "mips"; gcc = { arch = "mips32"; @@ -391,7 +384,6 @@ rec { fuloong2f_n32 = { name = "fuloong2f_n32"; - kernelMajor = "2.6"; kernelBaseConfig = "lemote2f_defconfig"; kernelArch = "mips"; kernelAutoModules = false; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e8f8942ca4145..99280c800c29f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1583,6 +1583,12 @@ githubId = 33503784; name = "Yucheng Zhang"; }; + cheriimoya = { + email = "github@hausch.xyz"; + github = "cheriimoya"; + githubId = 28303440; + name = "Max Hausch"; + }; chessai = { email = "chessai1996@gmail.com"; github = "chessai"; @@ -1699,16 +1705,6 @@ githubId = 46303707; name = "Christian Lütke-Stetzkamp"; }; - kampka = { - email = "christian@kampka.net"; - github = "kampka"; - githubId = 422412; - name = "Christian Kampka"; - keys = [{ - longkeyid = "ed25519/0x1CBE9645DD68E915"; - fingerprint = "F7FA 0BD0 8775 337C F6AB 4A14 1CBE 9645 DD68 E915"; - }]; - }; ckauhaus = { email = "kc@flyingcircus.io"; github = "ckauhaus"; @@ -4976,6 +4972,10 @@ github = "kyleondy"; githubId = 1640900; name = "Kyle Ondy"; + keys = [{ + longkeyid = "rsa4096/0xDB0E3C33491F91C9"; + fingerprint = "3C79 9D26 057B 64E6 D907 B0AC DB0E 3C33 491F 91C9"; + }]; }; kylesferrazza = { name = "Kyle Sferrazza"; @@ -5128,12 +5128,24 @@ githubId = 42153076; name = "Alexey Nikashkin"; }; + lesuisse = { + email = "thomas@gerbet.me"; + github = "LeSuisse"; + githubId = 737767; + name = "Thomas Gerbet"; + }; lethalman = { email = "lucabru@src.gnome.org"; github = "lethalman"; githubId = 480920; name = "Luca Bruno"; }; + leungbk = { + email = "leungbk@mailfence.com"; + github = "leungbk"; + githubId = 29217594; + name = "Brian Leung"; + }; lewo = { email = "lewo@abesis.fr"; github = "nlewo"; @@ -7181,6 +7193,12 @@ githubId = 13000278; name = "Maksim Bronsky"; }; + PlushBeaver = { + name = "Dmitry Kozlyuk"; + email = "dmitry.kozliuk+nixpkgs@gmail.com"; + github = "PlushBeaver"; + githubId = 8988269; + }; pmahoney = { email = "pat@polycrystal.org"; github = "pmahoney"; @@ -8703,6 +8721,12 @@ githubId = 1315818; name = "Felix Bühler"; }; + stupremee = { + email = "jutus.k@protonmail.com"; + github = "Stupremee"; + githubId = 39732259; + name = "Justus K"; + }; suhr = { email = "suhr@i2pmail.org"; github = "suhr"; @@ -8745,6 +8769,12 @@ githubId = 1040871; name = "Mathis Antony"; }; + svend = { + email = "svend@svends.net"; + github = "svend"; + githubId = 306190; + name = "Svend Sorensen"; + }; svrana = { email = "shaw@vranix.com"; github = "svrana"; @@ -9089,6 +9119,12 @@ githubId = 844343; name = "Thiago K. Okada"; }; + thibautmarty = { + email = "github@thibautmarty.fr"; + github = "ThibautMarty"; + githubId = 3268082; + name = "Thibaut Marty"; + }; thmzlt = { email = "git@thomazleite.com"; github = "thmzlt"; diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix index 6d99c94bf33e3..b0267281b389d 100644 --- a/maintainers/scripts/nixpkgs-lint.nix +++ b/maintainers/scripts/nixpkgs-lint.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, perl, perlPackages }: +{ stdenv, lib, makeWrapper, perl, perlPackages }: stdenv.mkDerivation { name = "nixpkgs-lint-1"; @@ -15,9 +15,9 @@ stdenv.mkDerivation { wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB ''; - meta = { - maintainers = [ stdenv.lib.maintainers.eelco ]; + meta = with lib; { + maintainers = [ maintainers.eelco ]; description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index dbdcc94149548..529ac1b1cd468 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -87,7 +87,7 @@ nixpkgs.config.packageOverrides = pkgs: You can edit the config with this snippet (by default <command>make menuconfig</command> won't work out of the box on nixos): <screen><![CDATA[ - nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})' + nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkg-config ncurses ];})' ]]></screen> or you can let nixpkgs generate the configuration. Nixpkgs generates it via answering the interactive kernel utility <command>make config</command>. The diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 2331375c2c22b..4206f44f6c77a 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -45,6 +45,15 @@ </listitem> <listitem> <para> + Grub is updated to 2.04, adding support for booting from F2FS filesystems and + Btrfs volumes using zstd compression. Note that some users have been unable +to boot after upgrading to 2.04 - for more information, please see <link +xlink:href="https://github.com/NixOS/nixpkgs/issues/61718#issuecomment-617618503">this + discussion</link>. + </para> + </listitem> + <listitem> + <para> Postgresql for NixOS service now defaults to v11. </para> </listitem> diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix index 93d1309701902..255d9741ba714 100644 --- a/nixos/modules/config/gnu.nix +++ b/nixos/modules/config/gnu.nix @@ -1,11 +1,9 @@ { config, lib, pkgs, ... }: -with lib; - { options = { - gnu = mkOption { - type = types.bool; + gnu = lib.mkOption { + type = lib.types.bool; default = false; description = '' When enabled, GNU software is chosen by default whenever a there is @@ -15,7 +13,7 @@ with lib; }; }; - config = mkIf config.gnu { + config = lib.mkIf config.gnu { environment.systemPackages = with pkgs; # TODO: Adjust `requiredPackages' from `system-path.nix'. @@ -26,7 +24,7 @@ with lib; nano zile texinfo # for the stand-alone Info reader ] - ++ stdenv.lib.optional (!stdenv.isAarch32) grub2; + ++ lib.optional (!stdenv.isAarch32) grub2; # GNU GRUB, where available. diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index c09588834cf15..ef747774b25a8 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -58,6 +58,7 @@ in "2.nixos.pool.ntp.org" "3.nixos.pool.ntp.org" ]; + type = types.listOf types.str; description = '' The set of NTP servers from which to synchronise. ''; diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 3c7cd729c60a6..80ec3126ca546 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -62,7 +62,7 @@ with lib; services.dbus.packages = packages; systemd.packages = packages; - environment.variables = { + environment.sessionVariables = { GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1"; XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals"; }; diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix index 02e4c3f46f8d2..baa07203118c6 100644 --- a/nixos/modules/hardware/nitrokey.nix +++ b/nixos/modules/hardware/nitrokey.nix @@ -19,23 +19,9 @@ in nitrokey-app package, depending on your device and needs. ''; }; - - group = mkOption { - type = types.str; - default = "nitrokey"; - example = "wheel"; - description = '' - Grant access to Nitrokey devices to users in this group. - ''; - }; }; config = mkIf cfg.enable { - services.udev.packages = [ - (pkgs.nitrokey-udev-rules.override (attrs: - { inherit (cfg) group; } - )) - ]; - users.groups.${cfg.group} = {}; + services.udev.packages = [ pkgs.nitrokey-udev-rules ]; }; } diff --git a/nixos/modules/installer/tools/nixos-option/default.nix b/nixos/modules/installer/tools/nixos-option/default.nix index 753fd92c7bbf6..72eec3a383634 100644 --- a/nixos/modules/installer/tools/nixos-option/default.nix +++ b/nixos/modules/installer/tools/nixos-option/default.nix @@ -1,11 +1,11 @@ -{lib, stdenv, boost, cmake, pkgconfig, nix, ... }: +{lib, stdenv, boost, cmake, pkg-config, nix, ... }: stdenv.mkDerivation rec { name = "nixos-option"; src = ./.; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost nix ]; - meta = { - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ chkno ]; + meta = with lib; { + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ chkno ]; }; } diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix index ec0457bbd5830..556f6bbb419a2 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix @@ -19,18 +19,16 @@ nix-shell -E 'with import <nixpkgs> { }; brscan4-etc-files.override{netDevices=[ */ -with lib; - let addNetDev = nd: '' brsaneconfig4 -a \ name="${nd.name}" \ model="${nd.model}" \ - ${if (hasAttr "nodename" nd && nd.nodename != null) then + ${if (lib.hasAttr "nodename" nd && nd.nodename != null) then ''nodename="${nd.nodename}"'' else ''ip="${nd.ip}"''}''; - addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs); + addAllNetDev = xs: lib.concatStringsSep "\n" (map addNetDev xs); in stdenv.mkDerivation { @@ -61,11 +59,11 @@ stdenv.mkDerivation { dontStrip = true; dontPatchELF = true; - meta = { + meta = with lib; { description = "Brother brscan4 sane backend driver etc files"; homepage = "http://www.brother.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + platforms = platforms.linux; + license = licenses.unfree; + maintainers = with maintainers; [ jraygauthier ]; }; } diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix index ee7e9b0454ded..89360f4bf3732 100644 --- a/nixos/modules/services/networking/dnscrypt-wrapper.nix +++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix @@ -83,7 +83,7 @@ let # correctly implement key rotation of dnscrypt-wrapper ephemeral keys. dnscrypt-proxy1 = pkgs.callPackage ({ stdenv, fetchFromGitHub, autoreconfHook - , pkgconfig, libsodium, ldns, openssl, systemd }: + , pkg-config, libsodium, ldns, openssl, systemd }: stdenv.mkDerivation rec { pname = "dnscrypt-proxy"; @@ -98,7 +98,7 @@ let configureFlags = optional stdenv.isLinux "--with-systemd"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; # <ldns/ldns.h> depends on <openssl/ssl.h> buildInputs = [ libsodium openssl.dev ldns ] ++ optional stdenv.isLinux systemd; diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index e6fa48daf46cd..115340924a25d 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -41,6 +41,7 @@ in servers = mkOption { default = config.networking.timeServers; + type = types.listOf types.str; description = '' The set of NTP servers from which to synchronise. ''; diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index 51398851adc6d..861b0db01a489 100644 --- a/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixos/modules/services/networking/ntp/ntpd.nix @@ -79,6 +79,7 @@ in servers = mkOption { default = config.networking.timeServers; + type = types.listOf types.str; description = '' The set of NTP servers from which to synchronise. ''; diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index 3fa8dad049083..3a6ea02676aa5 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -85,7 +85,7 @@ in config = lib.mkIf cfg.enable (lib.mkMerge [ { - meta.maintainers = with lib.maintainers; [ kampka ]; + meta.maintainers = with lib.maintainers; [ ]; users.groups.trilium = {}; users.users.trilium = { diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index 9eeae0c3ef447..5bcc95be324ab 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -20,8 +20,14 @@ let optionalString fixBinary "F"; in ":${name}:${type}:${offset'}:${magicOrExtension}:${mask'}:${interpreter}:${flags}"; - activationSnippet = name: { interpreter, ... }: - "ln -sf ${interpreter} /run/binfmt/${name}"; + activationSnippet = name: { interpreter, ... }: '' + rm -f /run/binfmt/${name} + cat > /run/binfmt/${name} << 'EOF' + #!/usr/bin/env sh + exec -- ${interpreter} "$@" + EOF + chmod +x /run/binfmt/${name} + ''; getEmulator = system: (lib.systems.elaborate { inherit system; }).emulator pkgs; diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index 35fb5578b0705..692315dbe99c4 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -16,6 +16,7 @@ with lib; }; servers = mkOption { default = config.networking.timeServers; + type = types.listOf types.str; description = '' The set of NTP servers from which to synchronise. ''; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index d172ae38fdcfa..e2332df611aa0 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -43,7 +43,7 @@ in system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; postVM = '' - PATH=$PATH:${with pkgs; stdenv.lib.makeBinPath [ gnutar gzip ]} + PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]} pushd $out mv $diskImage disk.raw tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz disk.raw diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index ea82adf09ad1d..5c436592f6471 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -60,7 +60,8 @@ in rec { (onFullSupported "nixos.tests.boot-stage1") (onSystems ["x86_64-linux"] "nixos.tests.boot.uefiCdrom") (onSystems ["x86_64-linux"] "nixos.tests.boot.uefiUsb") - (onSystems ["x86_64-linux"] "nixos.tests.chromium") + # TODO (@primeos): Fix the test failure since https://github.com/NixOS/nixpkgs/pull/110010: + #(onSystems ["x86_64-linux"] "nixos.tests.chromium") (onFullSupported "nixos.tests.containers-imperative") (onFullSupported "nixos.tests.containers-ip") (onSystems ["x86_64-linux"] "nixos.tests.docker") diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7d83b952f948d..902c3bbc65e94 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -147,6 +147,7 @@ in haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; hedgedoc = handleTest ./hedgedoc.nix {}; + herbstluftwm = handleTest ./herbstluftwm.nix {}; installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {}; # 9pnet_virtio used to mount /nix partition doesn't support diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 795b93f6f54e5..4d6b726d9e4c8 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -1,10 +1,14 @@ { system ? builtins.currentSystem , config ? {} , pkgs ? import ../.. { inherit system config; } -, channelMap ? { - stable = pkgs.chromium; - beta = pkgs.chromiumBeta; - dev = pkgs.chromiumDev; +, channelMap ? { # Maps "channels" to packages + stable = pkgs.chromium; + beta = pkgs.chromiumBeta; + dev = pkgs.chromiumDev; + ungoogled = pkgs.ungoogled-chromium; + chrome-stable = pkgs.google-chrome; + chrome-beta = pkgs.google-chrome-beta; + chrome-dev = pkgs.google-chrome-dev; } }: @@ -14,7 +18,7 @@ with pkgs.lib; mapAttrs (channel: chromiumPkg: makeTest rec { name = "chromium-${channel}"; meta = { - maintainers = with maintainers; [ aszlig ]; + maintainers = with maintainers; [ aszlig primeos ]; # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621 inherit (chromiumPkg.meta) timeout; }; @@ -58,6 +62,19 @@ mapAttrs (channel: chromiumPkg: makeTest rec { return "su - ${user} -c " + shlex.quote(cmd) + def get_browser_binary(): + """Returns the name of the browser binary.""" + pname = "${getName chromiumPkg.name}" + if pname.find("chromium") != -1: + return "chromium" # Same name for all channels and ungoogled-chromium + if pname == "google-chrome": + return "google-chrome-stable" + if pname == "google-chrome-dev": + return "google-chrome-unstable" + # For google-chrome-beta and as fallback: + return pname + + def create_new_win(): with machine.nested("Creating a new Chromium window"): machine.execute( @@ -80,7 +97,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { def close_win(): def try_close(_): - machine.execute( + status, _ = machine.execute( ru( "${xdo "close-window" '' search --onlyvisible --name "new tab" @@ -89,13 +106,14 @@ mapAttrs (channel: chromiumPkg: makeTest rec { ''}" ) ) - machine.execute( - ru( - "${xdo "close-window" '' - key Ctrl+w - ''}" + if status == 0: + machine.execute( + ru( + "${xdo "close-window" '' + key Ctrl+w + ''}" + ) ) - ) for _ in range(1, 20): status, out = machine.execute( ru( @@ -152,7 +170,14 @@ mapAttrs (channel: chromiumPkg: makeTest rec { machine.wait_for_x() url = "file://${startupHTML}" - machine.succeed(ru(f'ulimit -c unlimited; chromium "{url}" & disown')) + machine.succeed(ru(f'ulimit -c unlimited; "{get_browser_binary()}" "{url}" & disown')) + + if get_browser_binary().startswith("google-chrome"): + # Need to click away the first window: + machine.wait_for_text("Make Google Chrome the default browser") + machine.screenshot("google_chrome_default_browser_prompt") + machine.send_key("ret") + machine.wait_for_text("startup done") machine.wait_until_succeeds( ru( diff --git a/nixos/tests/cifs-utils.nix b/nixos/tests/cifs-utils.nix new file mode 100644 index 0000000000000..98587b10d941a --- /dev/null +++ b/nixos/tests/cifs-utils.nix @@ -0,0 +1,12 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "cifs-utils"; + + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.cifs-utils ]; }; + + testScript = '' + machine.succeed("smbinfo -h") + machine.succeed("smb2-quota -h") + assert "${pkgs.cifs-utils.version}" in machine.succeed("cifs.upcall -v") + assert "${pkgs.cifs-utils.version}" in machine.succeed("mount.cifs -V") + ''; +}) diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index e1ab098e985da..7ebf0d02a2406 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "containers-tmpfs"; meta = with pkgs.lib.maintainers; { - maintainers = [ kampka ]; + maintainers = [ ]; }; machine = diff --git a/nixos/tests/herbstluftwm.nix b/nixos/tests/herbstluftwm.nix new file mode 100644 index 0000000000000..2c98cceee6a21 --- /dev/null +++ b/nixos/tests/herbstluftwm.nix @@ -0,0 +1,38 @@ +import ./make-test-python.nix ({ lib, ...} : { + name = "herbstluftwm"; + + meta = { + maintainers = with lib.maintainers; [ thibautmarty ]; + timeout = 30; + }; + + machine = { pkgs, lib, ... }: { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + test-support.displayManager.auto.user = "alice"; + services.xserver.displayManager.defaultSession = lib.mkForce "none+herbstluftwm"; + services.xserver.windowManager.herbstluftwm.enable = true; + environment.systemPackages = [ pkgs.dzen2 ]; # needed for upstream provided panel + }; + + testScript = '' + with subtest("ensure x starts"): + machine.wait_for_x() + machine.wait_for_file("/home/alice/.Xauthority") + machine.succeed("xauth merge ~alice/.Xauthority") + + with subtest("ensure client is available"): + machine.succeed("herbstclient --version") + + with subtest("ensure keybindings are set"): + machine.wait_until_succeeds("herbstclient list_keybinds | grep xterm") + + with subtest("ensure panel starts"): + machine.wait_for_window("dzen title") + + with subtest("ensure we can open a new terminal"): + machine.send_key("alt-ret") + machine.wait_for_window(r"alice.*?machine") + machine.sleep(2) + machine.screenshot("terminal") + ''; +}) diff --git a/nixos/tests/opentabletdriver.nix b/nixos/tests/opentabletdriver.nix index 832d4c25a5409..fe345a7bec735 100644 --- a/nixos/tests/opentabletdriver.nix +++ b/nixos/tests/opentabletdriver.nix @@ -1,4 +1,6 @@ -import ./make-test-python.nix ( { pkgs, ... }: { +import ./make-test-python.nix ( { pkgs, ... }: let + testUser = "alice"; +in { name = "opentabletdriver"; meta = { maintainers = with pkgs.lib.maintainers; [ thiagokokada ]; @@ -10,7 +12,7 @@ import ./make-test-python.nix ( { pkgs, ... }: { ./common/user-account.nix ./common/x11.nix ]; - test-support.displayManager.auto.user = "alice"; + test-support.displayManager.auto.user = testUser; hardware.opentabletdriver.enable = true; }; @@ -18,10 +20,11 @@ import ./make-test-python.nix ( { pkgs, ... }: { '' machine.start() machine.wait_for_x() - machine.wait_for_unit("opentabletdriver.service", "alice") + machine.wait_for_unit("opentabletdriver.service", "${testUser}") - machine.succeed("cat /etc/udev/rules.d/30-opentabletdriver.rules") + machine.succeed("cat /etc/udev/rules.d/99-opentabletdriver.rules") # Will fail if service is not running - machine.succeed("otd detect") + # Needs to run as the same user that started the service + machine.succeed("su - ${testUser} -c 'otd detect'") ''; }) diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index bccd2de7c9b95..4985ff60365c9 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -61,6 +61,20 @@ import ./make-test-python.nix ( podman.succeed("podman stop sleeping") podman.succeed("podman rm sleeping") + # create systemd session for rootless + podman.succeed("loginctl enable-linger alice") + + with subtest("Run container rootless with runc"): + podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) + podman.succeed( + su_cmd( + "podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + ) + podman.succeed(su_cmd("podman ps | grep sleeping")) + podman.succeed(su_cmd("podman stop sleeping")) + podman.succeed(su_cmd("podman rm sleeping")) + with subtest("Run container rootless with crun"): podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) podman.succeed( @@ -71,7 +85,6 @@ import ./make-test-python.nix ( podman.succeed(su_cmd("podman ps | grep sleeping")) podman.succeed(su_cmd("podman stop sleeping")) podman.succeed(su_cmd("podman rm sleeping")) - # As of 2020-11-20, the runc backend doesn't work with cgroupsv2 yet, so we don't run that test. with subtest("Run container rootless with the default backend"): podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix index 357ade1053583..22c1967b81606 100644 --- a/nixos/tests/searx.nix +++ b/nixos/tests/searx.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "searx"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ rnhmjoj ]; }; diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix index caed45e851d41..3109c3f650818 100644 --- a/nixos/tests/zsh-history.nix +++ b/nixos/tests/zsh-history.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "zsh-history"; meta = with pkgs.lib.maintainers; { - maintainers = [ kampka ]; + maintainers = [ ]; }; nodes.default = { ... }: { diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 1d18f4a923021..2899d4ea6efaa 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -10,7 +10,7 @@ , meson , ninja , pango -, pkgconfig +, pkg-config , python3 , rustc , rustPlatform @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { gettext meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook glib # for glib-compile-resources diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/applications/accessibility/dasher/default.nix index 43844d0c66bb2..fe0d8fe863461 100644 --- a/pkgs/applications/accessibility/dasher/default.nix +++ b/pkgs/applications/accessibility/dasher/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, autoreconfHook, pkgconfig, wrapGAppsHook +, autoreconfHook, pkg-config, wrapGAppsHook , glib, gtk3, expat, gnome-doc-utils, which , at-spi2-core, dbus , libxslt, libxml2 @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook wrapGAppsHook - pkgconfig + pkg-config # doc generation gnome-doc-utils which diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index e1449131f1668..2ff36bb683339 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , glib, gtk3, gnome3, gsettings-desktop-schemas, wrapGAppsHook , libX11, libXtst, libXfixes, libXcursor }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "005fhmvb45sa9mq17dpa23n1xnspiissx5rnpiy7hiqmy3g5rg8f"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ glib gtk3 gsettings-desktop-schemas diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 35c9cda1821c7..4f76178a29d0f 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsaLib, dbus, libjack2 , python3Packages , meson, ninja }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ="; }; - nativeBuildInputs = [ pkgconfig makeWrapper meson ninja ]; + nativeBuildInputs = [ pkg-config makeWrapper meson ninja ]; buildInputs = [ alsaLib dbus libjack2 ] ++ (with python3Packages; [ python dbus-python ]); diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index cdf9e3e538ee2..ecc429de6b2be 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjack2, alsaLib , freetype, libX11, libXrandr, libXinerama, libXext, libXcursor , fetchpatch, fmt , adlplugChip ? "-DADLplug_CHIP=OPL3" @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext libXcursor ]; - nativeBuildInputs = [ cmake pkgconfig fmt ]; + nativeBuildInputs = [ cmake pkg-config fmt ]; meta = with lib; { description = "OPL3 and OPN2 FM Chip Synthesizer"; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index e4a196d0f6bf3..636314bf1cac7 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkg-config }: stdenv.mkDerivation rec { name = packageName + "-" + version ; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = false; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib minixml jack2Full ]; meta = with lib; { diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 99c3ca7360768..88956a190c4a4 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig +{ lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkg-config , wafHook, python3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk"; }; - nativeBuildInputs = [ pkgconfig wafHook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; meta = with lib; { diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index c4a7829157d1b..896f93619478d 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool, +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, intltool, wrapGAppsHook, libxml2, curl, mpd_clientlib, dbus-glib, libsoup, avahi, taglib }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl"; }; - nativeBuildInputs = [ pkgconfig gettext intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext intltool wrapGAppsHook ]; buildInputs = [ gtk3 libxml2 curl mpd_clientlib dbus-glib libsoup avahi taglib ]; diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 2e849912edb05..c3cba87e300c7 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkgconfig, cdparanoia +{ lib, stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkg-config, cdparanoia , mp3Support ? false, lame , oggSupport ? true, vorbis-tools , flacSupport ? true, flac @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1x3l308ss0iqhz90qyjb94gyd8b4piyrm2nzjmg5kf049k9prjf1"; }; - nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; + nativeBuildInputs = [ intltool makeWrapper pkg-config ]; buildInputs = [ gtk2 libcddb ]; runtimeDeps = diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index c441a2f9f3f16..82a2303e26b3b 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchurl, fetchpatch, - gettext, pkgconfig, + gettext, pkg-config, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug, @@ -22,7 +22,7 @@ mkDerivation rec { sha256 = "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz"; }; - nativeBuildInputs = [ gettext pkgconfig ]; + nativeBuildInputs = [ gettext pkg-config ]; buildInputs = [ # Core dependencies diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index c1701671bee08..6a4abbbdf5342 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, intltool +, pkg-config, intltool , glib, dbus, gtk3, libappindicator-gtk3, gst_all_1 , librsvg, wrapGAppsHook , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # https://bugs.launchpad.net/audio-recorder/+bug/1784622 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ glib dbus gtk3 librsvg libappindicator-gtk3 diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index ffda8b6734d61..b1808ed90f119 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -1,9 +1,9 @@ {lib, stdenv, fetchurl, gettext, ncurses , gtkGUI ? false -, pkgconfig ? null +, pkg-config ? null , gtk2 ? null}: -assert gtkGUI -> pkgconfig != null && gtk2 != null; +assert gtkGUI -> pkg-config != null && gtk2 != null; stdenv.mkDerivation rec { name = "aumix-2.9.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gettext ncurses ] - ++ (if gtkGUI then [pkgconfig gtk2] else []); + ++ (if gtkGUI then [pkg-config gtk2] else []); meta = { description = "Audio mixer for X and the console"; diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix index 4b4b5ce56780b..a8a2f8813af87 100644 --- a/pkgs/applications/audio/axoloti/dfu-util.nix +++ b/pkgs/applications/audio/axoloti/dfu-util.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, pkgconfig, libusb1-axoloti }: +{ lib, stdenv, fetchurl, pkg-config, libusb1-axoloti }: stdenv.mkDerivation rec { pname = "dfu-util"; version = "0.8"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1-axoloti ]; src = fetchurl { diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix index f00167026b4a5..b6c2a1b1ae6ea 100644 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: +{ stdenv, lib, fetchurl, pkg-config, systemd ? null, libobjc, IOKit, fetchpatch }: stdenv.mkDerivation rec { name = "libusb-1.0.19"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # get rid of propagating systemd closure - buildInputs = [ pkgconfig ]; + buildInputs = [ pkg-config ]; propagatedBuildInputs = lib.optional stdenv.isLinux systemd ++ lib.optionals stdenv.isDarwin [ libobjc IOKit ]; diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index ebea6251dfb05..6108d84c3d9a0 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }: +{ lib, stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkg-config }: stdenv.mkDerivation rec { pname = "bitmeter"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libjack2 gtk2 ]; patches = [ diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix index cc6df2328e073..104c795c11e78 100644 --- a/pkgs/applications/audio/bjumblr/default.nix +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, cairo, lv2, pkgconfig, libsndfile }: +{ lib, stdenv, fetchFromGitHub, libX11, cairo, lv2, pkg-config, libsndfile }: stdenv.mkDerivation rec { pname = "BJumblr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 cairo lv2 libsndfile ]; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index d58ff73bb70a9..e86341a608e3b 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }: +{ lib, stdenv, fetchurl, alsaLib, libjack2, pkg-config, libpulseaudio, xorg }: stdenv.mkDerivation rec { pname = "bristol"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext xorg.xorgproto diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix index 93e010d826dc1..d45b42ddb9faf 100644 --- a/pkgs/applications/audio/bsequencer/default.nix +++ b/pkgs/applications/audio/bsequencer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "BSEQuencer"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 cairo lv2 ]; diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/applications/audio/bshapr/default.nix index e4f96e396c9bd..7e45d6a826f90 100644 --- a/pkgs/applications/audio/bshapr/default.nix +++ b/pkgs/applications/audio/bshapr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "BShapr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "04zd3a178i2nivg5rjailzqvc5mlnilmhj1ziygmbhshbrywplri"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 cairo lv2 ]; diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix index c833bd1262b1c..d307307fd1d4d 100644 --- a/pkgs/applications/audio/bslizr/default.nix +++ b/pkgs/applications/audio/bslizr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "BSlizr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 cairo lv2 ]; diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index b94e8d2e6f2fe..d71420d072276 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -6,7 +6,7 @@ , fetchpatch , fetchzip , jack_capture -, pkgconfig +, pkg-config , pulseaudioFull , qtbase , makeWrapper @@ -48,7 +48,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 8fecd558e678c..bdcbf024e6064 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib -, gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: +, gtk2, libjack2, ladspaH , libglade, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "calf"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH - libglade lv2 pkgconfig + libglade lv2 pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index bbdcbc21b7893..8f02e8da89349 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , qtbase, qtsvg, qttools, perl # Cantata doesn't build with cdparanoia enabled so we disable that @@ -73,7 +73,7 @@ in mkDerivation { ++ lib.optional withUdisks udisks2 ++ lib.optional withLibVlc libvlc; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; cmakeFlags = lib.flatten [ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 3800e351fab96..a4b68707ee7cd 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg_3, jack2, - liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages, + liblo, libpulseaudio, libsndfile, pkg-config, python3Packages, which, withFrontend ? true, withQt ? true, qtbase ? null, wrapQtAppsHook ? null, withGtk2 ? true, gtk2 ? null, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - python3Packages.wrapPython pkgconfig which wrapQtAppsHook + python3Packages.wrapPython pkg-config which wrapQtAppsHook ]; pythonPath = with python3Packages; [ diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index b7b42b0aa7df8..12aec0d4cbbca 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -2,7 +2,7 @@ , qtbase, qtx11extras , taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf -, qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }: +, qca2, pkg-config, sparsehash, config, makeWrapper, gst_plugins }: let withIpod = config.clementine.ipod or false; @@ -24,7 +24,7 @@ let ./clementine-spotify-blob.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 5da6c63a81e51..2193b359e6882 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig +{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config , libiconv, CoreAudio , alsaSupport ? stdenv.isLinux, alsaLib ? null @@ -102,13 +102,13 @@ in stdenv.mkDerivation rec { pname = "cmus"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "cmus"; repo = "cmus"; rev = "v${version}"; - sha256 = "1ydnvq13ay8b8mfmmgwi5qsgyf220yi1d01acbnxqn775dghmwar"; + sha256 = "sha256-eSKF3xacJptAYdm0Qf1AEWLa+lKUWz6C8nKyTHAl5QI="; }; patches = [ ./option-debugging.patch ]; @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { "CONFIG_WAV=y" ] ++ concatMap (a: a.flags) opts); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ lib.optional stdenv.cc.isClang clangGCC ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 307e06602e7a5..79f78452c4ca4 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, libnotify, gdk-pixbuf }: stdenv.mkDerivation { version = "2020-07-23"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; # building configureFlags = [ "--enable-libnotify" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ curl libnotify gdk-pixbuf ]; meta = with lib; { diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index a30d604e3465a..e78e50877d379 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , ninja , meson -, pkgconfig +, pkg-config , wrapGAppsHook , appstream-glib , desktop-file-utils @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - meson ninja pkgconfig + meson ninja pkg-config wrapGAppsHook appstream-glib desktop-file-utils diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 800458e7925ab..9eda633311287 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -3,7 +3,7 @@ , automake , libtool , intltool -, pkgconfig +, pkg-config , jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { automake intltool libtool - pkgconfig + pkg-config ] ++ lib.optional gtk3Support wrapGAppsHook; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix index 819192fc1d4a8..16cefc5ff85a1 100644 --- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix +++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, libxml2, deadbeef, glib, gtk3 }: stdenv.mkDerivation rec { pname = "deadbeef-headerbar-gtk3-plugin"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1v1schvnps7ypjqgcbqi74a45w8r2gbhrawz7filym22h1qr9wn0"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig libxml2 ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config libxml2 ]; buildInputs = [ deadbeef glib gtk3 ]; # Choose correct installation path diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix index d5894e2fdbc3a..3f62e73e7e469 100644 --- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, deadbeef, gtk3, libxml2 }: stdenv.mkDerivation rec { pname = "deadbeef-infobar-plugin"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0c9wh3wh1hdww7v96i8cy797la06mylhfi0880k8vwh88079aapf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ deadbeef gtk3 libxml2 ]; buildFlags = [ "gtk3" ]; diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix index ad388e23d9f99..bc6d206956f09 100644 --- a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtkmm3, libxmlxx3 }: stdenv.mkDerivation { pname = "deadbeef-lyricbar-plugin"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "108hx5530f4xm8p9m2bk79nq7jkhcj39ad3vmxb2y6h6l2zv5kwl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ deadbeef gtkmm3 libxmlxx3 ]; buildFlags = [ "gtk3" ]; diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 7bc0a4d1fa6fc..d0c1b4f9e500c 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, deadbeef, glib }: +{ lib, stdenv, fetchurl, pkg-config, deadbeef, glib }: stdenv.mkDerivation rec { pname = "deadbeef-mpris2-plugin"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ deadbeef glib ]; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index ea152b59a507c..4abaec8dadd9f 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libjack2, gettext, intltool, guile_2_0, lilypond , glib, libxml2, librsvg, libsndfile, aubio , gtk3, gtksourceview, evince, fluidsynth, rubberband @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool gettext - pkgconfig + pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index 0ada1dfeaa6f4..4f3d2a6a4dcdc 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg }: +{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkg-config, xorg }: stdenv.mkDerivation rec { pname = "dragonfly-reverb"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchShebangs dpf/utils/generate-ttl.sh ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 xorg.libX11 libGL ]; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index f69e101877bc3..dfaf7127f4bc5 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, alsaLib, expat, glib, libjack2, libXext, libX11, libpng -, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig, zita-resampler +, libpthreadstubs, libsmf, libsndfile, lv2, pkg-config, zita-resampler }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs - libsmf libsndfile lv2 pkgconfig zita-resampler + libsmf libsndfile lv2 pkg-config zita-resampler ]; meta = with lib; { diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 82a47b8173a22..c175804a026b8 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: +{ mkDerivation, lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: mkDerivation rec { pname = "drumkv1"; @@ -11,7 +11,7 @@ mkDerivation rec { buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "An old-school drum-kit sampler synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 6f5431cf1d846..65c871640ef5a 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas , gnome3, wrapGAppsHook }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = "-lid3tag -lz"; - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac gsettings-desktop-schemas gnome3.adwaita-icon-theme diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix index 8897abd700773..25ed8a71aa1d9 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/applications/audio/ekho/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libsndfile, libpulseaudio }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DEKHO_DATA_PATH=\"$out/share/ekho-data\"" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile libpulseaudio ]; } diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix index 65dac936a386b..7858da25b7c5c 100644 --- a/pkgs/applications/audio/ensemble-chorus/default.nix +++ b/pkgs/applications/audio/ensemble-chorus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "ensemble-chorus"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fltk alsaLib freetype libXrandr libXinerama libXcursor lv2 libjack2 diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 720e1d4484a42..50d7af6d11644 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkg-config , ronn , pcaudiolibSupport ? true, pcaudiolib , sonicSupport ? true, sonic }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0jkqhf2h94vbqq7mg7mmm23bq372fa7mdk941my18c3vkldcir1b"; }; - nativeBuildInputs = [ autoconf automake which libtool pkgconfig ronn ]; + nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn ]; buildInputs = lib.optional pcaudiolibSupport pcaudiolib ++ lib.optional sonicSupport sonic; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index c7c975ef953a5..aa0dc90adf58d 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, unzip, portaudio, wxGTK, sox }: +{ lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }: stdenv.mkDerivation rec { name = "espeakedit-1.48.03"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ unzip portaudio wxGTK ]; # TODO: diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 365055523eada..6d7d2e2c2bae2 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -2,7 +2,7 @@ , coreutils , fetchurl , makeWrapper -, pkgconfig +, pkg-config }: with lib.strings; @@ -159,7 +159,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 52a291603f84b..990d073528e14 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -2,7 +2,7 @@ , coreutils , fetchFromGitHub , makeWrapper -, pkgconfig +, pkg-config , cmake , llvm , emscripten @@ -45,7 +45,7 @@ let inherit src; - nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ]; + nativeBuildInputs = [ makeWrapper pkg-config cmake vim which ]; buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; @@ -168,7 +168,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/applications/audio/faust/faust2jackrust.nix index 2562237424e55..77335da2ce792 100644 --- a/pkgs/applications/audio/faust/faust2jackrust.nix +++ b/pkgs/applications/audio/faust/faust2jackrust.nix @@ -6,7 +6,7 @@ , gcc , gnumake , openssl -, pkgconfig +, pkg-config }: @@ -14,5 +14,5 @@ faust.wrapWithBuildEnv { baseName = "faust2jackrust"; - propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkgconfig ]; + propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkg-config ]; } diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 852a4d68e6a62..20afb6fd7617d 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.4"; + version = "unstable-dev-2020-08-03"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; - rev = version; - sha256 = "0npn8fvq8iafyamq4wrj1k1bmk4xd0my2sp3gi5jdjfx6hc1sm3n"; + rev = "c16565dc1b616ac0aad7c303c1997fa9e57177ab"; + sha256 = "1ys661lp1xwz21vy12kwkg248jvjq1z9w433knkh0ldyy2igvmd5"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index b9750dd649ae0..a9dc7308aca2d 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkgconfig, shntool, flac +{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkg-config, shntool, flac , opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain, gtk3, qtbase , qttools, wrapQtAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "04yp3aym7h70xjni9ancqv5lc4zds5a8dgw3fzgqs8k5nmh074gv"; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qttools libuchardet ]; bin_path = lib.makeBinPath [ diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8c7a9775945a4..a1fee315d44b9 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake , alsaLib, glib, libjack2, libsndfile, libpulseaudio , AudioUnit, CoreAudio, CoreMIDI, CoreServices , version ? "2" @@ -30,7 +30,7 @@ stdenv.mkDerivation { inherit sha256; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ glib libsndfile libpulseaudio libjack2 ] ++ lib.optionals stdenv.isLinux [ alsaLib ] diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix index d8741525da5f1..57b4bec50adb9 100644 --- a/pkgs/applications/audio/fmsynth/default.nix +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkg-config }: stdenv.mkDerivation { pname = "fmsynth-unstable"; version = "2015-02-07"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtkmm2 lv2 lvtk ]; buildPhase = '' diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 006dbaf798033..ece8dc8d1ea54 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }: +{ lib, stdenv, fetchurl, lv2, pkg-config, python2, wafHook }: stdenv.mkDerivation rec { pname = "fomp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01ld6yjrqrki6zwac8lmwmqkr5rv0sdham4pfbfkjwck4hi1gqqw"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ lv2 python2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 6f91f1e197740..f7abeb2a91e83 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }: stdenv.mkDerivation { version = "git-2015-05-21"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 gtk2 lv2 faust ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index f484a76e75a1c..7bd063d9f53eb 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis , libSM, libsndfile, libogg, libtool }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; + nativeBuildInputs = [ pkg-config autoreconfHook libtool ]; buildInputs = [ freetype SDL SDL_gfx SDL_ttf liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index c1b8b808a1df9..d9d2570d0a872 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.42"; + version = "1.43"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0w3c1rgm8qlqi50gavrcjz40xb0nkis4i9mvpwmvzmdv9nipxry9"; + sha256 = "sha256-OIQk7ngg1wsB6DFcxhrviPGlhzdaAWBi9C2roSNg1eI="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index a97d1d3516f0b..1187dd1ba26e5 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which +{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, which , docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = "make -f Makefile.svn"; - nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ]; + nativeBuildInputs = [ autoconf automake intltool libtool pkg-config which ]; buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ]; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index f2ba8ab3bfa96..32c61380dca63 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl +{ lib, stdenv, fetchurl, pkg-config, mpd_clientlib, dbus-glib, audacious, gtk2, gsl , libaudclient }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index d3d0d5fcd0a1f..11187015df03f 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libtool, intltool, pkgconfig, glib +{ lib, stdenv, fetchurl, libtool, intltool, pkg-config, glib , gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique , libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; }; - nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook ]; buildInputs = [ glib gtk2 curl mpd_clientlib libsoup libunique libmpd libSM libICE sqlite hicolor-icon-theme diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 8686150c08ada..ed51304b22566 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -8,7 +8,7 @@ , cargo , rustc , python3 -, pkgconfig +, pkg-config , glib , libhandy_0 , gtk3 @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext cargo rustc diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index f9fda0fe7bd32..1e0fc40b53311 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , python3 , gsettings-desktop-schemas , desktop-file-utils @@ -30,7 +30,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 80008080ead7c..2d660bc736c17 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, cmake, pkg-config, gcc, pkgconfig, fftwFloat, alsaLib +{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsaLib , zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2 , includeDemo ? true }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pkgconfig fftwFloat alsaLib zlib wavpack wxGTK31 udev ] + buildInputs = [ pkg-config fftwFloat alsaLib zlib wavpack wxGTK31 udev ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optional (!jackaudioSupport) [ diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index c504f19de3934..f39558c1571d8 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, +{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac, gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl, libvorbis, gdk-pixbuf }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; buildInputs = [ curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 3f95ae825288b..69e427dd96cbb 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -23,7 +23,7 @@ , lilv , lrdf , lv2 -, pkgconfig +, pkg-config , python2 , sassc , serd @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { gettext hicolor-icon-theme intltool - pkgconfig + pkg-config python2 wafHook wrapGAppsHook diff --git a/pkgs/applications/audio/gxmatcheq-lv2/default.nix b/pkgs/applications/audio/gxmatcheq-lv2/default.nix index 42e5cd726c735..246b034400d43 100644 --- a/pkgs/applications/audio/gxmatcheq-lv2/default.nix +++ b/pkgs/applications/audio/gxmatcheq-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "GxMatchEQ.lv2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0azdmgzqwjn26nx38iw13666a1i4y2bv39wk89pf6ihdi46klf72"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 xorgproto cairo lv2 ]; diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index 9201ff730d902..d71d40f401c45 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "GxPlugins.lv2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 xorgproto cairo lv2 ]; diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 980b312ba6c44..e2c19ac156d4b 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3 -, pkgconfig, makeWrapper +, pkg-config, makeWrapper }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome3.zenity ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; preBuild = '' cd Projects/LinuxMakefile diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 1bf3ba6480bdd..172f134907c59 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -7,7 +7,7 @@ , curl , libjack2 , lv2 -, pkgconfig +, pkg-config , libGLU , libGL }: @@ -26,7 +26,7 @@ buildInputs = [ xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXinerama xorg.libXrender xorg.libXrandr - freetype alsaLib curl libjack2 pkgconfig libGLU libGL lv2 + freetype alsaLib curl libjack2 pkg-config libGLU libGL lv2 ]; CXXFLAGS = "-DHAVE_LROUND"; diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/applications/audio/hivelytracker/default.nix new file mode 100644 index 0000000000000..4cf20e3c89852 --- /dev/null +++ b/pkgs/applications/audio/hivelytracker/default.nix @@ -0,0 +1,89 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, makeWrapper +, SDL +, SDL_image +, SDL_ttf +, gtk2 +, glib +}: + +stdenv.mkDerivation rec { + pname = "hivelytracker"; + version = "unstable-2020-08-19"; + + src = fetchFromGitHub { + owner = "pete-gordon"; + repo = "hivelytracker"; + rev = "c8e3c7a5ee9f4a07cb4a941caecf7e4c4f4d40e0"; + sha256 = "1nqianlf1msir6wqwapi7ys1vbmf6aik58wa54b6cn5v6kwxh75a"; + }; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + SDL + SDL_image + SDL_ttf + gtk2 + glib + ]; + + makeFlags = [ + "-C sdl" + "-f Makefile.linux" + "PREFIX=$(out)" + ]; + + # TODO: try to exclude gtk and glib from darwin builds + NIX_CFLAGS_COMPILE = [ + "-I${SDL}/include/SDL" + "-I${SDL_image}/include/SDL" + "-I${SDL_ttf}/include/SDL" + "-I${gtk2.dev}/include/gtk-2.0" + "-I${glib.dev}/include/glib-2.0" + ]; + + # Also build the hvl2wav tool + postBuild = '' + make -C hvl2wav + ''; + + postInstall = '' + # https://github.com/pete-gordon/hivelytracker/issues/43 + # Ideally we should patch the sources, but the program can't open + # files passed as arguments anyway, so this works well enough until the + # issue is fixed. + wrapProgram $out/bin/hivelytracker \ + --run "cd $out/share/hivelytracker" + + # Also install the hvl2wav tool + install -Dm755 hvl2wav/hvl2wav $out/bin/hvl2wav + ''; + + meta = with lib; { + homepage = "http://www.hivelytracker.co.uk/"; + downloadPage = "http://www.hivelytracker.co.uk/downl.php"; + description = "Chip music tracker based upon the AHX format"; + longDescription = '' + Hively Tracker is a tracker program based upon the AHX format created in + the mid '90s by Dexter and Pink of Abyss. The format was relatively + popular, and many songs were created and used in scene productions and + games. AHX was designed to create a very SID-like sound on the Amiga. + + HivelyTracker can import and export modules and instruments in the AHX + format, but it also improves on AHX in several ways and therefore has + its own instrument and module formats. + ''; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + broken = stdenv.isDarwin; # TODO: try to use xcbuild + }; +} + diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index a8bb81de717b0..b887615a30fcb 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkgconfig, lv2, alsaLib, libjack2, +{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsaLib, libjack2, freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core, dbus, curl, fftwFloat }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ lv2 alsaLib libjack2 freetype libX11 gtk3 pcre libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus curl fftwFloat ]; diff --git a/pkgs/applications/audio/hydrogen/0.nix b/pkgs/applications/audio/hydrogen/0.nix index 774b2a9344716..1746715b834f2 100644 --- a/pkgs/applications/audio/hydrogen/0.nix +++ b/pkgs/applications/audio/hydrogen/0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, cmake +{ lib, stdenv, fetchurl, pkg-config, cmake , alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4 ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 728f0e90a9907..e794726e050dd 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook , alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf , qtbase, qttools, qtxmlpatterns }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0snljpvbcgikhz610c325dgvayi0k512p3bglck9vvi90wsqx7l1"; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf qtbase qttools qtxmlpatterns diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix deleted file mode 100644 index 2592c38e1428a..0000000000000 --- a/pkgs/applications/audio/i-score/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - alsaLib, - boost, - cln, - cmake, - fetchFromGitHub, - gcc, - ginac, - jamomacore, - kdnssd, - libsndfile, - ninja, - portaudio, - portmidi, - qtbase, - qtdeclarative, - qtimageformats, - qtmultimedia, - qtquickcontrols2, - qtserialport, - qtsvg, - qttools, - qtwebsockets, - rtaudio, - lib, stdenv -}: - -stdenv.mkDerivation rec { - version = "1.0.0-b31"; - pname = "i-score"; - - src = fetchFromGitHub { - owner = "OSSIA"; - repo = "i-score"; - rev = "v${version}"; - sha256 = "0g7s6n11w3wflrv5i2047dxx56lryms7xj0mznnlk5bii7g8dxzb"; - fetchSubmodules = true; - }; - - buildInputs = [ - alsaLib - boost - cln - cmake - ginac - gcc - jamomacore - kdnssd - libsndfile - ninja - portaudio - portmidi - qtbase - qtdeclarative - qtimageformats - qtmultimedia - qtquickcontrols2 - qtserialport - qtsvg - qttools - qtwebsockets - rtaudio - ]; - - cmakeFlags = [ - "-GNinja" - "-DISCORE_CONFIGURATION=static-release" - "-DISCORE_ENABLE_LTO=OFF" - "-DISCORE_BUILD_FOR_PACKAGE_MANAGER=True" - ]; - - preConfigure = '' - export CMAKE_PREFIX_PATH="''${CMAKE_PREFIX_PATH-}:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")" - ''; - - postInstall = ''rm $out/bin/i-score.sh''; - - meta = { - description = "An interactive sequencer for the intermedia arts"; - homepage = "http://i-score.org/"; - license = lib.licenses.cecill20; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index 57d91a298ca12..304f67e85aafd 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake +{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkg-config, qtbase, qtscript, qmake }: mkDerivation rec { @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "AhoP+Ok78Vk8Aee/RP572hJeM8O7v2ZTvFalOZZqRy8="; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ alsaLib qtbase qtscript ]; qmakeFlags = [ "PREFIX=/" ]; diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index ce3121e2f9580..dd96f720e939e 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: stdenv.mkDerivation rec { pname = "infamousPlugins"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "08xwh6px13y1gykaw103nhvjms7vgbgkcm0avh9f5d2d7aadq0l2"; }) ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; meta = with lib; { diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 9bb6ddd6a9850..55456b2fb6fd0 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv -, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom +, lv2, makeWrapper, pkg-config, python, raul, rdflib, serd, sord, sratom , wafHook , suil }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { deepClone = true; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper python raul serd sord sratom suil diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index bc3049dc6b342..6c2b9c5be9cfa 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }: +{ lib, stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkg-config, zita-convolver }: stdenv.mkDerivation rec { pname = "ir.lv2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftw gtk2 lv2 libsamplerate libsndfile zita-convolver ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; postPatch = '' # Fix build with lv2 1.18: https://github.com/tomszilagyi/ir.lv2/pull/20 diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index f5134745a9cae..44e6dd1cd8a2e 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libjack2, libsndfile, pkgconfig }: +{ lib, stdenv, fetchurl, libjack2, libsndfile, pkg-config }: stdenv.mkDerivation rec { pname = "jack_capture"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 libsndfile ]; buildPhase = "PREFIX=$out make jack_capture"; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index c6b971275d43d..9905d072361ee 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkgconfig }: +{ lib, stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkg-config }: stdenv.mkDerivation rec { pname = "jack_oscrolloscope"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libjack2 libGLU libGL ]; installPhase = '' diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index a65c8034f895d..ec62cb04c85ea 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 lrdf ]; NIX_LDFLAGS = "-ldl -lm -lpthread"; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 499badac6d276..2b4d413526a6f 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libjack2, pkgconfig }: +{ lib, stdenv, fetchurl, libjack2, pkg-config }: stdenv.mkDerivation rec { name = "jackmeter-0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ]; meta = { diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 14cda8a81b52d..eecafe9e501ff 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }: mkDerivation rec { pname = "jackmix"; @@ -13,7 +13,7 @@ mkDerivation rec { patches = [ ./no_error.patch ]; - nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ]; + nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkg-config ]; buildInputs = [ qtbase lash diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index d3ed57436c959..5d322eeca9340 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python +{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python , serd, sord , sratom, suil, wafHook }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1wwfn7yzbs37s2rdlfjgks63svd5g14yyzd2gdl7h0z12qncwsy2"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ gtk2 libjack2 lilv lv2 python serd sord sratom suil ]; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 7f6501a473d85..f111c4e99d7cd 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2 -, makeWrapper, pkgconfig, perlPackages +, makeWrapper, pkg-config, perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 55427ccfda49d..c6510f5469c0d 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "11rwgd2car7ziqa0vancb363m4ca94pj480jfxywd6d81139jl15"; + sha256 = "sha256-b187Q8KXcU32C2hGFqs6R2CqWgmieq6ewQDx+elEgP4="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index 05ac14eec090a..281a7148dfeae 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, sconsPackages, pkgconfig +{ lib, stdenv, fetchurl, sconsPackages, pkg-config , libsamplerate, libsndfile, liblo, libjack2, boost }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42"; }; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkgconfig ]; + nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ]; buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ]; prefixKey = "PREFIX="; NIX_CFLAGS_COMPILE = "-fpermissive"; diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/applications/audio/klystrack/default.nix index ea8cfcec2e430..5d26397efdb72 100644 --- a/pkgs/applications/audio/klystrack/default.nix +++ b/pkgs/applications/audio/klystrack/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , SDL2, SDL2_image -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_image ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patches = [ (fetchpatch { diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index 415bfe370269e..ca8df45e459e8 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, qttools, alsaLib, drumstick, qtbase, qtsvg }: +{ lib, stdenv, fetchurl, cmake, pkg-config, qttools, alsaLib, drumstick, qtbase, qtsvg }: stdenv.mkDerivation rec { pname = "kmetronome"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0bzm6vzlm32kjrgn1nvp096b2d41ybys2sk145nhy992wg56v32s"; }; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ alsaLib drumstick qtbase qtsvg ]; diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 855056c6c1566..fe8e9f323a57f 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkg-config , perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rqwh8xrw6hnp69dg4gy336bfbfpmbx4fjrk0nb8ypjcxkz91c6i"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw ladspaH libxml2 perlPackages.perl perlPackages.XMLParser ]; patchPhase = '' diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index 26a8568f01aad..eb355a4340965 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2 -, makeWrapper, pkgconfig, readline }: +, makeWrapper, pkg-config, readline }: assert libuuid != null; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./socket.patch ./gcc-47.patch ]; buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper - pkgconfig readline ]; + pkg-config readline ]; propagatedBuildInputs = [ libuuid ]; NIX_LDFLAGS = "-lm -lpthread -luuid"; diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index e8e6accefdb59..7ba47be686ee6 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, withRodio ? true +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true , withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null }: @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ])) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional withALSA alsaLib ++ lib.optional withPulseAudio libpulseaudio diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index 92933d21d1326..057d45c85e99f 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python2Packages }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, MMA, libjack2, libsmf, python2Packages }: let inherit (python2Packages) pyGtkGlade pygtksourceview python; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ]; patchPhase = '' diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 5eda9e92123cf..1daeb2cf37911 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, bison, libtool, pkgconfig, which +{ lib, stdenv, fetchurl, autoconf, automake, bison, libtool, pkg-config, which , alsaLib, asio, libjack2, libgig, libsndfile, lv2 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { make -f Makefile.svn ''; - nativeBuildInputs = [ autoconf automake bison libtool pkgconfig which ]; + nativeBuildInputs = [ autoconf automake bison libtool pkg-config which ]; buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ]; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index ef95bf5949444..4d52a286aba92 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13 , fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }: @@ -15,7 +15,7 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake qttools pkgconfig ]; + nativeBuildInputs = [ cmake qttools pkg-config ]; buildInputs = [ alsaLib diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 14ab2aaf2d0b7..c85645565ee40 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -3,7 +3,7 @@ , nix-update-script , meson , ninja -, pkgconfig +, pkg-config , python3 , gtk3 , gst_all_1 @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index f4cb5e8089083..6dc57cae0d614 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper , libsndfile, jack2Full , libGLU, libGL, lv2, cairo , ladspaH, php }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1apw8zh3a3il4smkjji6bih4vbsymj0hjs10fgkrd4nazqkjvgyd"; }; - nativeBuildInputs = [ pkgconfig php makeWrapper ]; + nativeBuildInputs = [ pkg-config php makeWrapper ]; buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; makeFlags = [ diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/applications/audio/ltc-tools/default.nix index 31986762fc1fd..c8c87959727c1 100644 --- a/pkgs/applications/audio/ltc-tools/default.nix +++ b/pkgs/applications/audio/ltc-tools/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, pkgconfig, libltc, libsndfile, jack2}: +{lib, stdenv, fetchFromGitHub, pkg-config, libltc, libsndfile, jack2}: stdenv.mkDerivation rec { pname = "ltc-tools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al"; }; - buildInputs = [ pkgconfig libltc libsndfile jack2 ]; + buildInputs = [ pkg-config libltc libsndfile jack2 ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix index ac7ff3a3084d8..36d329bcafd51 100644 --- a/pkgs/applications/audio/luppp/default.nix +++ b/pkgs/applications/audio/luppp/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , jack2 , cairo , liblo @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/lv2-cpp-tools/default.nix b/pkgs/applications/audio/lv2-cpp-tools/default.nix index b6e878d483673..f1709d0055842 100644 --- a/pkgs/applications/audio/lv2-cpp-tools/default.nix +++ b/pkgs/applications/audio/lv2-cpp-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, pkgconfig, lv2, gtkmm2, boost }: +{ lib, stdenv, fetchzip, pkg-config, lv2, gtkmm2, boost }: stdenv.mkDerivation rec { pname = "lv2-cpp-tools"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -r 's,/sbin/ldconfig,ldconfig,g' -i ./Makefile.template ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 gtkmm2 boost ]; diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index 8f997a28193b9..553e0e67f8364 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glib, libsndfile, lilv, lv2, pkgconfig, serd, sord, sratom }: +{ lib, stdenv, fetchFromGitHub, glib, libsndfile, lilv, lv2, pkg-config, serd, sord, sratom }: stdenv.mkDerivation rec { pname = "lv2bm"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vlppxfb9zbmffazs1kiyb79py66s8x9hihj36m2vz86zsq7ybl0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libsndfile lilv lv2 serd sord sratom ]; installPhase = '' diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index b53ea7a79636f..30d654ab87aeb 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook, python3 }: +{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkg-config, wafHook, python3 }: stdenv.mkDerivation rec { pname = "mda-lv2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8"; }; - nativeBuildInputs = [ pkgconfig wafHook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ fftwSinglePrec lv2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix index 37c3849677377..cddf1afd654aa 100644 --- a/pkgs/applications/audio/mellowplayer/default.nix +++ b/pkgs/applications/audio/mellowplayer/default.nix @@ -3,7 +3,7 @@ , lib , libnotify , mkDerivation -, pkgconfig +, pkg-config , qtbase , qtdeclarative , qtgraphicaleffects @@ -23,7 +23,7 @@ mkDerivation rec { sha256 = "1p0z8hkbxaxrqjmknjwxb0mpf3xdssik3m5cwrsv1881k1x2x5qs"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libnotify diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index fbf23fbbd58a0..a825eaa4e38cd 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, SDL, SDL_image, libjack2 +{ lib, stdenv, fetchurl, pkg-config, SDL, SDL_image, libjack2 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; buildInputs = - [ pkgconfig SDL SDL_image libjack2 + [ pkg-config SDL SDL_image libjack2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index 86a608db4c804..b21b859596e1c 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , lv2, libGLU, libGL, gtk2, cairo, pango, fftwFloat, libjack2 }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation { inherit name; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 libGLU libGL gtk2 cairo pango fftwFloat libjack2 ]; srcs = [ src robtkSrc ]; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index c87a050ed33b8..82f9b70c61811 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH -, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame +, ladspaPlugins, libsamplerate, libsndfile, pkg-config, libpulseaudio, lame , vorbis-tools }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "037pbq23kh8hsih994x2sv483imglwcrqrx6m8visq9c46fi0j1y"; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; preAutoreconf = "(cd docgen && sh gendocs.sh)"; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index b061b48abc84d..b43694eb9c056 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper , SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk"; }; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ]; diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index 52079e1f44190..57af7a469a09e 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkgconfig +{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config , alsaLib, libtool, icu , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index ef0db55f090f8..70e6616482f93 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -2,7 +2,7 @@ , fftw, flac, faad2, glibcLocales, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libGLU, libxcb, lilv, lv2, opusfile -, pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg +, pkg-config, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg , qtx11extras, rubberband, sconsPackages, sqlite, taglib, upower, vamp-plugin-sdk }: @@ -31,7 +31,7 @@ mkDerivation rec { nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; buildInputs = [ chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile - libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg + libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkg-config portaudio portmidi protobuf qtbase qtscript qtsvg qtx11extras rubberband sqlite taglib upower vamp-plugin-sdk ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index b2621a4ef1104..51d197fb0e0d9 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , ncurses, db , popt, libtool # Sound sub-systems , alsaSupport ? true, alsaLib @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ++ opt withffmpeg4 ./moc-ffmpeg4.patch ++ opt pulseSupport ./pulseaudio.patch; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ opt pulseSupport autoreconfHook; buildInputs = [ ncurses db popt libtool ] diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix index 776b4a0afb546..d8a6d6eacca64 100644 --- a/pkgs/applications/audio/mopidy/tunein.nix +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-tunein"; - version = "1.0.2"; + version = "1.1.0"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-TuneIn"; - sha256 = "1mvfhka8wi835yk9869yn3b6mdkfwqkylp14vpjkbm42d0kj4lkc"; + sha256 = "01y1asylscr73yqx071imhrzfzlg07wmqqzkdvpgm6r35marc2li"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 28ea6793f0d04..d67b4da5eb2bf 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, ncurses, pkgconfig, gtk2 }: +{ fetchurl, lib, stdenv, ncurses, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "mp3info-0.8.5a"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix index 2ff147fa919ec..1407c153aed2d 100644 --- a/pkgs/applications/audio/mp3splt/default.nix +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libmp3splt }: +{ lib, stdenv, fetchurl, pkg-config, libmp3splt }: stdenv.mkDerivation rec { pname = "mp3splt"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--enable-oggsplt-symlink" "--enable-flacsplt-symlink" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmp3splt ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index fcf438e5f0e5d..c1b88e47e87e0 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, mpd_clientlib, sphinx, libiconv }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, mpd_clientlib, sphinx, libiconv }: stdenv.mkDerivation rec { pname = "mpc"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ mpd_clientlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; + nativeBuildInputs = [ meson ninja pkg-config sphinx ]; meta = with lib; { description = "A minimalist command line interface to MPD"; diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index a583e45be2cc8..22d66b18ddd87 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools, wrapQtAppsHook , alsaLib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo , libsamplerate, libsndfile, lilv, lrdf, lv2, qtsvg, rtaudio, rubberband, sord }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-parallel-building.patch ]; - nativeBuildInputs = [ cmake pkgconfig qttools wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ alsaLib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index fa05e45b6689b..ff39e62e7290e 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects , qtquickcontrols2, qtscript, qtsvg, qttools @@ -7,13 +7,13 @@ mkDerivation rec { pname = "musescore"; - version = "3.5.2"; + version = "3.6"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${version}"; - sha256 = "VA0+npLUUXQJHalD01pmFTTum2Re7FiiyAwU1XvR93s="; + sha256 = "sha256-0M+idYnrgXyH6WLp+2jIYRnFzTB93v+dG1XHmSNyPjE="; }; patches = [ @@ -31,7 +31,7 @@ mkDerivation rec { "--set QML_DISABLE_DISK_CACHE 1" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index 4e069e001daca..876677c3bea9b 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mympd"; - version = "6.8.3"; + version = "6.10.0"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${version}"; - sha256 = "1a3jrqslxk2a9h5gj6kch108lg9z0i5zwr0j9yd5viyfhr3ka4cq"; + sha256 = "sha256-QGJti1tKKJlumLgABPmROplF0UVGMWMnyRXLb2cEieQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 4f0449401ddba..59b17d9c811d8 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, ncurses , mpd_clientlib, gettext, boost , pcreSupport ? false , pcre ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses mpd_clientlib boost ] ++ optional pcreSupport pcre; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkg-config gettext ]; mesonFlags = [ "-Dlirc=disabled" diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 7f645ac798604..64ca6823b9122 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline +{ lib, stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkg-config, readline , libiconv, icu, curl , outputsSupport ? true # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ optional clockSupport "--enable-clock" ++ optional taglibSupport "--with-taglib"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu curl ] ++ optional visualizerSupport fftw diff --git a/pkgs/applications/audio/ninjas2/default.nix b/pkgs/applications/audio/ninjas2/default.nix index 5af483ecfe3f8..8fa5bed306617 100644 --- a/pkgs/applications/audio/ninjas2/default.nix +++ b/pkgs/applications/audio/ninjas2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg, mesa, libsndfile, libsamplerate }: +{ lib, stdenv, fetchFromGitHub, libjack2, libGL, pkg-config, xorg, mesa, libsndfile, libsamplerate }: stdenv.mkDerivation rec { pname = "ninjas2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchShebangs dpf/utils/generate-ttl.sh ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 xorg.libX11 libGL mesa libsndfile libsamplerate ]; diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix index 88281cd0989ab..7aaa8ddd8435f 100644 --- a/pkgs/applications/audio/noise-repellent/default.nix +++ b/pkgs/applications/audio/noise-repellent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fftwFloat, lv2 }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat, lv2 }: stdenv.mkDerivation rec { pname = "noise-repellent"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ fftwFloat lv2 ]; diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index fbdfb78cab0fa..9dd377a601b8b 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2 +{ lib, stdenv, fetchFromGitHub, pkg-config, python2, cairo, libjpeg, ntk, libjack2 , libsndfile, ladspaH, liblo, libsigcxx, lrdf, wafHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1cljkkyi9dxqpqhx8y6l2ja4zjmlya26m26kqxml8gx08vyvddhx"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile ladspaH liblo libsigcxx lrdf ]; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index ed5ec36171425..cae9353d2deff 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }: +{lib, stdenv, fetchurl, sconsPackages, boost, ladspaH, pkg-config }: stdenv.mkDerivation { version = "0.2-2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; - nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_0_1 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_3_0_1 ]; buildInputs = [ boost ladspaH ]; patchPhase = '' diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index ff7a40d59939d..5a610284c21e0 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac +{ config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] ++ lib.optional usePulseAudio libpulseaudio; diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index f16e8e7a02d52..8ca75eecde197 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libogg, libao, pkgconfig, flac, opusfile, libopusenc}: +{lib, stdenv, fetchurl, libogg, libao, pkg-config, flac, opusfile, libopusenc}: stdenv.mkDerivation rec { name = "opus-tools-0.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libogg libao flac opusfile libopusenc ]; meta = { diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index 34813c05e5b27..e4f7e6ca6b465 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }: +{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus }: stdenv.mkDerivation rec { name = "opusfile-0.12"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libogg ]; propagatedBuildInputs = [ libopus ]; patches = [ ./include-multistream.patch ]; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 4db337917ed64..1d84aed8b2e76 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }: mkDerivation rec { pname = "padthv1"; @@ -11,7 +11,7 @@ mkDerivation rec { buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "polyphonic additive synthesizer"; diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index deb8bec28c207..fb076797fb5f7 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, cmake +, pkg-config, cmake , libpulseaudio, ncurses }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libpulseaudio ncurses ]; meta = with lib; { diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index f2ac17f155673..64e403001a3d2 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -3,7 +3,7 @@ , meson , ninja , gettext -, pkgconfig +, pkg-config , pulseaudioFull , glibmm , gtkmm3 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meson ninja gettext - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index 7ca0d347fea13..acffe9464fa65 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "parlatype"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gettext diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 5f62287755206..573b2262e73d9 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm -, gtkmm2, libjack2, pkgconfig, python2, wafHook +, gtkmm2, libjack2, pkg-config, python2, wafHook }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2 - pkgconfig python2 wafHook + pkg-config python2 wafHook ]; meta = { diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index f56ad4f593015..1d701004622e8 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , audiofile, libvorbis, fltk, fftw, fftwFloat -, minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate +, minixml, pkg-config, libmad, libjack2, portaudio, libsamplerate }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "06dy03dbz1yznhsn0xvsnkpc5drzwrgxbxdx0hfpsjn2xcg0jrnc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ audiofile diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 198fa1033ab70..31d9292675e59 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, pkgconfig, intltool, libpulseaudio, +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, intltool, libpulseaudio, gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; configureFlags = [ "--disable-lynx" ]; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index e9f54aeb58b10..0abc933d62863 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg_3, curl }: +{ fetchurl, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg_3, curl }: stdenv.mkDerivation rec { name = "pianobar-2020.11.28"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1znlwybfpxsjqr1jmr8j0ci8wzmpzmk2yxb0qcx9w9a8nnbgnfv5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libao json_c libgcrypt ffmpeg_3 curl ]; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 550cfc909d9c5..c64371f091c2e 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, appstream-glib +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib , wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection , libnotify, libsecret, gst_all_1 }: @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { patchShebangs meson_post_install.py ''; - nativeBuildInputs = [ meson ninja pkgconfig appstream-glib wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ]; propagatedBuildInputs = [ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++ diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index b906e0336014a..e209d98ec7115 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: +{ lib, stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkg-config, serd, sord, sratom }: stdenv.mkDerivation { pname = "plugin-torture"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1xyhvhm85d9z0kw716cjllrrzksn4s4bw34layg8hf4m5m31sp2p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost ladspaH lilv lv2 serd sord sratom ]; installPhase = '' diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index f54e8e8e9f02d..05800c360fae0 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: mkDerivation rec { version = "2.2.0"; @@ -22,7 +22,7 @@ mkDerivation rec { qtsvg ]; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; preConfigure = '' cd ./sources/ diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix index fb28b10448d45..70e7217dff79e 100644 --- a/pkgs/applications/audio/ponymix/default.nix +++ b/pkgs/applications/audio/ponymix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkg-config }: stdenv.mkDerivation rec { pname = "ponymix"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libpulseaudio libnotify ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; postPatch = ''substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out"''; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index b87e48768f14b..1d3fd534dd21e 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, gtk2, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, gtk2, pkg-config }: stdenv.mkDerivation rec { pname = "praat"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp praat $out/bin ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib gtk2 ]; meta = { diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 845435be60eb1..8f4cfb499f2c4 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -3,7 +3,7 @@ , lib , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , SDL2 , qtdeclarative , libpulseaudio @@ -23,7 +23,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook which ]; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index c7dc2cc3b1d32..331bce3e8be31 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -2,7 +2,7 @@ , runCommand , fetchFromGitHub , pulseaudio -, pkgconfig +, pkg-config , ffmpeg , patchelf , fdk_aac @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config patchelf cmake ]; diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index a2c6981813772..fca498bd8975d 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , itstool , python3 , libxml2 @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config libxml2 itstool python3 diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 9b9b84850dc55..d7b4b8343213f 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, qtbase, qttools, alsaLib, libjack2 }: +{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsaLib, libjack2 }: mkDerivation rec { version = "0.6.3"; @@ -13,7 +13,7 @@ mkDerivation rec { buildInputs = [ qtbase qttools alsaLib libjack2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network"; diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index 30062955bb5bb..e24824985fa78 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, qt4, alsaLib }: +{ lib, stdenv, fetchurl, pkg-config, qt4, alsaLib }: stdenv.mkDerivation rec { version = "0.4.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qt4 alsaLib ]; meta = with lib; { diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index f5015325d850c..950e16cedc8b9 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, pkgconfig, xlibsWrapper +{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper , qtbase, qttools, qtmultimedia, qtx11extras # transports , curl, libmms @@ -36,7 +36,7 @@ mkDerivation rec { sha256 = "1kvzw0n90crg3dgy8834qrjv0zb3ia5cny7virax9ax73y653jfa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ # basic requirements qtbase qttools qtmultimedia qtx11extras xlibsWrapper diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 0418957dee0bd..03f519d3816e9 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, qttools , liblscp, libgig, qtbase, mkDerivation }: mkDerivation rec { @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "1wr7k739zx2nz00b810f60g9k3y92w05nfci987hw7y2sks9rd8j"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config qttools ]; buildInputs = [ liblscp libgig qtbase ]; preConfigure = "make -f Makefile.svn"; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 1ea7852dc102e..4b712bf1d2542 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkgconfig +{ lib, stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config , mkDerivation, qtbase, qttools, qtx11extras }: @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "0xiqmpzpxjvh32vivfj6h33w0ahmyfjzjb41b6fnf92bbg9k6mqv"; }; - nativeBuildInputs = [ autoconf pkgconfig ]; + nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ]; diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix index 5b84989a7c41f..f013c338e7655 100644 --- a/pkgs/applications/audio/qtscrobbler/default.nix +++ b/pkgs/applications/audio/qtscrobbler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4, qmake4Hook }: +{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkg-config, which, qt4, qmake4Hook }: stdenv.mkDerivation rec { pname = "qtscrobbler"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01c8e48f616ed09504833d27d92fd62f455bd645ea2d1cc2a5f4c287d641daba"; }; - nativeBuildInputs = [ qmake4Hook ] ++ lib.optionals withMtp [ pkgconfig which ]; + nativeBuildInputs = [ qmake4Hook ] ++ lib.optionals withMtp [ pkg-config which ]; buildInputs = [ qt4 ] ++ lib.optional withMtp libmtp; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 746092977db3e..5730bcdcaab1e 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, pkgconfig +, cmake, pkg-config # Transport , curl # Libraries @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { sha256 = "1v2nsz7s0jj0wmqabzk6akcf1353rachm1lfq77hxbq9z5pw8pgb"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook makeWrapper ]; buildInputs = [ curl diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index a29fcf383b8e7..af35ad829dda3 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, fetchFromGitHub, sconsPackages +{ stdenv, lib, pkg-config, fetchFromGitHub, sconsPackages , python, glibmm, libpulseaudio, libao }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - sconsPackages.scons_3_1_2 pkgconfig + sconsPackages.scons_3_1_2 pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index ae45ca62eb958..173741484fd49 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , python3 , perl , perlPackages @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool perl perlPackages.XMLParser itstool wrapGAppsHook diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 31fce7460770a..5c7493ef7dbaf 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools, wrapQtAppsHook +{ lib, stdenv, fetchurl, cmake, makedepend, perl, pkg-config, qttools, wrapQtAppsHook , dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsaLib , liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }: @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { ''; nativeBuildInputs = - [ cmake makedepend perl pkgconfig qttools wrapQtAppsHook ]; + [ cmake makedepend perl pkg-config qttools wrapQtAppsHook ]; buildInputs = [ dssi diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 17b3f1c3745c3..4b06a99d4735e 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, libjack2 +{ mkDerivation, lib, fetchurl, pkg-config, libjack2 , alsaLib, liblo, libsndfile, lv2, qtbase, qttools , rubberband }: @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "ePhM9OTLJp1Wa2D9Y1Dqq/69WlEhEp3ih9yNUIJU5Y4="; }; - nativeBuildInputs = [ qttools pkgconfig ]; + nativeBuildInputs = [ qttools pkg-config ]; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ]; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index aa3abd3f0f396..84eebfac69565 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkg-config }: stdenv.mkDerivation rec { pname = "seq24"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./mutex_no_nameclash.patch ]; buildInputs = [ alsaLib gtkmm2 libjack2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Minimal loop based midi sequencer"; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 0f3b2fcfa9533..613abbf3c1283 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2 -, libGLU, libGL, pkgconfig, ttf_bitstream_vera +, libGLU, libGL, pkg-config, ttf_bitstream_vera }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { -i b_synth/Makefile ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib freetype ftgl libjack2 libX11 lv2 libGLU libGL ttf_bitstream_vera diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index 4ba30935089cf..85bc9e3542c66 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkgconfig }: +{ lib, stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkg-config }: stdenv.mkDerivation rec { pname = "sfizz"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libjack2 libsndfile ]; diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/applications/audio/sfxr/default.nix index 9e5195b2caaf5..aed27ecdba5ed 100644 --- a/pkgs/applications/audio/sfxr/default.nix +++ b/pkgs/applications/audio/sfxr/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , desktop-file-utils , SDL , gtk3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig + pkg-config desktop-file-utils ]; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 2ebf56fee5219..cebf0d83e16b7 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, pkgconfig +, pkg-config , libsidplayfp , alsaSupport ? stdenv.hostPlatform.isLinux , alsaLib @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "1s2dfs9z1hwarpfzawg11wax9nh0zcqx4cafwq7iysckyg4scz4k"; }; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optional alsaSupport alsaLib ++ optional pulseSupport libpulseaudio; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 311edbbae89f1..3ecd4665f2621 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU, libGL, cairo, pango, libjack2 }: +{ lib, stdenv, fetchFromGitHub, lv2, pkg-config, libGLU, libGL, cairo, pango, libjack2 }: let name = "sisco.lv2-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { srcs = [ src robtkSrc ]; sourceRoot = src.name; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 pango cairo libjack2 libGLU libGL ]; postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk"; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 5eff8f82e89d0..84695730db675 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr , nixosTests }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls"; }; - nativeBuildInputs = [ cmake pkgconfig boost170.dev ]; + nativeBuildInputs = [ cmake pkg-config boost170.dev ]; # snapcast also supports building against tremor but as we have libogg, that's # not needed buildInputs = [ diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index bbabaffa7f381..61d1647087ec1 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , gtk2, alsaLib , fftw, gsl }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "016slh34gb6qqb38m8k9yg48rbhc5p12084szcwvanhh5v7fc7mk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 alsaLib diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index 87803e684857c..b88165f693a32 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto -, wrapQtAppsHook, pkgconfig +, wrapQtAppsHook, pkg-config }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { portaudio rubberband serd sord capnproto ]; - nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index d80632a08f59b..349f4636a798d 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -6,7 +6,7 @@ , ruby , aubio , cmake -, pkgconfig +, pkg-config , boost , bash , jack2Full @@ -35,7 +35,7 @@ mkDerivation rec { buildInputs = [ bash cmake - pkgconfig + pkg-config qtbase qwt ruby diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index e9ec7b33f7473..135c042d538a8 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , which , libtool , liblo @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ autoreconfHook pkgconfig which libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config which libtool ]; buildInputs = [ liblo diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 08cbef146f1a2..740757a639e31 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero +{ lib, stdenv, fetchurl, pkg-config, glib, gtk3, intltool, itstool, libxml2, brasero , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes , gsettings-desktop-schemas, wrapGAppsHook }: @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny"; }; - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index e8704ff61919e..1c1724fbce8bd 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -1,7 +1,7 @@ # currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery { mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper, - cmake, extra-cmake-modules, pkgconfig, + cmake, extra-cmake-modules, pkg-config, libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui, qtbase, phonon, taglib, @@ -63,7 +63,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config kdelibs4support makeWrapper ]; propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; buildInputs = [ taglib ] ++ runtimeDeps; # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5 diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index f849e2fe7be05..fa9860ab248c1 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -2,7 +2,7 @@ , fetchgit , autoreconfHook , help2man -, pkgconfig +, pkg-config , libsndfile , fftwFloat , libjack2 @@ -32,7 +32,7 @@ stdenv.mkDerivation { LC_ALL = "en_US.UTF-8"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost boost.dev ecasound libGLU libGL help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index 055ed99dbeb67..a368d62ce7d00 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }: stdenv.mkDerivation rec { pname = "spectmorph"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Allows to analyze samples of musical instruments, and to combine them (morphing) to construct hybrid sounds"; diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index c5e3211a646be..12bb972398e25 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, libjack2, fftwFloat, gtk2 }: stdenv.mkDerivation rec { pname = "spectrojack"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "http://sed.free.fr/spectrojack/${pname}-${version}.tar.gz"; sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 fftwFloat gtk2 ]; configurePhase= '' sed -i 's/.*home.*/#&/' ./Makefile diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 34b372f964e63..c6536c4d20fb1 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lv2, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, lv2, meson, ninja }: let speech-denoiser-src = fetchFromGitHub { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = speech-denoiser-src; - nativeBuildInputs = [ pkgconfig meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ lv2 rnnoise-nu ]; mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index d4b83605c321a..1a73b8adea72a 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "spek"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # needed for autoreconfHook AUTOPOINT="intltoolize --automake --copy"; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ]; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 6f43dc3f03e1c..78972effc4d00 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, pkgconfig, openssl, python3, libxcb, AppKit, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, pkg-config, openssl, python3, libxcb, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "spotify-tui"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "100c7x603qyhav3p24clwfal4ngh0258x9lqsi84kcj4wq2f3i8f"; - nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkgconfig python3 ]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ]; buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ openssl libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 84cb64d8cc906..776c9576bb463 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPackages, pkgconfig, openssl +{ lib, fetchFromGitHub, rustPackages, pkg-config, openssl , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null @@ -26,7 +26,7 @@ rustPackages.rustPlatform.buildRustPackage rec { "${lib.optionalString withALSA "alsa_backend,"}${lib.optionalString withPulseAudio "pulseaudio_backend,"}${lib.optionalString withPortAudio "portaudio_backend,"}${lib.optionalString withMpris "dbus_mpris,"}${lib.optionalString withKeyring "dbus_keyring,"}" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional withALSA alsaLib diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index 06ff5f3909dcc..b44efc1534f8a 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses -, opusfile, pkgconfig +, opusfile, pkg-config }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "013vq52q9z6kpg9iyc2jnb3m2gihcjblvwpg4yj4wy1q2c05pzqp"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ flac libao libvorbis ncurses opusfile ]; diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix index 7fb4a5410fb46..7d12c6cbf34c0 100644 --- a/pkgs/applications/audio/stone-phaser/default.nix +++ b/pkgs/applications/audio/stone-phaser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkg-config }: stdenv.mkDerivation rec { pname = "stone-phaser"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 cairo lv2 libjack2 mesa ]; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 53a4cc96437c0..eb7aac16c64a1 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -3,7 +3,7 @@ , lib , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , alsaLib , boost , chromaprint @@ -77,7 +77,7 @@ mkDerivation rec { ]) ++ lib.optional withVlc libvlc; - nativeBuildInputs = [ cmake ninja pkgconfig qttools ]; + nativeBuildInputs = [ cmake ninja pkg-config qttools ]; cmakeFlags = [ "-DUSE_SYSTEM_TAGLIB=ON" diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 7d21e816667fd..6fae14e2b1ade 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }: +{ lib, stdenv, fetchurl , glib, pkg-config, libogg, libvorbis, libmad }: stdenv.mkDerivation rec { pname = "streamripper"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libogg libvorbis libmad ]; meta = with lib; { diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index ccec7b9171f81..f2b71c1ce291b 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }: +{ lib, stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "swh-lv2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftwSinglePrec lv2 ]; installPhase = "make install-system"; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index f10b20bfc3c05..8097ee9093059 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: +{ mkDerivation, lib, stdenv, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }: mkDerivation rec { pname = "synthv1"; @@ -11,7 +11,7 @@ mkDerivation rec { buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/talentedhack/default.nix b/pkgs/applications/audio/talentedhack/default.nix index 0dd9a03739dfc..387fd4f5a0c61 100644 --- a/pkgs/applications/audio/talentedhack/default.nix +++ b/pkgs/applications/audio/talentedhack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, lv2, fftwFloat, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, lv2, fftwFloat, pkg-config }: stdenv.mkDerivation rec { pname = "talentedhack"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 fftwFloat ]; diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 399c39acf08d8..623714e706fb3 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, gtk2 +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, gtk2 , libjack2, libsndfile }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "16fgyw6jnscx9279dczv72092dddghwlp53rkfw469kcgvjhwx0z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake gtk2 libjack2 libsndfile ]; diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix index 8d3ba620f9dc3..d8265c3161bcb 100644 --- a/pkgs/applications/audio/tony/default.nix +++ b/pkgs/applications/audio/tony/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, wrapQtAppsHook +{ lib, stdenv, fetchurl, pkg-config, wrapQtAppsHook , alsaLib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag , libjack2, liblo, libmad, libogg, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, qtbase, qtsvg, rubberband, serd, sord @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "03g2bmlj08lmgvh54dyd635xccjn730g4wwlhpvsw04bffz8b7fp"; }; - nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; buildInputs = [ alsaLib boost bzip2 fftw fftwFloat libX11 libfishsound libid3tag diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index cc3c8c7a0f0a9..ff10ff13e1946 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, flac, lame, zlib, libjpeg, libvorbis, libtheora, libxml2 -, lzo, libdvdread, pkgconfig, x264, libmpeg2, xvidcore }: +, lzo, libdvdread, pkg-config, x264, libmpeg2, xvidcore }: stdenv.mkDerivation rec { name = "transcode-1.1.7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo - libdvdread pkgconfig x264 libmpeg2 xvidcore ]; + libdvdread pkg-config x264 libmpeg2 xvidcore ]; configureFlags = [ "--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat" "--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2" diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index f9395ec6fa2b8..1cb9795005c10 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig +{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: @@ -11,7 +11,7 @@ mkDerivation { sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ alsaLib fftw flac.dev libjack2 lame libmad libpulseaudio libsamplerate.dev libsndfile.dev libvorbis portaudio qtbase wavpack ]; diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 44c8b0ecfb5a3..368731c52b3b0 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, which, libao, pkgconfig }: +{ lib, stdenv, fetchurl, which, libao, pkg-config }: let version = "2.13"; @@ -9,7 +9,7 @@ in stdenv.mkDerivation { url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ libao ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 8e836417f475e..c7e24b926c09f 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkgconfig +{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkg-config , alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi , libzip, rtaudio, rtmidi, speex, libsamplerate }: @@ -74,7 +74,7 @@ with lib; stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ alsaLib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ]; buildFlags = [ "Rack" ]; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index b0412005aba21..e38fc8386670e 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkg-config , taglib, curl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0lswzkap2nm7v5h7ppb6a64cb35rajysd09nb204rxgrkij4m6nx"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ mpd_clientlib ncurses pcre taglib curl ]; postInstall = '' diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index fb1046aab52e8..8c44931667492 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -4,7 +4,7 @@ , cmake , ninja , vala -, pkgconfig +, pkg-config , pantheon , gtk3 , glib @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libxml2 ninja vala - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/applications/audio/vocproc/default.nix index dce4ed36aac1b..46957000507bd 100644 --- a/pkgs/applications/audio/vocproc/default.nix +++ b/pkgs/applications/audio/vocproc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, pkgconfig, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: +{ lib, stdenv, fetchzip, pkg-config, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: stdenv.mkDerivation rec { pname = "vocproc"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07a1scyz14mg2jdbw6fpv4qg91zsw61qqii64n9qbnny9d5pn8n2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 fftw lv2-cpp-tools gtkmm2 ]; diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index b50912f26d756..894bed1715f58 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkgconfig, curl +{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkg-config, curl , speex, flac }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation { done ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libogg libvorbis libao curl speex flac ]; meta = with lib; { diff --git a/pkgs/applications/audio/waon/default.nix b/pkgs/applications/audio/waon/default.nix index 78e4fb1a5c551..970ab087b2ca7 100644 --- a/pkgs/applications/audio/waon/default.nix +++ b/pkgs/applications/audio/waon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fftw, gtk2, libao, libsamplerate -, libsndfile, ncurses, pkgconfig +, libsndfile, ncurses, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1xmq8d2rj58xbp4rnyav95y1vnz3r9s9db7xxfa2rd0ilq0ps4y7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftw gtk2 libao libsamplerate libsndfile ncurses ]; installPhase = '' diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index e724e934e52bd..b61ea3fc4d4b0 100644 --- a/pkgs/applications/audio/wolf-shaper/default.nix +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }: +{ lib, stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkg-config }: stdenv.mkDerivation rec { pname = "wolf-shaper"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 lv2 xorg.libX11 liblo libGL libXcursor ]; makeFlags = [ diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index b2b9a4c233d17..31ef68714f6a5 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cairo, glib, libGLU, lv2, pango }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cairo, glib, libGLU, lv2, pango }: stdenv.mkDerivation rec { pname = "x42-avldrums"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo glib libGLU lv2 pango ]; makeFlags = [ diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/applications/audio/x42-gmsynth/default.nix index dad6d05f90400..cde67908fdeba 100644 --- a/pkgs/applications/audio/x42-gmsynth/default.nix +++ b/pkgs/applications/audio/x42-gmsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, lv2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, lv2 }: stdenv.mkDerivation rec { pname = "x42-gmsynth"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "08dvdj8r17sfl6l18g2b8abgls2irkbrq5vhrfai01hp2m0rlm34"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib lv2 ]; makeFlags = [ diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 485e0de1ee7cb..2d2f670d0674d 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1av05ykph8x67018hm9zfgh1vk0zi39mvrsxkj6bm4hkarxf0vvl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ]; # Don't remove this. The default fails with 'do not know how to unpack source archive' diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index d38faa6925dcd..b6accf1993a7f 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, alsaLib, libxmp }: +{ lib, stdenv, fetchurl, pkg-config, alsaLib, libxmp }: stdenv.mkDerivation rec { name = "xmp-4.1.0"; @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib libxmp ]; } diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index e8f6bd94bb4b9..b994f197e67b5 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2, -ladspaH, ladspaPlugins, liblo, pkgconfig }: +ladspaH, ladspaPlugins, liblo, pkg-config }: stdenv.mkDerivation rec { pname = "xsynth-dssi"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH - ladspaPlugins liblo pkgconfig ]; + ladspaPlugins liblo pkg-config ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 7f5b0e8d008a3..e9e191112f9b8 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub , alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre -, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkgconfig, zlib, xorg +, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkg-config, zlib, xorg }: assert stdenv ? glibc; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { minixml zlib xorg.libpthreadstubs pcre ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; patchPhase = '' substituteInPlace src/Misc/Config.cpp --replace /usr $out diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 82993ec2673bb..233961ad11111 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: +{ lib, stdenv, fetchFromGitHub, boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkg-config, rubberband, libsndfile, fftwFloat, libsamplerate }: stdenv.mkDerivation rec { pname = "zam-plugins"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost libX11 libGL liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ]; postPatch = '' diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index b9c8512ae1361..79742d48a9971 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, git, doxygen, graphviz +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline, libsodium }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "07d87n1j4dc9gfwj6xy5jdpryn45095xdh961g6xjnjzc5fivjch"; }; - nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ]; + nativeBuildInputs = [ cmake pkg-config git doxygen graphviz ]; buildInputs = [ boost miniupnpc openssl unbound diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index a0a7f728315cd..446aafab8ceeb 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, cmake, openssl, db53, boost , zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent , withGui, python3, jemalloc, zeromq4 }: @@ -18,7 +18,7 @@ mkDerivation rec { patches = [ ./fix-bitcoin-qt-build.patch ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4 miniupnpc util-linux protobuf libevent ] ++ optionals withGui [ qtbase qttools qrencode ]; diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix index a9bf3f4715b3e..796c48a7c58aa 100644 --- a/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/pkgs/applications/blockchains/bitcoin-classic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qtbase ? null, qttools ? null, util-linux, protobuf, qrencode, libevent , withGui }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc util-linux protobuf libevent ] ++ optionals withGui [ qtbase qttools qrencode ]; diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold.nix index c4b7f90cd93b5..7ff2804ba799a 100644 --- a/pkgs/applications/blockchains/bitcoin-gold.nix +++ b/pkgs/applications/blockchains/bitcoin-gold.nix @@ -5,7 +5,7 @@ , libevent , autoreconfHook , db4 -, pkgconfig +, pkg-config , protobuf , hexdump , zeromq @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config hexdump ] ++ optionals withGui [ wrapQtAppsHook diff --git a/pkgs/applications/blockchains/bitcoin-knots.nix b/pkgs/applications/blockchains/bitcoin-knots.nix index a7fb005ea816f..eea836ac62d35 100644 --- a/pkgs/applications/blockchains/bitcoin-knots.nix +++ b/pkgs/applications/blockchains/bitcoin-knots.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , autoreconfHook , db5 , openssl @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0c8k1154kcwz6q2803wx0zigvqaij1fi5akgfqlj3yl57jjw48jj"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db5 openssl util-linux protobuf boost zlib miniupnpc libevent ]; diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix index ac1c184180673..04c906aefb2c9 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3 , withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null , Foundation, ApplicationServices, AppKit }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "018a22zbvjqky0whizmgxzscmna0sh2xqgyw02yjk8qj4yi0zp8c"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook python3 ] + nativeBuildInputs = [ pkg-config autoreconfHook python3 ] ++ optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl db48 boost zlib miniupnpc util-linux protobuf libevent ] diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 315be75a80243..b241fcc49ee77 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -52,7 +52,8 @@ stdenv.mkDerivation rec { postInstall = optional withGui '' install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop - install -Dm644 share/pixmaps/bitcoin128.png $out/share/pixmaps/bitcoin128.png + substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin" + install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png ''; configureFlags = [ diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index cd162a8f4b304..7f4e438173b04 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , openssl }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0qkmf89z2n7s95vhw3n9vh9dbi14zy4vqw3ffdh1w911jwm5ry3z"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ]; meta = { diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/applications/blockchains/cgminer/default.nix index b7d9bcd583a23..250379ee71093 100644 --- a/pkgs/applications/blockchains/cgminer/default.nix +++ b/pkgs/applications/blockchains/cgminer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , libtool , autoconf , automake @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool curl ncurses ocl-icd opencl-headers xorg.libX11 xorg.libXext xorg.libXinerama jansson libusb1 ]; diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index 2f3fca79c8de8..ef351d0843fd0 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, pkgconfig, which, libtool, autoconf, automake, +{ lib, stdenv, python3, pkg-config, which, libtool, autoconf, automake, autogen, sqlite, gmp, zlib, fetchurl, unzip, fetchpatch, gettext }: with lib; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which unzip gettext ]; + nativeBuildInputs = [ autoconf autogen automake libtool pkg-config which unzip gettext ]; buildInputs = let py3 = python3.withPackages (p: [ p.Mako ]); in [ sqlite gmp zlib py3 ]; diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix index 6b122d502c38b..ca1dd13e42519 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, pkgconfig, autoreconfHook +{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook , openssl, db48, boost, zlib, miniupnpc , qrencode, glib, protobuf, yasm, libevent , util-linux @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0l1gcj2xf2bal9ph9y11x8yd28fd25f55f48xbm45bfw3ij7nbaa"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib openssl db48 yasm boost zlib libevent miniupnpc protobuf qrencode util-linux ]; diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero.nix index 373170fe8ffd5..6b15cbd0a1684 100644 --- a/pkgs/applications/blockchains/dero.nix +++ b/pkgs/applications/blockchains/dero.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost , lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1v8b9wbmqbpyf4jpc0v276qzk3hc5fpddcmwvv5k5yfi30nmbh5c"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; meta = with lib; { diff --git a/pkgs/applications/blockchains/digibyte.nix b/pkgs/applications/blockchains/digibyte.nix index 97bf97bb34058..acf0b355e640e 100644 --- a/pkgs/applications/blockchains/digibyte.nix +++ b/pkgs/applications/blockchains/digibyte.nix @@ -5,7 +5,7 @@ , libevent , autoreconfHook , db4 -, pkgconfig +, pkg-config , protobuf , hexdump , zeromq @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config hexdump ] ++ optionals withGui [ wrapQtAppsHook diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix index 2a01288e4de06..88439d6bdbfe0 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin.nix @@ -1,5 +1,5 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , db5, openssl, boost, zlib, miniupnpc, libevent , protobuf, util-linux, qt4, qrencode , withGui }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1gw46q63mjzwvb17ck6p1bap2xpdrap08szw2kjhasa3yvd5swyy"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db5 openssl util-linux protobuf boost zlib miniupnpc libevent ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index 342f14c7df6bc..c80ef342c752a 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchFromGitHub -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , openssl, db48, boost, zlib, miniupnpc , glib, protobuf, util-linux, qrencode , AppKit @@ -22,7 +22,7 @@ mkDerivation rec { sha256 = "11753zhyx1kmrlljc6kbjwrcb06dfcrsqvmw3iaki9a132qk6l5c"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib zeromq miniupnpc glib protobuf util-linux libevent ] ++ optionals stdenv.isDarwin [ AppKit ] diff --git a/pkgs/applications/blockchains/masari.nix b/pkgs/applications/blockchains/masari.nix index 25301a87aeaaa..bf995da36afaa 100644 --- a/pkgs/applications/blockchains/masari.nix +++ b/pkgs/applications/blockchains/masari.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost , lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; meta = with lib; { diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 5165c61b070be..9bf1ca586c26e 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, wrapQtAppsHook, makeDesktopItem , fetchFromGitHub -, cmake, qttools, pkgconfig +, cmake, qttools, pkg-config , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns , qtquickcontrols, qtquickcontrols2 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig wrapQtAppsHook + cmake pkg-config wrapQtAppsHook (getDev qttools) ]; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 48d1952192d39..41931bc9ec3df 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, pkgconfig +, cmake, pkg-config , boost, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi , randomx, rapidjson @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cp -r . $source ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost miniupnpc openssl unbound diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix index 77f72f4824b86..dccee1dc05613 100644 --- a/pkgs/applications/blockchains/namecoin.nix +++ b/pkgs/applications/blockchains/namecoin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, qrencode, hexdump +{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump , withGui }: with lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config hexdump ]; diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 664e26740629a..60ad51152f692 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook, boost, libGL +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL , qtbase}: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { optionToFlag = name: value: "-D${name}=${value}"; in lib.mapAttrsToList optionToFlag options; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ boost libGL qtbase ]; buildPhase = '' diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix index cadd64b289bcb..2c17b34466455 100644 --- a/pkgs/applications/blockchains/particl/particl-core.nix +++ b/pkgs/applications/blockchains/particl/particl-core.nix @@ -6,7 +6,7 @@ , libevent , miniupnpc , openssl -, pkgconfig +, pkg-config , zeromq , zlib , unixtools @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "11y5q2srkh6r2samppjb5mg6hl79y16j2lj1r23p0968vb9c45kl"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc libevent zeromq unixtools.hexdump python3 ]; configureFlags = [ diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index 92f548789bf13..58986a1067638 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null +{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, wrapQtAppsHook ? null , openssl, db48, boost, zlib, miniupnpc, gmp , qrencode, glib, protobuf, yasm, libevent , util-linux, qtbase ? null, qttools ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ] ++ optionals withGui [ qtbase qttools qrencode ]; diff --git a/pkgs/applications/blockchains/stellar-core.nix b/pkgs/applications/blockchains/stellar-core.nix index 925942c56e9b4..ceb48bf6aa4d8 100644 --- a/pkgs/applications/blockchains/stellar-core.nix +++ b/pkgs/applications/blockchains/stellar-core.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoconf, libtool, automake, pkgconfig, git +{ lib, stdenv, fetchgit, autoconf, libtool, automake, pkg-config, git , bison, flex, postgresql }: let @@ -16,7 +16,7 @@ in stdenv.mkDerivation { leaveDotGit = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool git ]; propagatedBuildInputs = [ bison flex postgresql ]; diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index acb0eafb95e89..79a1eda3495ad 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2020.12.02"; + version = "2021.01.01"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "0ynnpvpd84qncvzmk4hmq8mn6m14a9p3zg4svijqwlsrr39amp3q"; + sha256 = "0a570570cmyngbz645728jdd0d2xmnyrnln2gbxnngiv4v62dxls"; }; - vendorSha256 = "0sk064iyaxq9ig9xv3h1p1c4994hna9bky16g3hblbnh3v7mmqar"; + vendorSha256 = "1x3mhfc16slaamp51rbscfwll25qj6ama1xkysidy7rscmmsj392"; runVend = true; subPackages = [ diff --git a/pkgs/applications/blockchains/vertcoin.nix b/pkgs/applications/blockchains/vertcoin.nix index d56126902b6e3..acb02298e1160 100644 --- a/pkgs/applications/blockchains/vertcoin.nix +++ b/pkgs/applications/blockchains/vertcoin.nix @@ -5,7 +5,7 @@ , libevent , autoreconfHook , db4 -, pkgconfig +, pkg-config , protobuf , hexdump , zeromq @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config hexdump ] ++ optionals withGui [ wrapQtAppsHook diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index 88f22bf9e7def..5f8c56592f6d4 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2, darwin +{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, python3, xorg, cmake, libgit2, darwin , curl }: rustPlatform.buildRustPackage rec { @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf"; - nativeBuildInputs = [ cmake pkgconfig python3 ]; + nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ openssl xorg.libxcb libgit2 ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]); diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index cb8e9b7e3bbcf..4265e0ef10465 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, cmake -, wrapGAppsHook, pkgconfig, desktop-file-utils +, wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive , shared-mime-info, haskellPackages}: @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { sha256 = "06bl1hc69ixk2vcb2ig74mwid14sl5zq6rfna7lx9na6j3l04879"; }; - nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils + nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils appstream-glib wrapGAppsHook ]; buildInputs = [ glib pythonEnv gobject-introspection gtk3 diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index b44dc7c6d4f64..58342ab1393af 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkgconfig +{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config , curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib , harfbuzzFull, glib, fontconfig, pcre , libX11, libXext, libXcursor, libXxf86vm, libGL @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig + cmake pkg-config ] ++ lib.optionals unfree [ ninja ]; buildInputs = [ diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix index ab5f2ccc10417..24fc8440bbd79 100644 --- a/pkgs/applications/editors/bless/default.nix +++ b/pkgs/applications/editors/bless/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , mono , gtk-sharp-2_0 , gettext @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gettext makeWrapper diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 21da4de9c6d6f..2507cb13d7a10 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkgconfig , gtk, libxml2 +{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2 , enchant, gucharmap, python, gnome3 }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d"; }; - nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 enchant gucharmap python ]; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 106ddb515ed2e..8a5f4cf4b3a4e 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, fetchurl, autoreconfHook, libtool, pkgconfig, file, zip, wxGTK, gtk2 -, contribPlugins ? false, hunspell, gamin, boost +{ lib, stdenv, fetchurl, pkg-config, file, zip, wxGTK30-gtk3, gtk3 +, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: with lib; stdenv.mkDerivation rec { name = "${pname}-${lib.optionalString contribPlugins "full-"}${version}"; - version = "17.12"; + version = "20.03"; pname = "codeblocks"; src = fetchurl { - url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.xz"; - sha256 = "1q2pph7md1p10i83rir2l4gvy7ym2iw8w6sk5vl995knf851m20k"; + url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks-${version}.tar.xz"; + sha256 = "1idaksw1vacmm83krxh5zlb12kad3dkz9ixh70glw1gaibib7vhm"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ]; - buildInputs = [ wxGTK gtk2 ] + nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; + buildInputs = [ wxGTK30-gtk3 gtk3 ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch ]; diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix index ff4dcca893526..25e620c51e4e7 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }: +{ lib, stdenv, fetchgit, unzip, pkg-config, ncurses, libX11, libXft, cwebbin }: stdenv.mkDerivation { pname = "edit-nightly"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ unzip - pkgconfig + pkg-config ncurses libX11 libXft diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index 9ba9e070d08b0..18dcef129cc21 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, emacs, python }: +{ lib, fetchurl, stdenv, emacs, python }: stdenv.mkDerivation rec { name = "cedet-1.1"; diff --git a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix index 5eb81197c8bdd..a92471a9493bf 100644 --- a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix +++ b/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { name = "ess-R-object-popup-20130302"; diff --git a/pkgs/applications/editors/emacs-modes/helm-words/default.nix b/pkgs/applications/editors/emacs-modes/helm-words/default.nix index a8a1274737a6c..0678492500d61 100644 --- a/pkgs/applications/editors/emacs-modes/helm-words/default.nix +++ b/pkgs/applications/editors/emacs-modes/helm-words/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { name = "helm-words-20190917"; diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix index 972d3b8a6f9a7..3b20326d96f52 100644 --- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix +++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, emacs }: +{ lib, stdenv, fetchurl, emacs }: # this package installs the emacs-mode which # resides in the hsc3 sources. diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 93e215753c792..9334a16d22d69 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -144,7 +144,7 @@ let flycheck-rtags = fix-rtags super.flycheck-rtags; pdf-tools = super.pdf-tools.overrideAttrs (old: { - nativeBuildInputs = [ external.pkgconfig ]; + nativeBuildInputs = [ external.pkg-config ]; buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; recipe = pkgs.writeText "recipe" '' @@ -341,6 +341,7 @@ let # Telega has a server portion for it's network protocol telega = super.telega.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; + nativeBuildInputs = [ external.pkg-config ]; postBuild = '' cd source/server @@ -373,7 +374,7 @@ let nativeBuildInputs = [ external.autoconf external.automake - external.pkgconfig + external.pkg-config external.libtool (external.zeromq.override { enableDrafts = true; }) ]; diff --git a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix index dba6e10a59080..600e44eb8abe5 100644 --- a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix +++ b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, emacs}: +{ lib, stdenv, fetchurl, emacs }: stdenv.mkDerivation { name = "org-mac-link-1.2"; diff --git a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix index 815783aabea15..e14e5ed8cc235 100644 --- a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix +++ b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "perl-completion"; diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix index 7be3b1ca3c73b..deac73a194ed7 100644 --- a/pkgs/applications/editors/emacs-modes/prolog/default.nix +++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "prolog-mode"; diff --git a/pkgs/applications/editors/emacs-modes/railgun/default.nix b/pkgs/applications/editors/emacs-modes/railgun/default.nix index 4cf4d18d8cca0..240a2f29edf35 100644 --- a/pkgs/applications/editors/emacs-modes/railgun/default.nix +++ b/pkgs/applications/editors/emacs-modes/railgun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { name = "railgun-2012-10-17"; diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix index d2785ef036345..1275c51b99e3e 100644 --- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, emacs}: +{ lib, stdenv, fetchurl, emacs }: stdenv.mkDerivation { name = "rect-mark-1.4"; diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index 710c33a96ec7f..412ed59f2ac74 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, emacs}: +{ lib, stdenv, fetchgit, emacs }: stdenv.mkDerivation { name = "sunrise-commander-6r435"; diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix index f67efb80bf97e..237c05c5fa761 100644 --- a/pkgs/applications/editors/emacs-modes/tramp/default.nix +++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, emacs, texinfo }: +{ lib, stdenv, fetchurl, emacs, texinfo }: stdenv.mkDerivation rec { name = "tramp-2.4.2"; diff --git a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix index 352c46718dd89..67bf7b500ff79 100644 --- a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix +++ b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, emacs }: +{ lib, stdenv, fetchurl, emacs }: stdenv.mkDerivation { name = "zeitgeist-20120221"; diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index eef98943c3b69..377079969196b 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -7,7 +7,7 @@ , patches ? [ ] }: { stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm -, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif +, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz @@ -92,7 +92,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { "" ]; - nativeBuildInputs = [ pkgconfig makeWrapper ] + nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals srcRepo [ autoreconfHook texinfo ] ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index dd9a66734586d..3c57d3bc81a6a 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson +{ lib, stdenv, fetchurl, ncurses, pkg-config, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson , AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit , ImageCaptureCore, GSS, ImageIO # These may be optional }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoconf automake ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ ncurses libxml2 gnutls texinfo gettext jansson AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index dee0fe72ebb0c..059d49151d868 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, pkgconfig, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: +{ lib, stdenv, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: mkDerivation rec { pname = "featherpad"; version = "0.10.0"; @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "1wrbs6kni9s3x39cckm9kzpglryxn5vyarilvh9pafbzpc6rc57p"; }; - nativeBuildInputs = [ qmake pkgconfig qttools ]; + nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ qtbase qtsvg qtx11extras ]; meta = with lib; { diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 1a5ce245153eb..31a7026106eba 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: +{ lib, stdenv, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: mkDerivation rec { pname = "focuswriter"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l"; }; - nativeBuildInputs = [ pkgconfig qmake qttools ]; + nativeBuildInputs = [ pkg-config qmake qttools ]; buildInputs = [ hunspell qtbase qtmultimedia ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index e6752386718e8..e77b63218c374 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -2,7 +2,7 @@ , fetchurl , gtk3 , which -, pkgconfig +, pkg-config , intltool , file , libintl @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool libintl which diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 4da73d0d2e617..f0ae7ef5f3eac 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebengine, hunspell }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, qttools, qtwebengine, hunspell }: mkDerivation rec { pname = "ghostwriter"; @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "sha256-Ag97iE++f3nG2zlwqn0qxSL9RpF8O3XWH9NtQ5kFuWg="; }; - nativeBuildInputs = [ qmake pkgconfig qttools ]; + nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ qtwebengine hunspell ]; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 4c36dcfda11d2..198185e469d92 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -25,7 +25,7 @@ , ostree , pcre , pcre2 -, pkgconfig +, pkg-config , python3 , sysprof , template-glib @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config python3 python3.pkgs.wrapPython wrapGAppsHook diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index d9e09bf0d8979..7967b78f13c28 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee -, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: +, tepl, amtk, gnome3, glib, pkg-config, intltool, itstool, libxml2 }: let version = "3.38.0"; pname = "gnome-latex"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { configureFlags = ["--disable-dconf-migration"]; nativeBuildInputs = [ - pkgconfig + pkg-config wrapGAppsHook itstool intltool diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index d4710094e4f5d..0e2671846c067 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,5 +1,5 @@ { avahiSupport ? false # build support for Avahi in libinfinity -, lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook, yelp-tools +, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools , gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: let @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az"; }; - nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool yelp-tools wrapGAppsHook ]; + nativeBuildInputs = [ autoconf automake pkg-config intltool itstool yelp-tools wrapGAppsHook ]; buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index f3671cc7b3a9b..2c959519f41fe 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, gtk3, librsvg }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, gtk3, librsvg }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # The Makefile uses "/usr/local" if not explicitly overridden installFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ gtk3 librsvg ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 5f2cf75ff3737..95b41ba5caf00 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm, - boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, + boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0xp6ijnrggskjrvscp204bmdpz48l5a8nxr9abp17wni6akb5wiq"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ dbus openssl diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 3c0a8bafa7e5f..93a9e1a05a6b0 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkg-config }: with lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "091qzk0qs7hql0q51hix99srgma35mhdnjfd5ncfba1bmc1h8x5i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; makeFlags = [ "debug=no" ]; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix index c81244ba13333..36842f999a569 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "kak-auto-pairs"; version = "2020-07-14"; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix index 6bd67da4228e2..731bb9e46d1a7 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix @@ -1,12 +1,12 @@ { stdenv, git, fetchFromGitHub }: stdenv.mkDerivation { name = "kak-powerline"; - version = "2019-07-23"; + version = "2020-08-22"; src = fetchFromGitHub { - owner = "andreyorst"; + owner = "jdugan6240"; repo = "powerline.kak"; - rev = "82b01eb6c97c7380b7da253db1fd484a5de13ea4"; - sha256 = "1480wp2jc7c84z1wqmpf09lzny6kbnbhiiym2ffaddxrd4ns9i6z"; + rev = "d641b2cd8024f872bcda23f9256e7aff36da02ae"; + sha256 = "65948f5ef3ab2f46f6d186ad752665c251d887631d439949decc2654a67958a4"; }; configurePhase = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Kakoune modeline, but with passion"; - homepage = "https://github.com/andreyorst/powerline.kak"; + homepage = "https://github.com/jdugan6240/powerline.kak"; license = licenses.mit; maintainers = with maintainers; [ nrdxp ]; platform = platforms.all; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix index 40cd1bc9d2751..e6f06f4b8e640 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "kak-prelude"; - version = "2020-03-15"; + version = "2020-06-09"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "prelude.kak"; - rev = "05b2642b1e014bd46423f9d738cc38a624947b63"; - sha256 = "180p8hq8z7mznzd9w9ma5as3ijs7zbzcj96prcpswqg263a0b329"; + rev = "f1e0f4d5cb62a36924e3f8ba6824d6aed8c19d23"; + sha256 = "1pncr8azqvl2z9yvzhc68p1s9fld8cvak8yz88zgrp5ypx2cxl8c"; }; installPhase = '' diff --git a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix index deeaa8a9f1567..8e60e17e79282 100644 --- a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix +++ b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, lua5_3 }: +{ lib, stdenv, fetchgit, lua5_3 }: stdenv.mkDerivation rec { pname = "quickscope-kak"; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index 4bd377444d06f..cb1265735f98c 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, extra-cmake-modules, qtbase }: +{ lib, stdenv, fetchurl, cmake, pkg-config, extra-cmake-modules, qtbase }: let pname = "kdevelop-pg-qt"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; }; - nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; + nativeBuildInputs = [ cmake pkg-config extra-cmake-modules ]; buildInputs = [ qtbase ]; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 8ca083a2d89f7..b54015de7b8ff 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -1,5 +1,5 @@ -{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules +{ mkDerivation, lib, fetchurl, cmake, gettext, pkg-config, extra-cmake-modules , qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor @@ -18,7 +18,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - cmake gettext pkgconfig extra-cmake-modules makeWrapper + cmake gettext pkg-config extra-cmake-modules makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index d37a2de286659..2f53df97d325a 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2 }: stdenv.mkDerivation rec { version = "0.8.18.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 8878e01de67f4..ea5e162fdde72 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, buildPackages }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages }: stdenv.mkDerivation rec { pname = "mg"; @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "PKG_CONFIG=${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config" ]; + makeFlags = [ "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ]; installPhase = '' install -m 555 -Dt $out/bin mg install -m 444 -Dt $out/share/man/man1 mg.1 ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index ed6695b9979a9..e5fde3e501ec6 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, autoconf, automake, pkgconfig, shared-mime-info, intltool +, autoconf, automake, pkg-config, shared-mime-info, intltool , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { patchFlags = [ "-p2" ]; patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake shared-mime-info intltool mono gtk-sharp-2_0 gnome-sharp unzip diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 427e11ca642ac..3e5de3d5fc15a 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv -, libuv, lua, ncurses, pkgconfig +, libuv, lua, ncurses, pkg-config , unibilium, xsel, gperf , libvterm-neovim , glibcLocales ? null, procps ? null @@ -74,7 +74,7 @@ in nativeBuildInputs = [ cmake gettext - pkgconfig + pkg-config ]; # extra programs test via `make functionaltest` diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index cd4fe34ef33b3..545d64ef5122c 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, which, qtbase, qtsvg, qttools, qtwebkit }: mkDerivation rec { pname = "notepadqq"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig which qttools + pkg-config which qttools ]; buildInputs = [ diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 7ad2a3247df28..96a543f3cb584 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -89,6 +89,7 @@ let description = "FPGA design and simulation software"; license = lib.licenses.unfree; platforms = lib.platforms.linux; + hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore maintainers = with lib.maintainers; [ kwohlfahrt ]; }; }; diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 48d509be41a57..2d04ad1629c04 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, pkgconfig, meson, ninja, python3, vala +{ lib, stdenv, fetchFromGitHub, nix-update-script, pkg-config, meson, ninja, python3, vala , gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon , libgee, discount, wrapGAppsHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 0b72a57df3ec6..3d6ec9ece9c78 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, gtk2 }: stdenv.mkDerivation { pname = "scite"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; sourceRoot = "scintilla/gtk"; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 8e662d55523df..1094c3c755356 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, makeWrapper +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper , boost, xercesc, hunspell, zlib, pcre16 , qtbase, qttools, qtwebengine, qtxmlpatterns , python3Packages @@ -17,7 +17,7 @@ mkDerivation rec { pythonPath = with python3Packages; [ lxml ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ boost xercesc qtbase qttools qtwebengine qtxmlpatterns diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index b42ebe19f64ce..e474ff5f19bb0 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }: +{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkg-config, makeWrapper, gnome2, gtk2 }: stdenv.mkDerivation { version = "git-2014-08-20"; pname = "supertux-editor"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ]; installPhase = '' diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix index 50cad500c9550..f5ad8d947c7bd 100644 --- a/pkgs/applications/editors/tecoc/default.nix +++ b/pkgs/applications/editors/tecoc/default.nix @@ -1,37 +1,47 @@ -{ lib, stdenv, fetchFromGitHub -, ncurses }: +{ stdenv +, lib +, fetchFromGitHub +, ncurses +}: stdenv.mkDerivation rec { - - pname = "tecoc-git"; - version = "20150606"; + pname = "tecoc"; + version = "unstable-2020-11-03"; src = fetchFromGitHub { owner = "blakemcbride"; repo = "TECOC"; - rev = "d7dffdeb1dfb812e579d6d3b518545b23e1b50cb"; - sha256 = "11zfa73dlx71c0hmjz5n3wqcvk6082rpb4sss877nfiayisc0njj"; + rev = "79fcb6cfd6c5f9759f6ec46aeaf86d5806b13a0b"; + sha256 = "sha256-JooLvoh9CxLHLOXXxE7zA7R9yglr9BGUwX4nrw2/vIw="; }; buildInputs = [ ncurses ]; makefile = if stdenv.hostPlatform.isDarwin - then "makefile.osx" - else if stdenv.hostPlatform.isFreeBSD - then "makefile.bsd" - else if stdenv.hostPlatform.isOpenBSD - then "makefile.bsd" - else if stdenv.hostPlatform.isWindows - then "makefile.win" - else "makefile.linux"; # I think Linux is a safe default... + then "makefile.osx" + else if stdenv.hostPlatform.isFreeBSD + then "makefile.bsd" + else if stdenv.hostPlatform.isOpenBSD + then "makefile.bsd" + else if stdenv.hostPlatform.isWindows + then "makefile.win" + else "makefile.linux"; # I think Linux is a safe default... makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ]; + preInstall = '' + install -d $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros + ''; + installPhase = '' - mkdir -p $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros - cp src/tecoc $out/bin - cp src/aaout.txt doc/* $out/share/doc/${pname}-${version} - cp lib/* lib2/* $out/lib/teco/macros + runHook preInstall + install -m755 src/tecoc $out/bin + install -m644 src/aaout.txt doc/* $out/share/doc/${pname}-${version} + install -m644 lib/* lib2/* $out/lib/teco/macros + runHook postInstall + ''; + + postInstall = '' (cd $out/bin ln -s tecoc Make ln -s tecoc mung @@ -54,9 +64,11 @@ stdenv.mkDerivation rec { of Editor MACroS for TECO. TECOC is a portable C implementation of TECO-11. - ''; + ''; homepage = "https://github.com/blakemcbride/TECOC"; - license = { url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt"; }; + license = { + url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt"; + }; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index f967f28f4df52..6046a3aa313dd 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -7,7 +7,7 @@ git ? null, python3 ? null, cmake, - pkgconfig, + pkg-config, ghostscriptX ? null, extraFonts ? false, chineseFonts ? false, @@ -31,7 +31,7 @@ mkDerivation { sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ guile_1_8 qtbase diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 0b78ff54c358f..75f22da251635 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }: +{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkg-config, poppler }: mkDerivation rec { pname = "texmaker"; @@ -10,7 +10,7 @@ mkDerivation rec { }; buildInputs = [ qtbase qtscript poppler zlib ]; - nativeBuildInputs = [ pkgconfig poppler qmake ]; + nativeBuildInputs = [ pkg-config poppler qmake ]; NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; qmakeFlags = [ @@ -24,10 +24,10 @@ mkDerivation rec { meta = with lib; { description = "TeX and LaTeX editor"; longDescription='' - This editor is a full fledged IDE for TeX and - LaTeX editing with completion, structure viewer, preview, - spell checking and support of any compilation chain. - ''; + This editor is a full fledged IDE for TeX and + LaTeX editing with completion, structure viewer, preview, + spell checking and support of any compilation chain. + ''; homepage = "http://www.xm1math.net/texmaker/"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 101c9bc59f9cc..988e32ae7128b 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtscript, qtsvg, - wrapQtAppsHook, poppler, zlib, pkgconfig }: + wrapQtAppsHook, poppler, zlib, pkg-config }: mkDerivation rec { pname = "texstudio"; @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "05q70wbdaldhrlapss4agmvz1cwqd229nd5amkj069v1wxrkvpb7"; }; - nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ]; + nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; buildInputs = [ qtbase qtscript qtsvg poppler zlib ]; qmakeFlags = [ "NO_APPDATA=True" ]; diff --git a/pkgs/applications/editors/textadept/10/default.nix b/pkgs/applications/editors/textadept/10/default.nix index 4450fe77d1835..9d86bdc4c5bfe 100644 --- a/pkgs/applications/editors/textadept/10/default.nix +++ b/pkgs/applications/editors/textadept/10/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: +{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: stdenv.mkDerivation rec { version = "10.8"; pname = "textadept"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ncurses glib unzip zip ]; diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/11/default.nix index 017a2970c308a..a0037ca6c2bf0 100644 --- a/pkgs/applications/editors/textadept/11/default.nix +++ b/pkgs/applications/editors/textadept/11/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: +{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: stdenv.mkDerivation rec { version = "11.0_beta"; pname = "textadept11"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ncurses glib unzip zip ]; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index b58f5da6a967a..f5306e75a56cc 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, qmake , python, qtbase, qttools }: mkDerivation rec { @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "0n8p7bp5pqq72c65av3v7wbazwphh78pw27nqvpiyp9y8k5w4pg0"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ python qtbase qttools ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index eb015550c3941..e611e486288ff 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,4 +1,4 @@ -{ source ? "default", callPackage, lib, stdenv, ncurses, pkgconfig, gettext +{ source ? "default", callPackage, lib, stdenv, ncurses, pkg-config, gettext , writeText, config, glib, gtk2-x11, gtk3-x11, lua, python3, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE @@ -119,7 +119,7 @@ in stdenv.mkDerivation rec { ++ lib.optional ximSupport "--enable-xim"; nativeBuildInputs = [ - pkgconfig + pkg-config ] ++ lib.optional wrapPythonDrv makeWrapper ++ lib.optional nlsSupport gettext diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 9b14199243563..48e1369c8c3ca 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, callPackage, ncurses, gettext, pkgconfig +{ lib, stdenv, fetchurl, callPackage, ncurses, gettext, pkg-config # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; - nativeBuildInputs = [ gettext pkgconfig ]; + nativeBuildInputs = [ gettext pkg-config ]; buildInputs = [ ncurses ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index e950e7685ef81..c71f057fe0f82 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, runCommand, ncurses, gettext -, pkgconfig, cscope, ruby, tcl, perl, luajit +, pkg-config, cscope, ruby, tcl, perl, luajit , darwin , usePython27 ? false @@ -38,7 +38,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig buildSymlinks ]; + nativeBuildInputs = [ pkg-config buildSymlinks ]; buildInputs = [ gettext ncurses cscope luajit ruby tcl perl python.pkg ]; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index f12112692343b..9a020233f3b09 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem , ncurses, libtermkey, lpeg, lua , acl ? null, libselinux ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "martanne"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ ncurses diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 414c08d27f9dd..65f42d7c53f0d 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw +{ stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1amjk9rz7vw5ha7nyl5j2bfwj5if9w62nlwx5qbp1x7spldimlll"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas libLAS proj-datumgrid ] diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/applications/gis/udig/default.nix new file mode 100644 index 0000000000000..e4abddbcde002 --- /dev/null +++ b/pkgs/applications/gis/udig/default.nix @@ -0,0 +1,66 @@ +{ stdenv, lib, fetchurl, unzip, makeWrapper, jre8, libXtst, gdal }: +let + pname = "udig"; + version = "2.0.0"; + + srcs = { + x86_64-linux = fetchurl { + url = "http://udig.refractions.net/files/downloads/udig-${version}.linux.gtk.x86_64.zip"; + sha256 = "03hj1mdd6sq0gbpa838wkccibp3l2hvnwxxf5dyc0jk3mmd94fwa"; + }; + x86_64-darwin = fetchurl { + url = "http://udig.refractions.net/files/downloads/udig-${version}.macosx.cocoa.x86_64.zip"; + sha256 = "16rcyp1zy3lr1hwjhzh6vwcgck52w66dm1qsc52gppy1f4i3f692"; + }; + }; + src = srcs.${stdenv.hostPlatform.system}; + + meta = with lib; { + description = "User-friendly Desktop Internet GIS"; + homepage = "http://udig.refractions.net/"; + license = with licenses; [ epl10 bsd3 ]; + maintainers = with maintainers; [ sikmir ]; + platforms = builtins.attrNames srcs; + }; + + linux = stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ unzip makeWrapper ]; + + installPhase = '' + install -dm755 $out/bin $out/opt/udig + cp -r . $out/opt/udig + makeWrapper $out/opt/udig/udig.sh $out/bin/udig \ + --prefix PATH : ${jre8}/bin \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ libXtst gdal ])} + ''; + + postFixup = '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/udig/udig_internal + ''; + }; + + darwin = stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ unzip makeWrapper ]; + + postPatch = '' + substituteInPlace configuration/config.ini \ + --replace "\$LOCALAPPDATA\$" "@user.home" + ''; + + installPhase = '' + mkdir -p $out/Applications/udig + cp -R . $out/Applications/udig + wrapProgram $out/Applications/udig/udig.app/Contents/MacOS/udig_internal \ + --prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath ([ gdal ])} + ''; + }; +in +if stdenv.isDarwin +then darwin +else linux diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 9d52046ba0cb1..ee608b7538ff5 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices @@ -50,7 +50,7 @@ stdenv.mkDerivation { [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM ; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ zlib fontconfig freetype ghostscript @@ -72,7 +72,7 @@ stdenv.mkDerivation { moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params for file in "$dev"/bin/*-config; do substituteInPlace "$file" --replace pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'" + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'" done '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 42f157e531396..ad559a6f21670 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices @@ -62,7 +62,7 @@ stdenv.mkDerivation { [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM ; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ zlib fontconfig freetype ghostscript @@ -85,10 +85,10 @@ stdenv.mkDerivation { moveToOutput "bin/*-config" "$dev" moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params for file in "$dev"/bin/*-config; do - substituteInPlace "$file" --replace "${pkgconfig}/bin/pkg-config -config" \ - ${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config - substituteInPlace "$file" --replace ${pkgconfig}/bin/pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'" + substituteInPlace "$file" --replace "${pkg-config}/bin/pkg-config -config" \ + ${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config + substituteInPlace "$file" --replace ${pkg-config}/bin/pkg-config \ + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'" done '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index ec146767a6aeb..0a611515b0d58 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, pkgconfig, libconfig +{ config, lib, stdenv, fetchFromGitHub, pkg-config, libconfig , gtkmm2, glibmm, libxml2, libsecret, curl, libzip , librsvg, gst_all_1, autoreconfHook, makeWrapper , useUnrar ? config.ahoviewer.useUnrar or false, unrar @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 libsecret curl libzip librsvg diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix index 4d0cc46bb5963..c2d8a4bda35a8 100644 --- a/pkgs/applications/graphics/akira/default.nix +++ b/pkgs/applications/graphics/akira/default.nix @@ -6,7 +6,7 @@ , meson , ninja , pantheon -, pkgconfig +, pkg-config , python3 , vala , vala-lint @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala vala-lint diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix index 771145d54b65f..dda734363ebc2 100644 --- a/pkgs/applications/graphics/animbar/default.nix +++ b/pkgs/applications/graphics/animbar/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create your own animation on paper and transparancy"; longDescription = '' - Animbar lets you easily create your own animation on paper and - transparancy. From a set of input images two output images are - computed, that are printed one on paper and one on - transparency. By moving the transparency over the paper you - create a fascinating animation effect. This kind of animation - technique is hundreds of years old and known under several - names: picket fence animation, barrier grid animation, Moiré - animation, to name a few. + Animbar lets you easily create your own animation on paper and + transparancy. From a set of input images two output images are + computed, that are printed one on paper and one on + transparency. By moving the transparency over the paper you + create a fascinating animation effect. This kind of animation + technique is hundreds of years old and known under several + names: picket fence animation, barrier grid animation, Moiré + animation, to name a few. ''; homepage = "http://animbar.mnim.org"; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 5e8e1e63344b5..e3b966353ffe9 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, callPackage, libpng12, imagemagick -, autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin +, autoreconfHook, glib, pstoedit, pkg-config, gettext, gd, darwin , runtimeShell }: # TODO: Figure out why the resultant binary is somehow linked against @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { #''; autofig = callPackage ./autofig.nix {}; - nativeBuildInputs = [ autoreconfHook glib autofig pkgconfig gettext ]; + nativeBuildInputs = [ autoreconfHook glib autofig pkg-config gettext ]; buildInputs = [ libpng12 imagemagick pstoedit ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ gd ApplicationServices ]); diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 7627d79554a52..d185c30ff435e 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip , gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3 -, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core +, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa }: stdenv.mkDerivation rec { pname = "avocode"; - version = "4.10.4"; + version = "4.11.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "06xf5y2mljk3pd74ap9n90bhhidbzpg5c6wws361ygd4f3x86c46"; + sha256 = "sha256-50aGechzlVVRQz6WOASHRjT46BKbwyhbt7/0oq2PsOg="; }; libPath = lib.makeLibraryPath (with xorg; [ @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { libXtst libXScrnSaver libuuid + libdrm + mesa ]); desktopItem = makeDesktopItem { diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 550b23173fce2..0f47b87d4ac1a 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook , cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg -, libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt +, libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 , ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "6dd3de1f5ea9f94af92838c0be5ff30fdaa599aa1d737dcb562f9e0b2b2dbdda"; }; - nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; buildInputs = [ cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 2648828cfdcd6..6fe8aed8f6744 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perlPackages, +{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkg-config, perlPackages, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, gtk-mac-integration-gtk2 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { ++ lib.optional withGNOME libgnomeui ++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2; - nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ] + nativeBuildInputs = [ autoconf automake libtool pkg-config intltool ] ++ (with perlPackages; [ perl XMLParser ]); preConfigure = '' diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 9437d04108c21..d1cee064aee69 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -1,7 +1,7 @@ { python2 , lib, stdenv , fetchurl -, pkgconfig +, pkg-config , libXext , libXxf86vm , libX11 @@ -38,7 +38,7 @@ in buildPythonApplication rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; preConfigure = '' diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 1b475df92a63f..ef100e5f7bd52 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , mkDerivation , fetchurl -, pkgconfig +, pkg-config , djvulibre , qtbase , qttools @@ -20,7 +20,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config qttools ]; diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index a0d28689ae7b6..0feb72f64aacd 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , python3 , gtk3 , appstream-glib @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection meson ninja - pkgconfig + pkg-config wrapGAppsHook glib gettext diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index 75f1fb9acd156..942a6d63bd519 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool, autoconf, automake , libjpeg, libexif }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig libtool autoconf automake ]; + nativeBuildInputs = [ pkg-config libtool autoconf automake ]; propagatedBuildInputs = [ libjpeg libexif ]; diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 12e4ec4496dc0..c31c1407da7ed 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU, libGL, ctl }: +{ lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }: stdenv.mkDerivation { name ="openexr_viewers-2.2.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openexr fltk libGLU libGL ctl ]; meta = { diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index c50b6d0c2ad8f..1985176765f0b 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }: +{ lib, stdenv, fetchurl, pkg-config, openexr, libpng12, libjpeg }: stdenv.mkDerivation rec { pname = "exrtools"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ stdenv openexr libpng12 libjpeg ]; meta = with lib; { diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 4754cc1a02414..9ed6ee75159e3 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm -, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm +, pkg-config, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm , epoxy, poppler, mesa, lirc }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index c22bbbb482783..667f5afe57932 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -1,26 +1,32 @@ -{ lib, stdenv, fetchurl, ghostscript, libpng } : +{ lib, stdenv, fetchurl, ghostscript, libpng, makeWrapper +, coreutils, bc, gnugrep, gawk, gnused } : -let - version = "3.2.7b"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "fig2dev"; - inherit version; + version = "3.2.8"; src = fetchurl { url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; - sha256 = "1ck8gnqgg13xkxq4hrdy706i4xdgrlckx6bi6wxm1g514121pp27"; + sha256 = "0zg29yqknfafyzmmln4k7kydfb2dapk3r8ffvlqhj3cm8fp5h4lk"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpng ]; GSEXE="${ghostscript}/bin/gs"; + postInstall = '' + wrapProgram $out/bin/fig2ps2tex \ + --set PATH ${lib.makeBinPath [ coreutils bc gnugrep gawk ]} + wrapProgram $out/bin/pic2tpic \ + --set PATH ${lib.makeBinPath [ gnused ]} + ''; + meta = with lib; { description = "Tool to convert Xfig files to other formats"; homepage = "http://mcj.sourceforge.net/"; license = licenses.xfig; platforms = platforms.linux; + maintainers = with maintainers; [ lesuisse ]; }; } - diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index ee75d6e1ae05a..49e8fee513d7b 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -3,7 +3,7 @@ , nix-update-script , pantheon , vala -, pkgconfig +, pkg-config , meson , ninja , python3 @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "fondo"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "1zmrpk0b5z6m956j923njn6dpqdm2p8653a325hgjjjq0sgwbhj2"; + sha256 = "sha256-eGHgZm9Q6JnY6OQNAyrFvRsuyuFnruMJNckOCCiO4Ug="; }; nativeBuildInputs = [ desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index ebf8b9ee6061a..3563220f2b873 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook, opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, -gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: +gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi ? null }: assert mpi != null; @@ -21,7 +21,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake ninja - pkgconfig + pkg-config pythonPackages.pyside2-tools wrapQtAppsHook ]; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 34391754e7f07..0e79f981fbc08 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, gtk2, perlPackages, pkgconfig } : +{lib, stdenv, fetchurl, gtk2, perlPackages, pkg-config } : let version = "0.4"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { [ ./gcolor2-amd64.patch ] else [ ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index f107d492434f3..ff1df143141f2 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool +{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , wrapGAppsHook, fetchpatch }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool + nativeBuildInputs = [ pkg-config autoconf automake gettext intltool wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 4ba7cb8eb0369..62f1a36277162 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -3,7 +3,7 @@ , fetchurl , substituteAll , autoreconfHook -, pkgconfig +, pkg-config , intltool , babl , gegl @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook # hardcode-plugin-interpreters.patch changes Makefile.am - pkgconfig + pkg-config intltool gettext makeWrapper diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 37387e2a72055..33337739364e6 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas -, intltool, itstool, makeWrapper, pkgconfig, yelp-tools +, intltool, itstool, makeWrapper, pkg-config, yelp-tools }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc yelp-tools gnome3.gnome-common gsettings-desktop-schemas diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index b292314301719..a710d6c1e4794 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -27,7 +27,7 @@ , meson , ninja , nixosTests -, pkgconfig +, pkg-config , python3 , tracker , tracker-miners @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config (python3.withPackages (pkgs: with pkgs; [ dogtail pygobject3 diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index e4a82703febb4..a1b4accc8d595 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkg-config }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { homepage = "https://launchpad.net/gnuclad"; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index ec51e077c5688..64ea533eefd25 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook , glfw3, gtk3, libpng12 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./disable-imgui_ini.patch ]; - nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ scons pkg-config wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; NIX_LDFLAGS = "-lpthread"; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index e686aa4f35919..b661ba562f9de 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2, fetchpatch }: +{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, fetchpatch }: stdenv.mkDerivation { name = "gpicview-0.2.4"; @@ -24,6 +24,6 @@ stdenv.mkDerivation { platforms = platforms.unix; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk2 ]; } diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 6ea67e332129a..39f7a42b3b3ba 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -1,6 +1,6 @@ -{lib, stdenv, fetchurl, pkgconfig, gtk2, libpng}: +{lib, stdenv, fetchurl, pkg-config, gtk2, libpng}: -assert pkgconfig != null && gtk2 != null && libpng != null; +assert pkg-config != null && gtk2 != null && libpng != null; # Note that we cannot just copy gtk's png attribute, since gtk might # not be linked against png. # !!! assert libpng == gtk2.libpng; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libpng]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 961cc7e49f7f0..3529f827b4a7e 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkgconfig, lua5 }: +{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkg-config, lua5 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 ]; preBuild = "cd src"; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 538e665be2505..cefb9c03dc041 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , gnome3 -, pkgconfig +, pkg-config , meson , ninja , exiv2 @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { itstool meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix index d888e55ed3d40..9f2f050441f1a 100644 --- a/pkgs/applications/graphics/guetzli/default.nix +++ b/pkgs/applications/graphics/guetzli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libpng, fetchFromGitHub, pkgconfig }: +{ lib, stdenv, libpng, fetchFromGitHub, pkg-config }: let version = "1.0.1"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "v${version}"; sha256 = "1wy9wfvyradp0aigfv8yijvj0dgb5kpq2yf2xki15f605jc1r5dm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng ]; installPhase = '' diff --git a/pkgs/applications/graphics/hdr-plus/default.nix b/pkgs/applications/graphics/hdr-plus/default.nix new file mode 100644 index 0000000000000..107694b2fcd25 --- /dev/null +++ b/pkgs/applications/graphics/hdr-plus/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, cmake, halide +, libpng, libjpeg, libtiff, libraw +}: + +stdenv.mkDerivation rec { + pname = "hdr-plus-unstable"; + version = "2020-10-29"; + + src = fetchFromGitHub { + owner = "timothybrooks"; + repo = "hdr-plus"; + rev = "132bd73ccd4eaef9830124605c93f06a98607cfa"; + sha256 = "1n49ggrppf336p7n510kapzh376791bysxj3f33m3bdzksq360ps"; + }; + + patches = [ + # PR #70, fixes incompatibility with Halide 10.0.0 + (fetchpatch { + url = "https://github.com/timothybrooks/hdr-plus/pull/70/commits/077e1a476279539c72e615210762dca27984c57b.patch"; + sha256 = "1sg2l1bqs2smpfpy4flwg86fzhcc4yf7zx998v1bfhim43yyrx59"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ halide libpng libjpeg libtiff libraw ]; + + installPhase = '' + for bin in hdrplus stack_frames; do + install -Dm755 $bin $out/bin/$bin + done + ''; + + meta = with stdenv.lib; { + description = "Burst photography pipeline based on Google's HDR+"; + homepage = "https://www.timothybrooks.com/tech/hdr-plus/"; + license = licenses.mit; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 17d1dc3267665..f7f1e17be22c9 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch +{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkg-config, fetchpatch , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi , libXmu, libGLU, libGL, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wxGTK zlib ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index fbee1d5b0e83d..f78170fde34a9 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -3,7 +3,7 @@ , nix-update-script , fetchpatch , vala -, pkgconfig +, pkg-config , python3 , glib , gtk3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 067abb785b479..3f6a27cbc76ad 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -8,7 +8,7 @@ , fontconfig , meson , ninja -, pkgconfig +, pkg-config , icu , pango , inih @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 161260bcea949..2c9430ded7307 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript , libjpeg, libpng, qtbase, mkDerivation }: @@ -20,7 +20,7 @@ mkDerivation rec { libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; qtWrapperArgs = [ ''--prefix PATH : ${texlive}/bin'' ]; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index c333ecaa99fde..99e56738dbfa4 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc , cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype -, libpng, boost, doxygen, cairomm, pkgconfig, libjpeg, libtiff +, libpng, boost, doxygen, cairomm, pkg-config, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" ''; - nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ]; + nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkg-config perl asciidoc ]; buildInputs = [ libGLU libGL zlib python expat libxml2 libsigcxx libuuid freetype libpng diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 4f3e08bf7b0f2..283ed1179544d 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook +{ lib, stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook , kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , qtbase, qtsvg , boost, graphviz @@ -19,7 +19,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - cmake extra-cmake-modules pkgconfig wrapGAppsHook + cmake extra-cmake-modules pkg-config wrapGAppsHook kdoctools ]; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 1872d976f8e3d..7cdf32cc8e787 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, wrapQtAppsHook +, pkg-config, wrapQtAppsHook , poppler, gnuplot , qmake, qtbase, qttools }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig qttools qmake wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config qttools qmake wrapQtAppsHook ]; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; buildInputs = [ qtbase poppler ]; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 9b1dbe537956d..36154af137bd1 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, cmake, fetchFromGitHub, pkgconfig +{ lib, stdenv, mkDerivation, cmake, fetchFromGitHub, pkg-config , boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr , qtbase, qtdeclarative, qttools, qtwebengine, eigen @@ -22,7 +22,7 @@ mkDerivation rec { boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { homepage = "http://qtpfsgui.sourceforge.net/"; diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix new file mode 100644 index 0000000000000..29aaed1278d5c --- /dev/null +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchgit +, meson +, ninja +, pkg-config +, wrapGAppsHook +, gtk3 +, gnome3 +, tiffSupport ? true +, libraw +, jpgSupport ? true +, imagemagick +, exiftool +}: + +assert jpgSupport -> tiffSupport; + +let + inherit (lib) makeBinPath optional optionals optionalString; + runtimePath = makeBinPath ( + optional tiffSupport libraw + ++ optionals jpgSupport [ imagemagick exiftool ] + ); +in +stdenv.mkDerivation rec { + pname = "megapixels"; + version = "0.14.0"; + + src = fetchgit { + url = "https://git.sr.ht/~martijnbraam/megapixels"; + rev = version; + sha256 = "136rv9sx0kgfkpqn5s90j7j4qhb8h04p14g5qhqshb89kmmsmxiw"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; + + buildInputs = [ gtk3 gnome3.adwaita-icon-theme ] + ++ optional tiffSupport libraw + ++ optional jpgSupport imagemagick; + + preFixup = optionalString (tiffSupport || jpgSupport) '' + gappsWrapperArgs+=( + --prefix PATH : ${runtimePath} + ) + ''; + + meta = with lib; { + description = "GTK3 camera application using raw v4l2 and media-requests"; + homepage = "https://sr.ht/~martijnbraam/Megapixels"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index 5bc67a8c63b05..af6b812e1e5c7 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libpng, nasm }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libpng, nasm }: stdenv.mkDerivation rec { version = "3.3.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1na68860asn8b82ny5ilwbhh4nyl9gvx2yxmm4wr2v1v95v51fky"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libpng nasm ]; meta = { diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 3b030a1eb578c..9da9c20942ecb 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -11,7 +11,7 @@ , hicolor-icon-theme , mypaint-brushes , gdk-pixbuf -, pkgconfig +, pkg-config , python3 , swig , wrapGAppsHook @@ -33,7 +33,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ gettext - pkgconfig + pkg-config swig wrapGAppsHook gobject-introspection # for setup hook diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 73a4d631acbb1..8a3e41965ffe5 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchpatch , cmake -, pkgconfig +, pkg-config , qtbase , qttools @@ -32,7 +32,7 @@ mkDerivation rec { ''; nativeBuildInputs = [cmake - pkgconfig]; + pkg-config]; buildInputs = [qtbase qttools diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index b200b9be8cd9e..f5595da47adf5 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "-DUSE_PYTHON=OFF" "-DUSE_QT=OFF" # GNUInstallDirs - "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig + "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index ad80d3a540440..c8950eba398a2 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -14,7 +14,7 @@ , mpfr , gmp , glib -, pkgconfig +, pkg-config , harfbuzz , gettext , freetype @@ -38,7 +38,7 @@ mkDerivation rec { sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l"; }; - nativeBuildInputs = [ bison flex pkgconfig gettext qmake ]; + nativeBuildInputs = [ bison flex pkg-config gettext qmake ]; buildInputs = [ eigen boost glew opencsg cgal mpfr gmp glib diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index d8a6a7c5f9539..da5aa7bf6efec 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -1,5 +1,5 @@ { boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint -, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkgconfig, qtbase +, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkg-config, qtbase , qtmultimedia, qtscript, lib, stdenv, superlu, wrapQtAppsHook, }: let source = import ./source.nix { inherit fetchFromGitHub; }; in stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { pname = "opentoonz"; version = source.versions.opentoonz; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ boost diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 3a06c8e31f7de..bcc094981214f 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "13b1ncpx189ca0h70j5cdp0jwlj95kasysryz1l6g13cwn9n6mii"; + sha256 = "sha256-Rx/LUp5s2DhEKuLUklYXjtTXjqBju+5YzK1hNfBCnIE="; }; - vendorSha256 = "11w9i1829hk1qb9w24dyxv1bi49358a274g60x11fp5x5cw7bqa7"; + vendorSha256 = "sha256-/SsDDFveovJfuEdnOkxHAWccS8PJW5k9IHSxSJAgHMQ="; # No tests doCheck = false; diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index b44130c47ae19..4acb50e200fdb 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16, - lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }: + lcms2, lensfun, pkg-config, libjpeg, exiv2, liblqr1 }: stdenv.mkDerivation { name = "photivo-2014-01-25"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { sed '1i#include <math.h>' -i Sources/filters/ptFilter_StdCurve.cpp ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ]; diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index 436d6764c75fe..79a171d6fc3fd 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -20,7 +20,7 @@ , ninja , openexr , pcre -, pkgconfig +, pkg-config , pugixml , lib, stdenv , swig @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gobject-introspection libxml2 ninja - pkgconfig + pkg-config swig ]; diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix new file mode 100644 index 0000000000000..a20a0a2db61bb --- /dev/null +++ b/pkgs/applications/graphics/pikopixel/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchurl +, gnustep +, gcc +, llvmPackages_9 +}: + +let + # Earlier llvm than 9 segfaults + gnustep' = gnustep.override { llvmPackages = llvmPackages_9; }; + +in gnustep'.gsmakeDerivation rec { + pname = "pikopixel"; + version = "1.0-b9e"; + + src = fetchurl { + url = "http://twilightedge.com/downloads/PikoPixel.Sources.${version}.tar.gz"; + sha256 = "1gmgb5ch7s6fwvg85l6pl6fsx0maqwd8yvg7sz3r9lj32g2pz5wn"; + }; + + sourceRoot = "PikoPixel.Sources.${version}/PikoPixel"; + + buildInputs = [ + gnustep'.base + gnustep'.gui + gnustep'.back + ]; + + # Fix the Exec and Icon paths in the .desktop file, and save the file in the + # correct place. + # postInstall gets redefined in gnustep.make's builder.sh, so we use preFixup + preFixup = '' + mkdir -p $out/share/applications + sed \ + -e "s@^Exec=.*\$@Exec=$out/bin/PikoPixel %F@" \ + -e "s@^Icon=.*/local@Icon=$out@" \ + PikoPixel.app/Resources/PikoPixel.desktop > $out/share/applications/PikoPixel.desktop + ''; + + meta = with lib; { + description = "Application for drawing and editing pixel-art images"; + homepage = "http://twilightedge.com/mac/pikopixel/"; + downloadPage = "http://twilightedge.com/mac/pikopixel/"; + license = licenses.agpl3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 969a3bcb9d14f..7948ef0f08c03 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler }: @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { sha256 = "18nvrqmlifh4m8nfs0d19sb9d1l3a95xc89qxqdr881jcxdsgflw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg_3 gtk3 imagemagick libarchive libspectre libwebp poppler ]; prePatch = "patchShebangs ."; diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index 65ecaa90784d7..c4fc79c7fecd6 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, pkg-config, cmake, qtbase, qttools, qtx11extras, poppler }: mkDerivation rec { pname = "qcomicbook"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig + cmake pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 2b24a34fbc256..886a753ee2c3d 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -4,7 +4,7 @@ , fetchpatch , cmake -, pkgconfig +, pkg-config , exiv2 , mpv @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index e0426de6fb621..acd9c576f731f 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, imlib2, file, lcms2, libexif } : +{ lib, stdenv, fetchurl, pkg-config, gtk2, imlib2, file, lcms2, libexif } : stdenv.mkDerivation (rec { version = "2.3.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation (rec { sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 imlib2 file lcms2 libexif ]; preBuild='' diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 7f9f4167c64b3..7d1acc1dcd69a 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, pixman, libpthreadstubs, gtkmm3, libXau , libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook , lensfun, librsvg }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0d644s4grfia6f3k6y0byd5pwajr12kai2kc280yxi8v3w1b12ik"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ pixman libpthreadstubs gtkmm3 libXau libXdmcp diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index f9e3662f1b809..b985ae7d57167 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, mkDerivation +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mkDerivation , qtbase, qtx11extras, qtsvg, makeWrapper , vulkan-loader, libglvnd, xorg, python3, python3Packages , bison, pcre, automake, autoconf, addOpenGLRunpath @@ -28,7 +28,7 @@ mkDerivation rec { ]; # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]); # TODO: figure out how to make cmake recognise pyside2 - nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf addOpenGLRunpath ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ]; postUnpack = '' cp -r ${custom_swig} swig diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 31ec8e8ddc786..88d47b58932ad 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv -, gettext, pkgconfig +, gettext, pkg-config , avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp # List of { src name backend } attibute sets - see installFirmware below: @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ gettext - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 8f5a10268e483..c0945242096f5 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb-compat-0_1 ? null }: +{ lib, stdenv, fetchurl, sane-backends, libX11, gtk2, pkg-config, libusb-compat-0_1 ? null }: stdenv.mkDerivation rec { pname = "sane-frontends"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ sane-backends libX11 gtk2 ] ++ lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index b9e45a767516a..1deaab4dfe538 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng +{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkg-config, libpng , libusb-compat-0_1 ? null , gimpSupport ? false, gimp ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else []) ++ lib.optional gimpSupport gimp; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 347d66df987ae..103a6ec3b6bc1 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -11,7 +11,7 @@ , vala , sqlite , webkitgtk -, pkgconfig +, pkg-config , gnome3 , gst_all_1 , libgudev @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config itstool gettext desktop-file-utils diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 26b544cf1c5d8..98348129d9bdd 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype +{ lib, stdenv, fetchgit, cmake, pkg-config, zlib, libpng, cairo, freetype , json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre , wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig cmake wrapGAppsHook + pkg-config cmake wrapGAppsHook ]; buildInputs = [ zlib libpng cairo freetype diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 14f502434b287..3f29d25fbe049 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 -, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig +, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config , imagemagick, intltool, autoreconfHook, which, gnome3 }: @@ -39,7 +39,7 @@ let "--with-boost-libdir=${boost.out}/lib" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook gettext ]; + nativeBuildInputs = [ pkg-config autoreconfHook gettext ]; buildInputs = [ ETL boost cairo glibmm mlt-qt5 libsigcxx libxmlxx pango ]; @@ -103,7 +103,7 @@ stdenv.mkDerivation { preConfigure = "./bootstrap.sh"; - nativeBuildInputs = [ pkgconfig autoreconfHook gettext ]; + nativeBuildInputs = [ pkg-config autoreconfHook gettext ]; buildInputs = [ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 66ff8675a31fe..7b9669bc465e4 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; LIBLEPT_HEADERSDIR = "${leptonica}/include"; diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index 18d865ae81c51..49cf93835b100 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config , leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoreconfHook autoconf-archive ]; + nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ]; buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; meta = { diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 9718dee45dd83..fc39306b75359 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, desktop-file-utils, gtk2, libpng, exiv2, lcms +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config desktop-file-utils intltool gettext diff --git a/pkgs/applications/graphics/xmountains/default.nix b/pkgs/applications/graphics/xmountains/default.nix new file mode 100644 index 0000000000000..c31f7923c9901 --- /dev/null +++ b/pkgs/applications/graphics/xmountains/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, xlibsWrapper, xorg }: + +stdenv.mkDerivation rec { + pname = "xmountains"; + version = "2.10"; + + src = fetchFromGitHub { + owner = "spbooth"; + repo = pname; + rev = "aa3bcbfed228adf3fff0fe4295589f13fc194f0b"; + sha256 = "0dx4n2y736lv04sj41cp1dw8n5zkw5gyd946a6zsiv0k796s9ra9"; + }; + + buildInputs = [ xlibsWrapper xorg.xbitmaps ]; + nativeBuildInputs = with xorg; [ imake gccmakedep ]; + + installPhase = "install -Dm755 xmountains -t $out/bin"; + + meta = with lib; { + description = "X11 based fractal landscape generator"; + homepage = "https://spbooth.github.io/xmountains"; + license = licenses.hpndSellVariant; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 41af11ef3387a..7d9ab53bef8b8 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -2,7 +2,7 @@ , ghostscript, atk, gtk2, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui , pango, libX11, xorgproto, zlib, poppler -, autoconf, automake, libtool, pkgconfig}: +, autoconf, automake, libtool, pkg-config}: let isGdkQuartzBackend = (gtk2.gdktarget == "quartz"); @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libgnomeprint libgnomeprintui ]; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; NIX_LDFLAGS = "-lz" + lib.optionalString (!isGdkQuartzBackend) " -lX11"; diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index d2c569b91c68c..d26f6eccf76a2 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }: +{ lib, stdenv, fetchurl, gtk2, libexif, pkg-config, texinfo }: stdenv.mkDerivation rec { pname = "xzgv"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5"; }; - nativeBuildInputs = [ pkgconfig texinfo ]; + nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ gtk2 libexif ]; postPatch = '' substituteInPlace config.mk \ diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 2d253d4462afc..5c727dbbaabf4 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, poppler, pkgconfig, libunarr +{ mkDerivation, lib, fetchFromGitHub, qmake, poppler, pkg-config, libunarr , libGLU, qtdeclarative, qtgraphicaleffects, qtmultimedia, qtquickcontrols , qtscript }: @@ -14,7 +14,7 @@ mkDerivation rec { sha256 = "17kzh69sxpyk4n7c2gkbsvr9y4j14azdy1qxzghsbwp7ij4iw9kv"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ poppler libunarr libGLU qtmultimedia qtscript ]; propagatedBuildInputs = [ qtquickcontrols qtgraphicaleffects qtdeclarative ]; diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 435f4ccaf6db6..a4e5e725490f0 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, SDL, SDL_image, libjpeg, libpng, libtiff }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, SDL, SDL_image, libjpeg, libpng, libtiff }: stdenv.mkDerivation rec { pname = "zgv"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL SDL_image libjpeg libpng libtiff ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/bluetooth_battery/default.nix b/pkgs/applications/misc/bluetooth_battery/default.nix new file mode 100644 index 0000000000000..19c2f3b99a4de --- /dev/null +++ b/pkgs/applications/misc/bluetooth_battery/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildPythonApplication, pybluez }: + +buildPythonApplication rec { + pname = "bluetooth_battery"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "TheWeirdDev"; + repo = "Bluetooth_Headset_Battery_Level"; + rev = "v${version}"; + sha256 = "121pkaq9z8p2i35cqs32aygjvf82r961w0axirpmsrbmrwq2hh6g"; + }; + + propagatedBuildInputs = [ pybluez ]; + + format = "other"; + + installPhase = '' + mkdir -p $out/bin + cp $src/bluetooth_battery.py $out/bin/bluetooth_battery + ''; + + meta = with lib; { + description = "Fetch the battery charge level of some Bluetooth headsets"; + homepage = "https://github.com/TheWeirdDev/Bluetooth_Headset_Battery_Level"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ cheriimoya ]; + }; +} diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index 8414e02eb889e..35627b28d1544 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -1,44 +1,46 @@ -{ lib, stdenv -, fetchurl +{ lib +, stdenv +, fetchFromGitHub , autoPatchelfHook +, wrapGAppsHook +, hicolor-icon-theme , gtk3 , gobject-introspection , libxml2 }: - -let - version = "1.7.2"; - - dbusService = fetchurl { - url = "https://github.com/phuhl/linux_notification_center/raw/${version}/com.ph-uhl.deadd.notification.service.in"; - sha256 = "0jvmi1c98hm8x1x7kw9ws0nbf4y56yy44c3bqm6rjj4lrm89l83s"; - }; -in stdenv.mkDerivation rec { - inherit version; pname = "deadd-notification-center"; + version = "1.7.3"; - src = fetchurl { - url = "https://github.com/phuhl/linux_notification_center/releases/download/${version}/${pname}"; - sha256 = "13f15slkjiw2n5dnqj13dprhqm3nf1k11jqaqda379yhgygyp9zm"; + src = fetchFromGitHub { + owner = "phuhl"; + repo = "linux_notification_center"; + rev = version; + sha256 = "QaOLrtlhQyhMOirk6JO1yMGRrgycHmF9FAdKNbN2TRk="; }; dontUnpack = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; buildInputs = [ gtk3 gobject-introspection libxml2 + hicolor-icon-theme ]; installPhase = '' mkdir -p $out/bin $out/share/dbus-1/services - cp $src $out/bin/deadd-notification-center - chmod +x $out/bin/deadd-notification-center - sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service + cp $src/.out/${pname} $out/bin/ + chmod +x $out/bin/${pname} + + sed "s|##PREFIX##|$out|g" $src/${pname}.service.in > \ + $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service ''; meta = with lib; { diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index adafe8801f390..ed1b31559f533 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "8.0"; + version = "8.2"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "01ggakpzmiwkqdzc9xqc93xmynd53kzpwl99q3l9z2hpqyzlnj2a"; + sha256 = "05wn4kmvsswwd2q2pffxbplb38capwv7iddsghix3r5zds13142z"; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 079077524789b..9d8dc1eaa03d2 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "2.0.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "0lxypgwgl64d4sw9kn0ncyik3whpq8iif0sbvi4r5kasx6wgs4qz"; + sha256 = "sha256-upsOmf46bCO8sVp5dBHPLUBZYZP3JyXa7H5KXbd76qo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 9e92a2c6659bd..b1c7949d258c2 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { homepage = "https://www.sidefx.com"; license = lib.licenses.unfree; platforms = lib.platforms.linux; + hydraPlatforms = [ ]; # requireFile src's should be excluded maintainers = [ lib.maintainers.canndrew ]; }; } diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index 5dd9bc0e644d4..120affb988c01 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ipmicfg"; - version = "1.30.0"; - buildVersion = "190710"; + version = "1.32.0"; + buildVersion = "200910"; src = fetchzip { url = "https://www.supermicro.com/wftp/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; - sha256 = "0srkzivxa4qlf3x9zdkri7xfq7kjj4fsmn978vzmzsvbxkqswd5a"; + sha256 = "1mncinwgx5d8jkvnvhccqlj2xp0xa5xjsab4r5mblmcnvm609rr3"; }; installPhase = '' diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index 1d6a6097d27ce..341341c3ca889 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "k4dirstat"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "jeromerobert"; repo = pname; rev = version; - sha256 = "15xjb80jq6vhzvzx4l341f40d8a23w1334qh6cczqm9adfnzycp7"; + sha256 = "sha256-U5p/gW5GPxRoM9XknP8G7iVhLDoqmvgspeRsmCRdxDg="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 722f2364ab3e1..ffb787a9bd987 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.16"; + version = "1.2.18"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "1nps7xcw1gp7kfdp13wyj2sprc8hn5iamdb0xj4202qygpzm63wq"; + sha256 = "sha256-raXPRoydd3CfciF7S0cZiuY7EPFKfE8IU3qj2dOztHU="; }; dontBuild = true; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 044550db7cee5..548356992c335 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -40,13 +40,13 @@ with lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h"; + sha256 = "1jd2mvafyn095crfs2hnfprqiy8yqsvfybwbjq8n0agapnz4bl5h"; }; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ @@ -55,11 +55,6 @@ stdenv.mkDerivation rec { "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" ]; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace CMakeLists.txt \ - --replace "/usr/local/bin" "../bin" \ - --replace "/usr/local/share/man" "../share/man" - ''; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; patches = [ @@ -83,14 +78,18 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' + runHook preCheck + export LC_ALL="en_US.UTF-8" export QT_QPA_PLATFORM=offscreen export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" # testcli and testgui are flaky - skip them both make test ARGS+="-E 'testcli|testgui' --output-on-failure" + + runHook postCheck ''; - nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; + nativeBuildInputs = [ cmake wrapQtAppsHook qttools pkg-config ]; buildInputs = [ asciidoctor @@ -103,7 +102,6 @@ stdenv.mkDerivation rec { libgpgerror libsodium libyubikey - pkg-config qrencode qtbase qtsvg @@ -124,7 +122,7 @@ stdenv.mkDerivation rec { description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)."; homepage = "https://keepassxc.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ jonafato turion ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 4c36b3d930f1e..4a72eecf9b370 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -1,6 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline, conf ? null }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline +, conf ? null, withIcons ? false, withNerdIcons ? false }: -with lib; +# Mutually exclusive options +assert withIcons -> withNerdIcons == false; +assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; @@ -13,13 +16,17 @@ stdenv.mkDerivation rec { sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy"; }; - configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf); - preBuild = optionalString (conf != null) "cp ${configFile} src/nnn.h"; + configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); + preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ readline ncurses ]; - makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ] ++ lib.optional withIcons [ "O_ICONS=1" ] + ++ lib.optional withNerdIcons [ "O_NERD=1" ]; # shell completions postInstall = '' @@ -28,7 +35,7 @@ stdenv.mkDerivation rec { install -Dm555 misc/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d ''; - meta = { + meta = with lib; { description = "Small ncurses-based file browser forked from noice"; homepage = "https://github.com/jarun/nnn"; license = licenses.bsd2; diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index 99033f14a6deb..c4c54ba7c53b5 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "0flp7mwj1pgcwx3k9pzc8pmqlkhbddj0maimdnvlazk87kzxpfd0"; + sha256 = "sha256-vuvYL9N9xdg27uhiTe2OqxZ3/n/9EjlqPxtNMXpqpE8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index fcdab3ddbc481..ddb99c35d05f0 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript }: +{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }: let version = "2.16.4.2"; @@ -12,7 +12,7 @@ let url = "https://www.rescuetime.com/installers/rescuetime_${version}_amd64.deb"; sha256 = "03bmnkxhip1wilnfqs8akmy1hppahxrmnm8gasnmw5s922vn06cv"; }; -in mkDerivation { +in mkDerivation rec { # https://www.rescuetime.com/updates/linux_release_notes.html inherit version; pname = "rescuetime"; @@ -35,12 +35,18 @@ in mkDerivation { $out/bin/rescuetime ''; - passthru.updateScript = writeScript "rescuetime-updater" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl pup common-updater-scripts + passthru.updateScript = writeScript "${pname}-updater" '' + #!${stdenv.shell} set -eu -o pipefail + PATH=${stdenv.lib.makeBinPath [curl pup common-updater-scripts]}:$PATH latestVersion="$(curl -sS https://www.rescuetime.com/release-notes/linux | pup '.release:first-of-type h2 strong text{}' | tr -d '\n')" - update-source-version rescuetime "$latestVersion" + + for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do + # The script will not perform an update when the version attribute is up to date from previous platform run + # We need to clear it before each run + update-source-version ${pname} 0 $(yes 0 | head -64 | tr -d "\n") --system=$platform + update-source-version ${pname} "$latestVersion" --system=$platform + done ''; meta = with lib; { diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index ef4d472e74c93..6dad2eaf81284 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -1,69 +1,69 @@ { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: - let - pname = "sidequest"; - version = "0.10.11"; + let + pname = "sidequest"; + version = "0.10.11"; - desktopItem = makeDesktopItem rec { - name = "SideQuest"; - exec = "SideQuest"; - desktopName = name; - genericName = "VR App Store"; - categories = "Settings;PackageManager;"; - }; + desktopItem = makeDesktopItem rec { + name = "SideQuest"; + exec = "SideQuest"; + desktopName = name; + genericName = "VR App Store"; + categories = "Settings;PackageManager;"; + }; - sidequest = stdenv.mkDerivation { - inherit pname version; + sidequest = stdenv.mkDerivation { + inherit pname version; - src = fetchurl { - url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9"; - }; + src = fetchurl { + url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; + sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9"; + }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper ]; - buildCommand = '' - mkdir -p "$out/lib/SideQuest" "$out/bin" - tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1 + buildCommand = '' + mkdir -p "$out/lib/SideQuest" "$out/bin" + tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1 - ln -s "$out/lib/SideQuest/sidequest" "$out/bin" + ln -s "$out/lib/SideQuest/sidequest" "$out/bin" - fixupPhase + fixupPhase - # mkdir -p "$out/share/applications" - # ln -s "${desktopItem}/share/applications/*" "$out/share/applications" + # mkdir -p "$out/share/applications" + # ln -s "${desktopItem}/share/applications/*" "$out/share/applications" - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \ - "$out/lib/SideQuest/sidequest" - ''; - }; - in buildFHSUserEnv { - name = "SideQuest"; + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \ + "$out/lib/SideQuest/sidequest" + ''; + }; + in buildFHSUserEnv { + name = "SideQuest"; - passthru = { - inherit pname version; + passthru = { + inherit pname version; - meta = with lib; { - description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; - homepage = "https://github.com/the-expanse/SideQuest"; - downloadPage = "https://github.com/the-expanse/SideQuest/releases"; - license = licenses.mit; - maintainers = with maintainers; [ joepie91 rvolosatovs ]; - platforms = [ "x86_64-linux" ]; - }; - }; + meta = with lib; { + description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; + homepage = "https://github.com/the-expanse/SideQuest"; + downloadPage = "https://github.com/the-expanse/SideQuest/releases"; + license = licenses.mit; + maintainers = with maintainers; [ joepie91 rvolosatovs ]; + platforms = [ "x86_64-linux" ]; + }; + }; - targetPkgs = pkgs: [ - sidequest - # Needed in the environment on runtime, to make QuestSaberPatch work - icu openssl zlib - ]; + targetPkgs = pkgs: [ + sidequest + # Needed in the environment on runtime, to make QuestSaberPatch work + icu openssl zlib + ]; - extraInstallCommands = '' - mkdir -p "$out/share/applications" - ln -s ${desktopItem}/share/applications/* "$out/share/applications" - ''; + extraInstallCommands = '' + mkdir -p "$out/share/applications" + ln -s ${desktopItem}/share/applications/* "$out/share/applications" + ''; - runScript = "sidequest"; - } + runScript = "sidequest"; + } diff --git a/pkgs/applications/misc/signumone-ks/default.nix b/pkgs/applications/misc/signumone-ks/default.nix index 144f725e2ef04..aeea3ff5daa3c 100644 --- a/pkgs/applications/misc/signumone-ks/default.nix +++ b/pkgs/applications/misc/signumone-ks/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "signumone-ks"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "https://cdn-dist.signum.one/${version}/${pname}-${version}.deb"; - sha256 = "4efd80e61619ccf26df1292194fcec68eb14d77dfcf0a1a673da4cf5bf41f4b7"; + sha256 = "00wlya3kb6qac2crflm86km9r48r29bvngjq1wgzj9w2xv0q32b9"; }; # Necessary to avoid using multiple ffmpeg and gtk libs diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index 8ea484d4a4cb0..98c8a8afae0c2 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchurl, pkgconfig, ncurses, openssl, Security }: +{ lib, stdenv, rustPlatform, fetchurl, pkg-config, ncurses, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "asuka"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0p0x4ch04kydg76bfal5zqzr9hvn5268wf3k2v9h7g8r4y8xqlhw"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/networking/browsers/chromium/README.md b/pkgs/applications/networking/browsers/chromium/README.md index 5b7c9fe55040d..9d23e3143c609 100644 --- a/pkgs/applications/networking/browsers/chromium/README.md +++ b/pkgs/applications/networking/browsers/chromium/README.md @@ -36,6 +36,21 @@ update `upstream-info.json`. After updates it is important to test at least `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which reuses `upstream-info.json`). +To run all automated NixOS VM tests for Chromium, ungoogled-chromium, +and Google Chrome (not recommended, currently 6x tests!): +``` +nix-build nixos/tests/chromium.nix +``` + +A single test can be selected, e.g. to test `ungoogled-chromium` (see +`channelMap` in `nixos/tests/chromium.nix` for all available options): +``` +nix-build nixos/tests/chromium.nix -A ungoogled +``` +(Note: Testing Google Chrome requires `export NIXPKGS_ALLOW_UNFREE=1`.) + +For custom builds it's possible to "override" `channelMap`. + ## Backports All updates are considered security critical and should be ported to the stable diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 19930714f0cba..7442d60008544 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -7,7 +7,7 @@ , xdg_utils, yasm, nasm, minizip, libwebp , libusb1, pciutils, nss, re2 -, python2Packages, perl, pkgconfig +, python2Packages, perl, pkg-config , nspr, systemd, kerberos , util-linux, alsaLib , bison, gperf @@ -126,7 +126,7 @@ let nativeBuildInputs = [ llvmPackages.lldClang.bintools - ninja which python2Packages.python perl pkgconfig + ninja which python2Packages.python perl pkg-config python2Packages.ply python2Packages.jinja2 nodejs gnutar python2Packages.setuptools ]; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index eb5baf1902e0c..75653d312b422 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,26 +1,26 @@ { "stable": { - "version": "87.0.4280.141", - "sha256": "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l", - "sha256bin64": "0wq3yi0qyxzcid390w5rh4xjq92fjajvlifjl70g6sqnbk6vgvdp", + "version": "88.0.4324.96", + "sha256": "17y7x50cx2d3bbz0hna25j8pyqsk0914266mpvrpk5am52xwb5c9", + "sha256bin64": "09210781s9y49l6qkbd1v8w52741rmhxz6cc6qsldnqpm5mwlgsc", "deps": { "gn": { - "version": "2020-09-09", + "version": "2020-11-05", "url": "https://gn.googlesource.com/gn", - "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", - "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", + "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" } }, "chromedriver": { - "version": "87.0.4280.88", - "sha256_linux": "1insh1imi25sj4hdkbll5rzwnag8wvfxv4ckshpq8akl8r13p6lj", - "sha256_darwin": "048hsqp6575r980m769lzznvxypmfcwn89f1d3ik751ymzmb5r78" + "version": "88.0.4324.27", + "sha256_linux": "1vx1llg0x6903ggqa345iswd63y9c24184zv784q01zqxqwn0g8p", + "sha256_darwin": "0x1s6crfwkcn86w6p8g4vmx5raqlr41pjr4h2dbwppgrc0nx1p14" } }, "beta": { - "version": "88.0.4324.87", - "sha256": "0pfrx8b2rmrxx5dfv4kc1ggrgi7kj7gbxrzqzd7rsvjpasyidbxg", - "sha256bin64": "07xl02zg5pi89l6dqrbqx2ibl8pm9v6njqfl8p4l2hwsb881hx8g", + "version": "88.0.4324.96", + "sha256": "17y7x50cx2d3bbz0hna25j8pyqsk0914266mpvrpk5am52xwb5c9", + "sha256bin64": "1v7bpidqs8y3k7kzfp52q8xsdc515mnf9arfw9pp5bsp79fl3rik", "deps": { "gn": { "version": "2020-11-05", diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 6e4c7d1dade00..12adbc0a9b79e 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib -, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkgconfig, libev +, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkg-config, libev , gpm, libidn, tre, expat , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ++ lib.optional enablePerl perl ; - nativeBuildInputs = [ autoreconfHook gettext pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gettext pkg-config ]; configureFlags = [ "--enable-finger" diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 53a32e09f8781..6b3b63512307b 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script +{ lib, stdenv, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils , gobject-introspection, wrapGAppsHook, gnome3 }: @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index cff93e196a649..338ceaa43442d 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -11,7 +11,7 @@ , meson , ninja , pantheon -, pkgconfig +, pkg-config , python3 , webkitgtk , wrapGAppsHook @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index c1d40fa770ffa..f39ae2f166912 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch -, cmake, extra-cmake-modules, pkgconfig, qmake +, cmake, extra-cmake-modules, pkg-config, qmake , libpthreadstubs, libxcb, libXdmcp , qtsvg, qttools, qtwebengine, qtx11extras , qtwayland, wrapQtAppsHook @@ -41,7 +41,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules - pkgconfig + pkg-config qmake qttools wrapQtAppsHook diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index db9f46c63ef7c..ec57bcfae184b 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, gpm, openssl, pkgconfig, libev # Misc. +, gpm, openssl, pkg-config, libev # Misc. , libpng, libjpeg, libtiff, librsvg # graphic formats , bzip2, zlib, xz # Transfer encodings , enableFB ? true @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ++ optionals enableX11 [ libX11 libXau libXt ] ++ optional enableDirectFB [ directfb ]; - nativeBuildInputs = [ pkgconfig bzip2 ]; + nativeBuildInputs = [ pkg-config bzip2 ]; configureFlags = [ "--with-ssl" ] ++ lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics" diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index ca6d4335785ef..3362948e98abd 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -2,7 +2,7 @@ , fetchurl , cmake , ninja -, pkgconfig +, pkg-config , intltool , vala , wrapGAppsHook @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cmake intltool ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix index 00e70431abd25..db4940093b309 100644 --- a/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook # Buildtime dependencies. -, check, pkgconfig, xxd +, check, pkg-config, xxd # Runtime dependencies. , curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { makeWrapper perl perlPackages.HTMLParser - pkgconfig + pkg-config xxd ] ++ optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook diff --git a/pkgs/applications/networking/browsers/netsurf/libcss.nix b/pkgs/applications/networking/browsers/netsurf/libcss.nix index b09701fc3678e..be8adaa1568ba 100644 --- a/pkgs/applications/networking/browsers/netsurf/libcss.nix +++ b/pkgs/applications/networking/browsers/netsurf/libcss.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl +{ lib, stdenv, fetchurl, pkg-config, perl , buildsystem , libparserutils , libwapcaplet @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl libparserutils diff --git a/pkgs/applications/networking/browsers/netsurf/libdom.nix b/pkgs/applications/networking/browsers/netsurf/libdom.nix index 5bb6280143742..4c7224f2263c2 100644 --- a/pkgs/applications/networking/browsers/netsurf/libdom.nix +++ b/pkgs/applications/networking/browsers/netsurf/libdom.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, expat +{ lib, stdenv, fetchurl, pkg-config, expat , buildsystem , libparserutils , libwapcaplet @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ expat libhubbub diff --git a/pkgs/applications/networking/browsers/netsurf/libhubbub.nix b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix index 3a1a29e743c02..9fd04904c8e99 100644 --- a/pkgs/applications/networking/browsers/netsurf/libhubbub.nix +++ b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl +{ lib, stdenv, fetchurl, pkg-config, perl , buildsystem , libparserutils }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl libparserutils diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index f25ccf9635421..24790c477d4ed 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnsfb.nix b/pkgs/applications/networking/browsers/netsurf/libnsfb.nix index cb3a759acb858..d093df4662981 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsfb.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsfb.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , uilib, SDL , buildsystem }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 032d886085fbc..582bcc84e4f1a 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnslog.nix b/pkgs/applications/networking/browsers/netsurf/libnslog.nix index eba4952d7fc07..7189f1c591b33 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnslog.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnslog.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, bison, flex +{ lib, stdenv, fetchurl, pkg-config, bison, flex , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A="; }; - nativeBuildInputs = [ pkgconfig bison flex ]; + nativeBuildInputs = [ pkg-config bison flex ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnspsl.nix b/pkgs/applications/networking/browsers/netsurf/libnspsl.nix index bfbd611000c84..01e3e401a7878 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnspsl.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnspsl.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix index 56e2e048b6767..b0d954a00d4f8 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index 66a2dbcf437f3..1439978843362 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gperf +{ lib, stdenv, fetchurl, pkg-config, gperf , buildsystem , libdom , libhubbub @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E="; }; - nativeBuildInputs = [ pkgconfig gperf ]; + nativeBuildInputs = [ pkg-config gperf ]; buildInputs = [ libdom libhubbub diff --git a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix index 38680da1bcf31..c7362b998beb2 100644 --- a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix +++ b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , buildsystem }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 5ab7cb8d93b3f..26cbc92adace7 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit -, pkgconfig, wrapGAppsHook +, pkg-config, wrapGAppsHook , glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk , xorg, dmenu, findutils, gnused, coreutils , patches ? null @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0pjsv2q8c74sdmqsalym8wa2lv55lj4pd36miam5wd12769xw68m"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ glib gcr glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ]; inherit patches; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 705b9ec7f7086..816b986f8835b 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libsoup, webkitgtk, gtk3, glib-networking +{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk, gtk3, glib-networking , gsettings-desktop-schemas, wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf"; }; - nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; + nativeBuildInputs = [ wrapGAppsHook pkg-config ]; buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix index 9ea122fc7f6a6..d9e997f514b62 100644 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, makeDesktopItem, pkgconfig, makeWrapper +{ stdenv, lib, fetchgit, makeDesktopItem, pkg-config, makeWrapper # Build , python2, autoconf213, yasm, perl , unzip, gnome2, gnum4 @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gnum4 makeWrapper perl pkgconfig python2 + gnum4 makeWrapper perl pkg-config python2 ]; buildInputs = [ diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 60be1d000b3d2..c6f835351061d 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atlantis"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "0xxg48f28ac7x6kap6w1hgsimdc604ivkck4dx7p5p7xd3s7gld5"; + sha256 = "sha256-1sak6CaqFhiBIoaa7kERXLHsgn24oMgBlOJaQDuF61E="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index ee3428ae468f7..4271187cc6047 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxcd"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "16jq6ygm7and4fixh8f7jjv45vgjmyy8wghwnkhwb0140j6lj3ym"; + sha256 = "sha256-A5sEv8d6T0tvhD5UzZ2h2cymtXSO2h68pnD8MGg+Dfo="; }; - vendorSha256 = "1909czaa0q03xh1qvg3f2qzwfwlqyc0akg2c98wd7qrnk1yzzdxy"; + vendorSha256 = "sha256-eh5oUOLgZLIODL58WI1trXerHDWrIiclkrv/w0lvzL4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 4f1f57e45b7fb..896c04d6879e5 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "007i6kb80142v19w2dm3667sskcvdp1ilg3q3f9gjgr9c5nrg1m2"; + sha256 = "sha256-/go8V1EjY/iL3csoNpPyeWORvWCf0WnnaSOgiZ8UFQ8="; }; - vendorSha256 = "01v4x2mk5jglnigq0iic52f84vzx56zh46i7v2wlq8ninj8y1k0x"; + vendorSha256 = "sha256-GEU0Q2Elhiel20xvup+i1DSXCjQdA9s7cWykcbKR5KA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 2516370430e36..2073916ffe175 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.135.0"; + version = "0.137.0"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "1ky9mh5n6n84g77ax1dn1cisgxjwyrhnapaikyj4q53zcbyai3ng"; + sha256 = "sha256-HrVQS09lllUC4HClWahMV72j2TiQnzEUkV16YKm6984="; }; - vendorSha256 = "0dycngvk4nymcrkn6pn2q2h2zfvhc69m1zs2pspl58sa0mkakk2p"; + vendorSha256 = "sha256-dL36mcYCs92USf18BMB6vXd+qLsk2BYmAEm1bwx+o5k="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 21a9608db2c20..15ccd065e2f51 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "0a9f6745f17sws7fyhz0d8wnriv69d6nrci9j5nhysnzg97ky1np"; + sha256 = "sha256-CvepOpAI40eTS5p5gjtbzahn0tX/z4CId1DDqlaMSMw="; }; - vendorSha256 = "04csmw5zpansb30amr3i6vlwxc3z38q4g69cklh44cr37glm04sm"; + vendorSha256 = "sha256-VRNQ6TsjM0IgnSyZRzAaf7DO6TZx5KrAWNqq+wuvmhE="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 5d293df9157cf..5f136fef80750 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "1m97hszmw0hfzj3jvd1is7fa3mpqkm7jbq3ik337rb9yq1f0gasv"; + sha256 = "sha256-9mQYJvZU/Ra+LyzfDbWGfopkdGBD7DpS9/yvRvGHDKg="; }; - vendorSha256 = "0ividxxmil69vpvyjlgyzb2jzipmh9rpvk19kv7266d29ky3q7s6"; + vendorSha256 = "sha256-7LQY32hNXLxg/IUBbzzgb67yrbPGLCTNtmNvjE9tUno="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 1f1eb3e8548fe..d7fc1cb22429a 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "2.1.149"; + version = "2.1.155"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "0jgny09wpfab8mkxkhv9swp1baqx3lxsx75a5i78cypkj6xadc69"; + sha256 = "sha256-kwcmZSOA26XuSgNSHitGaMohalnLobabXf4z3ybSJtk="; }; - vendorSha256 = "1fswrf14nwjm0z8qqgdx236w7w1m451lyfinhx9pyp89fw2h5mv6"; + vendorSha256 = "sha256-ZtcCBXcJXX9ThzY6T0MhNfDDzRC9PYzRB1VyS4LLXLs="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index f3037cf8a3630..98ffcd6fe6705 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -44,7 +44,7 @@ let homepage = "https://github.com/kubernetes/kops"; changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases"; license = licenses.asl20; - maintainers = with maintainers; [ offline zimbatm kampka ]; + maintainers = with maintainers; [ offline zimbatm ]; platforms = platforms.unix; }; } // attrs'; diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index 712761eeef29a..ae9380c5139a0 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.37.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "1b1sgwax67pazcs1lly3h3bb7ww91lcd3nr0w3r3f46d1c6iy8mn"; + sha256 = "sha256-4SGCYkx9U6XNUrJfVPgNEhFA75CF8GOrtS4BSm6f7mM="; }; - vendorSha256 = "0dn6nryf3vn7r0xna02va4wbgkq0z6x8sj6g2mskfywrk0mfhadv"; + vendorSha256 = "sha256-y/l9k3oTrN+9OGgyiVzCyYi+6lJpcKaEygirytbn9aI="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index a97bf509fe46c..f38e3135ecb43 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: let - k3sVersion = "1.19.4-k3s1"; + k3sVersion = "1.20.0-k3s2"; in buildGoModule rec { pname = "kube3d"; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index ed00fb231a650..28f7b540722e0 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "nerdctl"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "AkihiroSuda"; repo = pname; rev = "v${version}"; - sha256 = "0vjcbvd5yrasw97hd5mrn6cdjvfv2r03z7g1wczlszlcs8gr6nxw"; + sha256 = "sha256-lSvYiTh67gK9kJls7VsayV8T3H6RzFEEKe49BOWnUBw="; }; - vendorSha256 = "181lp9l4i0qpiqm8wbxa4ldi1j5bm3ygmanz1xh3mkjanl0pwqjr"; + vendorSha256 = "sha256-qywiaNoO3pI7sfyPbwWR8BLd86RvJ2xSWwCJUsm3RkM="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/spacegun/default.nix b/pkgs/applications/networking/cluster/spacegun/default.nix index 2180d8d304890..64623f88ddaae 100644 --- a/pkgs/applications/networking/cluster/spacegun/default.nix +++ b/pkgs/applications/networking/cluster/spacegun/default.nix @@ -21,7 +21,7 @@ nodePackages."${packageName}".override { meta = with lib; { description = "Version controlled multi-cluster deployment manager for kubernetes"; - maintainers = with maintainers; [ kampka ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix index 4833a96778848..2bf7675875284 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix @@ -20,6 +20,8 @@ buildGoModule rec { # if the versions are not provided via file paths. postInstall = "mv $out/bin/${pname}{,_v${version}}"; + passthru.provider-source-address = "registry.terraform.io/scottwinkler/shell"; + meta = with lib; { inherit (src.meta) homepage; description = "Terraform provider for executing shell commands and saving output to state file"; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 1c315447254c3..d0db8cc10b953 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,5 +1,5 @@ { autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb -, libpcap, libtins, libtool, lzma, openssl, pkgconfig, lib, stdenv, tcpdump, wireshark-cli +, libpcap, libtins, libtool, lzma, openssl, pkg-config, lib, stdenv, tcpdump, wireshark-cli }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; # cbor-diag, cddl and wireshark-cli are only used for tests. - nativeBuildInputs = [ autoconf automake libtool pkgconfig cbor-diag cddl wireshark-cli ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config cbor-diag cddl wireshark-cli ]; buildInputs = [ boost libpcap diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 5ec94c819a628..57b39383e97da 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -1,6 +1,6 @@ { lib, stdenv , substituteAll -, pkgconfig +, pkg-config , fetchurl , python3 , dropbox @@ -35,7 +35,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection gdk-pixbuf # only for build, the install command also wants to use GTK through introspection diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index 30a25dc9f70d3..1dfd1f62fb013 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "08q4yjfbwlldirf3j5db18l8kn6sf288wd364s50jlcx2ka8w50j"; + sha256 = "sha256-UZzpecW4vW1JYUDCcwDIJXCGjw80fgZC4wvCh0DdE98="; }; - vendorSha256 = "0qp8n7z3vcsbc6safp7i18i0i3r4hy4nidzwl85i981sg12vcg6b"; + vendorSha256 = "sha256-5oVr1qazTzsSNVLvcAsAN8UyrJOeqLjSVinImLOyJlk="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 3d1fc19113c6e..a2d12124dbf15 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, olm, makeDesktopItem }: +{ lib +, stdenv +, substituteAll +, buildGoModule +, fetchFromGitHub +, makeDesktopItem +, makeWrapper +, libnotify +, olm +, pulseaudio +, sound-theme-freedesktop +}: buildGoModule rec { pname = "gomuks"; @@ -15,7 +26,13 @@ buildGoModule rec { doCheck = false; - buildInputs = [ olm ]; + buildInputs = [ makeWrapper olm ]; + + # Upstream issue: https://github.com/tulir/gomuks/issues/260 + patches = lib.optional stdenv.isLinux (substituteAll { + src = ./hardcoded_path.patch; + soundTheme = sound-theme-freedesktop; + }); postInstall = '' cp -r ${ @@ -30,13 +47,15 @@ buildGoModule rec { } }/* $out/ substituteAllInPlace $out/share/applications/* + wrapProgram $out/bin/gomuks \ + --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}" ''; meta = with lib; { homepage = "https://maunium.net/go/gomuks/"; description = "A terminal based Matrix client written in Go"; license = licenses.gpl3; - maintainers = with maintainers; [ tilpner emily ]; + maintainers = with maintainers; [ charvp emily ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch b/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch new file mode 100644 index 0000000000000..0e0d4e28b0a1d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch @@ -0,0 +1,13 @@ +diff --git a/lib/notification/notify_linux.go b/lib/notification/notify_linux.go +index f93a95f..da6a61d 100644 +--- a/lib/notification/notify_linux.go ++++ b/lib/notification/notify_linux.go +@@ -32,7 +32,7 @@ func Send(title, text string, critical, sound bool) error { + if critical { + soundName = "complete" + } +- exec.Command("paplay", "/usr/share/sounds/freedesktop/stereo/"+soundName+".oga").Run() ++ exec.Command("paplay", "@soundTheme@/share/sounds/freedesktop/stereo/"+soundName+".oga").Run() + } + return exec.Command("notify-send", args...).Run() + } diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 48adc6f03cfdb..b640d7c5f9a9c 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -57,6 +57,10 @@ mkDerivation rec { qtgraphicaleffects ] ++ lib.optional stdenv.isDarwin qtmacextras; + cmakeFlags = [ + "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 + ]; + meta = with lib; { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index bc26b68d2db7c..5525805c2e4ca 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,46 +1,22 @@ -{ stdenv, lib, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook -, libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify, wrapGAppsHook -}: +{ stdenv, callPackage, fetchurl, lib }: let - version = "0.7.7"; -in stdenv.mkDerivation rec { + mkRambox = opts: callPackage (import ./rambox.nix opts) { }; +in mkRambox rec { pname = "rambox"; - inherit version; + version = "0.7.7"; + src = { x86_64-linux = fetchurl { - url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb"; - sha256 = "0bij4f1bkg94gc8pq7r6yfym5zcvwc2ymdnmnmh5m4h1pa1gk6x9"; + url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-x86_64.AppImage"; + sha256 = "0f82hq0dzcjicdz6lkzj8889y100yqciqrwh8wjjy9pxkhjcdini"; }; i686-linux = fetchurl { - url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb"; - sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd51rfs"; + url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.AppImage"; + sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd52rfs"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; - buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ]; - runtimeDependencies = [ (lib.getLib udev) libnotify ]; - - unpackPhase = "dpkg-deb -x $src ."; - - installPhase = '' - mkdir -p $out/bin - cp -r opt $out - ln -s $out/opt/Rambox/rambox $out/bin - - # provide resources - cp -r usr/share $out - substituteInPlace $out/share/applications/rambox.desktop \ - --replace Exec=/opt/Rambox/rambox Exec=rambox - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : ${xdg_utils}/bin - ) - ''; - meta = with lib; { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; homepage = "https://rambox.pro"; diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index 1df0b597ae24a..7051799a27751 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -1,56 +1,25 @@ -{ autoPatchelfHook, electron_7, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, lib, stdenv, xdg_utils, xorg }: +{ stdenv, callPackage, fetchurl, lib }: let - electron = electron_7; -in -stdenv.mkDerivation rec { + mkRambox = opts: callPackage (import ./rambox.nix opts) { }; +in mkRambox rec { pname = "rambox-pro"; version = "1.4.1"; - dontBuild = true; - dontStrip = true; + desktopName = "Rambox Pro"; - buildInputs = [ nss xorg.libXext xorg.libxkbfile xorg.libXScrnSaver ]; - nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.asar ]; - - src = fetchurl { - url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "1bd4fba3ac8c20fa557ebfb110f6503d36e6c3dba0401d1073529dcae2c2ec1e"; - }; - - installPhase = '' - mkdir -p $out/{bin,resources/dist/renderer/assets/images/app,share/applications,share/icons/hicolor/256x256/apps} - - asar e resources/app.asar $out/resources - - substituteInPlace "$out/resources/dist/electron/main.js" \ - --replace ",isHidden:" ",path:\"$out/bin/ramboxpro\",isHidden:" - - cp $desktopItem/share/applications/* $out/share/applications - cp $out/resources/dist/electron/imgs/256x256.png $out/share/icons/hicolor/256x256/apps/ramboxpro.png - cp $out/resources/dist/electron/imgs/256x256.png $out/resources/dist/renderer/assets/images/app/icon.png - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/ramboxpro \ - --add-flags "$out/resources --without-update" \ - --prefix PATH : ${xdg_utils}/bin - ''; - - desktopItem = makeDesktopItem { - name = "rambox-pro"; - exec = "ramboxpro"; - icon = "ramboxpro"; - type = "Application"; - desktopName = "Rambox Pro"; - categories = "Network;"; - }; + src = { + x86_64-linux = fetchurl { + url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.AppImage"; + sha256 = "18383v3g26hd1czvw06gmjn8bdw2w9c7zb04zkfl6szgakrv26x4"; + }; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); meta = with lib; { description = "Messaging and emailing app that combines common web applications into one"; homepage = "https://rambox.pro"; license = licenses.unfree; maintainers = with maintainers; [ chrisaw ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix new file mode 100644 index 0000000000000..6881ae270f9b6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix @@ -0,0 +1,30 @@ +{ pname, version, src, meta, desktopName ? "Rambox" }: + +{ appimageTools, stdenv, lib, fetchurl, makeDesktopItem }: + +let + name = "${pname}-${version}"; + + desktopItem = (makeDesktopItem { + inherit desktopName; + name = pname; + exec = pname; + icon = pname; + type = "Application"; + categories = "Network;"; + }); + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 rec { + inherit name src meta; + + extraInstallCommands = '' + mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps + # CE uses rambox-<version>, Pro uses rambox + mv $out/bin/rambox* $out/bin/${pname} + install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/rambox*.png $out/share/icons/hicolor/256x256/apps/${pname}.png + install -Dm644 ${desktopItem}/share/applications/* $out/share/applications + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 88cd3dc54c568..19e48bf88d688 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.39.5"; # Please backport all updates to the stable channel. + version = "1.39.6"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1x29ri4jxd1q2wbv5gf26x986x9sms4rxnhj7d5rhm6pz2ihzb2a"; + sha256 = "04fd81vc0dxk0b47crm5zacf4x79pdn483xicygnc1z6v7mnrmgk"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/applications/networking/instant-messengers/tangram/default.nix new file mode 100644 index 0000000000000..e7ca8c320ac60 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/tangram/default.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, fetchFromGitHub, appstream-glib, desktop-file-utils, gdk-pixbuf +, gettext, gjs, glib, gobject-introspection, gsettings-desktop-schemas, gtk3 +, hicolor-icon-theme, meson, ninja, pkg-config, python3, webkitgtk, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "tangram"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "sonnyp"; + repo = "Tangram"; + rev = "v${version}"; + sha256 = "0bhs9s6c2k06i3cx01h2102lgl7g6vxm3k63jkkhh2bwdpc9kvn3"; + fetchSubmodules = true; + }; + + buildInputs = [ gdk-pixbuf gjs glib gsettings-desktop-schemas gtk3 webkitgtk ]; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + gobject-introspection + hicolor-icon-theme + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + dontWrapGApps = true; + + # Fixes https://github.com/NixOS/nixpkgs/issues/31168 + postPatch = '' + chmod +x build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py + ''; + + postFixup = '' + for file in $out/bin/re.sonny.Tangram; do + sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ + -i $file + wrapGApp "$file" + done + ''; + + meta = with lib; { + description = "Run web apps on your desktop"; + homepage = "https://github.com/sonnyp/Tangram"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index a8f947aebf77a..995070066e0fc 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jmeter"; - version = "5.1.1"; + version = "5.4"; src = fetchurl { url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz"; - sha256 = "1bmlxnlcias781mwf3wzpd4935awswbq3w8ijck65bsaw07m2kc4"; + sha256 = "1hbyvh0hrvfvrsf7wpnwqsry5gaziac632s0bwb5zbq6y5b0z41a"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper jre ]; installPhase = '' mkdir $out @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/jmeter.sh --set JAVA_HOME "${jre}" ''; - doInstallCheck = true; + doInstallCheck = false; #NoClassDefFoundError: org/apache/logging/log4j/Level for tests checkInputs = [ coreutils ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { Applications but has since expanded to other test functions. ''; license = licenses.asl20; - maintainers = [ ]; + maintainers = [ maintainers.bryanasdev000 ]; priority = 1; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index e14e5b57461b4..090f53cffb627 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "linssid"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - nativeBuildInputs = [ pkgconfig qmake wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; buildInputs = [ qtbase qtsvg boost qwt ]; patches = [ ./0001-unbundled-qwt.patch ]; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index f0ab5f148f148..f0f3bdb3ff46c 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.7.8"; + version = "1.8.0"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "207fbf813b6da018a5b848e5dc1194b5996daab39adbd873b2cecb0565c105ce"; + sha256 = "BtzYcHN87qH7s3GiBrsDfmuy9v2xdhCeSShu8+T9T3E="; }; nativeBuildInputs = [ @@ -60,7 +60,6 @@ stdenv.mkDerivation rec { cp -ar ./usr/share $out substituteInPlace $out/share/mailspring/resources/app.asar.unpacked/mailsync \ - --replace realpath ${coreutils}/bin/realpath \ --replace dirname ${coreutils}/bin/dirname ln -s $out/share/mailspring/mailspring $out/bin/mailspring diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 5aa0861b4e9ee..01528df856c08 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnutls, gsasl, libidn, Security }: +{ lib, stdenv, fetchurl, pkg-config, gnutls, gsasl, libidn, Security }: with lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1gcxvhin5y0q47svqbf90r5aip0cgywm8sq6m84ygda7km8xylwv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnutls gsasl libidn ] ++ optional stdenv.isDarwin Security; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index fd6a011b1bd62..02131b41ea41c 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo +{ stdenv, lib, fetchurl, autoreconfHook, pkg-config, texinfo , netcat-gnu, gnutls, gsasl, libidn2, Security , withKeyring ? true, libsecret ? null , systemd ? null }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin Security ++ lib.optional withKeyring libsecret; - nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ]; + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; configureFlags = [ "--sysconfdir=/etc" ] ++ lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 368bd716ce675..d93e5fbb9637c 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, qt5 +{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkg-config, qt5 , avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python , rnnoise @@ -25,7 +25,7 @@ let patches = (source.patches or []) ++ [ ./fix-rnnoise-argument.patch ]; - nativeBuildInputs = [ pkgconfig python qt5.qmake ] + nativeBuildInputs = [ pkg-config python qt5.qmake ] ++ (overrides.nativeBuildInputs or [ ]); buildInputs = [ boost protobuf avahi ] diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 5e53e61e0408b..90bbd31a88842 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,5 +1,5 @@ { spellChecking ? true -, lib, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null +, lib, stdenv, fetchurl, pkg-config, gtk3, gtkspell3 ? null , gmime2, gettext, intltool, itstool, libxml2, libnotify, gnutls , makeWrapper, gnupg , gnomeSupport ? true, libsecret, gcr @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55"; }; - nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ]; + nativeBuildInputs = [ pkg-config gettext intltool itstool libxml2 makeWrapper ]; buildInputs = [ gtk3 gmime2 libnotify gnutls ] ++ lib.optional spellChecking gtkspell3 ++ lib.optionals gnomeSupport [ libsecret gcr ]; diff --git a/pkgs/applications/networking/ngadmin/default.nix b/pkgs/applications/networking/ngadmin/default.nix index 718a0970c86b7..8392e05834542 100644 --- a/pkgs/applications/networking/ngadmin/default.nix +++ b/pkgs/applications/networking/ngadmin/default.nix @@ -1,17 +1,28 @@ -{ stdenv, lib, fetchgit, autoreconfHook, readline }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, readline +, withReadline ? true +, enableEmu ? true +, enableSpy ? true +}: stdenv.mkDerivation { pname = "ngadmin"; - version = "unstable-2017-11-17"; + version = "unstable-2020-10-05"; - src = fetchgit { - url = "https://git.netgeek.ovh/c/ngadmin.git"; - rev = "95240c567b5c40129d733cbd76911ba7574e4998"; - sha256 = "052ss82fs8cxk3dqdwlh3r8q9gsm36in2lxdgwj9sljdgwg75c34"; + src = fetchFromGitHub { + owner = "Alkorin"; + repo = "ngadmin"; + rev = "5bf8650ce6d465b8cb1e570548819f0cefe9a87d"; + sha256 = "15vixhwqcpbjdxlaznans9w63kwl29mdkds6spvbv2i7l33qnhq4"; }; - nativeBuildInputs = [ autoreconfHook readline ]; + nativeBuildInputs = + [ autoreconfHook ] + ++ lib.optional withReadline readline; enableParallelBuild = true; + configureFlags = with lib; + optional (!withReadline) "--without-readline" + ++ optional enableEmu "--enable-emu" + ++ optional enableSpy "--enable-spy"; meta = with lib; { description = "Netgear switch (NSDP) administration tool"; diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index d85266f68d6e8..528db85092c08 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -1,7 +1,7 @@ { lib , rustPlatform , fetchFromGitHub -, pkgconfig +, pkg-config , openssl , libredirect , writeText @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0zr5nzmglmvn6xfqgvipbzy8nw5cl3nf7zjmghkqdwi6zj9p9272"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index c1711497f781b..452acc1c7ca34 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite, libsecret }: +{ lib, stdenv, fetchurl, mkDerivation, cmake, pkg-config, qtbase, qtkeychain, sqlite, libsecret }: mkDerivation rec { pname = "owncloud-client"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "1xcklhvbyg34clm9as2rjnjfwxpwq77lmdxj6qc0w7q43viqvlz3"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qtbase qtkeychain sqlite ]; qtWrapperArgs = [ diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 8ca82c5b98f33..c7a05f37ca80f 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4, boost, bzip2, libX11 , fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ] ++ lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 20fb5d4e79c22..b4efd89441ee5 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring -, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib +, makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib , libpulseaudio, libopus, libogg, jansson, libsodium }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig libtool makeWrapper ]; + nativeBuildInputs = [ pkg-config libtool makeWrapper ]; buildInputs = [ adns curl gmp gnutls libextractor libgcrypt libgnurl libidn libmicrohttpd libunistring libxml2 ncurses gettext libsodium diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index e479da0f22a85..dd7f4a7bb60fe 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: +{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }: stdenv.mkDerivation rec { pname = "ncdc"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bdgqd07f026qk6vpbxqsin536znd33931m3b4z44prlm9wd6pyi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ]; meta = with lib; { diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index d83cc6ad184fc..ace528494bc5d 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkg-config , boost, libtorrent-rasterbar, qtbase, qttools, qtsvg , debugSupport ? false , guiSupport ? true, dbus ? null # GUI (disable to run headless) @@ -22,7 +22,7 @@ mkDerivation rec { }; # NOTE: 2018-05-31: CMake is working but it is not officially supported - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 412016e4877a5..85a5217ff69c9 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkg-config, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 , qtmultimedia, qtx11extras, qttools }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libretroshare/src/upnp/UPnPBase.cpp ''; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3 diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 4eeac2db98164..761d18e5fe37f 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, CoreServices, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, CoreServices, Security }: rustPlatform.buildRustPackage rec { pname = "synapse-bt"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0lhhdzq4sadnp2pnbq309d1mb7ggbf24k5ivlchrjhllbim1wmdz"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index ef2b97563bbcd..cbeb6afa40884 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , cmake -, pkgconfig +, pkg-config , vala_0_40 , pantheon , curl @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake vala_0_40 # https://github.com/davidmhewitt/torrential/issues/135 - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 4dbb54faabc2a..809e4528df9a4 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus, +{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, unzip, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ unzip fpc lazarus stdenv.cc libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index fe93657048a91..c89e539770670 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig +{ lib, stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkg-config , intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib, fetchpatch }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs= [ autoconf automake libtool wrapGAppsHook - pkgconfig intltool autoconf-archive + pkg-config intltool autoconf-archive appstream-glib ]; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index ab4fc0908ba87..8cc674b1ea79f 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , openssl , curl , libevent @@ -50,7 +50,7 @@ in stdenv.mkDerivation { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ] ++ lib.optionals enableGTK3 [ wrapGAppsHook ] diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index dfc63fff7e4ec..1d05cafef832c 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkgconfig, python2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2 , boost, db, openssl, geoip, libiconv, miniupnpc , srcOnly, fetchgit }: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { "--with-boost-libdir=${boostPython.out}/lib" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool python2 boostPython db openssl geoip miniupnpc libiconv diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index a81356da252da..04f2efd5b070a 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsaLib, ffmpeg, glib, openssl , pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama , libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland , gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { zlib ] ++ optional stdenv.isLinux systemd; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; doCheck = true; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 61e82726f3537..e7544258acf13 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool +{ stdenv, lib, fetchurl, autoconf, automake, pkg-config, libtool , gtk2, halibut, ncurses, perl, darwin }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { done '' else null; - nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ]; + nativeBuildInputs = [ autoconf automake halibut libtool perl pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ gtk2 ncurses ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index cdbdde31fac77..acf1d7cc2d2f5 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook +{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkg-config, autoreconfHook , enableCredssp ? (!stdenv.isDarwin) } : @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { sha256 = "1s6k1jwd28y38ymk3lfv76ch4arpfwrbdhpkbnwwy3fc4617gb78"; }; - nativeBuildInputs = [pkgconfig autoreconfHook]; + nativeBuildInputs = [pkg-config autoreconfHook]; buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] ++ lib.optional enableCredssp krb5; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 35ce055b3b00c..02f1e7ed3444c 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libX11 , freerdp, libssh, libgcrypt, gnutls , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-n3YfLKCv6CoBeUIv+1yN6RIih63PTFj5zr+dZDJwYdw="; }; - nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 6401393acda5a..dc828b5882585 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh -, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }: +, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: mkDerivation { pname = "x2goclient"; @@ -12,7 +12,7 @@ mkDerivation { }; buildInputs = [ cups libssh libXpm nx-libs openldap openssh - qtbase qtsvg qtx11extras qttools phonon pkgconfig ]; + qtbase qtsvg qtx11extras qttools phonon pkg-config ]; postPatch = '' substituteInPlace Makefile \ diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index faa65379de493..b8677a2683c0e 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: +{ lib, stdenv, fetchFromGitHub, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: let xorgxrdp = stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ let sha256 = "1bhp5x47hajhinvglmc4vxxnpjvfjm6369njb3ghqfr7c5xypvzr"; }; - nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; + nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; buildInputs = [ xorg.xorgserver ]; @@ -45,7 +45,7 @@ let sha256 = "0ynj6pml4f38y8571ryhifza57wfqg4frdrjcwzw3fmryiznfm1z"; }; - nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; + nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ]; diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index 000a2fa0a4a15..1e3f2635f474c 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libtool, gtk3, libpcap, goocanvas2, +{ lib, stdenv, fetchurl, pkg-config, libtool, gtk3, libpcap, goocanvas2, popt, itstool, libxml2 }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0w63vg2q6if3wvy2md66in8b6cdw9q40hny5xy6yrxky58l4kmg7"; }; - nativeBuildInputs = [ itstool pkgconfig (lib.getBin libxml2) ]; + nativeBuildInputs = [ itstool pkg-config (lib.getBin libxml2) ]; buildInputs = [ libtool gtk3 libpcap goocanvas2 popt ]; diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index d3bfc148c42fe..a3c79fd9560b7 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre , openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip, harfbuzz -, pkgconfig }: +, pkg-config }: stdenv.mkDerivation rec { pname = "ettercap"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ cmake flex bison pkgconfig ]; + nativeBuildInputs = [ cmake flex bison pkg-config ]; buildInputs = [ libpcap libnet zlib curl pcre openssl ncurses glib gtk3 atk pango geoip harfbuzz diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 4c31d3746763d..ad1ee0a0b302c 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libpcap, pcre, libnl, zlib, libmicrohttpd +{ lib, stdenv, fetchurl, pkg-config, libpcap, pcre, libnl, zlib, libmicrohttpd , sqlite, protobuf, protobufc, libusb1, libcap, binutils, elfutils , withNetworkManager ? false, glib, networkmanager , withPython ? false, python3 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1n6y6sgqf50bng8n0mhs2r1w0ak14mv654sqay72a78wh2s7ywzg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap pcre libmicrohttpd libnl zlib sqlite protobuf protobufc diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index bd1757dfb484e..55789401c143c 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares +{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib , libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper , withQt ? true, qt5 ? null @@ -34,7 +34,7 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; nativeBuildInputs = [ - bison cmake flex pkgconfig + bison cmake flex pkg-config ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix index f3eae72970fb6..6652e7c986c38 100644 --- a/pkgs/applications/networking/sniproxy/default.nix +++ b/pkgs/applications/networking/sniproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkg-config, udns }: stdenv.mkDerivation rec { pname = "sniproxy"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0isgl2lyq8vz5kkxpgyh1sgjlb6sqqybakr64w2mfh29k5ls8xzm"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext libev pcre udns ]; meta = with lib; { diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 35e89c0d0a009..0e82aa2dd85d4 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, python3, sphinx +, meson, ninja, pkg-config, python3, sphinx , acl, curl, fuse, libselinux, udev, xz, zstd , fuseSupport ? true , selinuxSupport ? true @@ -22,7 +22,7 @@ stdenv.mkDerivation { ++ lib.optionals (fuseSupport) [ fuse ] ++ lib.optionals (selinuxSupport) [ libselinux ] ++ lib.optionals (udevSupport) [ udev ]; - nativeBuildInputs = [ meson ninja pkgconfig python3 sphinx ]; + nativeBuildInputs = [ meson ninja pkg-config python3 sphinx ]; checkInputs = [ glibcLocales rsync ]; postPatch = '' diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 06371f80ffe98..2723f15dd652d 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkgconfig, rsync, +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkg-config, rsync, asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ rsync - cmake lua pkgconfig + cmake lua pkg-config asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt ]; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index a6175af3511d5..ec983276de824 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkg-config , curl, sqlite, libnotify , withSystemd ? stdenv.isLinux, systemd ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "12g2z6c4f65y8cc7vyhk9nlg1mpbsmlsj7ghlny452qhr13m7qpn"; }; - nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkgconfig ]; + nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; buildInputs = [ curl sqlite libnotify diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 1db6943264269..60b24a6619c07 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gd, ncurses, sqlite, check }: +{ lib, stdenv, fetchurl, pkg-config, gd, ncurses, sqlite, check }: stdenv.mkDerivation rec { pname = "vnstat"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { substituteInPlace src/cfg.c --replace /usr/local $out ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gd ncurses sqlite ]; checkInputs = [ check ]; diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 3393dea929e6d..3de0d450de5e9 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 +{ lib, stdenv, fetchFromGitLab, vala, python3, pkg-config, meson, ninja, gtk3 , json-glib, libsoup, webkitgtk, geocode-glib, nix-update-script , libappindicator, desktop-file-utils, appstream, wrapGAppsHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index b8e850211cd7c..557c2865fa1f1 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, pkgconfig +{ lib, stdenv, fetchurl, openssl, pkg-config , withPerl ? false, perl , withPython ? false, python3 , withTcl ? false, tcl @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ optional withPerl perl diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 5edb777ac5190..a72618d935d46 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -119,21 +119,21 @@ in { palaver = zncDerivation rec { name = "znc-palaver-${version}"; - version = "2018-09-18"; + version = "2020-07-18"; module_name = "palaver"; src = fetchFromGitHub { owner = "cocodelabs"; repo = "znc-palaver"; - rev = "c70e8112686f917d39197d582db36c3ea37a4cb6"; - sha256 = "1gjr8yqgpkpcc18rf0zfgil3rcd1ihqk0q9f8rwbfvs5381h3c58"; + rev = "825cb6814d64006ca0f85fec23fa0a8a3a2d14ca"; + sha256 = "zXWPIxhO5Z2L6f+Hf3vIpEh6V4kjUONWAaKexKLECc8="; }; meta = with lib; { description = "Palaver ZNC module"; homepage = "https://github.com/cocodelabs/znc-palaver"; license = licenses.mit; - maintainers = with maintainers; [ kiwi ]; + maintainers = with maintainers; [ kiwi szlend ]; }; }; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index d743baaed7e49..8c1245a99ac8a 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atlassian-cli"; - version = "9.4.0"; + version = "9.5.0"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "091dhjkx7fdn23cj7c4071swncsbmknpvidmmjzhc0355l3p4k2g"; + sha256 = "sha256-EAoydA2lg4K1gTgzn9patNw7pcCdU/OPfaEG1OfEJ18="; }; tools = [ diff --git a/pkgs/applications/office/csv2odf/default.nix b/pkgs/applications/office/csv2odf/default.nix index 7bab06ed4ab9b..436e8d97bdbaf 100644 --- a/pkgs/applications/office/csv2odf/default.nix +++ b/pkgs/applications/office/csv2odf/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { creating reports from databases and other data sources that produce csv files. csv2odf can be combined with cron and shell scripts to automatically generate business reports. - + The output format (fonts, number formatting, etc.) is controlled by a template file that you can design in your office application of choice. ''; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index bd067688fb48b..499aa1e5faf51 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -16,7 +16,7 @@ let homepage = "https://github.com/zadam/trilium"; license = licenses.agpl3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; + maintainers = with maintainers; [ emmanuelrosa dtzWill ]; }; version = "0.43.3"; diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index 5cad364d240b3..4c7b60c125ccb 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pappl"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = pname; rev = "v${version}"; - sha256 = "1cg06v8hxska0hnybnmfda1v4h3ifjir24nx2iqx80kb6jq0hayb"; + sha256 = "sha256-4evyOrPd8zb5y00L8h2t++ayW1S8WQ5P+6MXe6eju68="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 863c2010868c5..8a61230990976 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null; mkDerivation rec { pname = "gqrx"; - version = "2.14.3"; + version = "2.14.4"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "10pmd2jqmw77gybjfzrch6qi8jil1g6nsjzabbd6gnbsq7320axj"; + sha256 = "sha256-mMaxu0jq2GaNLWjLsJQXx+zCxtyiCAZQJJZ8GJtnllQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/applications/radio/klog/default.nix new file mode 100644 index 0000000000000..cb8ac9fe5dd3b --- /dev/null +++ b/pkgs/applications/radio/klog/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }: + +stdenv.mkDerivation rec { + pname = "klog"; + version = "1.3.2"; + + src = fetchurl { + url = "https://download.savannah.nongnu.org/releases/klog/${pname}-${version}.tar.gz"; + sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c"; + }; + + nativeBuildInputs = [ pkg-config wrapQtAppsHook qmake qttools ]; + buildInputs = [ hamlib qtbase qtserialport qtcharts ]; + + qmakeFlags = [ "KLog.pro" ]; + + meta = with stdenv.lib; { + description = "A multiplatform free hamradio logger"; + longDescription = '' + KLog provides QSO management, useful QSL management DX-Cluster client, DXCC management, + ClubLog integration, WSJT-X, DX-Marathon support and much more. + ''; + homepage = "https://www.klog.xyz/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ pulsation ]; + }; +} diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index cbdd29b418db3..24eace7eb9911 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu -, lua, libGLU, libGL, pkgconfig, perl, autoreconfHook +, lua, libGLU, libGL, pkg-config, perl, autoreconfHook }: let @@ -43,7 +43,7 @@ stdenv.mkDerivation { sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU libGL lua perl autoreconfHook ]; diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 2174d38d8b418..b716b0f2f90fc 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2-x11 , pkgconfig , python3 , gfortran , lesstif +{ lib, stdenv, fetchurl, gtk2-x11 , pkg-config , python3 , gfortran , lesstif , cfitsio , getopt , perl , groff , which, darwin, ncurses }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "9faa0b3e674b5ffe5b1aee88027d7401a46ae28cd0b306595300547605d6222a"; }; - nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; + nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index a089bf6534b4b..4cda15e516d4e 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool +{ lib, stdenv, fetchurl, pkg-config, intltool , gtk3, glib, curl, goocanvas2, gpsd , hamlib, wrapGAppsHook }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; }; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; meta = with lib; { diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index c32d671cb05df..33f00979c972f 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "0fpkm75abn0hhdhfyvpfl6n0fr7gvw63xhb4hvwdrglhkf2nxam1"; + sha256 = "sha256-gf+yaXiYQFuO1/nvdP6OOuD4QrRtPAQTwQZAbYNKxUU="; }; patches = [ diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix index 57054cc491ac9..bd92ae01ebb1f 100644 --- a/pkgs/applications/science/astronomy/xearth/default.nix +++ b/pkgs/applications/science/astronomy/xearth/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { longDescription = '' Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space, correctly shaded for the current position of the Sun. - By default, xearth updates the displayed image every five minutes. + By default, xearth updates the displayed image every five minutes. ''; maintainers = [ maintainers.mafo ]; license = "xearth"; diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 305eb158d1363..82331a9496d4b 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, fetchpatch, pkgconfig, freetype, pango, libpng, libtiff +{lib, stdenv, fetchurl, fetchpatch, pkg-config, freetype, pango, libpng, libtiff , giflib, libjpeg, netpbm}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1rzc1alph03j67lrr66499zl0wqndiipmj99nqgvh9xzm1qdb023"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype pango libpng libtiff giflib libjpeg netpbm ]; patches = [ diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index 17d8944128e2d..a2ba038c05991 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libminc, bicpl, itk4, fftwFloat, gsl }: stdenv.mkDerivation rec { pname = "EZminc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ itk4 libminc bicpl fftwFloat gsl ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" diff --git a/pkgs/applications/science/biology/cd-hit/default.nix b/pkgs/applications/science/biology/cd-hit/default.nix index 94012b1c2ff44..bed562abe23ca 100644 --- a/pkgs/applications/science/biology/cd-hit/default.nix +++ b/pkgs/applications/science/biology/cd-hit/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "032nva6iiwmw59gjipm1mv0xlcckhxsf45mc2qbnv19lbis0q22i"; }; - propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick perlPackages.Storable ]; + propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick ]; nativeBuildInputs = [ zlib makeWrapper ]; diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix index b3029f586add4..019370378605b 100644 --- a/pkgs/applications/science/biology/ecopcr/default.nix +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { buildInputs = [ gcc python27 zlib ]; installPhase = '' - mkdir -p $out/bin - cp -v ecoPCR $out/bin - cp -v ecogrep $out/bin - cp -v ecofind $out/bin - cp -v ../tools/ecoPCRFormat.py $out/bin/ecoPCRFormat - chmod a+x $out/bin/ecoPCRFormat + mkdir -p $out/bin + cp -v ecoPCR $out/bin + cp -v ecogrep $out/bin + cp -v ecofind $out/bin + cp -v ../tools/ecoPCRFormat.py $out/bin/ecoPCRFormat + chmod a+x $out/bin/ecoPCRFormat ''; meta = with lib; { diff --git a/pkgs/applications/science/biology/exonerate/default.nix b/pkgs/applications/science/biology/exonerate/default.nix index 9f87d0117df59..f7b6bf6c14cee 100644 --- a/pkgs/applications/science/biology/exonerate/default.nix +++ b/pkgs/applications/science/biology/exonerate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, pkgconfig }: +{ lib, stdenv, fetchurl, glib, pkg-config }: stdenv.mkDerivation rec { version = "2.4.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Generic tool for sequence alignment"; diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index ae327e2c43fd7..d21ef8b3d7a9c 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man/man1 cp minimap2.1 $out/share/man/man1 ''; - + meta = with lib; { description = "A versatile pairwise aligner for genomic and spliced nucleotide sequences"; homepage = "https://lh3.github.io/minimap2"; diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 3dbc39684c2da..154965b15214f 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , automake , autoconf , libtool @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "neuron"; version = "7.5"; - nativeBuildInputs = [ which pkgconfig automake autoconf libtool ]; + nativeBuildInputs = [ which pkg-config automake autoconf libtool ]; buildInputs = [ ncurses readline python mpi iv ]; src = fetchurl { diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index d18ca2e2a4f8b..054fb66dccb24 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.23.9"; + version = "2.24.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "1ygdl590sbcsxpk0qwr0bx163nx51h0545n1xxkbc3pk2r6n51lk"; + sha256 = "sha256-cOkQObzMb222DxjEFxMhiozfRfWR8CwQEsBiFSsnzXs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/pkgs/applications/science/biology/prodigal/default.nix index 70069fe541d19..22883cc522f1a 100644 --- a/pkgs/applications/science/biology/prodigal/default.nix +++ b/pkgs/applications/science/biology/prodigal/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "CC=cc" "INSTALLDIR=$(out)/bin" ]; - + meta = with lib; { description = "Fast, reliable protein-coding gene prediction for prokaryotic genomes"; homepage = "https://github.com/hyattpd/Prodigal"; diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 01c65f4bcff48..2efa39ac489d9 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, rocksdb, rapidjson, pkgconfig, fetchFromGitHub, fetchpatch, zlib }: +{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, fetchpatch, zlib }: stdenv.mkDerivation rec { pname = "sortmerna"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0r91viylzr069jm7kpcgb45kagvf8sqcj5zc1af4arl9sgfs1f3j"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib rocksdb rapidjson ]; cmakeFlags = [ diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index 61b2ea143b8d5..9f88079627e04 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }: +{ lib, stdenv, fetchFromGitHub, zlib, autoreconfHook, pkg-config, perl }: stdenv.mkDerivation rec { pname = "vcftools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx"; }; - buildInputs = [ autoreconfHook pkgconfig zlib perl ]; + buildInputs = [ autoreconfHook pkg-config zlib perl ]; meta = with lib; { description = "A set of tools written in Perl and C++ for working with VCF files, such as those generated by the 1000 Genomes Project"; diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index a1e775135e0f2..f5c6d79e28aa5 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU, libGL, libX11, doxygen }: +{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }: stdenv.mkDerivation rec { name = "avogadro-1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 eigen zlib openbabel libGL libGLU libX11 ]; - nativeBuildInputs = [ cmake pkgconfig doxygen ]; + nativeBuildInputs = [ cmake pkg-config doxygen ]; NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h"; diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 8c5e9e41aaccd..ab16866fe01cb 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, pkgconfig, cmake +{ lib, mkDerivation, fetchFromGitHub, pkg-config, cmake , libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl , libsigrokdecode4dsl, python3, fetchpatch }: @@ -27,7 +27,7 @@ mkDerivation rec { ./qt515.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix index a2fcb9a929d77..8e04d72780ca2 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, autoreconfHook, +{ lib, stdenv, pkg-config, autoreconfHook, glib, libzip, libserialport, check, libusb1, libftdi, systemd, alsaLib, dsview }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { export sourceRoot=$sourceRoot/libsigrok4DSL ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib libzip libserialport libusb1 libftdi systemd check alsaLib diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix index 2bab4b681d3fa..09eed4a67c572 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, autoreconfHook, +{ lib, stdenv, pkg-config, autoreconfHook, glib, check, python3, dsview }: @@ -11,7 +11,7 @@ stdenv.mkDerivation { export sourceRoot=$sourceRoot/libsigrokdecode4DSL ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ python3 glib check diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index 9ef47ae263463..f1c458f40d9f9 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , flex, bison, fig2dev, imagemagick, netpbm, gtk2 -, pkgconfig +, pkg-config }: with lib; @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ flex bison - pkgconfig + pkg-config imagemagick fig2dev netpbm diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 91d6f5e77abba..b25f76800e879 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig +{ mkDerivation, lib, stdenv, fetchpatch, fetchFromGitHub, qmake, pkg-config , qtbase, qtsvg, qttools, qtserialport, boost, libgit2 }: @@ -32,7 +32,7 @@ mkDerivation rec { buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ]; - nativeBuildInputs = [ qmake pkgconfig qttools ]; + nativeBuildInputs = [ qmake pkg-config qttools ]; patches = [(fetchpatch { name = "fix-libgit2-version.patch"; diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index c9a3dcf1aa033..053211f52adee 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }: +{ lib, stdenv, fetchurl, pkg-config, guile, gtk2, flex, gawk, perl }: stdenv.mkDerivation { pname = "geda"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { configureFlags = [ "--disable-update-xdg-database" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile gtk2 flex gawk perl ]; meta = with lib; { diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index a44a892eabebe..94a8f081f69ab 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: +{ lib, stdenv, fetchgit, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: stdenv.mkDerivation { pname = "gerbv"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext libtool automake autoconf cairo gtk2 ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index aeca4326756ed..971891a5b011d 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkgconfig, bzip2, tcl, tk, wrapGAppsHook, judy, xz }: +{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkg-config, bzip2, tcl, tk, wrapGAppsHook, judy, xz }: stdenv.mkDerivation rec { pname = "gtkwave"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ma30jyc94iid3v3m8aw4i2lyiqfxkpsdvdmmaibynk400cbzivl"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ glib gtk3 gperf bzip2 tcl tk judy xz ]; configureFlags = [ diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index c16f6bf122bf7..2c5ee674a23da 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages +{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook , fmt, graphviz, llvmPackages ? null }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { shopt -u extglob ''; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook ] ++ (with python3Packages; [ python pybind11 ]) ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index 6b9f07ee68f19..8e4241b3ea994 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -13,7 +13,7 @@ , libuuid , libzip , opencascade -, pkgconfig +, pkg-config , podofo , python3 , sqlite @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ boost.dev - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/science/electronics/hyp2mat/default.nix b/pkgs/applications/science/electronics/hyp2mat/default.nix index 01d587fc17232..799af4c43086b 100644 --- a/pkgs/applications/science/electronics/hyp2mat/default.nix +++ b/pkgs/applications/science/electronics/hyp2mat/default.nix @@ -7,7 +7,7 @@ , groff , libharu , autoreconfHook -, pkgconfig +, pkg-config , libpng , zlib }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index c2da57d183345..3ed6234b4f86f 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -13,7 +13,7 @@ , curl , openssl , boost -, pkgconfig +, pkg-config , doxygen , pcre , libpthreadstubs @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ] ; - nativeBuildInputs = [ cmake doxygen pkgconfig lndir ]; + nativeBuildInputs = [ cmake doxygen pkg-config lndir ]; buildInputs = [ libGLU diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 47de21739472c..69ff7b2e69f30 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , gtk2 , bison , intltool @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config bison intltool flex diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index f43717389b535..00c830fcd3370 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, cmake, glib, boost, libsigrok +{ mkDerivation, lib, fetchurl, pkg-config, cmake, glib, boost, libsigrok , libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm , pcre, librevisa, python3, qtbase, qtsvg }: @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index 013f5a098bcf7..68322a191787c 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, automake, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, automake, pkg-config , cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn"; }; - nativeBuildInputs = [ autoreconfHook automake pkgconfig ]; + nativeBuildInputs = [ autoreconfHook automake pkg-config ]; hardeningDisable = [ "format" ]; configureFlags = [ diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 26fbadc615954..5052a3715ef4c 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, gtk2, pkgconfig}: +{lib, stdenv, fetchurl, gtk2, pkg-config}: stdenv.mkDerivation rec { name = "xoscope-2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index a147cb305ccc6..59d7315ef4132 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libglade, gtk2, guile, libxml2, perl -, intltool, libtool, pkgconfig }: +, intltool, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "drgeo"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./struct.patch ]; buildInputs = [libglade gtk2 guile libxml2 - perl intltool libtool pkgconfig]; + perl intltool libtool pkg-config]; prebuild = '' cp drgeo.desktop.in drgeo.desktop diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 54842dd4769f2..a2ff8382947b1 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -5,7 +5,7 @@ # - The exact version can be specified through the `version` argument to # the derivation; it defaults to the latest stable version. -{ lib, stdenv, fetchzip, writeText, pkgconfig, gnumake42 +{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses , buildIde ? !(stdenv.isDarwin && lib.versionAtLeast version "8.10") @@ -121,7 +121,7 @@ self = stdenv.mkDerivation { ''; }; - nativeBuildInputs = [ pkgconfig ] ++ optional (!versionAtLeast "8.6") gnumake42; + nativeBuildInputs = [ pkg-config ] ++ optional (!versionAtLeast "8.6") gnumake42; buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if versionAtLeast "8.10" diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 042a4b23566c1..33de2d27dc90b 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "00hmxdlyhn7pwk9jlvc5g0l5z5xqfchjzf5jgn3pkj9xhl8yqq50"; }; - patches = [ + patches = [ (fetchpatch { # https://github.com/msoos/cryptominisat/pull/621 url = "https://github.com/msoos/cryptominisat/commit/11a97003b0bfbfb61ed6c4e640212110d390c28c.patch"; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index fd31a5732e388..b0b3e5e610e64 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, cln, gmp, git, swig, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, cln, gmp, git, swig, pkg-config , readline, libantlr3c, boost, jdk, python3, antlr3_4 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1rhs4pvzaa1wk00czrczp58b2cxfghpsnq534m0l3snnya2958jp"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ gmp git python3.pkgs.toml cln readline swig libantlr3c antlr3_4 boost jdk python3 ]; configureFlags = [ "--enable-language-bindings=c,c++,java" diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index d094019dbe92c..bb10998b2f455 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: +{ lib, pkg-config, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "elan"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-2fYicpoEERwD4OjdpseKQOkDvZlb7NnOZcb6Tu+rQdA="; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl zlib openssl ]; diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 3542dab93824f..8752c4ef59d43 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ocaml, opaline }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ocaml, opaline }: stdenv.mkDerivation rec { pname = "ott"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0l81126i2qkz11fs5yrjdgymnqgjcs5avb7f951h61yh1s68jpnn"; }; - nativeBuildInputs = [ pkgconfig opaline ]; + nativeBuildInputs = [ pkg-config opaline ]; buildInputs = [ ocaml ]; installTargets = "ott.install"; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 4db3c333e97eb..2606b94f4bbb5 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }: +{ lib, stdenv, fetchurl, pkg-config, ncurses, ocamlPackages }: stdenv.mkDerivation rec { pname = "prooftree"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 lablgtk ]); diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index 73fe423673b53..67779b2b5722f 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, smlnj, rsync }: +{ lib, stdenv, fetchurl, pkg-config, smlnj, rsync }: stdenv.mkDerivation rec { pname = "twelf"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0fi1kbs9hrdrm1x4k13angpjasxlyd1gc3ys8ah54i75qbcd9c4i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ smlnj rsync ]; buildPhase = '' diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix index 6eec10e958c23..47e14108e37c7 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix @@ -9,7 +9,7 @@ in sha256 = "19f873ilcdsf50g2v0s2zzmxil1bqncsk8nq99bzy87h0i7khkla"; stripRoot = false; }; - + melee = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip"; sha256 = "0z44pgy10jklsvgpr0kcn4c2mz3hw7nlcmvsy6a6lzpi3dvzf33i"; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index d9fbc626e009a..7cbff99bf474c 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib -, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, blas, lapack +, less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu - pkgconfig bison imake which blas lapack curl tcl tk jdk + pkg-config bison imake which blas lapack curl tcl tk jdk ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix index 65dd05d3d62da..cc8c3514a0b7d 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu/default.nix @@ -9,7 +9,7 @@ , qmake , git , libpng_apng -, pkgconfig +, pkg-config }: mkDerivation rec { @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake git - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index c55e8d9adffa2..4bb9b0ae681d1 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: +{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python }: stdenv.mkDerivation rec { name = "ginac-1.8.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ] ++ lib.optional stdenv.isDarwin gmp; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkg-config python ]; preConfigure = "patchShebangs ginsh"; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 37173f8197851..931e83defdc92 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , fetchpatch , python3 , meson @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { intltool # for libqalculate meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index 9d76ef75d2684..6e9ff90315cd1 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl -, pkgconfig, gtksourceview, pango, gettext, dconf +, pkg-config, gtksourceview, pango, gettext, dconf , makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme , texinfo, ssw, python3 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan"; }; - nativeBuildInputs = [ pkgconfig texinfo python3 ]; + nativeBuildInputs = [ pkg-config texinfo python3 ]; buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl gtksourceview pango gettext makeWrapper gsettings-desktop-schemas hicolor-icon-theme ssw diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index d49285c3e2f04..00d35b491d628 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchurl , autoreconfHook -, pkgconfig +, pkg-config , flint , gmp , python3 @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; patches = [ diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index d7d880df04035..3d80d8c039ef7 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "qalculate-gtk"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ libqalculate gtk3 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index e7cf98c726665..9e0c840364663 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , rofi-unwrapped , libqalculate , glib @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 416f2b957b7b3..8ef1f5189e5b9 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -17,7 +17,7 @@ let inherit sage-src env-locations pynac singular; ecl = maxima-ecl.ecl; linbox = pkgs.linbox.override { withSage = true; }; - pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig + pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; }; }; @@ -56,7 +56,7 @@ let inherit env-locations; inherit python3 singular palp flint pynac pythonEnv maxima-ecl; ecl = maxima-ecl.ecl; - pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig + pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; # The documentation for sage, building it takes a lot of ram. @@ -70,7 +70,7 @@ let inherit python3 pythonEnv; inherit sage-env; inherit pynac singular maxima-ecl; - pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig + pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config three = nodePackages.three; }; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 8c5eac2c06d2e..fad05099a733b 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig +{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkg-config , lib , fetchpatch , autoreconfHook @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison perl - pkgconfig + pkg-config autoreconfHook ]; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index e549fda11623e..460ea1408ecaa 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkgconfig, m4, curl, +{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkg-config, m4, curl, libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0nicpkag18xq0libfqqvs0im22mijpsxzfk272iwdd9l0lmgfvyd"; }; - nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ]; + nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; buildInputs = [ curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index a18131993e51e..cab0fa5ff5c6b 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,6 +1,6 @@ {lib, stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, hwloc, jre, lapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, -lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, +lp_solve, omniorb, sqlite, libatomic_ops, pkg-config, file, gettext, flex, bison, doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }: let @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [autoconf cmake automake libtool gfortran clang gnumake hwloc jre lapack blas hdf5 expat ncurses readline qt4 webkitgtk which - lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison + lp_solve omniorb sqlite libatomic_ops pkg-config file gettext flex bison doxygen boost openscenegraph gnome2.gtkglext xorg.libXmu git gtk2 makeWrapper]; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index bf21983adcd40..2e34f2d15d251 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake , libjpeg ? null , zlib ? null , libpng ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg zlib libpng eigen libtiff ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index ec22aaa599b27..731230130caf9 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake , eigen, opencv, ceres-solver, cgal, boost, vcg , gmp, mpfr, glog, gflags, libjpeg_turbo }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog gflags libjpeg_turbo ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; preConfigure = '' cmakeFlagsArray=( diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 425d3e1e4b9f5..2f3d57c31e7bf 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5 , libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre -, pkgconfig, python, xxHash, zlib, zstd +, pkg-config, python, xxHash, zlib, zstd , libAfterImage, giflib, libjpeg, libtiff, libpng , Cocoa, OpenGL, noSplash ? false }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0mqvj42nax0bmz8h83jjlwjm3xxjy1n0n10inc8csip9ly28fs64"; }; - nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; + nativeBuildInputs = [ makeWrapper cmake pkg-config ]; buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 lzma gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 0b39c60b28331..9a304272fe9b8 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapGAppsHook ]; - + buildInputs = [ unzip gsettings-desktop-schemas gtk3 ]; - + installPhase = '' mkdir -p $out/bin \ $out/opt/${pname} @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "The Betaflight flight control system configuration tool"; longDescription = '' A crossplatform configuration tool for the Betaflight flight control system. - Various types of aircraft are supported by the tool and by Betaflight, e.g. + Various types of aircraft are supported by the tool and by Betaflight, e.g. quadcopters, hexacopters, octocopters and fixed-wing aircraft. ''; homepage = "https://github.com/betaflight/betaflight/wiki"; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 023a4fc8b6a3c..95c8aebd32d07 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,7 +1,7 @@ { lib, mkDerivation, fetchFromGitHub, SDL2 , qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2 , qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools -, gst_all_1, wayland, pkgconfig +, gst_all_1, wayland, pkg-config }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { enableParallelBuilding = true; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; - nativeBuildInputs = [ pkgconfig qmake qttools ]; + nativeBuildInputs = [ pkg-config qmake qttools ]; preConfigure = '' mkdir build diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix index bd056a2ec21c2..0b4b807a481c4 100644 --- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix +++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, python3, qt5, fetchFromGitHub, wrapPython, pyqt5, pyserial }: - + stdenv.mkDerivation rec { pname = "sumorobot-manager"; version = "0.9.0"; diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index 7fef36d910eec..1225f036a4986 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { -e "s:^\( *\)mutt:\1${mutt}/bin/mutt:" \ $out/bin/grepm ''; - + meta = with lib; { description = "Wrapper for grepmail utilizing mutt"; homepage = "http://www.barsnick.net/sw/grepm.html"; diff --git a/pkgs/applications/snowmachine/default.nix b/pkgs/applications/snowmachine/default.nix new file mode 100644 index 0000000000000..2e05fe0c64390 --- /dev/null +++ b/pkgs/applications/snowmachine/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage, lib, click, colorama, fetchPypi, setuptools-git }: + +buildPythonPackage rec { + pname = "snowmachine"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1v385hhxy2a8vx5p0fhn0di8l4qfpb0a86j6nwsg0aw6ngb09qf1"; + }; + + buildInputs = [ setuptools-git ]; + propagatedBuildInputs = [ click colorama ]; + + doCheck = false; + pythonImportsCheck = [ "snowmachine" ]; + + meta = with lib; { + description = "A python script that will make your terminal snow"; + homepage = "http://github.com/sontek/snowmachine"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 13a67c6236ff8..6049b0e45e6aa 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -8,7 +8,7 @@ , installShellFiles , makeWrapper , ncurses -, pkgconfig +, pkg-config , python3 , expat @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { installShellFiles makeWrapper ncurses - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix index b72b31babe0b3..9e2afe5790754 100644 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/pkgs/applications/terminal-emulators/eterm/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , libX11, libXext, libXaw -, pkgconfig, imlib2, libast }: +, pkg-config, imlib2, libast }: stdenv.mkDerivation rec { pname = "eterm"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXaw imlib2 ]; propagatedBuildInputs = [ libast ]; diff --git a/pkgs/applications/terminal-emulators/evilvte/default.nix b/pkgs/applications/terminal-emulators/evilvte/default.nix index 40e723f168255..06dafe09168a0 100644 --- a/pkgs/applications/terminal-emulators/evilvte/default.nix +++ b/pkgs/applications/terminal-emulators/evilvte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, makeWrapper, pkgconfig, +{ lib, stdenv, fetchgit, makeWrapper, pkg-config, gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg, configH ? "" }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11 - xorg.xorgproto xorg.libXext makeWrapper pkgconfig + xorg.xorgproto xorg.libXext makeWrapper pkg-config ]; buildPhase = '' diff --git a/pkgs/applications/terminal-emulators/havoc/default.nix b/pkgs/applications/terminal-emulators/havoc/default.nix index 61fd5831dc98a..5df53be3b92ab 100644 --- a/pkgs/applications/terminal-emulators/havoc/default.nix +++ b/pkgs/applications/terminal-emulators/havoc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, libxkbcommon, wayland, wayland-protocols }: +, pkg-config, libxkbcommon, wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1g05r9j6srwz1krqvzckx80jn8fm48rkb4xp68953gy9yp2skg3k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxkbcommon wayland wayland-protocols ]; dontConfigure = true; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index fbafa1c6bc92f..91d7b48738e25 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, substituteAll, fetchFromGitHub, python3Packages, libunistring, - harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, + harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, lcms2, @@ -52,7 +52,7 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - pkgconfig sphinx ncurses + pkg-config sphinx ncurses installShellFiles ] ++ lib.optionals stdenv.isDarwin [ imagemagick diff --git a/pkgs/applications/terminal-emulators/lilyterm/default.nix b/pkgs/applications/terminal-emulators/lilyterm/default.nix index 9822b180b232b..9e2d2a67b440d 100644 --- a/pkgs/applications/terminal-emulators/lilyterm/default.nix +++ b/pkgs/applications/terminal-emulators/lilyterm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitHub -, pkgconfig +, pkg-config , autoconf, automake, intltool, gettext , gtk, vte , flavour ? "stable" @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { inherit (stuff) src version; - nativeBuildInputs = [ pkgconfig autoconf automake intltool gettext ]; + nativeBuildInputs = [ pkg-config autoconf automake intltool gettext ]; buildInputs = [ gtk vte ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/applications/terminal-emulators/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix index 0b992cd26895c..a62db90c9e011 100644 --- a/pkgs/applications/terminal-emulators/lxterminal/default.nix +++ b/pkgs/applications/terminal-emulators/lxterminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte, wrapGAppsHook +{ lib, stdenv, fetchurl, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - automake autoconf intltool pkgconfig wrapGAppsHook + automake autoconf intltool pkg-config wrapGAppsHook libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 9c01430d6dfc9..94629314341de 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, autoconf, makeDesktopItem +{ stdenv, lib, fetchFromGitHub, pkg-config, autoconf, makeDesktopItem , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1hh196kz2n3asv8r8r2bdk5b2w93zq7rw4880ciiq1554h0ib7fj"; }; - nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config autoconf wrapGAppsHook ]; buildInputs = [ libX11 gdk-pixbuf.dev diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index e273e96cbedf6..d46ff802239ce 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE -, freetype, pkgconfig, which }: +, freetype, pkg-config, which }: stdenv.mkDerivation { name = "mrxvt-0.5.4"; buildInputs = - [ libX11 libXft libXi xorgproto libSM libICE freetype pkgconfig which ]; + [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; configureFlags = [ "--with-x" diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index 93c3ab099c96f..fff534aaff1ae 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -1,7 +1,7 @@ { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 -, pkgconfig, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto +, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; buildInputs = [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix index 4b6b4eb8184cc..cb3843cb61ea8 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, perlPackages, pkgconfig, fribidi }: +{ lib, fetchurl, perlPackages, pkg-config, fribidi }: perlPackages.buildPerlPackage rec { pname = "urxvt-bidi"; @@ -9,7 +9,7 @@ perlPackages.buildPerlPackage rec { sha256 = "1w65xbi4mw5acsrpv3phyzv82ghb29kpbb3b1b1gcinlfxl6f61m"; }; - nativeBuildInputs = [ pkgconfig perlPackages.ExtUtilsPkgConfig ]; + nativeBuildInputs = [ pkg-config perlPackages.ExtUtilsPkgConfig ]; buildInputs = [ fribidi ]; postInstall = '' diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index fe1ddf57679e5..82536e4b873a6 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeDesktopItem , libX11, libXt, libXft, libXrender , ncurses, fontconfig, freetype -, pkgconfig, gdk-pixbuf, perl +, pkg-config, gdk-pixbuf, perl , perlSupport ? true , gdkPixbufSupport ? true , unicode3Support ? true @@ -36,7 +36,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXt libXft ncurses # required to build the terminfo file - fontconfig freetype pkgconfig libXrender + fontconfig freetype pkg-config libXrender ] ++ optional perlSupport perl ++ optional gdkPixbufSupport gdk-pixbuf; diff --git a/pkgs/applications/terminal-emulators/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix index 2c89940f76063..0cd4f13e465e8 100644 --- a/pkgs/applications/terminal-emulators/rxvt/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, libtool +, pkg-config, libtool , libX11, libXt, libXpm }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libtool libX11 libXt libXpm ]; configurePhase = '' diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index 6aa1c4b44df43..af56f54a4149f 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , cmake -, pkgconfig +, pkg-config , gtk3 , perl , vte @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos="; }; - nativeBuildInputs = [ cmake perl pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake perl pkg-config makeWrapper ]; buildInputs = [ gtk3 vte pcre2 glib ]; diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 77ec7c7bee77e..4e43bed0a07b6 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses +{ lib, stdenv, fetchurl, pkg-config, writeText, libX11, ncurses , libXft, conf ? null, patches ? [], extraLibs ? []}: with lib; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { substituteInPlace config.mk --replace "-lrt" "" ''; - nativeBuildInputs = [ pkgconfig ncurses ]; + nativeBuildInputs = [ pkg-config ncurses ]; buildInputs = [ libX11 libXft ] ++ extraLibs; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix index c183bc391dee1..9634a3be6b6df 100644 --- a/pkgs/applications/terminal-emulators/st/xst.nix +++ b/pkgs/applications/terminal-emulators/st/xst.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, ncurses, libXext, libXft, fontconfig }: with lib; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "1fplgy30gyrwkjsw3z947327r98i13zd1whwkplpj9fzckhb9vs9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix index 0d8c39a45f544..554d210fbdea3 100644 --- a/pkgs/applications/terminal-emulators/stupidterm/default.nix +++ b/pkgs/applications/terminal-emulators/stupidterm/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, vte, gtk, pcre2 }: stdenv.mkDerivation { pname = "stupidterm"; version = "2019-03-26"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ vte gtk pcre2 ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp"; }; - makeFlags = [ "PKGCONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" "binary=stupidterm" ]; + makeFlags = [ "PKGCONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" "binary=stupidterm" ]; installPhase = '' install -D stupidterm $out/bin/stupidterm diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix index 67724d8ec0f1d..96fd3409dc7ab 100644 --- a/pkgs/applications/terminal-emulators/termite/default.nix +++ b/pkgs/applications/terminal-emulators/termite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: let @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { buildInputs = [ vte-ng gtk3 ncurses pcre2 ]; - nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; + nativeBuildInputs = [ wrapGAppsHook pkg-config ]; outputs = [ "out" "terminfo" ]; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index ee9eac8e26754..80956a5124427 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -4,7 +4,7 @@ , meson , ninja , python3 -, pkgconfig +, pkg-config , dmd , dconf , dbus @@ -39,7 +39,7 @@ stdenv.mkDerivation { dmd meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/terminal-emulators/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix index 99ee326aebf25..528e3f50ea066 100644 --- a/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/pkgs/applications/terminal-emulators/wayst/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, pkgconfig +, pkg-config , freetype , fontconfig , libGL @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL_DIR=\${out}/bin" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fontconfig diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index a8bc41dfa6cde..ba6c9bc8fdf84 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkg-config , makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix , gnused, coreutils, enableDecLocator ? true }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ncurses freetype fontconfig - pkgconfig + pkg-config xorg.libXft xorg.luit makeWrapper diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index 875f9dfa4855f..c185a4fb759b5 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, perl, gperf, bison, groff -, pkgconfig, libXft, pcre +, pkg-config, libXft, pcre , libtomcrypt, libtommath, lz4 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl gperf bison groff libXft pcre libtomcrypt libtommath lz4 diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 831db07ffea79..f48fe4b1ec4ce 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt -, docbook_xsl, pkgconfig, luajit +, docbook_xsl, pkg-config, luajit , coreutils, gnused, groff, docutils , gzip, bzip2, lzip, xz, zstd , python, wrapPython, pygments, markdown @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; + nativeBuildInputs = [ pkg-config ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 0117b6cb3b666..fb3f555cb1399 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -5,7 +5,7 @@ , libssh , cmake , perl -, pkgconfig +, pkg-config , rustPlatform , curl , libiconv @@ -30,7 +30,7 @@ buildRustPackage rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config perl ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index d55ad89ca56d5..c7453aff85bce 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1g2jijx8y34lid9qwa26v4svab5v9ki6gn9vcfiy61dqa964c3l9"; - nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ]; + nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 884eed2e2efb0..b01976f7632ea 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkg-config, openssl, darwin }: with rustPlatform; buildRustPackage rec { pname = "git-ignore"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "sondr3"; repo = pname; rev = "v${version}"; - sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c"; + sha256 = "sha256-bKIBPqGKiS3ey8vH2F4EoleV1H2PTOp+71d/YW3jkT0="; }; - cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0"; + cargoSha256 = "sha256-D1CIITuZSAsKYsK8U0q8HwPsYCyrfkTXZThxufEEkWU="; - nativeBuildInputs = [ pkgconfig installShellFiles ]; + nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index 9bb680a489dcf..9b2853551c2bd 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -2,23 +2,23 @@ , fetchFromGitHub , rustPlatform , Security -, pkgconfig, openssl +, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "1ckfk221ag6yhbqxfz432wpgbhddgzgdsaxhl1ymw90pwpnz717y"; + sha256 = "sha256-//EyGhuE8rMRL03TtECIi0X51/p/GvTqvr2FRQEIqFA="; }; - cargoSha256 = "0zkns037vgy96ybmn80px515ivz6yhj5br5mwbvxgl73va92wd9v"; + cargoSha256 = "sha256-lvxEYjVMJoAFFRG5iVfGwxUeJObIxfEaWokk69l++nI="; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index d7258dd3660c1..90f6ba5ac5ac8 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -15,7 +15,7 @@ , sendEmailSupport , darwin , withLibsecret ? false -, pkgconfig, glib, libsecret +, pkg-config, glib, libsecret , gzip # needed at runtime by gitweb.cgi }: @@ -73,7 +73,7 @@ stdenv.mkDerivation { ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] ++ lib.optionals stdenv.isDarwin [ darwin.Security ] - ++ lib.optionals withLibsecret [ pkgconfig glib libsecret ]; + ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; # required to support pthread_cancel() NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index b9bca127472e2..08bf5eb6ba078 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -4,13 +4,13 @@ with pkgs.lib; stdenv.mkDerivation rec { pname = "gitflow"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "petervanderdoes"; repo = pname; rev = version; - sha256 = "0smwlc1wa4ndvspc9x6f4jwnzr58achysrhhip402j98d7di8hw5"; + sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8="; }; buildInputs = [ pkgs.makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/pkgs/applications/version-management/git-and-tools/gitin/default.nix index c9111ea2c3227..e2aaafea20243 100644 --- a/pkgs/applications/version-management/git-and-tools/gitin/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitin/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , buildGoPackage , fetchFromGitHub -, pkgconfig +, pkg-config , libgit2_0_27 }: @@ -20,7 +20,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgit2_0_27 ]; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index 9c2e4f00ca7a9..ac2cd5d3b4177 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.11.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "mmrTuldU2WDe9t2nC3DYfqwb28uh6qjAaaveR221mjw="; + sha256 = "sha256-NSc/h6cENuXIBwC4ixvZDlERV7b/X0GB4OGzxGEk4YY="; }; - vendorSha256 = "B4RKcKUTdGkonsKhL7NIKzVpZq6XD6cMMWed4wr/Moc="; + vendorSha256 = "sha256-N9swoVltKzdYez1WSoXMLZCvfYSFhVXgPjUfR0+5aAo="; runVend = true; # Tests are trying to access /homeless-shelter diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index f7aae5ba8d27e..041034651894b 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkgconfig, readline +{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline , cmake }: let version = "0.3.2"; @@ -8,7 +8,7 @@ buildGoPackage { inherit version; buildInputs = [ ncurses readline curl ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; goPackagePath = "github.com/rgburke/grv"; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index f907cdac036eb..6ac6cde44a87a 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 -, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig +, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b"; }; - nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; + nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; autoreconfFlags = "-I tools -v"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c16e66c9e8182..acfd91be331bd 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby -, bundlerEnv, pkgconfig +, bundlerEnv, pkg-config # libgit2 + dependencies , libgit2, openssl, zlib, pcre, http-parser }: @@ -50,7 +50,7 @@ in buildGoModule rec { }; buildFlags = [ "-tags=static,system_libgit2" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index ba359bc9779c5..51fc538261d14 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - # Needed to get openssl-sys to use pkgconfig. + # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; meta = with lib; { diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 048ad4036652b..c4a86b8d4be98 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre +{ lib, stdenv, fetchurl, SDL2, ftgl, pkg-config, libpng, libjpeg, pcre , SDL2_image, freetype, glew, libGLU, libGL, boost, glm }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL boost glm freetype diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 82513bab9527a..d78023d8468f1 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: +{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkg-config, graphviz }: let version = "1.0-mtn-head"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { patches = [ ./parallel-building.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qt4 qmake4Hook graphviz ]; qmakeFlags = [ "guitone.pro" ]; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index f4e21dd4149d2..5c260cc8e6cf1 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib +{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib , libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw }: # We need an old version of Graphviz for format compatibility reasons. # This version is vulnerable, but monotone-viz will never feed it bad input. let graphviz_2_0 = import ./graphviz-2.0.nix { - inherit lib stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw + inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp; }; in let inherit (gnome2) libgnomecanvas; in @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "1.0.2"; pname = "monotone-viz"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz"; diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index c72256807dd88..8ecc5bf9ac8f0 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw +{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw , yacc, libtool, fontconfig, pango, gd, libwebp }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index c8c2d5b048b91..f20d827dc5ff0 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, boost, zlib, botan, libidn -, lua, pcre, sqlite, perl, pkgconfig, expect +, lua, pcre, sqlite, perl, pkg-config, expect , bzip2, gmp, openssl }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost zlib botan libidn lua pcre sqlite expect openssl gmp bzip2 ]; diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index 8dd10fff89a48..782f001610682 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "vishen"; repo = pname; rev = "v${version}"; - sha256 = "0frvj1van1qn7hi96m0l7pzm4jf0v49xl4r4fi2lh1yqzgsgzy9f"; + sha256 = "sha256-OCykgy49RZL2aAE0OeHxj8zkFnr32sIYjtoFMwESqLg="; }; - vendorSha256 = "0vgbmgk07kqmhhmcssy1ibr2hzk07hf32kkdyj2b9jqj9sb49p49"; + vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index d47b5fddf88c0..e6e971ad43873 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ]; - + # workaround https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 946e109c99e0e..388cf328ff511 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1lrr8y0k6609z4gb8cg277rq58sh0bqd2b4mzjlynyjdgp3xskfq"; + sha256 = "sha256-3rougAl0vVH01ulbnfIO2x8OCyofWlvVsvlKjoAD2NE="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix index 26cdbc1f65f7f..b1d1d7783c24d 100644 --- a/pkgs/applications/virtualization/xen/xsa-patches.nix +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -454,7 +454,7 @@ in { }) ]; - # 4.5 + # 4.5 XSA_248_45 = [ (xsaPatch { name = "248-4.5"; diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 4bfe654380549..fbb4a7a5e4908 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libjpeg, libtiff, libpng, freetype , fltk, gtk , libX11, libXext, libICE @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ]; - # A strange type of bug: dbus is not immediately found by pkgconfig + # A strange type of bug: dbus is not immediately found by pkg-config preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)" ''; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 7f6dc3df19286..a526636063e96 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk-pixbuf +{ lib, stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobject-introspection , which, dbus, nettools, git, doxygen @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doxygen imagemagick makeWrapper - pkgconfig + pkg-config xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs asciidoctor diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index dc80b54bc6936..69c9cc1c37cb6 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkg-config }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0f9xmki2hx10k8iisfzc7nm1l31zkf1r06pdgn06ar9w9nizrld9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXinerama libXrandr libXft yacc ]; prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index d58b505ad4cc2..1724a2c9824ca 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkgconfig, xorg +{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg , enableAlsaUtils ? true, alsaUtils, coreutils , enableNetwork ? true, dnsutils, iproute, wirelesstools }: @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "172qkzbi37j6wx81pyqqffi9wxbg3bf8nis7d15ncn1yfd5r4gqh"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; cargoSha256 = "041sd9zm1c3v6iihnwjcya2xg5yxb2y4biyxpjlfblz2srxa15dm"; diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix index 2be20bc6db0be..84380bfc9d861 100644 --- a/pkgs/applications/window-managers/dzen2/default.nix +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }: +{ lib, stdenv, fetchurl, pkg-config, libX11, libXft, libXinerama, libXpm }: stdenv.mkDerivation { name = "dzen2-0.9.5"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXft libXinerama libXpm ]; src = fetchurl { diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index e927db36fdd57..1a87f29f67cd9 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg, gdk-pixbuf, gdk-pixbuf-xlib }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; }; buildInputs = - [ pkgconfig libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; + [ pkg-config libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index 4cc4601d0d443..36a22cb46d761 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , freetype, fribidi , libXext, libXft, libXpm, libXrandr, libXrender, xorgproto , libXinerama @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype fribidi libXext libXft libXpm libXrandr libXrender xorgproto libXinerama imlib2 ]; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index c691bcf59ed95..ae5dad94f2eb6 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -1,5 +1,5 @@ { gestures ? false -, lib, stdenv, fetchurl, pkgconfig +, lib, stdenv, fetchurl, pkg-config , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama , libXpm, libXt, librsvg, libpng, fribidi, perl , libstroke ? null @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo fontconfig freetype libXft libXcursor libXinerama libXpm libXt diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index c4bdcb4ca753c..ad45f01915da4 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,35 +1,38 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr -, withDoc ? stdenv.buildPlatform == stdenv.targetPlatform, asciidoc ? null }: +{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, asciidoc +, xdotool, xorgserver, xsetroot, xterm, runtimeShell +, nixosTests }: # Doc generation is disabled by default when cross compiling because asciidoc -# does not cross compile for now +# dependency is broken when cross compiling for now -assert withDoc -> asciidoc != null; +let + cross = stdenv.buildPlatform != stdenv.targetPlatform; -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "herbstluftwm"; - version = "0.8.3"; + version = "0.9.1"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; - sha256 = "1qmb4pjf2f6g0dvcg11cw9njwmxblhqzd70ai8qnlgqw1iz3nkm1"; + sha256 = "0r4qaklv97qcq8p0pnz4f2zqg69vfai6c2qi1ydi2kz24xqjf5hy"; }; outputs = [ "out" - ] ++ lib.optionals withDoc [ - "doc" + "doc" # share/doc exists with examples even without generated html documentation + ] ++ lib.optionals (!cross) [ "man" ]; cmakeFlags = [ "-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc" - ] ++ lib.optional (!withDoc) "-DWITH_DOCUMENTATION=OFF"; + ] ++ lib.optional cross "-DWITH_DOCUMENTATION=OFF"; nativeBuildInputs = [ cmake - pkgconfig - ] ++ lib.optional withDoc asciidoc; + pkg-config + python3 + ] ++ lib.optional (!cross) asciidoc; buildInputs = [ libX11 @@ -38,10 +41,50 @@ stdenv.mkDerivation rec { libXrandr ]; - meta = { + patches = [ + ./test-path-environment.patch + ]; + + postPatch = '' + patchShebangs doc/gendoc.py + + # fix /etc/xdg/herbstluftwm paths in documentation and scripts + grep -rlZ /etc/xdg/herbstluftwm share/ doc/ scripts/ | while IFS="" read -r -d "" path; do + substituteInPlace "$path" --replace /etc/xdg/herbstluftwm $out/etc/xdg/herbstluftwm + done + + # fix shebang in generated scripts + substituteInPlace tests/conftest.py --replace "/usr/bin/env bash" ${runtimeShell} + substituteInPlace tests/test_herbstluftwm.py --replace "/usr/bin/env bash" ${runtimeShell} + ''; + + doCheck = true; + + checkInputs = [ + (python3.withPackages (ps: with ps; [ ewmh pytest xlib ])) + xdotool + xorgserver + xsetroot + xterm + python3.pkgs.pytestCheckHook + ]; + + # make the package's module avalaible + preCheck = '' + export PYTHONPATH="$PYTHONPATH:../python" + ''; + + pytestFlagsArray = [ "../tests" ]; + + passthru = { + tests.herbstluftwm = nixosTests.herbstluftwm; + }; + + meta = with lib; { description = "A manual tiling window manager for X"; homepage = "https://herbstluftwm.org/"; - license = lib.licenses.bsd2; - platforms = lib.platforms.linux; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ thibautmarty ]; }; } diff --git a/pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch b/pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch new file mode 100644 index 0000000000000..dab30d8ac71a5 --- /dev/null +++ b/pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch @@ -0,0 +1,10 @@ +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -43,6 +43,7 @@ + self.next_client_id = 0 + self.env = { + 'DISPLAY': display, ++ 'PATH': os.environ['PATH'] + } + self.env = extend_env_with_whitelist(self.env) + self.hlwm_process = hlwm_process diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 89fa7f7ccf15a..2325deaf37cb1 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, - pkgconfig, bmake, + pkg-config, bmake, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, libucl, wayland, wayland-protocols, wlroots, features ? { @@ -23,7 +23,7 @@ stdenv.mkDerivation { sha256 = "0sln1n5f67i3vxkybfi6xhzplb45djqyg272vqkv64m72rmm8875"; }; - nativeBuildInputs = [ pkgconfig bmake ]; + nativeBuildInputs = [ pkg-config bmake ]; buildInputs = [ cairo diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix index 517971905f64c..a2ee445eaf12e 100644 --- a/pkgs/applications/window-managers/i3/easyfocus.nix +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb, xcbutilkeysyms +{ lib, stdenv, fetchFromGitHub, pkg-config, xorgproto, libxcb, xcbutilkeysyms , xorg , i3ipc-glib , glib }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "1db23vzzmp0hnfss1fkd80za6d2pajx7hdwikw50pk95jq0w8wfm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb xcbutilkeysyms xorgproto xorg.libX11.dev i3ipc-glib glib.dev ]; # Makefile has no rule for 'install' diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix index 36b48fa3b07e2..572b12d986c10 100644 --- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgproto, libxcb +{ lib, stdenv, fetchFromGitHub, pkg-config, xorgproto, libxcb , autoreconfHook, json-glib, gtk-doc, which , gobject-introspection }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "01fzvrbnzcwx0vxw29igfpza9zwzp2s7msmzb92v01z0rz0y5m0p"; }; - nativeBuildInputs = [ autoreconfHook which pkgconfig ]; + nativeBuildInputs = [ autoreconfHook which pkg-config ]; buildInputs = [ libxcb json-glib gtk-doc xorgproto gobject-introspection ]; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 7fe48189752c5..6f22070dbc862 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxcb, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxcb, xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile, libjpeg_turbo, xcbutilxrm }: stdenv.mkDerivation rec { - version = "2.12.c.5"; + version = "2.13.c.1"; pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; rev = version; - sha256 = "10h50a6p9ivqjz8hd5pn9l03vz6y9dxdx68bprqssfzdkzqnzaiv"; + sha256 = "sha256-E+ejc26eyCJ0PnMpDgQrouaBIaUH0SWlzB08fQs8lDw="; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11 libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ]; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 3b991d091ce99..03506e889d7fd 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage, +{ fetchurl, lib, stdenv, which, pkg-config, libxcb, xcbutilkeysyms, xcbutilimage, xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "02szjsaz7rqrdkd0r2nwgwa85c4hwfrcskxw7ryk695kmjcfhzv3"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage xcbutilxrm pam libX11 libev cairo libxkbcommon libxkbfile ]; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index d49f8ff6bd6b7..b9dbe6136b407 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,7 +1,7 @@ { lib, stdenv , rustPlatform , fetchFromGitHub -, pkgconfig +, pkg-config , makeWrapper , dbus , libpulseaudio @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0qqkcgl9iz4kxl1a2vv2p7vy7wxn970y28jynf3n7hfp16i3liy2"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ dbus libpulseaudio notmuch ]; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 00fd501c80595..935a6c3c23b42 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ fetchurl, lib, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { name = "i3status-2.13"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff"; }; - nativeBuildInputs = [ pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; buildInputs = [ libconfuse yajl alsaLib libpulseaudio libnl ]; makeFlags = [ "all" "PREFIX=$(out)" ]; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 6f6a63eca0972..db6ec29d9e988 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform -, xorg, python3, pkgconfig, cairo, libxkbcommon }: +, xorg, python3, pkg-config, cairo, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "wmfocus"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0rczas6sgcppacz48xx7sarkvc4s2sgcdz6c661d7vcry1y46xms"; - nativeBuildInputs = [ python3 pkgconfig ]; + nativeBuildInputs = [ python3 pkg-config ]; buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; # For now, this is the only available featureset. This is also why the file is diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 510003e52ea9b..3c97c5630b08e 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, gettext +{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, libtool, gettext , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp , libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-Fix-Gettext-Requirement.patch ]; - nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; + nativeBuildInputs = [ pkg-config automake autoconf libtool gettext which ]; buildInputs = [ libX11 diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index 58105ec219b50..d3b685e7dcd79 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: stdenv.mkDerivation { pname = "jwm-settings-manager"; version = "2018-10-19"; - + src = fetchFromGitHub { owner = "Israel-D"; repo = "jwm-settings-manager"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig + pkg-config gettext ]; diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 9496d306bc738..8f684fec620f6 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }: +{ lib, stdenv, fetchFromGitHub, pkg-config, dbus-glib, autoreconfHook, xorg }: stdenv.mkDerivation { pname = "kbdd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "068iqkqxh7928xlmz2pvnykszn9bcq2qgkkiwf37k1vm8fdmgzlj"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ xorg.libX11 dbus-glib ]; meta = { diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 2a4004e554396..88d4b8360a50f 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation { name = "lemonbar-1.4"; - + src = fetchurl { url = "https://github.com/LemonBoy/bar/archive/v1.4.tar.gz"; sha256 = "0fa91vb968zh6fyg97kdaix7irvqjqhpsb6ks0ggcl59lkbkdzbv"; }; - + buildInputs = [ libxcb perl ]; - + prePatch = ''sed -i "s@/usr@$out@" Makefile''; - + meta = with lib; { description = "A lightweight xcb based bar"; homepage = "https://github.com/LemonBoy/bar"; maintainers = [ maintainers.meisternu ]; - license = "Custom"; + license = "Custom"; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index 035fcd44dd37a..51bb3010d3301 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }: +{ lib, stdenv, fetchurl, pkg-config, libmatchbox, libX11, libXext }: stdenv.mkDerivation rec { pname = "matchbox"; version = "1.2"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmatchbox ]; NIX_LDFLAGS = "-lX11 -L${libX11}/lib -lXext -L${libXext}/lib"; diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix index da6b5e2825d64..bf017ae085a67 100644 --- a/pkgs/applications/window-managers/neocomp/default.nix +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -17,7 +17,7 @@ , libXrandr , libXrender , pcre -, pkgconfig +, pkg-config }: let rev = "v0.6-17-g271e784"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { libXrandr libXrender pcre - pkgconfig + pkg-config ]; makeFlags = [ diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index 5d688f5e23533..e59103d7d6d04 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , lua, gettext, which, groff, xmessage, xterm , readline, fontconfig, libX11, libXext, libSM , libXinerama, libXrandr, libXft @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "14swd0yqci8lxn259fkd9w92bgyf4rmjwgvgyqp78wlfix6ai4mv"; }; - nativeBuildInputs = [ pkgconfig makeWrapper groff ]; + nativeBuildInputs = [ pkg-config makeWrapper groff ]; buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM libXinerama libXrandr libXft xlibsWrapper ]; diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 9b58bb1093dd8..5e3392b20025b 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, python3 +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, python3 , libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM , imlib2, pango, libstartup_notification, makeWrapper }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config makeWrapper python3.pkgs.wrapPython ]; diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index 52ca2b710739b..0124261e423f0 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , freetype, fribidi , libSM, libICE, libXt, libXaw, libXmu , libXext, libXft, libXpm, libXrandr @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "oroborus"; version = "2.0.20"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xorgproto libXinerama ]; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 284a12e65f542..709a5b147362d 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python37Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }: +{ lib, stdenv, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: let cairocffi-xcffib = python37Packages.cairocffi.override { withXcffib = true; @@ -31,7 +31,7 @@ python37Packages.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ]; pythonPath = with python37Packages; [ diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 30195ab91471a..472707bf35c09 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl, autoconf, automake +{ lib, stdenv, fetchurl, pkg-config, perl, autoconf, automake , libX11, xorgproto, libXt, libXpm, libXft, libXtst, libXi , libXrandr, fontconfig, freetype, readline }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--enable-history" ]; - nativeBuildInputs = [ pkgconfig autoconf automake ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ perl diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 6598fefaebd28..be2c5bc3d6ec3 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xorg }: +{ lib, stdenv, fetchFromGitHub, pkg-config, xorg }: stdenv.mkDerivation { pname = "spectrwm"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0bf0d25yr0craksamczn2mdy6cjp27l88smihlw9bw4p6a2qhi41"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = with xorg; [ libXrandr libXcursor diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index a4532960619f9..57b81c7831cec 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, scdoc +, meson, ninja, pkg-config, scdoc , wayland, wayland-protocols, cairo, gdk-pixbuf }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1lmqz5bmig90gq2m7lwf02d2g7z4hzf8fhqz78c8vk92c6p4xwbc"; }; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; mesonFlags = [ diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 2b3c51a7340fc..1798c8235d057 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg , meson, ninja, pkg-config, wayland, scdoc , libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { patches = [ ./sway-config-no-nix-store-references.patch ./load-configuration-from-etc.patch + + (substituteAll { + src = ./fix-paths.patch; + inherit swaybg; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/sway/fix-paths.patch b/pkgs/applications/window-managers/sway/fix-paths.patch new file mode 100644 index 0000000000000..c52f65b146b79 --- /dev/null +++ b/pkgs/applications/window-managers/sway/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/sway/config.c ++++ b/sway/config.c +@@ -276,7 +276,7 @@ + + if (!(config->active_bar_modifiers = create_list())) goto cleanup; + +- if (!(config->swaybg_command = strdup("swaybg"))) goto cleanup; ++ if (!(config->swaybg_command = strdup("@swaybg@/bin/swaybg"))) goto cleanup; + + if (!(config->config_chain = create_list())) goto cleanup; + config->current_config_path = NULL; diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 546999e603527..acfbb1ad36b11 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, scdoc +, meson, ninja, pkg-config, scdoc , wayland, wayland-protocols, systemd }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace "version: '1.5'" "version: '${version}'" ''; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols systemd ]; mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ]; diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index e90aaf5efc238..eff8710ebfc04 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, - meson, ninja, pkgconfig, scdoc, + meson, ninja, pkg-config, scdoc, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build ''; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 51e7bf345943d..9b1523421eef8 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, scdoc +, meson, ninja, pkg-config, scdoc , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace "version: '1.4'" "version: '${version}'" ''; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index fe78e1a9ff961..0a80ce70e0321 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -1,5 +1,5 @@ { lib, stdenv -, sway-unwrapped, swaybg +, sway-unwrapped , makeWrapper, symlinkJoin, writeShellScriptBin , withBaseWrapper ? true, extraSessionCommands ? "", dbus , withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3 @@ -42,7 +42,6 @@ in symlinkJoin { ${optionalString withGtkWrapper "gappsWrapperArgsHook"} wrapProgram $out/bin/sway \ - --prefix PATH : "${swaybg}/bin" \ ${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \ ${optionalString (extraOptions != []) "${concatMapStrings (x: " --add-flags " + x) extraOptions}"} ''; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index e7fc397e123c2..c210b39fe181c 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, gtk2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, gtk2 }: stdenv.mkDerivation rec { name = "trayer-1.1.8"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gdk-pixbuf gtk2 ]; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 1b70706d0d3e7..9eea18f79d602 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -1,9 +1,9 @@ -{lib, stdenv, fetchurl, ncurses, pkgconfig, glib, libviper, libpseudo, gpm, +{lib, stdenv, fetchurl, ncurses, pkg-config, glib, libviper, libpseudo, gpm, libvterm}: stdenv.mkDerivation rec { name = "vwm-2.1.3"; - + src = fetchurl { url = "mirror://sourceforge/vwm/${name}.tar.gz"; sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/bin $out/include ''; - - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; - + meta = with lib; { homepage = "http://vwm.sourceforge.net/"; description = "Dynamic window manager for the console"; diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix index 134dd525ce017..f4fea3f434c3c 100644 --- a/pkgs/applications/window-managers/windowlab/default.nix +++ b/pkgs/applications/window-managers/windowlab/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libX11, libXext, libXft }: let version = "1.40"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1fx4jwq4s98p2wpvawsiww7d6568bpjgcjpks61dzfj8p2j32s4d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXft ]; postPatch = diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index 6bb0586ffed70..e56ff2512c104 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libX11, libXext, libXft, libXmu, libXinerama, libXrandr, libXpm , imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "055pqvlkhipyjn7m6bb3fs4zz9rd1ynzl0mmwbhp05ihc3zmh8zj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXft libXmu libXinerama libXrandr libXpm imagemagick libpng libjpeg libexif libtiff libungif libwebp ]; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index cde55e0169858..ced4cad80556e 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }: +{ lib, stdenv, fetchurl, pkg-config, libX11, libXpm, libXext, libXfixes, libXmu }: stdenv.mkDerivation rec { pname = "wmsystemtray"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXpm libXext libXfixes libXmu ]; meta = with lib; { diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index f51dbfbee5ab9..b78b7c015703a 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, pkgconfig, libixp_hg, txt2tags, dash, python, which +{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python, which , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { EOF ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ unzip libixp_hg txt2tags dash python which libX11 libXrender libXext libXinerama libXrandr libXft ]; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index c75a481e19a89..ebabcf196d5b6 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib , desktopSupport ? "gnomeflashback", xorg , gtk2 , gtk3, gnome3, mate @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-panel=${desktopSupport}" ]; diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index c4b4f5cc8c4f4..ec15f7e362758 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkgconfig +{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkg-config , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib , rev, sha256, version, patches ? [] @@ -19,7 +19,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl alsaLib wirelesstools asciidoc libxslt makeWrapper diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 10a331bcc9e78..3be72bd22c3f7 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -172,7 +172,9 @@ in stdenv.mkDerivation (fBuildAttrs // { chmod -R +w $bazelOut find $bazelOut -type l | while read symlink; do - ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink" + if [[ $(readlink "$symlink") == *NIX_BUILD_TOP* ]]; then + ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink" + fi done '' + fBuildAttrs.preConfigure or ""; diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix index dae9ed888c754..440b10044f0fa 100644 --- a/pkgs/build-support/build-dotnet-package/default.nix +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, pkgconfig, mono, dotnetbuildhelpers }: +{ stdenv, lib, makeWrapper, pkg-config, mono, dotnetbuildhelpers }: attrsOrig @ { baseName @@ -19,7 +19,7 @@ attrsOrig @ attrs = { name = "${baseName}-${version}"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono dotnetbuildhelpers diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix index 6ab697c3696fa..15d7b31535803 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, meson, ninja, pkgconfig, glib }: +{ lib, stdenv, meson, ninja, pkg-config, glib }: stdenv.mkDerivation { name = "chrootenv"; src = ./.; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib ]; meta = with lib; { diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 0855c27eff49a..d1d5f8e6c8623 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -65,6 +65,7 @@ let && libcxx == null && !(stdenv.targetPlatform.useLLVM or false) && !(stdenv.targetPlatform.useAndroidPrebuilt or false) + && !(stdenv.targetPlatform.isiOS or false) && gccForLibs != null; # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu diff --git a/pkgs/build-support/dotnetbuildhelpers/default.nix b/pkgs/build-support/dotnetbuildhelpers/default.nix index 809619ed55d93..4348832ac04c7 100644 --- a/pkgs/build-support/dotnetbuildhelpers/default.nix +++ b/pkgs/build-support/dotnetbuildhelpers/default.nix @@ -1,4 +1,4 @@ -{ runCommand, mono, pkgconfig }: +{ runCommand, mono, pkg-config }: runCommand "dotnetbuildhelpers" { preferLocalBuild = true; } @@ -12,7 +12,7 @@ cp -v "$script" "$target"/"$scriptName" chmod 755 "$target"/"$scriptName" patchShebangs "$target"/"$scriptName" - substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config + substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config substituteInPlace "$target"/"$scriptName" --replace monodis ${mono}/bin/monodis done '' diff --git a/pkgs/build-support/fetchbzr/default.nix b/pkgs/build-support/fetchbzr/default.nix index 2cf169de7a527..b7db9e9274da3 100644 --- a/pkgs/build-support/fetchbzr/default.nix +++ b/pkgs/build-support/fetchbzr/default.nix @@ -10,6 +10,6 @@ stdenvNoCC.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = sha256; - + inherit url rev; } diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix index 7ce67453d698b..b5da0f80a31f2 100644 --- a/pkgs/build-support/fetchmtn/default.nix +++ b/pkgs/build-support/fetchmtn/default.nix @@ -4,7 +4,7 @@ # each is an url for sync # selector is mtn selector, like h:org.example.branch -# +# {name ? "mtn-checkout", dbs ? [], sha256 , selector ? "h:" + branch, branch}: diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 89edbd513d506..f853f37fec635 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -122,7 +122,7 @@ rec { pkgs.coreutils pkgs.findutils pkgs.gcc - pkgs.pkgconfig + pkgs.pkg-config ]} export PKG_CONFIG_PATH=${concatMapStringsSep ":" (pkg: "${pkg}/lib/pkgconfig") libraries} gcc \ diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix index 3443846c83cc3..7ba5fe0745005 100644 --- a/pkgs/data/documentation/rnrs/common.nix +++ b/pkgs/data/documentation/rnrs/common.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; - # Tell the builder about the name of the report. + # Tell the builder about the name of the report. reportName = name; builder = ./builder.sh; diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/data/fonts/mno16/default.nix index 1b311d2c25a2a..eeb53904fe110 100644 --- a/pkgs/data/fonts/mno16/default.nix +++ b/pkgs/data/fonts/mno16/default.nix @@ -15,7 +15,7 @@ in fetchzip rec { meta = with lib; { description = "minimalist monospaced font"; - homepage = "https://sev.dev/fonts/mno16"; + homepage = "https://sev.dev/fonts/mno16"; license = licenses.cc0; }; } diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/data/fonts/nerdfonts/shas.nix index e360dd042b12c..4194e57532dce 100644 --- a/pkgs/data/fonts/nerdfonts/shas.nix +++ b/pkgs/data/fonts/nerdfonts/shas.nix @@ -1,52 +1,52 @@ { - "3270" = "1k71zsijasn6013c58pgf52xw3h9gkqdjlsa177wlldz8qxb16xk"; - "Agave" = "0jgm31wvmckb71qc9l0nj3sg4zq2vw67piaxr6h8zkakcl2mysha"; - "AnonymousPro" = "0s3n8rrr9kfqd8gxjxksp7p8bc3q7qhcrpyq8090dksvmbcks6xm"; - "Arimo" = "1k7ldfx6dmy9sigzsvi9qwms510nddw634g8xrn0vwnw6d7infk8"; - "AurulentSansMono" = "0q35948dai8qc7gfvas8sfn5s7b64b2y4f9psz6xslrv7nw8lcaz"; - "BigBlueTerminal" = "0ymw2m2xjsx77brm79aws26icwcf2a1d7q3p3ipsd25g4cgqcd2v"; - "BitstreamVeraSansMono" = "1n2298g1fn8jb1fbvw74289n7nnmjddn7zxh88gnl58pwz8ra5dk"; - "CascadiaCode" = "1q4l5a7b7ab6h1bs5pq734r9pp3fw9b59gdk1g4hyn2w61h0kdcj"; - "CodeNewRoman" = "1mgxawj3pblaxy0y9w0hzlfgipiskmc5p028m82zh1wyaplmh2pa"; - "Cousine" = "0jr0gxrsba3dhchp53vd67qq2pgfnvmvcwbv99l1700p539bcvy1"; - "DaddyTimeMono" = "1n6vwykz084fxgylayizxc210f4ms2ijfws5b2hvl2kqmy2q6jk4"; - "DejaVuSansMono" = "03qfrkzmhnn8dwgx4qhiigbz4dxs3957hydlr0j8vxl89j8c9g1z"; - "DroidSansMono" = "187cbcn4a2whrl8dag1ix6j1v3jgv5z2jdfw1w1z9llm1znvpp7z"; - "FantasqueSansMono" = "147h15k3ni0w6chxkrah2fk4klhdhq8y1d3nbx763h9ia3mnggv6"; - "FiraCode" = "1rx7zrkq0584k6hrh6dx30xrnz5nq379xyw73pfd4gxaxnh9mpi1"; - "FiraMono" = "0f2daidakhmbbd5ph6985rghjmr87k7xzmmmf9n851dxvfyndsgl"; - "Go-Mono" = "1bzh3pgyn87j27kw7x5h02rqzhh21pm6d0zhxd5iqi5qq5mj0nvm"; - "Gohu" = "1rlkprjg9nz1s69s4ancmxii6l907qachl116gngbj8gjv3g1x21"; - "Hack" = "052mav170lwxkgzg3hij4zvnmfwyrddn45gn07a33gpzzicjx1bh"; - "Hasklig" = "0vyb0z0m04pn8477d6a711vjwb3nhvpn5fxfwnz37av9jmz3i9vk"; - "HeavyData" = "065rhq7z52dp211inw3vszwc5zrd5s0w1kmgnrh68bxc0js0xqyb"; - "Hermit" = "1ij9pjr517jxk3dlsrzmnqivsfq5i5ai6pd8hznmrkb3360cn7sm"; - "iA-Writer" = "0clksrxw6xcv5c1pbd8rl2rc3r15iak1qv8v6bn0j2mccjcss64z"; - "IBMPlexMono" = "0xkfkpnkkrvjfiv624l7lpmfji107y7645w6ah47ijyg47yxkmsg"; - "Inconsolata" = "14gbwc0k3d1j496w6pv9kry1pglswzd0armsdb0g1mqgzfdf1ci1"; - "InconsolataGo" = "0c6yhx242d82dalyjas42qniy0jagqs47cfsfarwmzar6zg3lj5m"; - "InconsolataLGC" = "1746nl1rz4hscfgbmd8642wq3z1wizvfjb50y3yyjsc1ixc1f0pd"; - "Iosevka" = "1qqd4xh98vxb99rh2a2qv9gjclilhaw84pyqdpbx225qhvw9xlkb"; - "JetBrainsMono" = "1kc8fyk1aczxkmn8dzv1gy6xfi2jywgahd8np576v2dn8kx16844"; - "Lekton" = "0mny5j9bns9104wg2wmabdw0sl80c7i3dzp4j5mxh8jybx929d3i"; - "LiberationMono" = "19bpm893assmmnfvlvhz8df54c9pr2kfv2b6anlr4g64hliy1c1h"; - "Meslo" = "08zm8nqskhrqkw80wl460zbvsrvs5fp2njlcv867phpqna9hyqzh"; - "Monofur" = "0f5khqgdxi4g0qm5n48r1sk4pd2wlk987d8yxwks2mcsqa6fraqj"; - "Monoid" = "0m7i82jfiwqmi9lhv8lmq2n723ihn0isxi5559478qbdy5b104dd"; - "Mononoki" = "074avnvfl260pcrli4h5bc55yqr4mgd54paf80qcnh101qsz325w"; - "MPlus" = "03mrfhzfmmqjfl7fa81v1ih3fdr3q2k439w6pjbd2zvl806l92yq"; - "Noto" = "1jmycnf4fflijs730vbyj258kajkxv0j42655a7hvpapym7z940z"; - "OpenDyslexic" = "0ma62xg6cy8l4chfhqvm64zzhx3mrzdj6gxwnvx8plqy3j4dn3by"; - "Overpass" = "1xs2z3ch7dd32zb5l1axzd78hyskimqglcjcrb7n4ic85qm55xxm"; - "ProFont" = "0ck4rprj0w29pv3qm4n1zg6cdq76m3kaag0ka4q1qqcnhga67zr7"; - "ProggyClean" = "0sk3gk6zj61nbv94xv6z8y67sr5blg9n079d8srv7bbw9dv96i8g"; - "RobotoMono" = "1nhbr9zc0cz81pdj95rrb56bwdkmmbqmk429nf60j35pkcqmvk8x"; - "ShareTechMono" = "1h79myy0my3jyrvqcrgfdsjqrwwm5fdy2nmzp3ynyi769p7z1dwr"; - "SourceCodePro" = "06cnsdmm84kzjlwwcmhwpj7pyfqinqpmww1c13i21l611fg6hwd7"; - "SpaceMono" = "1xmmf2gdsa3ycl3pgpr3zr919qh702wjvc5k4hsdivvs2lzfdgmk"; - "Terminus" = "0g2ybs225fwxmvwfnanc32jc2lfnag3agmliv1vrb5mxyqzm53gj"; - "Tinos" = "077n4k6yh4qbirfkl02zqn3057kymspr10zcbfkf4ldvifa36pjd"; - "Ubuntu" = "1lzdrgb8vk5dwicxhvkgbain5phf88g3zgv5ya2ihh052xsl3qih"; - "UbuntuMono" = "0wa8ri7f3g8vwd194q812qh8nzplnmhl5ak0yhgilmm44s46ad0h"; - "VictorMono" = "18z92kwggfqwrd5m09yda55hcb4b159278lps6f9hr8icwki6v9q"; + "3270" = "1k71zsijasn6013c58pgf52xw3h9gkqdjlsa177wlldz8qxb16xk"; + "Agave" = "0jgm31wvmckb71qc9l0nj3sg4zq2vw67piaxr6h8zkakcl2mysha"; + "AnonymousPro" = "0s3n8rrr9kfqd8gxjxksp7p8bc3q7qhcrpyq8090dksvmbcks6xm"; + "Arimo" = "1k7ldfx6dmy9sigzsvi9qwms510nddw634g8xrn0vwnw6d7infk8"; + "AurulentSansMono" = "0q35948dai8qc7gfvas8sfn5s7b64b2y4f9psz6xslrv7nw8lcaz"; + "BigBlueTerminal" = "0ymw2m2xjsx77brm79aws26icwcf2a1d7q3p3ipsd25g4cgqcd2v"; + "BitstreamVeraSansMono" = "1n2298g1fn8jb1fbvw74289n7nnmjddn7zxh88gnl58pwz8ra5dk"; + "CascadiaCode" = "1q4l5a7b7ab6h1bs5pq734r9pp3fw9b59gdk1g4hyn2w61h0kdcj"; + "CodeNewRoman" = "1mgxawj3pblaxy0y9w0hzlfgipiskmc5p028m82zh1wyaplmh2pa"; + "Cousine" = "0jr0gxrsba3dhchp53vd67qq2pgfnvmvcwbv99l1700p539bcvy1"; + "DaddyTimeMono" = "1n6vwykz084fxgylayizxc210f4ms2ijfws5b2hvl2kqmy2q6jk4"; + "DejaVuSansMono" = "03qfrkzmhnn8dwgx4qhiigbz4dxs3957hydlr0j8vxl89j8c9g1z"; + "DroidSansMono" = "187cbcn4a2whrl8dag1ix6j1v3jgv5z2jdfw1w1z9llm1znvpp7z"; + "FantasqueSansMono" = "147h15k3ni0w6chxkrah2fk4klhdhq8y1d3nbx763h9ia3mnggv6"; + "FiraCode" = "1rx7zrkq0584k6hrh6dx30xrnz5nq379xyw73pfd4gxaxnh9mpi1"; + "FiraMono" = "0f2daidakhmbbd5ph6985rghjmr87k7xzmmmf9n851dxvfyndsgl"; + "Go-Mono" = "1bzh3pgyn87j27kw7x5h02rqzhh21pm6d0zhxd5iqi5qq5mj0nvm"; + "Gohu" = "1rlkprjg9nz1s69s4ancmxii6l907qachl116gngbj8gjv3g1x21"; + "Hack" = "052mav170lwxkgzg3hij4zvnmfwyrddn45gn07a33gpzzicjx1bh"; + "Hasklig" = "0vyb0z0m04pn8477d6a711vjwb3nhvpn5fxfwnz37av9jmz3i9vk"; + "HeavyData" = "065rhq7z52dp211inw3vszwc5zrd5s0w1kmgnrh68bxc0js0xqyb"; + "Hermit" = "1ij9pjr517jxk3dlsrzmnqivsfq5i5ai6pd8hznmrkb3360cn7sm"; + "iA-Writer" = "0clksrxw6xcv5c1pbd8rl2rc3r15iak1qv8v6bn0j2mccjcss64z"; + "IBMPlexMono" = "0xkfkpnkkrvjfiv624l7lpmfji107y7645w6ah47ijyg47yxkmsg"; + "Inconsolata" = "14gbwc0k3d1j496w6pv9kry1pglswzd0armsdb0g1mqgzfdf1ci1"; + "InconsolataGo" = "0c6yhx242d82dalyjas42qniy0jagqs47cfsfarwmzar6zg3lj5m"; + "InconsolataLGC" = "1746nl1rz4hscfgbmd8642wq3z1wizvfjb50y3yyjsc1ixc1f0pd"; + "Iosevka" = "1qqd4xh98vxb99rh2a2qv9gjclilhaw84pyqdpbx225qhvw9xlkb"; + "JetBrainsMono" = "1kc8fyk1aczxkmn8dzv1gy6xfi2jywgahd8np576v2dn8kx16844"; + "Lekton" = "0mny5j9bns9104wg2wmabdw0sl80c7i3dzp4j5mxh8jybx929d3i"; + "LiberationMono" = "19bpm893assmmnfvlvhz8df54c9pr2kfv2b6anlr4g64hliy1c1h"; + "Meslo" = "08zm8nqskhrqkw80wl460zbvsrvs5fp2njlcv867phpqna9hyqzh"; + "Monofur" = "0f5khqgdxi4g0qm5n48r1sk4pd2wlk987d8yxwks2mcsqa6fraqj"; + "Monoid" = "0m7i82jfiwqmi9lhv8lmq2n723ihn0isxi5559478qbdy5b104dd"; + "Mononoki" = "074avnvfl260pcrli4h5bc55yqr4mgd54paf80qcnh101qsz325w"; + "MPlus" = "03mrfhzfmmqjfl7fa81v1ih3fdr3q2k439w6pjbd2zvl806l92yq"; + "Noto" = "1jmycnf4fflijs730vbyj258kajkxv0j42655a7hvpapym7z940z"; + "OpenDyslexic" = "0ma62xg6cy8l4chfhqvm64zzhx3mrzdj6gxwnvx8plqy3j4dn3by"; + "Overpass" = "1xs2z3ch7dd32zb5l1axzd78hyskimqglcjcrb7n4ic85qm55xxm"; + "ProFont" = "0ck4rprj0w29pv3qm4n1zg6cdq76m3kaag0ka4q1qqcnhga67zr7"; + "ProggyClean" = "0sk3gk6zj61nbv94xv6z8y67sr5blg9n079d8srv7bbw9dv96i8g"; + "RobotoMono" = "1nhbr9zc0cz81pdj95rrb56bwdkmmbqmk429nf60j35pkcqmvk8x"; + "ShareTechMono" = "1h79myy0my3jyrvqcrgfdsjqrwwm5fdy2nmzp3ynyi769p7z1dwr"; + "SourceCodePro" = "06cnsdmm84kzjlwwcmhwpj7pyfqinqpmww1c13i21l611fg6hwd7"; + "SpaceMono" = "1xmmf2gdsa3ycl3pgpr3zr919qh702wjvc5k4hsdivvs2lzfdgmk"; + "Terminus" = "0g2ybs225fwxmvwfnanc32jc2lfnag3agmliv1vrb5mxyqzm53gj"; + "Tinos" = "077n4k6yh4qbirfkl02zqn3057kymspr10zcbfkf4ldvifa36pjd"; + "Ubuntu" = "1lzdrgb8vk5dwicxhvkgbain5phf88g3zgv5ya2ihh052xsl3qih"; + "UbuntuMono" = "0wa8ri7f3g8vwd194q812qh8nzplnmhl5ak0yhgilmm44s46ad0h"; + "VictorMono" = "18z92kwggfqwrd5m09yda55hcb4b159278lps6f9hr8icwki6v9q"; } diff --git a/pkgs/data/fonts/nerdfonts/update.sh b/pkgs/data/fonts/nerdfonts/update.sh index ccfab174dd8f1..b4c4aaa7cf2b7 100755 --- a/pkgs/data/fonts/nerdfonts/update.sh +++ b/pkgs/data/fonts/nerdfonts/update.sh @@ -15,7 +15,7 @@ while read -r name read -r url do - printf '\t"%s" = "%s";\n' "${name%.*}" "$(nix-prefetch-url "$url")" >>"$dirname/shas.nix" + printf ' "%s" = "%s";\n' "${name%.*}" "$(nix-prefetch-url "$url")" >>"$dirname/shas.nix" done < <(jq -r '.assets[] | .name, .browser_download_url' <<<"$latest_release") printf '}\n' >> "$dirname/shas.nix" diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 8c213a2854c47..80a026e88361b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { cairo cinnamon-desktop cinnamon-common - gnome3.libgnomekbd + libgnomekbd gnome3.caribou # things diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix index e4b2a7ac205aa..8222c6ed843ec 100644 --- a/pkgs/desktops/enlightenment/evisum/default.nix +++ b/pkgs/desktops/enlightenment/evisum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "evisum"; - version = "0.5.8"; + version = "0.5.9"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx"; + sha256 = "sha256-ao5b4Mhr+fhY19X1g0gupcU8LayR55/kgHSwhGUAfys="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnustep/default.nix b/pkgs/desktops/gnustep/default.nix index 4f7c13e8e4ae5..abbabd4abf299 100644 --- a/pkgs/desktops/gnustep/default.nix +++ b/pkgs/desktops/gnustep/default.nix @@ -1,21 +1,22 @@ -{ pkgs, newScope, llvmPackages_6 }: +{ newScope +, llvmPackages +, giflib_4_1 +}: let callPackage = newScope self; self = rec { - stdenv = pkgs.clangStdenv; + stdenv = llvmPackages.stdenv; gsmakeDerivation = callPackage ./make/gsmakeDerivation.nix {}; gorm = callPackage ./gorm {}; projectcenter = callPackage ./projectcenter {}; system_preferences = callPackage ./systempreferences {}; - libobjc = callPackage ./libobjc2 { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; + libobjc = callPackage ./libobjc2 {}; make = callPackage ./make {}; back = callPackage ./back {}; - base = callPackage ./base { giflib = pkgs.giflib_4_1; }; + base = callPackage ./base { giflib = giflib_4_1; }; gui = callPackage ./gui {}; gworkspace = callPackage ./gworkspace {}; }; diff --git a/pkgs/desktops/gnustep/projectcenter/default.nix b/pkgs/desktops/gnustep/projectcenter/default.nix index abfdac1e7afb8..afe47c6cef70a 100644 --- a/pkgs/desktops/gnustep/projectcenter/default.nix +++ b/pkgs/desktops/gnustep/projectcenter/default.nix @@ -16,7 +16,7 @@ gsmakeDerivation { # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS) # 2. Framework/PCProjectBuilder.m, locate gmake (similar) propagatedBuildInputs = [ base back gui gnumake gdb gorm ]; - + meta = { description = "GNUstep's integrated development environment"; }; diff --git a/pkgs/desktops/lxde/core/lxsession/default.nix b/pkgs/desktops/lxde/core/lxsession/default.nix new file mode 100644 index 0000000000000..16264522f28f9 --- /dev/null +++ b/pkgs/desktops/lxde/core/lxsession/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, docbook_xml_dtd_412 +, docbook_xsl +, intltool +, libxml2 +, libxslt +, pkg-config +, wrapGAppsHook +, gtk2-x11 +, libX11 +, polkit +, vala +}: + +stdenv.mkDerivation rec { + pname = "lxsession"; + version = "0.5.5"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = "lxsession"; + rev = version; + sha256 = "17sqsx57ymrimm5jfmcyrp7b0nzi41bcvpxsqckmwbhl19g6c17d"; + }; + + patches = [ ./xmlcatalog_patch.patch ]; + + nativeBuildInputs = [ + autoconf + automake + docbook_xml_dtd_412 + docbook_xsl + intltool + libxml2 + libxslt + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gtk2-x11 + libX11 + polkit + vala + ]; + + configureFlags = [ + "--enable-man" + "--disable-buildin-clipboard" + "--disable-buildin-polkit" + "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" + ]; + + preConfigure = "./autogen.sh"; + + meta = with lib; { + description = "Classic LXDE session manager"; + license = licenses.gpl2Plus; + homepage = "https://wiki.lxde.org/en/LXSession"; + maintainers = [ maintainers.shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch b/pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch new file mode 100644 index 0000000000000..644518a6eb2af --- /dev/null +++ b/pkgs/desktops/lxde/core/lxsession/xmlcatalog_patch.patch @@ -0,0 +1,23 @@ +diff --color -ur a/configure.ac b/configure.ac +--- a/configure.ac 2021-01-18 12:39:19.556844678 +0100 ++++ b/configure.ac 2021-01-18 17:26:47.989410501 +0100 +@@ -167,18 +167,7 @@ + AM_GLIB_GNU_GETTEXT + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) + +-if test x"$enable_man" = x"yes"; then +- AC_PATH_PROG([XSLTPROC], [xsltproc]) +- if test -z "$XSLTPROC"; then +- enable_man=no +- fi +- +- dnl check for DocBook DTD and stylesheets in the local catalog. +- JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN], +- [DocBook XML DTD V4.1.2], [], enable_man=no) +- JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], +- [DocBook XSL Stylesheets >= 1.70.1], [], enable_man=no) +-fi ++AC_PATH_PROG([XSLTPROC], [xsltproc]) + + AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test "x$enable_man" != "xno") + diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix index 89c5620f5fced..f2f2c9cf8aa6d 100644 --- a/pkgs/development/compilers/acme/default.nix +++ b/pkgs/development/compilers/acme/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "acme"; - version = "120"; + version = "unstable-2020-12-27"; src = fetchsvn { url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk"; - rev = version; - sha256 = "0w17b8f8bis22m6l5bg8qg8nniy20f8yg2xmzjipblmc39vpv6s2"; + rev = "314"; + sha256 = "08zg26rh19nlif7id91nv0syx5n243ssxhfw0nk2r2bhjm5jrjz1"; }; sourceRoot = "code-0-r${src.rev}/src"; diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index b62b9c95ef6a6..670f7f941936a 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: +{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkg-config, npapi_sdk, bash, bc }: stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0pxijw9v5k4j840jczglx9qyfd57df390g5jdaz3qafblfg0k10n"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; + nativeBuildInputs = [ autoreconfHook pkg-config bc ]; buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; preConfigure = '' diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index df7b6585205a4..1e9fd8505c523 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -11,7 +11,7 @@ , perl , flex , bison -, pkgconfig +, pkg-config , itktcl , incrtcl , tcl @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { perl flex bison - pkgconfig + pkg-config ghcWithPackages ]; diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index bcac4eeb9c463..1d8b0137eb0ca 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, crystal, shards, git, pkg-config, which, linkFarm, fetchFromGitHub, installShellFiles }: { # Some projects do not include a lock file, so you can pass one @@ -61,7 +61,7 @@ stdenv.mkDerivation (mkDerivationArgs // { buildInputs = args.buildInputs or [ ] ++ [ crystal ] ++ lib.optional (format != "crystal") shards; - nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkgconfig which ]; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkg-config which ]; buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([ "runHook preBuild" diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index fa8198fabad9d..b449d66d3ba4d 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -18,7 +18,7 @@ , makeWrapper , openssl , pcre -, pkgconfig +, pkg-config , readline , tzdata , which @@ -134,7 +134,7 @@ let buildInputs = commonBuildInputs extraBuildInputs; - nativeBuildInputs = [ binary makeWrapper which pkgconfig llvmPackages.llvm ]; + nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ]; makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" @@ -158,7 +158,7 @@ let install -Dm755 .build/crystal $bin/bin/crystal wrapProgram $bin/bin/crystal \ - --suffix PATH : ${lib.makeBinPath [ pkgconfig llvmPackages.clang which ]} \ + --suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \ --suffix CRYSTAL_PATH : lib:$lib/crystal \ --suffix CRYSTAL_LIBRARY_PATH : ${ lib.makeLibraryPath (commonBuildInputs extraBuildInputs) diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 0a694e29ee834..c5d33590daad5 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, flex, bison, pkgconfig, which +{ stdenv, lib, fetchgit, flex, bison, pkg-config, which , pythonSupport ? false, python, swig }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0li992wwd7kgy71bikanqky49y4hq3p3vx35p2hvyxy1k0wfy7i8"; }; - nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ]; + nativeBuildInputs = [ flex bison pkg-config which ] ++ lib.optionals pythonSupport [ python swig ]; postPatch = '' patchShebangs pylibfdt/ diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index 2c7edb9c17032..eba5b0f584c04 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, git, - rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, + rlwrap, curl, pkg-config, perl, makeWrapper, tzdata, ncurses, pango, cairo, gtk2, gdk-pixbuf, gtkglext, mesa, xorg, openssl, unzip }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./fuel-dir.patch ]; - buildInputs = with xorg; [ git rlwrap curl pkgconfig perl makeWrapper + buildInputs = with xorg; [ git rlwrap curl pkg-config perl makeWrapper libX11 pango cairo gtk2 gdk-pixbuf gtkglext mesa libXmu libXt libICE libSM openssl unzip ]; diff --git a/pkgs/development/compilers/flux/default.nix b/pkgs/development/compilers/flux/default.nix index c599c9f8baf5d..75386f21f7439 100644 --- a/pkgs/development/compilers/flux/default.nix +++ b/pkgs/development/compilers/flux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "flux"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "11f3ypg0sdq5kj69zgz6kih1yrzgm48r16spyvzwvlswng147410"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "An interface description language used by DirectFB"; diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 0c60403a6beee..53c9aeea3e0ca 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -1,6 +1,6 @@ # Temporarily avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it -{ stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }: +{ stdenv, fetchurl, mono, pkg-config, dotnetbuildhelpers, autoconf, automake, which }: stdenv.mkDerivation rec { pname = "fsharp"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mvmvwwpl4zq0yvgzdizww8l9azvlrc82xm32nz1fi1nw8x5qfqk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono dotnetbuildhelpers autoconf automake which ]; configurePhase = '' diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index 6475deb1026b9..7c1a2fd32ef5c 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -1,6 +1,6 @@ # Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it -{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }: +{ stdenv, fetchurl, pkg-config, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }: stdenv.mkDerivation rec { pname = "fsharp"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 617a19e238ba8..3d2c754c6a2ce 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -20,7 +20,7 @@ , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null +, zip ? null, unzip ? null, pkg-config ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xorgproto ? null @@ -161,7 +161,7 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig); + ++ (optional javaAwtGtk pkg-config); # For building runtime libs depsBuildTarget = diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 7ea80ffbeb3f5..b3192e44cfe1e 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -20,7 +20,7 @@ , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null +, zip ? null, unzip ? null, pkg-config ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xorgproto ? null @@ -174,7 +174,7 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig); + ++ (optional javaAwtGtk pkg-config); # For building runtime libs depsBuildTarget = diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 029777430ffa0..908f7e0f699f1 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -23,7 +23,7 @@ , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , gnatboot ? null -, zip ? null, unzip ? null, pkgconfig ? null +, zip ? null, unzip ? null, pkg-config ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xorgproto ? null @@ -190,7 +190,7 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig) + ++ (optional javaAwtGtk pkg-config) ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex); # For building runtime libs diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 42eb994b8fe2c..ce963e1c27518 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -194,7 +194,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index fbb75637df652..8663f16f023f7 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -189,7 +189,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index 538655a0d056a..deb19bb87b520 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -194,7 +194,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index e69766bccdaaa..c1b39a70e3829 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 6f9f577743f5e..c203f5cf19ced 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -203,7 +203,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf autoreconfHook automake m4 python3 sphinx diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index c6c81491fe6d7..8a04bc0c079c7 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -12,7 +12,7 @@ , makeWrapper , xorg , gmp -, pkgconfig +, pkg-config , gcc , lib , ghcjsDepOverrides ? (_:_:{}) @@ -73,7 +73,7 @@ in stdenv.mkDerivation { makeWrapper xorg.lndir gmp - pkgconfig + pkg-config ] ++ lib.optionals stdenv.isDarwin [ gcc # https://github.com/ghcjs/ghcjs/issues/663 ]; diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index f48cd6dfa1b13..e06c16058d1d4 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, libtool +{ config, stdenv, fetchurl, pkg-config, libtool , zip, libffi, libsigsegv, readline, gmp , gnutls, gnome2, cairo, SDL, sqlite , emacsSupport ? config.emacsSupport or false, emacs ? null }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { # The dependencies and their justification are explained at # http://smalltalk.gnu.org/download - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk cairo SDL sqlite diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index a37d5c3d2cf69..4c5a276ec849a 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages , pkgsBuildTarget @@ -36,15 +36,15 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.13"; + version = "1.14.14"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0xxins5crcgghgvnzplmp0qyv2gbmh36v1fpl15d03jwdd6287ds"; + sha256 = "0vx7r0bb1a500znnnh7v3wgw22ly3p2x06vzyi9hiblgylrby132"; }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; + nativeBuildInputs = [ perl which pkg-config patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 47bf9cebd4c7d..65e75ba690784 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages , pkgsBuildTarget @@ -36,15 +36,15 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.6"; + version = "1.15.7"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "05sqcx4fm1nxfm46j6xriq0fnnah4bm8bqw027xrzcg2qmrvl2w9"; + sha256 = "1g1a39y1cnvw3y0bjwjms55cz0s9icm8myrgxi295jwfznmb6cc6"; }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; + nativeBuildInputs = [ perl which pkg-config patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 6bc32b07c3d20..032a8933db9e5 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross -, pkgconfig +, pkg-config , pcre , Security }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre ]; depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix index 35d3365768a3c..c43b4d0175a55 100644 --- a/pkgs/development/compilers/go/2-dev.nix +++ b/pkgs/development/compilers/go/2-dev.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages , pkgsBuildTarget @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; + nativeBuildInputs = [ perl which pkg-config patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 8ca85817f9e4f..7d0c67a1acb44 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , bison , flex diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix index 8b91e3f2c6d80..b20a0899f0352 100644 --- a/pkgs/development/compilers/intercal/default.nix +++ b/pkgs/development/compilers/intercal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig +, pkg-config , bison, flex , makeWrapper }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bison flex makeWrapper ]; + [ pkg-config bison flex makeWrapper ]; # Intercal invokes gcc, so we need an explicit PATH postInstall = '' diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix index 2c29a30d76f4f..442e1ee3a6d8b 100644 --- a/pkgs/development/compilers/llvm/11/llvm.nix +++ b/pkgs/development/compilers/llvm/11/llvm.nix @@ -152,7 +152,7 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; - doCheck = stdenv.isLinux && (!stdenv.isx86_32); + doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl); checkTarget = "check-all"; diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 8d2ad8e6bbc56..1919f99980586 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation { pname = "manticore"; version = "2019.12.03"; - + src = fetchFromGitHub { owner = "ManticoreProject"; repo = "manticore"; @@ -14,9 +14,9 @@ in stdenv.mkDerivation { }; enableParallelBuilding = false; - + nativeBuildInputs = [ autoreconfHook ]; - + buildInputs = [ coreutils smlnj ]; autoreconfFlags = "-Iconfig -vfi"; @@ -28,8 +28,8 @@ in stdenv.mkDerivation { mv source repo_checkout cd repo_checkout chmod u+w . -R - ''; - + ''; + postPatch = '' patchShebangs . substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout' @@ -40,14 +40,14 @@ in stdenv.mkDerivation { meta = { description = "A parallel, pure variant of Standard ML"; - longDescription = '' + longDescription = '' Manticore is a high-level parallel programming language aimed at general-purpose applications running on multi-core processors. Manticore supports parallelism at multiple levels: explicit concurrency and coarse-grain parallelism via CML-style constructs and fine-grain parallelism via various light-weight notations, such as parallel tuple expressions and NESL/Nepal-style - parallel array comprehensions. + parallel array comprehensions. ''; homepage = "http://manticore.cs.uchicago.edu/"; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 705b222a86cba..b31a2daa1f894 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig +{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkg-config , git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g"; }; - nativeBuildInputs = [ cmake pkgconfig git ]; + nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil libmysqlclient mbedtls openssl libpthreadstubs ] diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 946013562c229..8c9a6ef07fa28 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { [ (fetchurl { name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch"; url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug"; - sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e"; + sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e"; }) ]; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 326aef1a562c2..fc896f43d2818 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, bash, pkgconfig, autoconf, cpio, file, which, unzip +{ stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap @@ -25,7 +25,7 @@ let sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 1de5d84a13beb..75f114e9fbff9 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk11 @@ -22,7 +22,7 @@ let sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 3c7ddfb8dd96f..ee99cb93a1a93 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap @@ -22,7 +22,7 @@ let sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 050ca2a564a10..96a01b0cd9259 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, lndir, bash, cpio, file, which, unzip, zip +{ stdenv, lib, fetchurl, pkg-config, lndir, bash, cpio, file, which, unzip, zip , cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib @@ -83,7 +83,7 @@ let outputs = [ "out" "jre" ]; - nativeBuildInputs = [ pkgconfig lndir ]; + nativeBuildInputs = [ pkg-config lndir ]; buildInputs = [ cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 513f4d968f6f2..30762d7811ac5 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake +{ stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake , gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby , openjdk11-bootstrap }: @@ -20,7 +20,7 @@ let }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; - nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index f406a3959fd12..d491250bd9307 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen -, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib +, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib , ffmpeg_3, python, ruby }: let @@ -22,7 +22,7 @@ let }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; - nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index e820b982620a9..40acb925d10bf 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,4 @@ -{ stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib +{ stdenv, file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, libiconv, cacert, rustPlatform, rustc , CoreFoundation, Security }: @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - nativeBuildInputs = [ pkgconfig cmake installShellFiles makeWrapper ]; + nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper ]; buildInputs = [ cacert file curl python3 openssl zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 7534a52fe0f0c..c57b28aee51ef 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -1,5 +1,5 @@ { stdenv, makeWrapper, fetchFromGitHub, rustPlatform -, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv +, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv , CoreFoundation, Security }: rustPlatform.buildRustPackage { @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { # rls-rustc links to rustc_private crates CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ] ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 570cd8b796fdc..a5c24a5fc69ff 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -2,7 +2,7 @@ , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget , fetchurl, file, python3 , darwin, cmake, rust, rustPlatform -, pkgconfig, openssl +, pkg-config, openssl , which, libffi , withBundledLLVM ? false , enableRustcDev ? true @@ -133,7 +133,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ file python3 rustPlatform.rust.rustc cmake - which libffi removeReferencesTo pkgconfig + which libffi removeReferencesTo pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix index dcc3457fe112b..ff40c622f1e52 100644 --- a/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , cmake -, pkgconfig +, pkg-config , libffi , boehmgc , openssl @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # build extensions export ${platformLdLibraryPath}="$(pwd)/build" ''; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libffi boehmgc openssl zlib ] ++ stdenv.lib.optional odbcSupport libiodbc; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index e94ebab50e650..f62e86461f9d9 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused -, libpthreadstubs, pango, pkgconfig, libpulseaudio, which }: +, libpthreadstubs, pango, pkg-config, libpulseaudio, which }: stdenv.mkDerivation rec { pname = "squeak"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs pango libpulseaudio which ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' for i in squeak.in squeak.sh.in; do diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index dadf374d5b676..66d2add98b1d4 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib , libarchive, db, pcre, libedit, libossp_uuid, libXpm -, libSM, libXt, freetype, pkgconfig, fontconfig +, libSM, libXt, freetype, pkg-config, fontconfig , cmake, libyaml, Security , libjpeg, libX11, libXext, libXft, libXinerama , extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ] @@ -26,7 +26,7 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ gmp readline openssl libarchive libyaml db pcre libedit libossp_uuid diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 2cabacadd7567..6b87381076476 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -7,7 +7,7 @@ , perl , libedit , ninja -, pkgconfig +, pkg-config , sqlite , swig , bash @@ -141,7 +141,7 @@ stdenv.mkDerivation { makeWrapper ninja perl - pkgconfig + pkg-config python rsync which @@ -155,7 +155,7 @@ stdenv.mkDerivation { libgit2 python ]; - propagatedUserEnvPkgs = [ git pkgconfig ]; + propagatedUserEnvPkgs = [ git pkg-config ]; hardeningDisable = [ "format" ]; # for LLDB diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 1964d74cf3af4..47a114899171c 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, autoreconfHook +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook , graphviz, glib, libiconv, libintl, libtool, expat, substituteAll }: @@ -70,7 +70,7 @@ let outputs = [ "out" "devdoc" ]; nativeBuildInputs = [ - pkgconfig flex bison libxslt + pkg-config flex bison libxslt ] ++ lib.optional (stdenv.isDarwin && (lib.versionAtLeast version "0.38")) expat ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure ++ extraNativeBuildInputs; diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 31867d16b4cff..15e3ccbb9722a 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }: +{ lib, stdenv, fetchurl, pkg-config, guile, guile-lib, cairo, expat }: stdenv.mkDerivation rec { pname = "guile-cairo"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile cairo expat ]; enableParallelBuilding = true; diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index db16c91c4ef60..3521853187c44 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, guile, texinfo }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, guile, texinfo }: let version = "1.0.0"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "1r47m1m112kxf23xny99f0qkqsk6626iyc5jp7vzndfiyp5yskwi"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ guile texinfo ]; autoreconfPhase = "./autogen.sh"; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index e1ae323707eb8..2dc07deac5c60 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, guile, guile-lib, gwrap -, pkgconfig, gconf, glib, gnome_vfs, gtk2 +, pkg-config, gconf, glib, gnome_vfs, gtk2 , libglade, libgnome, libgnomecanvas, libgnomeui , pango, guile-cairo, texinfo }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - texinfo guile gwrap pkgconfig gconf glib gnome_vfs gtk2 + texinfo guile gwrap pkg-config gconf glib gnome_vfs gtk2 libglade libgnome libgnomecanvas libgnomeui pango guile-cairo ] ++ lib.optional doCheck guile-lib; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 6b860bd28da56..34299b345eeb2 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, guile, texinfo, pkgconfig }: +{ lib, stdenv, fetchurl, guile, texinfo, pkg-config }: assert stdenv ? cc && stdenv.cc.isGNU; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile texinfo ]; doCheck = true; diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index eb10c0f1e5913..8f879249a23ea 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, ncurses, libffi }: +{ lib, stdenv, fetchurl, pkg-config, guile, ncurses, libffi }: let name = "guile-ncurses-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile ncurses libffi ]; preConfigure = '' diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix index f05804776533a..effa651b99c80 100644 --- a/pkgs/development/guile-modules/guile-opengl/default.nix +++ b/pkgs/development/guile-modules/guile-opengl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile }: +{ lib, stdenv, fetchurl, pkg-config, guile }: let name = "guile-opengl-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim"; }; - nativeBuildInputs = [ pkgconfig guile ]; + nativeBuildInputs = [ pkg-config guile ]; meta = with lib; { description = "Guile bindings for the OpenGL graphics API"; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index ac5358bade91f..eaf402a86058f 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, pkg-config , gperf, guile, guile-lib, libffi }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gperf guile guile-lib libffi ]; GUILE_SITE="${guile-lib}/share/guile/site"; diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index a676f65215d21..8816e7b4ffcb3 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, buildEnv +{ lib, stdenv, fetchurl, pkg-config, guile, buildEnv , SDL, SDL_image, SDL_ttf, SDL_mixer }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01"; }; - nativeBuildInputs = [ pkgconfig guile ]; + nativeBuildInputs = [ pkg-config guile ]; buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer ]; diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index fe1567272ceac..c3f5fdaefbd2d 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, guile, libtool, pkgconfig +{ lib, stdenv, fetchurl, guile, libtool, pkg-config , SDL2, SDL2_image, SDL2_ttf, SDL2_mixer }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m"; }; - nativeBuildInputs = [ libtool pkgconfig ]; + nativeBuildInputs = [ libtool pkg-config ]; buildInputs = [ guile SDL2 SDL2_image SDL2_ttf SDL2_mixer ]; diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index d0cc719b62573..2de4452442592 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, guile, texinfo }: +{ lib, stdenv, fetchurl, pkg-config, guile, texinfo }: let name = "guile-xcb-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile texinfo ]; preConfigure = '' diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 23b9a2735f67a..a4674e356cc81 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -500,7 +500,7 @@ self: super: builtins.intersectAttrs super { # requires autotools to build secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ]; - # requires libsecp256k1 in pkgconfig-depends + # requires libsecp256k1 in pkg-config-depends secp256k1-haskell = addPkgconfigDepend super.secp256k1-haskell pkgs.secp256k1; # tests require git and zsh diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index e135374511fb5..bf4f7bd3bbfc4 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -7,7 +7,7 @@ let isCross = stdenv.buildPlatform != stdenv.hostPlatform; inherit (buildPackages) fetchurl removeReferencesTo - pkgconfig coreutils gnugrep gnused glibcLocales; + pkg-config coreutils gnugrep gnused glibcLocales; in { pname @@ -54,7 +54,7 @@ in , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} -, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] +, pkg-configDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? [] , benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? [] , testTarget ? "" @@ -234,7 +234,7 @@ let isHaskellPkg = x: x ? isHaskellLibrary; - allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ + allPkgconfigDepends = pkg-configDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; depsBuildBuild = [ nativeGhc ]; @@ -243,7 +243,7 @@ let optionals doCheck testToolDepends ++ optionals doBenchmark benchmarkToolDepends; nativeBuildInputs = - [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ + [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkg-config ++ setupHaskellDepends ++ collectedToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; otherBuildInputsHaskell = @@ -285,7 +285,7 @@ let ''; in stdenv.lib.fix (drv: -assert allPkgconfigDepends != [] -> pkgconfig != null; +assert allPkgconfigDepends != [] -> pkg-config != null; stdenv.mkDerivation ({ name = "${pname}-${version}"; @@ -532,7 +532,7 @@ stdenv.mkDerivation ({ libraryPkgconfigDepends librarySystemDepends libraryToolDepends - pkgconfigDepends + pkg-configDepends setupHaskellDepends ; } // stdenv.lib.optionalAttrs doCheck { @@ -616,7 +616,7 @@ stdenv.mkDerivation ({ depsBuildBuild = stdenv.lib.optional isCross ghcEnvForBuild; nativeBuildInputs = - [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ + [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkg-config ++ collectedToolDepends; buildInputs = otherBuildInputsSystem; diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 45c1a8fbd3337..8b3020f886130 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, ghc, pkgconfig, glibcLocales +{ stdenv, ghc, pkg-config, glibcLocales , cacert, stack, makeSetupHook, lib }@depArgs: { buildInputs ? [] @@ -28,7 +28,7 @@ in stdenv.mkDerivation (args // { ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales; nativeBuildInputs = nativeBuildInputs - ++ [ ghc pkgconfig stack stackHook ]; + ++ [ ghc pkg-config stack stackHook ]; STACK_PLATFORM_VARIANT = "nix"; STACK_IN_NIX_SHELL = 1; diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 964c179fb65b0..1537cd6466cdb 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -160,7 +160,7 @@ rec { addTestToolDepends = drv: xs: overrideCabal drv (drv: { testToolDepends = (drv.testToolDepends or []) ++ xs; }); addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x]; - addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; }); + addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkg-configDepends = (drv.pkg-configDepends or []) ++ xs; }); addSetupDepend = drv: x: addSetupDepends drv [x]; addSetupDepends = drv: xs: overrideCabal drv (drv: { setupHaskellDepends = (drv.setupHaskellDepends or []) ++ xs; }); diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix index da23ae18331c2..c63cf8acb0f36 100644 --- a/pkgs/development/idris-modules/glfw.nix +++ b/pkgs/development/idris-modules/glfw.nix @@ -10,7 +10,7 @@ build-idris-package { idrisDeps = [ effects ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; extraBuildInputs = [ pkgs.glfw ]; postPatch = '' diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix index 2e1cdaa9be3ad..943db9e87a0fd 100644 --- a/pkgs/development/idris-modules/sdl2.nix +++ b/pkgs/development/idris-modules/sdl2.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , effects , lib -, pkgconfig +, pkg-config , SDL2 , SDL2_gfx }: @@ -13,7 +13,7 @@ build-idris-package rec { idrisDeps = [ effects ]; extraBuildInputs = [ - pkgconfig + pkg-config SDL2 SDL2_gfx ]; diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index 84f88e1598bb6..ce040bebe3552 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -8,7 +8,7 @@ build-idris-package { version = "2020-02-11"; ipkgName = "TParsec"; - + idrisDeps = [ contrib ]; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 0209bcaaafcd2..f4139a37eea52 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="angelscript"; - version = "2.34.0"; + version = "2.35.0"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "1xxxpwln4v2yasa35y7552fsfd8fbg50gnbp4vxy0ajj2wvh9akg"; + sha256 = "sha256-AQ3UXiPnNNRvWJHXDiaGB6EsuasSUD3aQvhC2dt+iFc="; }; buildInputs = [ unzip diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index bbc38e515424e..aa3abc655343f 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,29 +1,37 @@ -{ stdenv, fetchzip, coreutils, gnugrep }: +{ stdenv, lib, fetchzip, bash, makeWrapper, coreutils, gnugrep, doCheck ? true }: stdenv.mkDerivation rec { pname = "bats"; - version = "1.2.0"; + version = "1.2.1"; src = fetchzip { url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz"; - sha256 = "0f59zh4d4pa1a7ybs5zl6h0csbqqv11lbnq0jl1dgwm1s6p49bsq"; + hash = "sha256-grB/rJaDU0fuw4Hm3/9nI2px8KZnSWqRjTJPd7Mmb7s="; }; + nativeBuildInputs = [ makeWrapper ]; + patchPhase = '' - patchShebangs ./install.sh + patchShebangs . + ''; - substituteInPlace ./libexec/bats-core/bats \ - --replace 'type -p greadlink readlink' 'type -p ${coreutils}/bin/readlink' - substituteInPlace ./libexec/bats-core/bats-format-tap-stream \ - --replace grep ${gnugrep}/bin/grep + installPhase = '' + ./install.sh $out + wrapProgram $out/bin/bats --suffix PATH : "${lib.makeBinPath [ bash coreutils gnugrep ]}" ''; - installPhase = "./install.sh $out"; + inherit doCheck; + checkPhase = '' + # test generates file with absolute shebang dynamically + substituteInPlace test/install.bats --replace \ + "/usr/bin/env bash" "${bash}/bin/bash" + bin/bats test + ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bats-core/bats-core"; description = "Bash Automated Testing System"; - maintainers = [ maintainers.lnl7 ]; + maintainers = with maintainers; [ abathur ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 59abf36f7ac06..60a284de3f1be 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -1,4 +1,4 @@ -{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security, cmake }: +{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, stdenv, gcc, Security, cmake }: rustPlatform.buildRustPackage rec { pname = "evcxr"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; - nativeBuildInputs = [ pkgconfig makeWrapper cmake ]; + nativeBuildInputs = [ pkg-config makeWrapper cmake ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; postInstall = let wrap = exe: '' diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 39d4918a70bf9..9ff81553550c5 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }: stdenv.mkDerivation { pname = "falcon"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cmake pcre zlib sqlite ]; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index 4a8330f2749c7..7203ba3199325 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -2,7 +2,7 @@ , glib , gtk3 , libffcall -, pkgconfig +, pkg-config , wrapGAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd src ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ libffcall glib gtk3 ]; configureOptions = [ "--with-gtk3" ]; diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 6057480476f28..b1c80b13af99f 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -1,5 +1,5 @@ { stdenv, pkgsBuildBuild, buildPackages -, fetchurl, makeWrapper, gawk, pkgconfig +, fetchurl, makeWrapper, gawk, pkg-config , libtool, readline, gmp }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_1_8; - nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + nativeBuildInputs = [ makeWrapper gawk pkg-config ]; buildInputs = [ readline libtool ]; propagatedBuildInputs = [ diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 5b26b38dbd4e9..1db5676a8c7bb 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -1,5 +1,5 @@ { stdenv, pkgsBuildBuild, buildPackages -, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig +, fetchpatch, fetchurl, makeWrapper, gawk, pkg-config , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null }: @@ -23,7 +23,7 @@ depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_2_0; - nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + nativeBuildInputs = [ makeWrapper gawk pkg-config ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 52a3488d0515e..77483b2256a1f 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgsBuildBuild, buildPackages -, fetchurl, makeWrapper, gawk, pkgconfig +, fetchurl, makeWrapper, gawk, pkg-config , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null , fetchpatch @@ -25,7 +25,7 @@ depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile; - nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + nativeBuildInputs = [ makeWrapper gawk pkg-config ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ @@ -58,7 +58,8 @@ # "libgcc_s.so.1 must be installed for pthread_cancel to work". # don't have "libgcc_s.so.1" on darwin - LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + LDFLAGS = stdenv.lib.optionalString + (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ] ++ stdenv.lib.optionals stdenv.isSunOS [ diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 42af3cc427b40..a87b3ef86786e 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo, ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile, libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, - python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached + python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ stdenv.mkDerivation { zlib sqlite gmp libffi cairo ncurses freetype libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2 freeglut libsamplerate pcre libevent libedit yajl - pkgconfig glfw openssl libpthreadstubs libXdmcp + pkg-config glfw openssl libpthreadstubs libXdmcp libmemcached python3 ]; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 113a582392fe6..fe0d3073acbdf 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.12.2"; + version = "1.13.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "0if514zdmbjvvrsa9x5yfvg2b14sz53yaka12g3yhwkq8ls3qk0c"; + sha256 = "sha256-JXRPW1PYhVe2Qu8SAmcLgtwf8u3sb43H7AFeW7EqPZo="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix index bd4b93b835fc6..180ce28c9ae5a 100644 --- a/pkgs/development/interpreters/lolcode/default.nix +++ b/pkgs/development/interpreters/lolcode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, doxygen, cmake, readline }: +{ stdenv, fetchurl, pkg-config, doxygen, cmake, readline }: with stdenv.lib; stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1li7ikcrs7wqah7gqkirg0k61n6pm12w7pydin966x1sdn9na46b"; }; - nativeBuildInputs = [ pkgconfig cmake doxygen ]; + nativeBuildInputs = [ pkg-config cmake doxygen ]; buildInputs = [ readline ]; # Maybe it clashes with lci scientific logic software package... diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index dbe3f6fa2df09..9319fa12406c2 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit, +{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 6f09c0764412d..2198ff962a18a 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , SDL, libGLU, libGL, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696) patches = [ ./0.7-gl-prototypes.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libGLU libGL openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 3a6c385ee5fc6..866ce83adf1e2 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , SDL, libGLU, libGL, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libGLU libGL openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 79b83f0643f15..315a07bd9caef 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , SDL2, libGLU, libGL, openal, luajit , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 2ef3a4ca05a43..48ac142934b7c 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit, +{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "18gfp65ngb8k8g7hgbw2bhrwk2i7m56m21d39pk4484q9z8p4vm7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index e4e984fc4ac61..d824d29c35c0b 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -4,11 +4,11 @@ let - version = "3.0"; + version = "3.1"; fullMaude = fetchurl { - url = "http://maude.cs.illinois.edu/w/images/0/04/Full-Maude-${version}.zip"; - sha256 = "0gf36wlkkl343vlxgryqdhxmgyn8z0cc2zayccd7ac3inmj1iayw"; + url = "http://maude.cs.illinois.edu/w/images/0/0a/Full-Maude-${version}.zip"; + sha256 = "8b13af02c6243116c2ef9592622ecaa06d05dbe1dd6b1e595551ff33855948f2"; }; in @@ -18,8 +18,8 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://maude.cs.illinois.edu/w/images/9/92/Maude-${version}.tar.gz"; - sha256 = "0vhn3lsck6ji9skrgm67hqrn3k4f6y442q73jbw65qqznm321k5a"; + url = "http://maude.cs.illinois.edu/w/images/d/d3/Maude-${version}.tar.gz"; + sha256 = "b112d7843f65217e3b5a9d40461698ef8dab7cbbe830af21216dfb924dc88a2f"; }; buildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation { postInstall = '' for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done unzip ${fullMaude} - install -D -m 444 full-maude3.maude $out/share/maude/full-maude.maude + install -D -m 444 full-maude31.maude $out/share/maude/full-maude.maude ''; # bison -dv surface.yy -o surface.c diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 8d5a0252944af..0441e48685eaf 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, libffi, python3, readline }: +{ stdenv, lib, fetchFromGitHub, pkg-config, libffi, python3, readline }: stdenv.mkDerivation rec { pname = "micropython"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libffi readline ]; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 0c976f2f0b058..de829c14c98a1 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nix, git }: let +{ stdenv, fetchurl, pkg-config, nix, git }: let version = "4.1.6"; in stdenv.mkDerivation { pname = "nix-exec"; @@ -9,7 +9,7 @@ in stdenv.mkDerivation { sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ nix git ]; NIX_CFLAGS_COMPILE = "-std=c++1y"; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 67fca52dad51e..7dedf79c340f9 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -14,7 +14,7 @@ , libX11 , graphicsmagick , pcre -, pkgconfig +, pkg-config , libGL , libGLU , fltk @@ -145,7 +145,7 @@ in mkDerivation rec { ] ; nativeBuildInputs = [ - pkgconfig + pkg-config gfortran # Listed here as well because it's outputs are split fftw diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 82134e14406f8..2389b56bd6faf 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -7,7 +7,7 @@ let generic = { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool - , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 + , pkg-config, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 , systemd, system-sendmail, valgrind, xcbuild , version @@ -149,7 +149,7 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ] + nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] ++ lib.optional stdenv.isDarwin xcbuild; buildInputs = diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 9b57e153aa05a..02f561c004e2d 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkgconfig, gcc, +{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc, pypy, libffi, libedit, libuv, boost, zlib, variant ? "jit", buildWithPypy ? false }: @@ -32,7 +32,7 @@ let build = {flags, target}: stdenv.mkDerivation rec { pname = "pixie"; version = "0-r${commit-count}-${variant}"; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = libs; PYTHON = if buildWithPypy then "${pypy}/pypy-c/pypy-c" diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 8feeb3c51bf35..9c6457d22aa35 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,5 +1,5 @@ { stdenv, substituteAll, fetchurl -, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi, libunwind, Security +, zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 , self, gdbm, db, lzma , python-setup-hook @@ -49,7 +49,7 @@ in with passthru; stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db ] ++ optionals isPy3k [ diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index 1762edbbdb7df..4ce4db5aca10b 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }: +{ stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }: stdenv.mkDerivation { pname = "qnial"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { buildInputs = [ unzip - pkgconfig + pkg-config ncurses ]; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 41cf4c221c6a1..3768751efdc07 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, pkgconfig, SDL2 +{ stdenv, fetchurl, python2Packages, pkg-config, SDL2 , libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib , glib }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter} ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python cython wrapPython tkinter SDL2 libpng ffmpeg_3 freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 37efeba3f9b6e..0588d564b1c17 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }: +{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkg-config, nspr, perl, python2, zip }: stdenv.mkDerivation { pname = "spidermonkey"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ nspr ]; - nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isAarch32 autoconf213; + nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isAarch32 autoconf213; buildInputs = [ perl python2 zip ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index 22ce5a0b387cf..2a527eb8640ef 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages +{ stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages , libobjc }: with stdenv.lib; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libffi readline icu zlib ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; - nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ]; + nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 42731421d81d7..4bb6c815b2d49 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, buildPackages +{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages , which, readline, zlib, icu }: with stdenv.lib; @@ -18,7 +18,7 @@ in stdenv.mkDerivation { setOutputFlags = false; # Configure script only understands --includedir buildInputs = [ readline zlib icu ]; - nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; + nativeBuildInputs = [ autoconf213 pkg-config perl which python2 zip ]; patches = [ # Fixed in 62.0 diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix index 36d28f62e2e1f..bb577be4cd7b4 100644 --- a/pkgs/development/interpreters/spidermonkey/68.nix +++ b/pkgs/development/interpreters/spidermonkey/68.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, python3, zip, buildPackages +{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages , which, readline, zlib, icu, cargo, rustc, llvmPackages }: with stdenv.lib; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf213 - pkgconfig + pkg-config perl which python2 diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index a3d7242f453d1..e7f6387018103 100644 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ b/pkgs/development/interpreters/spidermonkey/78.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , autoconf213 -, pkgconfig +, pkg-config , perl , python3 , zip @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargo llvmPackages.llvm # for llvm-objdump perl - pkgconfig + pkg-config python3 rust-cbindgen rustc diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 113eb54a00ba2..df873937b4f83 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, alsaLib +{ stdenv, fetchurl, cmake, pkg-config, alsaLib , libjack2, libsndfile, fftw, curl, gcc , libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "-DSC_EL=${if useSCEL then "ON" else "OFF"}" ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 7b390c5471630..60ce4d89f19cd 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -22,6 +22,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config ]; + # Since wasmer 0.17 no backends are enabled by default. Backends are now detected + # using the [makefile](https://github.com/wasmerio/wasmer/blob/master/Makefile). + # Enabling cranelift as this used to be the old default. At least one backend is + # needed for the run subcommand to work. + cargoBuildFlags = [ "--features 'backend-cranelift'" ]; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; meta = with lib; { diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 61609a90dd027..e13c94bcb6e2e 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv +{ stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL, libGLU , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optional stdenv.isLinux libcap; propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 31624bee2fb33..1fa021feb85f1 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, fetchurl, pkgconfig +{ stdenv, config, fetchurl, pkg-config , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { --replace 'WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`' 'WAYLAND_SCANNER=`pkg-config --variable=wayland_scanner wayland-scanner`' ''; - depsBuildBuild = [ pkgconfig ]; + depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkgconfig ] ++ optionals waylandSupport [ wayland ]; + nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index 9340b9f709150..f5191a116c97e 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkgconfig }: +{ stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkg-config }: stdenv.mkDerivation rec { pname = "SDL_Pango"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "197baw1dsg0p4pljs5k0fshbyki00r4l49m1drlpqw6ggawx6xbz"; }; - patches = [ + patches = [ (fetchpatch { url = "https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch"; sha256 = "00p5ry5gd3ixm257p9i2c4jg0qj8ipk8nf56l7c9fma8id3zxyld"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -i -f"; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ SDL pango ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 3696e485ad72a..606820120dc0f 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -17,23 +17,23 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL graphics drawing primitives and support functions"; - longDescription = - '' The SDL_gfx library evolved out of the SDL_gfxPrimitives code - which provided basic drawing routines such as lines, circles or - polygons and SDL_rotozoom which implemented a interpolating - rotozoomer for SDL surfaces. - - The current components of the SDL_gfx library are: - - * Graphic Primitives (SDL_gfxPrimitves.h) - * Rotozoomer (SDL_rotozoom.h) - * Framerate control (SDL_framerate.h) - * MMX image filters (SDL_imageFilter.h) - * Custom Blit functions (SDL_gfxBlitFunc.h) - - The library is backwards compatible to the above mentioned - code. Its is written in plain C and can be used in C++ code. - ''; + longDescription = '' + The SDL_gfx library evolved out of the SDL_gfxPrimitives code + which provided basic drawing routines such as lines, circles or + polygons and SDL_rotozoom which implemented a interpolating + rotozoomer for SDL surfaces. + + The current components of the SDL_gfx library are: + + * Graphic Primitives (SDL_gfxPrimitves.h) + * Rotozoomer (SDL_rotozoom.h) + * Framerate control (SDL_framerate.h) + * MMX image filters (SDL_imageFilter.h) + * Custom Blit functions (SDL_gfxBlitFunc.h) + + The library is backwards compatible to the above mentioned + code. Its is written in plain C and can be used in C++ code. + ''; homepage = "https://sourceforge.net/projects/sdlgfx/"; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index 8d37124d31174..a1e4dda68786f 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libsixel }: +{ stdenv, fetchFromGitHub, pkg-config, libsixel }: stdenv.mkDerivation { pname = "SDL_sixel"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-video-sixel" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsixel ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index d26a910638e96..10d954397ff1a 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, imake, gccmakedep, bison, flex, pkgconfig +, imake, gccmakedep, bison, flex, pkg-config , xlibsWrapper, libXmu, libXpm, libXp }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; dontUseImakeConfigure = true; - nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ]; + nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ]; buildInputs = [ libXpm libXp ]; propagatedBuildInputs = [ xlibsWrapper libXmu ]; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 4e2e33b852e82..dcfe4a4ef27b8 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qmake }: +{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake }: mkDerivation rec { pname = "accounts-qt"; @@ -12,7 +12,7 @@ mkDerivation rec { }; propagatedBuildInputs = [ glib libaccounts-glib ]; - nativeBuildInputs = [ doxygen pkgconfig qmake ]; + nativeBuildInputs = [ doxygen pkg-config qmake ]; # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 6bd76c62b9748..362605d105076 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , substituteAll -, pkgconfig +, pkg-config , glib , shadow , gobject-introspection @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 49c8e14a74f43..0fe777b7b2b04 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, perl }: +{ stdenv, fetchurl, pkg-config, libtool, perl }: stdenv.mkDerivation rec { pname = "ace"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ perl ]; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index a1d4c2259091d..d50cbe26e5605 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - pname = "aften"; - version = "0.0.8"; - src = fetchurl { - url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2"; - sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47"; - }; + pname = "aften"; + version = "0.0.8"; + src = fetchurl { + url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2"; + sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47"; + }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DSHARED=ON" ]; + cmakeFlags = [ "-DSHARED=ON" ]; - meta = { - description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; - homepage = "http://aften.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - }; + meta = { + description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; + homepage = "http://aften.sourceforge.net/"; + license = stdenv.lib.licenses.lgpl2; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; } diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index d65ff369064eb..2b083a47a20b0 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig +{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config , freetype, SDL, libX11 }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "http://www.antigrain.com/${name}.tar.gz"; sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool freetype SDL libX11 ]; postPatch = '' diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index d7d8c268928ff..18c40c5b5fb38 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -5,11 +5,11 @@ mkDerivation rec { pname = "alkimia"; - version = "8.0.2"; + version = "8.0.4"; src = fetchurl { url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz"; - sha256 = "0al5k9irmg9gsjc234qxjsqfzgzsavl18pspqk78mkp8zlv7fvv1"; + sha256 = "sha256-AASnBo3/CqLLb0f3DSHBKQc74R8u2yHxRRK8RHBIfR8="; }; nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index fd612170910e2..20175486b1602 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -3,7 +3,7 @@ , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL, libjpeg, flac , libXi, libXfixes, freetype, libopus, libtheora -, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs +, physfs, enet, pkg-config, gtk2, pcre, libpulseaudio, libpthreadstubs , libXdmcp }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libXxf86vm openal libGLU libGL libjpeg flac libXi libXfixes - enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp + enet libtheora freetype physfs libopus pkg-config gtk2 pcre libXdmcp libpulseaudio libpthreadstubs ]; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index f6859c9436424..b4731b608dcd8 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -5,7 +5,7 @@ , ninja , patchelf , perl -, pkgconfig +, pkg-config , python3 , expat , libdrm @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { ninja patchelf perl - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index e514b8b5c31bf..300069e60ae51 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , gtk3 -, pkgconfig +, pkg-config , gobject-introspection , gnome3 , dbus @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config dbus gobject-introspection ]; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 8e77f6aa34e3c..a5b4c0cad48a4 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -19,7 +19,7 @@ , libxslt , meson , ninja -, pkgconfig +, pkg-config , pngquant }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 820e738324621..3764d1e7f8655 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gettext +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection , pcre, itstool, gperf, vala, lmdb, libsoup @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gettext + meson ninja pkg-config gettext libxslt xmlto docbook_xsl docbook_xml_dtd_45 gobject-introspection itstool vala ]; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 37bc175fede02..ab5ff960e98ef 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt -, pkgconfig, gettext, xmlsec, zlib +, pkg-config, gettext, xmlsec, zlib }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; meta = with stdenv.lib; { description = "An interface to banking tasks, file formats and country information"; diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 4c5192574d864..660f3bf377edc 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkgconfig, gettext +{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkg-config, gettext , which # GUI support @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { configure ''; - nativeBuildInputs = [ pkgconfig gettext which ]; + nativeBuildInputs = [ pkg-config gettext which ]; buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ]; diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix index 0e01480a4bdff..c4cf069b04c51 100644 --- a/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gwenhywfar, pcsclite, zlib }: +{ stdenv, fetchurl, pkg-config, gwenhywfar, pcsclite, zlib }: let inherit ((import ./sources.nix).libchipcard) sha256 releaseId version; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gwenhywfar pcsclite zlib ]; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index 40a96553fbe2b..89c8d91f26a75 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool , audit, glib, libusb1, libxml2 , wrapGAppsHook , gstreamer ? null @@ -46,7 +46,7 @@ in nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config intltool gtk-doc ] ++ stdenv.lib.optional enableViewer wrapGAppsHook; diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix index ceae869854563..949fd401f5dad 100644 --- a/pkgs/development/libraries/aribb25/default.nix +++ b/pkgs/development/libraries/aribb25/default.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , fetchpatch , autoreconfHook -, pkgconfig +, pkg-config , pcsclite , PCSC , xcbuild @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ] ++ lib.optional stdenv.isDarwin xcbuild; buildInputs = if stdenv.isDarwin then [ PCSC ] else [ pcsclite ]; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 450182138a402..12f6316537b2a 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.1.2"; + version = "10.2.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "0pb3ypdaiiw0895x1zzzjvkrfp39bsl3s4f6zb5bzv4wbjv7kvwn"; + sha256 = "sha256-gvhNUmyNpyJAqwXLErPz8eZ00gzLOOAI5L9TNVsapoo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index 3e678c8544e0b..c9a09ac115ca3 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config , opencl-clhpp, ocl-icd, fftw, fftwFloat , blas, lapack, boost, mesa, libGLU, libGL , freeimage, python, clfft, clblas @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config python ]; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 04f8c266131b5..c638c4b2a40da 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -3,7 +3,7 @@ , meson , ninja -, pkgconfig +, pkg-config , at-spi2-core , atk @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8="; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ at-spi2-core atk dbus glib libxml2 ]; doCheck = false; # fails with "No test data file provided" diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index ba77020ec7031..2d3e96639c719 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -3,7 +3,7 @@ , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , gsettings-desktop-schemas , makeWrapper @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ]; buildInputs = [ libX11 libXtst libXi ]; # In atspi-2.pc dbus-1 glib-2.0 propagatedBuildInputs = [ dbus glib ]; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index aa132515b3e99..e962eac00926f 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib +{ stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib , fixDarwinDylibNames, gobject-introspection, gnome3 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] + nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index cc45dc5a8d888..1e6f047b6aa1d 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, atk, glibmm, pkgconfig, gnome3 }: +{ stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }: stdenv.mkDerivation rec { pname = "atkmm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ atk glibmm ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = true; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index bd1d86520c0cf..0760a1438c0bf 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate -, libsndfile, pkgconfig, python, wafHook +, libsndfile, pkg-config, python, wafHook }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; }; - nativeBuildInputs = [ pkgconfig python wafHook ]; + nativeBuildInputs = [ pkg-config python wafHook ]; buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix deleted file mode 100644 index c08b25fea37a5..0000000000000 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, pkg-config, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }: - -stdenv.mkDerivation rec { - version = "1.0-beta.1"; - pname = "JamomaCore"; - - src = fetchFromGitHub { - owner = "jamoma"; - repo = "JamomaCore"; - rev = "v${version}"; - sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ alsaLib portaudio portmidi libsndfile libxml2 ]; - - meta = { - description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media"; - homepage = "http://www.jamoma.org"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; - broken = true; # 2018-04-10 - }; -} diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index bc98dab4ab629..24f4c77e350ed 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsndfile }: +{ stdenv, fetchurl, pkg-config, libsndfile }: stdenv.mkDerivation rec { pname = "libbs2b"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index d521b7e76abbe..a3d76e55e3652 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, glib, pkgconfig }: +{ stdenv, fetchurl, autoreconfHook, glib, pkg-config }: stdenv.mkDerivation rec { version = "1.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index e8008058626a3..1e126654bbacc 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, sratom, wafHook }: +{ stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook }: stdenv.mkDerivation rec { pname = "lilv"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./lilv-pkgconfig.patch ]; - nativeBuildInputs = [ pkgconfig python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index dac9858464695..3005a4398f9e3 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python3, wafHook }: +{ stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "lv2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ gtk2 libsndfile python3 ]; wafConfigureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ]; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 6bc487e261626..e497816bf1c59 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }: +{ stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { pname = "lvtk"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd"; }; - nativeBuildInputs = [ pkgconfig python wafHook ]; + nativeBuildInputs = [ pkg-config python wafHook ]; buildInputs = [ boost gtkmm2 lv2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index f039e574d547a..e2f20d46a3d2c 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }: +{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python2, wafHook }: stdenv.mkDerivation rec { pname = "ntk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ cairo libjpeg libXft python2 ]; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 8acd6d3c6664d..1516b6df879f9 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, boost, gtk2, pkgconfig, python, wafHook }: +{ stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { pname = "raul"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ boost gtk2 python ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index d30b1ce6c64c8..33a400c2f3df1 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkgconfig }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }: stdenv.mkDerivation rec { version = "4.0.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool libjack2 alsaLib ]; preConfigure = '' diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index cec50290d09e9..392c05c02a749 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, wafHook }: +{ stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, wafHook }: stdenv.mkDerivation rec { pname = "sratom"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l"; }; - nativeBuildInputs = [ pkgconfig wafHook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ lv2 serd sord ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index c2496840b7d4c..43e5bc8f9cc79 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom +{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python, serd, sord, sratom , wafHook , withQt4 ? true, qt4 ? null , withQt5 ? false, qt5 ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ gtk2 lv2 python serd sord sratom ] ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index 0e49a62651203..9c0a138b309a0 100644 --- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -1,7 +1,7 @@ # set VAMP_PATH ? # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) -{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }: +{ stdenv, fetchFromGitHub, pkg-config, libsndfile }: stdenv.mkDerivation rec { pname = "vamp-plugin-sdk"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1lhmskcyk7qqfikmasiw7wjry74gc8g5q6a3j1iya84yd7ll0cz6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index a560cc39d1629..ca832816eabda 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages +{ fetchurl, fetchpatch, stdenv, pkg-config, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent , gtk3Support ? false, gtk3 ? null , qt4 ? null @@ -13,7 +13,7 @@ assert qt4Support -> qt4 != null; let # despite the configure script claiming it supports $PKG_CONFIG, it doesnt respect it - pkgconfig-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"''; + pkg-config-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"''; in stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]); - nativeBuildInputs = [ pkgconfig pkgconfig-helper gettext intltool glib ]; + nativeBuildInputs = [ pkg-config pkg-config-helper gettext intltool glib ]; configureFlags = [ "--disable-qt3" "--disable-gdbm" "--disable-mono" diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 99f8d7f8497ad..b0dfd52ab16c7 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }: +{ stdenv, cmake, fetchurl, pkg-config, jansson, zlib }: let version = "1.9.1"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { patchShebangs . ''; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ jansson zlib ]; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 5473867a6ad0f..23d7f9d8629ad 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.4.63"; + version = "0.4.64"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "16bc6fn1gq3nqcrzgpi2kjphq7xkkr73aljakrg89ysm6hyzyim9"; + sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index eda87ba2c5346..e2074cc835a63 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "0wagc1205r57llqd39wqjasq3bgc8h1mfdqk4r5lcrnn4jbpcill"; + sha256 = "sha256-dDvq5clOUaPR7lOCJ/1g0lrCzVOmzwCnqHrBZfBewO4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index fc3f7896dbeea..ffe15652a3d92 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.8.113"; + version = "1.8.121"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0y784cjrxgrin3ck5f2lk0riyy9kv928kcb9y0gzka65imgma48c"; + sha256 = "sha256-uita3HPcerxH/bnSIL3ZNUp68QXtKJLYi0pcnV7OBkQ="; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 9bb6e9e1c5e0d..ef24f0dadb77f 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , lcms2 , vala @@ -10,19 +10,19 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.82"; + version = "0.1.84"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1iddkwdfw1bmfl6n8y1d4kkm3rb15rzvrfri6a7cnx37mpa96bf6"; + sha256 = "sha256-5+OLhEH3f+udyCMctDSoYZCiHy82ksKBRX6Z016cNOo="; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection vala ]; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index d80413048560b..e7d8daf4d28c5 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -10,7 +10,7 @@ , libwnck3 , glib , vala -, pkgconfig +, pkg-config , libstartup_notification , gobject-introspection , gtk-doc @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { gobject-introspection gtk-doc libtool - pkgconfig + pkg-config vala which wrapGAppsHook diff --git a/pkgs/development/libraries/bashup-events/3.2.nix b/pkgs/development/libraries/bashup-events/3.2.nix new file mode 100644 index 0000000000000..f7e88c3825110 --- /dev/null +++ b/pkgs/development/libraries/bashup-events/3.2.nix @@ -0,0 +1,26 @@ +{ callPackage, fetchFromGitHub }: + +callPackage ./generic.nix { + variant = "3.2"; + version = "2019-07-27"; + branch = "master"; + src = fetchFromGitHub { + owner = "bashup"; + repo = "events"; + rev = "83744c21bf720afb8325343674c62ab46a8f3d94"; + hash = "sha256-0VDjd+1T1JBmSDGovWOOecUZmNztlwG32UcstfdigbI="; + }; + fake = { + # Note: __ev.encode is actually defined, but it happens in a + # quoted arg to eval, which resholve currently doesn't (and may + # never) parse into. See abathur/resholve/issues/2. + function = [ "__ev.encode" ]; + }; + keep = { + # allow vars in eval + eval = [ "e" "f" "q" "r" ]; + # allow vars executed as commands + "$f" = true; + "$n" = true; + }; +} diff --git a/pkgs/development/libraries/bashup-events/4.4.nix b/pkgs/development/libraries/bashup-events/4.4.nix new file mode 100644 index 0000000000000..f880009ea71ad --- /dev/null +++ b/pkgs/development/libraries/bashup-events/4.4.nix @@ -0,0 +1,20 @@ +{ callPackage, fetchFromGitHub }: + +callPackage ./generic.nix { + variant = "4.4"; + version = "2020-04-04"; + branch = "bash44"; + src = fetchFromGitHub { + owner = "bashup"; + repo = "events"; + rev = "e97654f5602fc4e31083b27afa18dcc89b3e8296"; + hash = "sha256-51OSIod3mEg3MKs4rrMgRcOimDGC+3UIr4Bl/cTRyGM="; + }; + keep = { + # allow vars in eval + eval = [ "e" "bashup_ev" "n" ]; + # allow vars executed as commands + "$f" = true; + "$n" = true; + }; +} diff --git a/pkgs/development/libraries/bashup-events/default.nix b/pkgs/development/libraries/bashup-events/default.nix new file mode 100644 index 0000000000000..bcefdd0fcacff --- /dev/null +++ b/pkgs/development/libraries/bashup-events/default.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +{ + bashup-events32 = callPackage ./3.2.nix { }; + bashup-events44 = callPackage ./4.4.nix { }; +} diff --git a/pkgs/development/libraries/bashup-events/generic.nix b/pkgs/development/libraries/bashup-events/generic.nix new file mode 100644 index 0000000000000..78ef4c2f33699 --- /dev/null +++ b/pkgs/development/libraries/bashup-events/generic.nix @@ -0,0 +1,83 @@ +{ + # general + lib +, callPackage +, runCommand +, resholvePackage +, bash +, shellcheck +, doCheck ? true +, doInstallCheck ? true + # variant-specific +, variant +, version +, branch +, src +, fake ? false +, keep +}: +let + # extracting this so that it's trivial to test in other shells + installCheck = shell: + '' + echo "testing bashup.events in ${shell}" + ${shell} <<'EOF' + source $out/bin/bashup.events + neat(){ + echo $0: Hi from event \'test event\'. I can have both $1 and $2 arguments. + exit 0 + } + event on "test event" @2 neat curried + echo event registered + event emit "test event" runtime + exit 1 # fail if emitting event didn't exit clean + EOF + ''; + +in +resholvePackage rec { + # bashup.events doesn't version yet but it has two variants with + # differing features/performance characteristics: + # - branch master: a variant for bash 3.2+ + # - branch bash44: a variant for bash 4.4+ + pname = "bashup-events${variant}-unstable"; + # should be YYYY-MM-DD + inherit version; + inherit src; + + installPhase = '' + install -Dt $out/bin bashup.events + ''; + + inherit doCheck; + checkInputs = [ shellcheck bash ]; + + # check based on https://github.com/bashup/events/blob/master/.dkrc + checkPhase = '' + SHELLCHECK_OPTS='-e SC2016,SC2145' ${shellcheck}/bin/shellcheck ./bashup.events + ${bash}/bin/bash -n ./bashup.events + ${bash}/bin/bash ./bashup.events + ''; + + solutions = { + events = { + inputs = [ ]; + interpreter = "none"; + scripts = [ "bin/bashup.events" ]; + inherit keep; + } // lib.optionalAttrs (lib.isAttrs fake) { inherit fake; }; + }; + + inherit doInstallCheck; + installCheckInputs = [ bash ]; + installCheckPhase = installCheck "${bash}/bin/bash"; + + meta = with lib; { + inherit branch; + description = "An event listener/callback API for creating extensible bash programs"; + homepage = "https://github.com/bashup/events"; + license = licenses.cc0; + maintainers = with maintainers; [ abathur ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 5273ef0c5684e..29618623bbf08 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , clang-unwrapped , llvm , libdrm @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config python3 ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 - pkgconfig + pkg-config makeWrapper ]; diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 35de9fb934775..df4e5329018d3 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "4.4.13"; + version = "4.4.24"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m"; + sha256 = "sha256-FTHtd93LOnRek9fqvI+KBkk/+53Bwy9GKCEo0NDtops="; }; buildInputs = [ bctoolbox belr ]; diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index 27c6637d9fee6..5286359b9461a 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, libuuid }: +{ stdenv, fetchFromGitHub, pkg-config, cmake, libuuid }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libuuid ]; meta = with stdenv.lib; { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { navigation, and handling of incoming packets. ''; license = licenses.publicDomain; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix index 31997e5857777..cb2b24f580b52 100644 --- a/pkgs/development/libraries/boehm-gc/7.6.6.nix +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libatomic_ops , enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libatomic_ops ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 9ec27d3e9ebce..a056ece56e96c 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl, pkg-config }: let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = { description = "Library for operations on boolean expression binary trees"; diff --git a/pkgs/development/libraries/boost/1.71.nix b/pkgs/development/libraries/boost/1.71.nix index f66bd4cd6fb1c..7b128e25bb608 100644 --- a/pkgs/development/libraries/boost/1.71.nix +++ b/pkgs/development/libraries/boost/1.71.nix @@ -5,7 +5,7 @@ callPackage ./generic.nix (args // rec { src = fetchurl { #url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2"; - urls = [ + urls = [ "mirror://sourceforge/boost/boost_1_71_0.tar.bz2" "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2" ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 3a7c63165b7fb..2eedfbb7b0ee2 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv +{ config, stdenv, fetchurl, fetchpatch, pkg-config, libiconv , libintl, expat, zlib, libpng, pixman, fontconfig, freetype , x11Support? !stdenv.isDarwin, libXext, libXrender , gobjectSupport ? true, glib @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { outputBin = "dev"; # very small nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 13550bf3faba0..cbf9eedc8d5e2 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, darwin, cairo, fontconfig, freetype, libsigcxx }: +{ fetchurl, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }: stdenv.mkDerivation rec { pname = "cairomm"; version = "1.12.2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ cairo libsigcxx ]; buildInputs = [ fontconfig freetype ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 5140205ebc8a2..1e51822703590 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { pname = "capstone"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { installPhase = (stdenv.lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ") + "PREFIX=$out ./make.sh install"; - + nativeBuildInputs = [ - pkgconfig + pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index dba16b19e3b67..7813e53a41ebd 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ucommon, openssl, libgcrypt }: +{ stdenv, fetchurl, pkg-config, ucommon, openssl, libgcrypt }: stdenv.mkDerivation rec { name = "ccrtp-2.1.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ ucommon openssl libgcrypt ]; configureFlags = [ diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 4613eefd3b901..a95e22645cb8e 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "cdk"; - version ="5.0-20200923"; + version ="5.0-20210109"; buildInputs = [ ncurses @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" ]; - sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0"; + sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY="; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index f2377a59e7b28..68706c7b8d191 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-namespace" "--enable-flexible-member" ]; - + meta = { homepage = "http://www.cs.wisc.edu/condor/classad/"; description = "The Classified Advertisements library provides a generic means for matching resources"; diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 1a9644991b61e..823388189186f 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: +{ fetchurl, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "clutter-gst"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; postBuild = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 973ae344dc928..15bf0d689f5b0 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, meson, ninja +{ fetchurl, stdenv, pkg-config, meson, ninja , gobject-introspection, clutter, gtk3, gnome3 }: let @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; postBuild = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 8a70a872b9ef0..8644f83a689cd 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGLU, libGL, libX11, libXext, libXfixes +{ stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib , gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ gtk3 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libX11 libGL libGLU libXext libXfixes libXdamage libXcomposite libXi cogl pango atk json-glib gobject-introspection libxcb libinput libgudev libxkbcommon diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index 3b2d748a8366f..34678d9b37d78 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "cminpack-1.3.6"; - + src = fetchurl { url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz"; sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw"; diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix index 512a289152adf..a391f604875ef 100644 --- a/pkgs/development/libraries/cmrt/default.nix +++ b/pkgs/development/libraries/cmrt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, libdrm, libva }: stdenv.mkDerivation rec { pname = "cmrt"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1q7651nvvcqhph5rgfhklm71zqd0c405mrh3wx0cfzvil82yj8na"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libdrm libva ]; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index f2a69e87d85e5..10f732dc629ec 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk-pixbuf, xorg, libintl +{ stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 , mesa, automake, autoconf , gstreamerSupport ? true, gst_all_1 }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig libintl automake autoconf ]; + nativeBuildInputs = [ pkg-config libintl automake autoconf ]; configureFlags = [ "--enable-introspection" diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index a54bc75478224..d5d9aa75e8906 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp"; }; - + #Deleting this line causes "Unknown option --disable-static" configurePhase = "./configure --prefix=$out"; diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix index fa4f5d232aa3e..df1837de305b8 100644 --- a/pkgs/development/libraries/cre2/default.nix +++ b/pkgs/development/libraries/cre2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, - libtool, pkgconfig, re2, texinfo }: + libtool, pkg-config, re2, texinfo }: stdenv.mkDerivation rec { pname = "cre2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libtool - pkgconfig + pkg-config ]; buildInputs = [ re2 texinfo ]; diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index 71e3010447660..7ca90281abbcc 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, ilmbase, libtiff, openexr }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }: stdenv.mkDerivation rec { pname = "ctl"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libtiff ilmbase openexr ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index 077ac63748c6f..7c78faaee0b8c 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { pname = "ctpl"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1yr92xv9n6kgyixwg9ps4zb404ic5pgb171k4bi3mv9p6k8gv59s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/development/libraries/ctypes_sh/default.nix index d82296c3e66bc..6ec2a694970ef 100644 --- a/pkgs/development/libraries/ctypes_sh/default.nix +++ b/pkgs/development/libraries/ctypes_sh/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitHub -, autoreconfHook, pkgconfig +, autoreconfHook, pkg-config , zlib, libffi, elfutils, libdwarf }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ zlib libffi elfutils libdwarf ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 9f12da6b0ede3..80ec1986f8cfb 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook , qtbase, libuuid, libcap, uwsgi, grantlee, pcre }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-RidUZqDnzRrgW/7LVF+BF01zNcf1cJ/kS7OF/t1Q65c="; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index 353a5ba90611d..a19b1a2d9d0fc 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkgconfig, gtk2 }: +{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "cwiid-${version}-git"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex bluez gtk2 ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; NIX_LDFLAGS = "-lbluetooth"; diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 4be942d8b69ff..b78df35190bc1 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab -, meson, ninja, nasm, pkgconfig +, meson, ninja, nasm, pkg-config , withTools ? false # "dav1d" binary , withExamples ? false, SDL2 # "dav1dplay" binary , useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x"; }; - nativeBuildInputs = [ meson ninja nasm pkgconfig ]; + nativeBuildInputs = [ meson ninja nasm pkg-config ]; # TODO: doxygen (currently only HTML and not build by default). buildInputs = stdenv.lib.optional withExamples SDL2 ++ stdenv.lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ]; diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 1c9f71311726e..68b4efb377b64 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, glib, pkgconfig, expat }: +{ stdenv, fetchurl, dbus, glib, pkg-config, expat }: stdenv.mkDerivation rec { pname = "dbus-cplusplus"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus glib expat ]; configureFlags = [ "--disable-ecore" "--disable-tests" ]; diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index b0dd8e91960f3..8fb06fe9c4427 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPackages -, pkgconfig, expat, gettext, libiconv, dbus, glib +, pkg-config, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig gettext glib ]; + nativeBuildInputs = [ pkg-config gettext glib ]; buildInputs = [ expat libiconv ]; diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix index 22c0a9137caee..77cbd6e28ca5c 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono, dbus-sharp-1_0 }: stdenv.mkDerivation rec { pname = "dbus-sharp-glib"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0z8ylzby8n5sar7aywc8rngd9ap5qqznadsscp5v34cacdfz1gxm"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ mono dbus-sharp-1_0 ]; dontStrip = true; diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix index 496a109b58f13..33f0c6b382e92 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/default.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }: +{ stdenv, fetchFromGitHub, pkg-config, mono, dbus-sharp-2_0, autoreconfHook }: stdenv.mkDerivation rec { pname = "dbus-sharp-glib"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0i39kfg731as6j0hlmasgj8dyw5xsak7rl2dlimi1naphhffwzm8"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ mono dbus-sharp-2_0 ]; dontStrip = true; diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix index 084beae597271..291bb56efdef6 100644 --- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: +{stdenv, fetchFromGitHub, pkg-config, mono, autoreconfHook }: stdenv.mkDerivation rec { pname = "dbus-sharp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "13qlqx9wqahfpzzl59157cjxprqcx2bd40w5gb2bs3vdx058p562"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ mono ]; dontStrip = true; diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index 0fd638dbf8eb5..86a4fce00aa06 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }: +{stdenv, fetchFromGitHub, pkg-config, mono4, autoreconfHook }: stdenv.mkDerivation rec { pname = "dbus-sharp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1g5lblrvkd0wnhfzp326by6n3a9mj2bj7a7646g0ziwgsxp5w6y7"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged # See: https://github.com/NixOS/nixpkgs/pull/46060 diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 4480d197fa7c7..4496e59a407e1 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, pkgconfig +, pkg-config , expat , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , systemd @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" "doc" "man" ]; nativeBuildInputs = [ - pkgconfig + pkg-config docbook_xml_dtd_44 docbook-xsl-nons xmlto diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 594cac5002f67..fdbe8783d02b4 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchgit , fetchpatch -, pkgconfig +, pkg-config , glib , icu , gobject-introspection @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config vala autoreconfHook gobject-introspection diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index d333b7866655a..1b0b50d28f008 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch -, autoreconfHook, perl, pkgconfig, flux, zlib +, autoreconfHook, perl, pkg-config, flux, zlib , libjpeg, freetype, libpng, giflib , enableX11 ? true, xorg , enableSDL ? true, SDL }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook perl pkgconfig flux ]; + nativeBuildInputs = [ autoreconfHook perl pkg-config flux ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] ++ lib.optional enableSDL SDL diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index ff81ab7273283..6570b48e1630d 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dbus, dleyna-core, glib }: +{ stdenv, autoreconfHook, pkg-config, fetchFromGitHub, dbus, dleyna-core, glib }: stdenv.mkDerivation rec { pname = "dleyna-connector-dbus"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vziq5gwjm79yl2swch2mz6ias20nvfddf5cqgk9zbg25cb9m117"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ dbus dleyna-core glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 1f0a9bc7c5976..56d40361334b7 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchpatch , autoreconfHook -, pkgconfig +, pkg-config , gupnp }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index 6b14bbc611a83..8bff782bacc7d 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , dleyna-connector-dbus , dleyna-core , gssdp @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config makeWrapper ]; diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 90c4df8e6413d..4e6d263ed18e0 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -3,7 +3,7 @@ , fetchpatch , autoreconfHook , makeWrapper -, pkgconfig +, pkg-config , dleyna-core , dleyna-connector-dbus , gssdp @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config makeWrapper ]; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index c4d441df5a9ab..0f0b9720a1abe 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libpng, libjpeg +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libpng, libjpeg , guiSupport ? false, libX11 # see http://dlib.net/compile.html @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/development/libraries/dotnetfx35/default.nix index e1c59846aec53..68569b516a9b6 100644 --- a/pkgs/development/libraries/dotnetfx35/default.nix +++ b/pkgs/development/libraries/dotnetfx35/default.nix @@ -12,12 +12,12 @@ in ln -s $src/MSBuild.exe $out/bin ''; }; - + assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727"; - + wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1"; - + referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0"; - + referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5"; } diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/development/libraries/dotnetfx40/default.nix index 701464071d032..1ffc10cfc6056 100644 --- a/pkgs/development/libraries/dotnetfx40/default.nix +++ b/pkgs/development/libraries/dotnetfx40/default.nix @@ -12,12 +12,12 @@ in ln -s $src/MSBuild.exe $out/bin ''; }; - + assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727"; - + wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1"; - + referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0"; - + referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5"; } diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 49435ec67184a..5c9454d32280d 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file, libco-canonical +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libco-canonical , libuv, raft-canonical, sqlite-replication }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0h7ypigj1b6xbspzc35y89jkp84v8rqiv9qgkyqlqylr7mcw952a"; }; - nativeBuildInputs = [ autoreconfHook file pkgconfig ]; + nativeBuildInputs = [ autoreconfHook file pkg-config ]; buildInputs = [ libco-canonical.dev libuv diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 779e6b077625e..cfb0f31af041b 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM -, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkgconfig +, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ladspaH libjack2 liblo alsaLib qt4 libX11 libsndfile libSM - libsamplerate libtool autoconf automake xorgproto libICE pkgconfig + libsamplerate libtool autoconf automake xorgproto libICE pkg-config ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index f0f96273bea58..1eb23c1145b0c 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -pr *.so* $out/lib install -d -m 0755 $out/include/dxflib cp -pr src/*.h $out/include/dxflib - # Generate pkgconfig file + # Generate pkg-config file install -d -m 0755 $out/lib/pkgconfig cat << 'EOF' > $out/lib/pkgconfig/dxflib.pc prefix=${placeholder "out"} diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 1509db1b80dea..be22e24044d62 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , meson , ninja , libX11 @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 1fbe6f8893bf9..9f340545584ff 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation { pname = "elementary-cmake-modules"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { --replace ' ''${CMAKE_ROOT}/Modules' " $out/lib/cmake" ''; - propagatedBuildInputs = [ cmake pkgconfig ]; + propagatedBuildInputs = [ cmake pkg-config ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix index c1764e83c3039..72166bb38ce99 100644 --- a/pkgs/development/libraries/elf-header/default.nix +++ b/pkgs/development/libraries/elf-header/default.nix @@ -35,9 +35,9 @@ stdenvNoCC.mkDerivation { outputsToInstall = [ "out" ]; description = "The datastructures of ELF according to the target platform's libc"; longDescription = '' - The Executable and Linkable Format (ELF, formerly named Extensible Linking - Format), is usually defined in a header like this. - ''; + The Executable and Linkable Format (ELF, formerly named Extensible Linking + Format), is usually defined in a header like this. + ''; platforms = lib.platforms.all; maintainers = [ lib.maintainers.ericson2314 ]; }; diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index 650c1d4ce4970..fad14a898a789 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw, openimageio, libjpeg, libpng, libpthreadstubs, libX11, glib }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; - nativeBuildInputs = [ ispc pkgconfig cmake ]; + nativeBuildInputs = [ ispc pkg-config cmake ]; buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ] ++ lib.optionals stdenv.isDarwin [ glib ]; diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix index 0b7b4c9c8b172..671ebb279fab5 100644 --- a/pkgs/development/libraries/enchant/1.x.nix +++ b/pkgs/development/libraries/enchant/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }: +{ stdenv, fetchurl, aspell, pkg-config, glib, hunspell, hspell }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ aspell glib hunspell hspell ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 15e634fe4b5b6..7cc7a24f2c84c 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python3 +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3 , libGL, libX11 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python3 ]; + nativeBuildInputs = [ autoreconfHook pkg-config utilmacros python3 ]; buildInputs = [ libGL libX11 ]; preConfigure = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 4968c38bfd33b..9f9adb455b959 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libosip, openssl, pkgconfig, fetchpatch }: +{ stdenv, fetchurl, libosip, openssl, pkg-config, fetchpatch }: stdenv.mkDerivation rec { pname = "libexosip2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libosip openssl ]; patches = [ diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 0ce0f56d710e6..c49c12c03bd87 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , libnice -, pkgconfig +, pkg-config , autoreconfHook , gstreamer , gst-plugins-base @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gobject-introspection ]; diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix new file mode 100644 index 0000000000000..80306bf506bec --- /dev/null +++ b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "fast-cpp-csv-parser"; + version = "2021-01-03"; + + src = fetchFromGitHub { + owner = "ben-strasser"; + repo = pname; + rev = "75600d0b77448e6c410893830df0aec1dbacf8e3"; + sha256 = "04kalwgsr8khqr1j5j13vzwaml268c5dvc9wfcwfs13wp3snqwf2"; + }; + + installPhase = '' + mkdir -p $out/lib/pkgconfig $out/include + cp -r *.h $out/include/ + substituteAll ${./fast-cpp-csv-parser.pc.in} $out/lib/pkgconfig/fast-cpp-csv-parser.pc + ''; + + meta = with stdenv.lib; { + description = "A small, easy-to-use and fast header-only library for reading comma separated value (CSV) files"; + homepage = "https://github.com/ben-strasser/fast-cpp-csv-parser"; + license = licenses.bsd3; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in b/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in new file mode 100644 index 0000000000000..4a8e57d20ffcb --- /dev/null +++ b/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in @@ -0,0 +1,8 @@ +prefix=@out@ +includedir=${prefix}/include + +Name: fast-cpp-csv-parser +Description: Fast header-only library for reading CSV files +URL: https://github.com/ben-strasser/fast-cpp-csv-parser +Version: @version@ +Cflags: -isystem${includedir} diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix index 59056a9b9a37b..eb5cb25162091 100644 --- a/pkgs/development/libraries/fastpbkdf2/default.nix +++ b/pkgs/development/libraries/fastpbkdf2/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation { name = "fastpbkdf2-1.0.0"; - + src = fetchFromGitHub { owner = "ctz"; repo = "fastpbkdf2"; rev = "v1.0.0"; sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2"; }; - + buildInputs = [ openssl ]; preBuild = '' diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 1ce09b63cbed2..fd6f26c9789fa 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -1,21 +1,28 @@ { stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc -,freetype, fontconfig, harfbuzz, pixman, tllist, check }: +, freetype, fontconfig, pixman, tllist, check +, withHarfBuzz ? true +, harfbuzz +}: stdenv.mkDerivation rec { pname = "fcft"; - version = "2.3.1"; + version = "2.3.2"; src = fetchgit { url = "https://codeberg.org/dnkl/fcft.git"; rev = version; - sha256 = "sha256-FD3KfaQbSEA1XdmS6YxH+c5fSsra9Ro/KKslb7Brv7U="; + sha256 = "0k2i57rakm4g86f7hbhkby8af0vv7v63a70lk3m58mkycpy5q2rm"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; - buildInputs = [ freetype fontconfig pixman tllist harfbuzz ]; + buildInputs = [ freetype fontconfig pixman tllist ] + ++ lib.optional withHarfBuzz harfbuzz; checkInputs = [ check ]; - mesonFlags = [ "--buildtype=release" ]; + mesonFlags = [ + "--buildtype=release" + "-Dtext-shaping=${if withHarfBuzz then "enabled" else "disabled"}" + ]; doCheck = true; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index decea9bfb7944..d62d3dd7cc6fd 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas, lapack +{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkg-config, blas, lapack , gmpxx }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ] ++ stdenv.lib.optionals doCheck checkInputs; buildInputs = [ givaro blas lapack ]; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index f428290e8039a..27f2c65e867a9 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm +{ stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkg-config, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -430,7 +430,7 @@ stdenv.mkDerivation rec { "--enable-cross-compile" ]; - nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; + nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; buildInputs = [ bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index 049ef32b72fbf..d01f22c0b3a17 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm +{ stdenv, fetchFromGitHub, pkg-config, libsixel, yasm }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "00s2lggfdj2ibpngpyqqg7360p7yb69ys1ppg59yvv0m0mxk5x3k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsixel yasm diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d763fb513545f..bc4de6a5b4a7b 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm +{ stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d @@ -167,7 +167,7 @@ stdenv.mkDerivation rec { ] ++ optional stdenv.cc.isClang "--cc=clang"); depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; + nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index ebbced19eb8ea..3dfe697981cb0 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkgconfig }: +{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkg-config }: stdenv.mkDerivation rec { pname = "ffms"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fPIC"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ffmpeg_3 ]; # ffms includes a built-in vapoursynth plugin, see: diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index c40a75edc0902..4c482176fcbcb 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi +{ stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi , freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index ad4736533cf02..ca8198fb271b0 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi +{ stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi , freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 6181cb45e19ec..7b2ca83fe5ba8 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,6 +1,6 @@ { fetchurl , stdenv -, pkgconfig +, pkg-config , meson , ninja , glib @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 62f73a361916d..26680b2d23cb9 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (rec { pname = "folly"; - version = "2020.09.28.00"; + version = "2021.01.18.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "1ry2nqfavcbz0jvsqw71105gbxm5hpmdi2k1w155m957jrv3n5vg"; + sha256 = "sha256-jTLHaaD/Rkfo96IMV4XtvmPzo34P26e17IabFU/5o6Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/forge/default.nix b/pkgs/development/libraries/forge/default.nix index 83630aef9aa80..aec790dd84311 100644 --- a/pkgs/development/libraries/forge/default.nix +++ b/pkgs/development/libraries/forge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , arrayfire, expat, fontconfig, freeimage, freetype, boost , mesa, libGLU, libGL, glfw3, SDL2, cudatoolkit }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index f266f07a631c9..76549e728ebb6 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xorg }: +, stdenv, fetchurl, pkg-config, xorg }: stdenv.mkDerivation rec { pname = "frame"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a"; }; - buildInputs = [ - stdenv pkgconfig + buildInputs = [ + stdenv pkg-config ] ++ stdenv.lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 9021e78a5b69b..2cf0265147315 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu +{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkg-config, freeglut, libGLU, libGL, libXi, libXmu , GLUT, Cocoa }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = { description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 1dc9633d1a733..df26ac9978d55 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig +{ stdenv, fetchurl, autoreconfHook, pkg-config , openssl , odbcSupport ? true, unixODBC ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { openssl ] ++ stdenv.lib.optional odbcSupport unixODBC; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with stdenv.lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index b87e64c2afbf7..4e4db4b844e53 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , buildPackages -, pkgconfig, which, makeWrapper +, pkg-config, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkgconfig which makeWrapper ] + nativeBuildInputs = [ pkg-config which makeWrapper ] # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { postInstall = glib.flattenInclude + '' substituteInPlace $dev/bin/freetype-config \ - --replace ${buildPackages.pkgconfig} ${pkgconfig} + --replace ${buildPackages.pkg-config} ${pkg-config} wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 2dc7275559d49..8a0590419982c 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }: +{ stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }: stdenv.mkDerivation rec { pname = "frei0r-plugins"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0"; }; - nativeBuildInputs = [ autoconf pkgconfig ]; + nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ cairo opencv ]; postInstall = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index f10af240720de..0055811e185cc 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -3,7 +3,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , fixDarwinDylibNames , python3 }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patchShebangs test ''; - nativeBuildInputs = [ meson ninja pkgconfig ] + nativeBuildInputs = [ meson ninja pkg-config ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index 7b1adb3e3f0c3..cd36af184b4a9 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, openssl }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, openssl }: stdenv.mkDerivation rec { pname = "fstrm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libevent openssl ]; preBuild = '' diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix index 46ed3626d2af1..701ee3556671c 100644 --- a/pkgs/development/libraries/gaia/default.nix +++ b/pkgs/development/libraries/gaia/default.nix @@ -4,7 +4,7 @@ , libyaml , swig , eigen -, pkgconfig +, pkg-config , python2 , wafHook , makeWrapper @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig + pkg-config python2 # For wafHook swig wafHook diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 89096c8874508..eb11bc6d72bb9 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }: let cross = stdenv.hostPlatform != stdenv.buildPlatform; @@ -10,7 +10,7 @@ in stdenv.mkDerivation (rec { sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib ]; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index cf9b04863043b..130568460171b 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python, wafHook }: +{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { pname = "ganv"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ graphviz gtk2 gtkmm2 python ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 0034f7ed63333..9d9e6cd1c156e 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -5,7 +5,7 @@ , gtk-doc , docbook_xsl , docbook_xml_dtd_43 -, pkgconfig +, pkg-config , meson , ninja , git @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meson ninja git - pkgconfig + pkg-config vala gettext gobject-introspection diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 212b087fbe2c9..a2eea019400fb 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson python3 ninja diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index 893fc4f8d27ce..22034733f5e3b 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, mono, dotnetPackages }: +{ stdenv, fetchsvn, pkg-config, mono, dotnetPackages }: let newtonsoft-json = dotnetPackages.NewtonsoftJson; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0b0rvgg3xsbbg2fdrpz0ywsy9rcahlyfskndaagd3yzm83gi6bhk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono newtonsoft-json ]; sourceRoot = "svn-r1217/clients/cs"; diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index 338d0b6b91b08..7b3d1d4e831ce 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: +{ stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }: stdenv.mkDerivation rec { pname = "gdl"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ libxml2 gtk3 ]; passthru = { diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index e38cb7535b001..ec0621c5a3d5e 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, libxml2, gtk-doc}: +{stdenv, fetchurl, pkg-config, glib, libxml2, gtk-doc}: let pname = "gdome2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxml2 gtk-doc ]; propagatedBuildInputs = [glib libxml2]; patches = [ ./xml-document.patch ]; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index c25f9145ea5e6..4852db0dac3f4 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , vala , gobject-introspection , gtk-doc @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config gettext meson ninja diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index a99ec05d771ce..93adb49d8b704 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , babl , libpng , cairo @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] ++ stdenv.lib.optional stdenv.isDarwin OpenGL; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = false; # fails 3 out of 19 tests diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index fd3924fec3ea0..b7623d15dd4e9 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig +, pkg-config , python3Packages , wrapGAppsHook , atk @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ pygobject3 ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython]; + nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython]; buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver ]; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 74d778c5c555a..8e54c6c43b092 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf +{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkg-config, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf , modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala , withDemoAgent ? false }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig intltool meson ninja wrapGAppsHook python3 vala gobject-introspection + pkg-config intltool meson ninja wrapGAppsHook python3 vala gobject-introspection # devdoc gtk-doc docbook_xsl docbook_xml_dtd_412 ]; diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index ec9bf2e5cb991..a13cbdfc15952 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: +{ fetchurl, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: stdenv.mkDerivation rec { pname = "geocode-glib"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gettext gtk-doc docbook_xsl gobject-introspection ]; buildInputs = [ glib libsoup json-glib ]; patches = [ diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 9b72ca3524cce..b9d287ba2eb2e 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: stdenv.mkDerivation rec { pname = "gexiv2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla"; }; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ glib ]; propagatedBuildInputs = [ exiv2 ]; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index 4718e6ac015a0..93286e85d12c1 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, librest, gnome-online-accounts +{ stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts , gnome3, libsoup, json-glib, gobject-introspection , gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig gobject-introspection gtk-doc + pkg-config gobject-introspection gtk-doc docbook-xsl-nons autoconf automake libtool ]; buildInputs = [ glib gnome-online-accounts ]; diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index a19febbfd66e6..f315679c9b7b9 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, glib, gtk-sharp-2_0 }: +{ stdenv, fetchFromGitHub, autoconf, automake, which, pkg-config, mono, glib, gtk-sharp-2_0 }: stdenv.mkDerivation rec { pname = "gio-sharp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig"; }; - nativeBuildInputs = [ pkgconfig autoconf automake which ]; + nativeBuildInputs = [ pkg-config autoconf automake which ]; buildInputs = [ mono glib gtk-sharp-2_0 ]; dontStrip = true; diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 9437d76335d0a..5bcea2798191f 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -3,7 +3,7 @@ , stdenv , meson , ninja -, pkgconfig +, pkg-config , gnome3 , gtk3 , atk @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config makeWrapper which # for locale detection libxml2 # for xml-stripblanks diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index e749ca733daaf..ca65315e1cba2 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { make x11-dist-install PREFIX=$out mv $out/lib/libglfw.so $out/lib/libglfw.so.2 ln -s libglfw.so.2 $out/lib/libglfw.so - ''; - - meta = with stdenv.lib; { + ''; + + meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; homepage = "http://glfw.sourceforge.net/"; license = licenses.zlib; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index fc85b50e07f37..31e066e8a2507 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -4,7 +4,7 @@ , meson , ninja , nixosTests -, pkgconfig +, pkg-config , glib , gettext , makeWrapper @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext makeWrapper python3 # for install_script diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/development/libraries/glib-testing/default.nix index 085dfc7344f5d..b04cbfe36d00c 100644 --- a/pkgs/development/libraries/glib-testing/default.nix +++ b/pkgs/development/libraries/glib-testing/default.nix @@ -2,7 +2,7 @@ , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gtk-doc docbook-xsl-nons docbook_xml_dtd_43 diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 57f05d410fbf7..da1eb0765365a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3 +{ config, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3 , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null @@ -29,7 +29,7 @@ assert stdenv.isLinux -> util-linuxMinimal != null; * Support org.freedesktop.Application, including D-Bus activation from desktop files */ let - # Some packages don't get "Cflags" from pkgconfig correctly + # Some packages don't get "Cflags" from pkg-config correctly # and then fail to build when directly including like <glib/...>. # This is intended to be run in postInstall of any package # which has $out/include/ containing just some disjunct directories. @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ]); nativeBuildInputs = [ - meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 + meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 53e924b1325af..c737ee9ec451e 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3, darwin }: +{ stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }: stdenv.mkDerivation rec { pname = "glibmm"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig + pkg-config gnum4 glib # for glib-compile-schemas ]; diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index 3ab157598a4e9..6f53cda536acd 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, zlib, openssl_1_0_2, pcsclite }: +{ stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { pname = "globalplatform"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib openssl_1_0_2 pcsclite ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix index 043be9e91b50a..33a6954d69550 100644 --- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, globalplatform, openssl_1_0_2, pcsclite }: +{ stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { pname = "gppcscconnectionplugin"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ globalplatform openssl_1_0_2 pcsclite ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index c902aac23a144..05bb401822937 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, libgpgerror, gobject-introspection }: +{ stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpgerror, gobject-introspection }: stdenv.mkDerivation rec { version = "2.6.23"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; propagatedBuildInputs = [ glib zlib libgpgerror ]; configureFlags = [ "--enable-introspection=yes" ]; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index f2ba29d461e7d..01ddde2ca89a0 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection +{ stdenv, fetchurl, pkg-config, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection , vala }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ vala gobject-introspection zlib gpgme libidn2 libunistring ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glib ]; configureFlags = [ "--enable-introspection=yes" diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix index f6516815bb927..81e33c39a7d15 100644 --- a/pkgs/development/libraries/gmtk/default.nix +++ b/pkgs/development/libraries/gmtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, substituteAll, fetchFromGitHub, libtool, pkgconfig, intltool, glib, gtk3 +{stdenv, substituteAll, fetchFromGitHub, libtool, pkg-config, intltool, glib, gtk3 , libpulseaudio, mplayer, gnome_mplayer }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i"; }; - nativeBuildInputs = [ libtool pkgconfig intltool ]; + nativeBuildInputs = [ libtool pkg-config intltool ]; buildInputs = [ glib gtk3 libpulseaudio ]; patches = [ diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index 749b021890acc..91522e3f1269a 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, glib, libtool }: +{stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }: stdenv.mkDerivation { name = "gnet-2.0.8"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake glib libtool ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index f8e25640f29af..3d4d8be3f1ac2 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, gnome3 }: +{ stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-menus"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ glib gobject-introspection ]; passthru = { diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index 5926f59cc37e9..efd95d0f973c3 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, pkgconfig +, pkg-config , gtk2 , mono , gtk-sharp-2_0 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z"; }; - nativeBuildInputs = [ pkgconfig autoconf automake libtool which ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; buildInputs = [ gtk2 mono gtk-sharp-2_0 ] ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]); diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index dfbb2c3b1e67c..41a0cb297c427 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext ]; diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index c6d35b6823606..245b0c1e63812 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkg-config, lzip , perl, gmp, autogen, libidn, p11-kit, unbound, libiconv , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake @@ -62,12 +62,12 @@ stdenv.mkDerivation { ++ [ unbound ] ++ lib.optional guileBindings guile; - nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; + nativeBuildInputs = [ perl pkg-config ] ++ nativeBuildInputs; #inherit doCheck; doCheck = false; - # Fixup broken libtool and pkgconfig files + # Fixup broken libtool and pkg-config files preFixup = lib.optionalString (!stdenv.isDarwin) '' sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \ -e 's,-lz,-L${zlib.out}/lib -lz,' \ diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index ae3775002ec91..2cd1e783ea924 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip , perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv , unbound, dns-root-data, gettext, cacert, util-linux , guileBindings ? config.gnutls.guile or false, guile @@ -40,7 +40,7 @@ stdenv.mkDerivation { ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; # Skip some tests: - # - pkgconfig: building against the result won't work before installing (3.5.11) + # - pkg-config: building against the result won't work before installing (3.5.11) # - fastopen: no idea; it broke between 3.6.2 and 3.6.3 (3437fdde6 in particular) # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11) # - psk-file: no idea; it broke between 3.6.3 and 3.6.4 @@ -76,7 +76,7 @@ stdenv.mkDerivation { ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile; - nativeBuildInputs = [ perl pkgconfig ] + nativeBuildInputs = [ perl pkg-config ] ++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ] ++ lib.optionals doCheck [ which nettools util-linux ]; @@ -87,7 +87,7 @@ stdenv.mkDerivation { # Error setting the x509 trust file: Error while reading file. checkInputs = [ cacert ]; - # Fixup broken libtool and pkgconfig files + # Fixup broken libtool and pkg-config files preFixup = lib.optionalString (!isDarwin) '' sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \ -e 's,-lz,-L${zlib.out}/lib -lz,' \ diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 46b40d00d7803..d9cffbc228ede 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3, lasem +{ fetchurl, stdenv, pkg-config, intltool, glib, gtk3, lasem , libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; propagatedBuildInputs = [ glib gtk3 libxml2 cairo pango libgsf lasem diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 753db22f4f9f3..2be144fc4c63f 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , glib , python3 , sqlite @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index a744cf314e291..ae583f5ac8b86 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: +{ stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: let version = "2.0.4"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; }; - nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ]; + nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ]; buildInputs = [ gtk3 cairo glib gobject-introspection ]; configureFlags = [ diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 024ac363af18a..825e0cbe1948b 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, cairo, glib, pkgconfig, gnome3 }: +{ stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome3 }: stdenv.mkDerivation rec { pname = "goocanvas"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 cairo glib ]; passthru = { diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index d8a910d4799c5..e68094f9d5239 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, goocanvas2, gtkmm3, gnome3 }: +{ stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome3 }: stdenv.mkDerivation rec { pname = "goocanvasmm"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vpdfrj59nwzwj8bk4s0h05iyql62pxjzsxh72g3vry07s3i3zw0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ gtkmm3 goocanvas2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 91b2c2929a489..bdb4e67f85feb 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,11 +1,20 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, libunwind }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, libunwind +}: stdenv.mkDerivation rec { - name = "gperftools-2.8"; - - src = fetchurl { - url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz"; - sha256 = "0gjiplvday50x695pwjrysnvm5wfvg2b0gmqf6b4bdi8sv6yl394"; + pname = "gperftools"; + version = "2.8.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "19bj2vlsbfwq7m826v2ccqg47kd7cb5vcz1yw2x0v5qzhaxbakk1"; }; patches = [ @@ -20,21 +29,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # tcmalloc uses libunwind in a way that works correctly only on non-ARM linux - buildInputs = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind; + buildInputs = lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind; # Disable general dynamic TLS on AArch to support dlopen()'ing the library: # https://bugzilla.redhat.com/show_bug.cgi?id=1483558 - configureFlags = stdenv.lib.optional (stdenv.isAarch32 || stdenv.isAarch64) + configureFlags = lib.optional (stdenv.isAarch32 || stdenv.isAarch64) "--disable-general-dynamic-tls"; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.am --replace stdc++ c++ - substituteInPlace Makefile.in --replace stdc++ c++ - substituteInPlace libtool --replace stdc++ c++ ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin - "-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + "-D_XOPEN_SOURCE"; # some packages want to link to the static tcmalloc_minimal # to drop the runtime dependency on gperftools @@ -42,7 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/gperftools/gperftools"; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 489b6001342b4..4b96b493cf5e0 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch -, autoreconfHook, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan +, autoreconfHook, libgpgerror, gnupg, pkg-config, glib, pth, libassuan , file, which, ncurses , texinfo , buildPackages @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { [ libgpgerror glib libassuan pth ] ++ lib.optional (qtbase != null) qtbase; - nativeBuildInputs = [ pkgconfig gnupg texinfo autoreconfHook ] + nativeBuildInputs = [ pkg-config gnupg texinfo autoreconfHook ] ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index 6efc1fca39a8d..bd1c8434949c9 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true, - stdenv, fetchurl, pkgconfig, xorg, python3, frame }: + stdenv, fetchurl, pkg-config, xorg, python3, frame }: stdenv.mkDerivation rec { pname = "grail"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python3 frame ] ++ stdenv.lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index ee147d82afdbf..f72b354f16143 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , nix-update-script -, pkgconfig +, pkg-config , meson , ninja , python3 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config gobject-introspection python3 ]; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 9073a501c09f9..07bad7745d6c7 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -3,7 +3,7 @@ , substituteAll , meson , ninja -, pkgconfig +, pkg-config , gettext , gperf , sqlite @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool gperf # for lua-factory diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 858e8d81fd426..7a3667af880c5 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3 +{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext gobject-introspection vala + meson ninja pkg-config gettext gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 1032f15196ccd..3c6b2688b773e 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , glib , gobject-introspection , meson @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { glib meson ninja - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index cbba9c5fcea2b..9bb6bd17f4099 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig +{ stdenv, fetchFromGitLab, pkg-config , qmake, qtbase, qtdeclarative, wrapQtAppsHook , glib, gobject-introspection , genericUpdater, common-updater-scripts @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config qmake gobject-introspection wrapQtAppsHook diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix index b0db776bd6167..dda751acfb1a5 100644 --- a/pkgs/development/libraries/gsignond/default.nix +++ b/pkgs/development/libraries/gsignond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking +{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, glib-networking , sqlite, gobject-introspection, vala, gtk-doc, libsecret, docbook_xsl , docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper , symlinkJoin, gsignondPlugins, plugins }: @@ -26,7 +26,7 @@ unwrapped = stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index b1a383ee59185..72d1a8e90ff69 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: +{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: stdenv.mkDerivation { pname = "gsignond-plugin-lastfm"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { gobject-introspection meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix index 4ac6e6a6f9ffd..240d47f6dd2de 100644 --- a/pkgs/development/libraries/gsignond/plugins/mail.nix +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobject-introspection }: +{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, gobject-introspection }: stdenv.mkDerivation rec { pname = "gsignond-plugin-mail"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index b4b16a57af412..b1d673eea952f 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, check +{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: @@ -23,7 +23,7 @@ stdenv.mkDerivation { gtk-doc meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index 1a1f34681cea1..8fc633838311b 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check +{ stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, gsasl, check , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation { gtk-doc meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index bae1b17e5322e..9fc099fd3dd0b 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: +{ stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: stdenv.mkDerivation rec { pname = "gsound"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection libtool vala ]; + nativeBuildInputs = [ pkg-config gobject-introspection libtool vala ]; buildInputs = [ glib libcanberra ]; passthru = { diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 37e54c8259551..a240db6c04db7 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , libxml2 , glib , gtk3 @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config vala gobject-introspection libxml2 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - # required for pkgconfig + # required for pkg-config enchant2 ]; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 0a808b71a71ca..0ab377c2e29df 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection vala gtk-doc diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 49343e79c8788..58b33f6c2f985 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -5,7 +5,7 @@ , ninja , gettext , config -, pkgconfig +, pkg-config , python3 , gst-plugins-base , orc @@ -105,7 +105,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config orc # for orcc python3 gettext diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 4728e49c51629..bac59ac4c48ca 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , lib -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 gettext orc diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 0d33d28196cae..a5b4c0b827a1e 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , gobject-introspection , bison @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext bison flex @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing ] ++ lib.optionals stdenv.isDarwin [ - # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it. + # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. "-Dlibunwind=disabled" "-Dlibdw=disabled" ]; diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 6743a5ecd6752..1665c7f8a1334 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gstreamer , gst-plugins-base , python3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection # documentation diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 75e065e6d2be7..4ccb2e2c286ab 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , python3 , bash-completion , gst-plugins-base @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext gobject-introspection gst-devtools diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index d4c3b99c7ca99..4bbdfdad69d0d 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -3,7 +3,7 @@ , meson , nasm , ninja -, pkgconfig +, pkg-config , python3 , gst-plugins-base , orc @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config python3 meson ninja diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 35c278da03b1f..51d0fcc8efda3 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1, gnome3 }: +{ stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }: stdenv.mkDerivation rec { pname = "gstreamermm"; version = "1.10.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig file ]; + nativeBuildInputs = [ pkg-config file ]; propagatedBuildInputs = [ glibmm gst_all_1.gst-plugins-base ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index c75d439cd53f5..3175cff4acaa8 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -3,7 +3,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , python3 , gst-plugins-base , gettext @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meson ninja gettext - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 4167b17277690..16de3a6e65f83 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , python3 , gettext , gobject-introspection @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ninja gettext gobject-introspection - pkgconfig + pkg-config python3 # documentation diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 1cdc0a5193000..8f35829ed3845 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , python3 , gst-plugins-base , orc @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meson ninja gettext - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 52a6cb27894b2..e758568b2bb49 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gst-plugins-base , bzip2 , libva @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config bzip2 # documentation diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index b848af6c318a7..7b25d6dd725ce 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkgconfig}: +{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip"; sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cdk unzip gtk2 glib ncurses ]; diff --git a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix index 99ca221f5ba2d..e595f6bf02ddc 100644 --- a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix +++ b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ stdenv, fetchurl, pkg-config, intltool, gtk2 }: stdenv.mkDerivation { name = "gtk-engine-bluecurve-1.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk2 ]; diff --git a/pkgs/development/libraries/gtk-engine-murrine/default.nix b/pkgs/development/libraries/gtk-engine-murrine/default.nix index 9acb7b25a0dd7..f5ae9c0552d90 100644 --- a/pkgs/development/libraries/gtk-engine-murrine/default.nix +++ b/pkgs/development/libraries/gtk-engine-murrine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ stdenv, fetchurl, pkg-config, intltool, gtk2 }: stdenv.mkDerivation rec { pname = "gtk-engine-murrine"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk2 ]; meta = { diff --git a/pkgs/development/libraries/gtk-engines/default.nix b/pkgs/development/libraries/gtk-engines/default.nix index 2f56f6eb4c5c0..077bb53443a20 100644 --- a/pkgs/development/libraries/gtk-engines/default.nix +++ b/pkgs/development/libraries/gtk-engines/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ stdenv, fetchurl, pkg-config, intltool, gtk2 }: stdenv.mkDerivation { name = "gtk-engines-2.20.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk2 ]; meta = { diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 87f9698bec0a8..1aef590bb92af 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.5.1"; + version = "0.5.2"; outputs = [ "out" "dev" "devdoc" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "1yfqfv3hn92cy9y5zgvz7qhq2ypill2z5857ki5snjimhjdz0cnw"; + sha256 = "sha256-516N45q5EZTq5eLCqH/T/VV/AxgBsQhJ+yZdLOEeDUk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index 5cf62b319a6b1..d6df10db176a8 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }: +{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, glib, gtk-doc, gtk, gobject-introspection }: stdenv.mkDerivation rec { pname = "gtk-mac-integration"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1w0agv4r0daklv5d2f3l0c10krravjq8bj9hsdsrpka48dbnqmap"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobject-introspection ]; + nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc gobject-introspection ]; buildInputs = [ glib ]; propagatedBuildInputs = [ gtk ]; diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index 2b83a8ef52e28..9daf3bb91e501 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }: +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono, gtk-sharp-2_0, gio-sharp }: stdenv.mkDerivation rec { pname = "gtk-sharp-beans"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook which ]; + nativeBuildInputs = [ pkg-config autoreconfHook which ]; buildInputs = [ mono gtk-sharp-2_0 gio-sharp ]; dontStrip = true; diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index ed53105f7581b..5afcb2d285a2e 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, pkgconfig +, pkg-config , mono , glib , pango @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { popd ''; - nativeBuildInputs = [ pkgconfig autoconf automake libtool which ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; buildInputs = [ mono glib pango gtk2 GConf libglade libgnomecanvas diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 49405c655e15e..576ad670bdba3 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , mono , glib , pango @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono glib pango gtk3 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index be5f8521f9c8c..bd1b15b59e27b 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg +{ config, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg , gdk-pixbuf, xlibsWrapper, gobject-introspection , xineramaSupport ? stdenv.isLinux , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ./hooks/drop-icon-theme-cache.sh ]; - nativeBuildInputs = setupHooks ++ [ perl pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ]; patches = [ ./patches/2.0-immodules.cache.patch diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 59685ca07ccb3..d802ee7e44f69 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , gettext , docbook_xsl , docbook_xml_dtd_43 @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { makeWrapper meson ninja - pkgconfig + pkg-config python3 sassc ] ++ setupHooks ++ optionals withGtkDoc [ diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 5cef820db1497..89c674f09d5e7 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg -, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkgconfig, which, vte }: +, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ dmd pkgconfig which ]; + nativeBuildInputs = [ dmd pkg-config which ]; propagatedBuildInputs = [ atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4 libgda libpeas librsvg pango vte @@ -117,7 +117,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" - "PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" + "PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" ]; # The .pc files does not declare an `includedir=`, so the multiple diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 54054270c3c64..8246d80a10f8a 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2 }: +{ stdenv, fetchurl, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "gtkdatabox-0.9.3.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ gtk2 ]; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index babcaa9933407..65b6fd1b43dc3 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gtk2 }: +{ fetchurl, stdenv, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "gtkimageview-1.6.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; preConfigure = '' diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index 0c72f8501cc27..d5a10171bdfc4 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }: +{stdenv, fetchurl, pkg-config, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }: let pname = "gtkmathview"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0hwcamf5fi35frg7q6kgisc9v0prqbhsplb2gl55cg3av9sh3hqx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ t1lib glib gmetadom libxml2 popt]; propagatedBuildInputs = [gtk2 t1lib]; diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 24262d263cbf1..0e04cb710dc54 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, glibmm, cairomm, pangomm, atkmm }: +{ stdenv, fetchurl, pkg-config, gtk2, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { name = "gtkmm-${minVer}.5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 5794b2ddf46f3..523cb5c59d8c1 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: +{ stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: stdenv.mkDerivation rec { pname = "gtkmm"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ epoxy ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index d32a0eebf1377..870637202c4e7 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala +{ stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala , libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ]; checkInputs = [ xvfb_run dbus ]; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 2041e83fb0c32..0254c096c14fe 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, fribidi, vala +{ stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info , meson, ninja }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext perl gobject-introspection vala ]; + nativeBuildInputs = [ meson ninja pkg-config gettext perl gobject-introspection vala ]; checkInputs = [ xvfb_run dbus ]; diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index 1607a5819961d..d05e1ebf83e8a 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview4, gnome3 }: +{ stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glibmm gtkmm3 gtksourceview4 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 7bf510207ab3e..675ced4ee497e 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }: +{ stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glibmm gtkmm3 gtksourceview3 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index 707acfcd3820c..721db5983d7ec 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}: +{stdenv, fetchurl, gtk3, aspell, pkg-config, enchant, isocodes, intltool, gobject-introspection, vala}: stdenv.mkDerivation rec { pname = "gtkspell"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0cjp6xdcnzh6kka42w9g0w2ihqjlq8yl8hjm9wsfnixk6qwgch5h"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config intltool gobject-introspection vala ]; buildInputs = [ aspell gtk3 enchant isocodes ]; propagatedBuildInputs = [ enchant ]; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index b6ee2c6825d66..a1305a435b2ea 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, aspell, pkgconfig, enchant, intltool}: +{stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}: stdenv.mkDerivation { name = "gtkspell-2.0.16"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [aspell gtk2 enchant intltool]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index b3bca9bd7b6df..47edb03985d36 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig +, pkg-config , gtk3, glib, glibmm, gtkmm3, gtkspell3 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { gtkspell3 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 glib glibmm gtkmm3 ]; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 48bdfc9b5e1b2..3738baa21aeb7 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, autoreconfHook, gettext, glib, buildPackages }: +{ fetchurl, stdenv, pkg-config, autoreconfHook, gettext, glib, buildPackages }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook glib # required to satisfy AM_PATH_GLIB_2_0 ]; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 80fb9e3affffc..d288f09b36a63 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection vala gtk-doc diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 8fc001de3d563..6b5f80a0e51ed 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection vala gtk-doc diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index a8ed1f7cadd09..d5aa7a99196e2 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , autoreconfHook -, pkgconfig +, pkg-config , gettext , gobject-introspection , gtk-doc @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gettext gobject-introspection diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 153eb681d6331..7f606c10b6bef 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection vala gtk-doc diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index a2e1576914594..1d0c5e1b02717 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobject-introspection +{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, gobject-introspection , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3 , glib, systemd, libusb1, vala, hwdata }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gettext pythonEnv + meson ninja pkg-config gettext pythonEnv gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 gobject-introspection vala ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index f79ffa579c876..1b840eba73a10 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , dbus , glib @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meson ninja python3 - pkgconfig + pkg-config gettext wrapGAppsHook libxml2 diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 8ef8b55be522f..2c415b39df31d 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkgconfig, +{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkg-config, boost, libtool, perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 - tcl libusb-compat-0_1 pkgconfig boost libtool ]; + tcl libusb-compat-0_1 pkg-config boost libtool ]; configureFlags = [ "--with-perl-binding" "--with-python-binding" "--with-tcl-binding" "--with-rigmatrix" ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 6c5703f521d72..c0e1be302535a 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, freetype, cairo, libintl +{ stdenv, fetchFromGitHub, pkg-config, glib, freetype, cairo, libintl , meson, ninja , gobject-introspection , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. @@ -50,7 +50,7 @@ stdenv.mkDerivation { ninja gobject-introspection libintl - pkgconfig + pkg-config python3 gtk-doc docbook-xsl-nons diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index c42a352822334..2251bb7a91a4f 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb1 +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, udev, libusb1 , darwin }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ]; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index ee22726414ac4..1afbe8a2f75a1 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper +{ stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper , perlPackages, libxml2, libiconv }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./hivex-syms.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoreconfHook makeWrapper libxml2 ] diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 561a4693c1d79..3c8ffee1bdeb3 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl +{ stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl , x11Support ? false, libX11 ? null, cairo ? null }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ]; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. - 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/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index 09b7751c8284b..073e9d1668616 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp-2_0, monoDLLFixer }: +{ stdenv, fetchurl, pkg-config, mono, gtk-sharp-2_0, monoDLLFixer }: stdenv.mkDerivation rec { pname = "hyena"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono gtk-sharp-2_0 ]; diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix index 17246f0aa0a94..3ab52165b7891 100644 --- a/pkgs/development/libraries/hyperscan/default.nix +++ b/pkgs/development/libraries/hyperscan/default.nix @@ -4,8 +4,8 @@ , withStatic ? false # build only shared libs by default, build static+shared if true }: -# NOTICE: pkgconfig, pcap and pcre intentionally omitted from build inputs -# pcap used only in examples, pkgconfig used only to check for pcre +# NOTICE: pkg-config, pcap and pcre intentionally omitted from build inputs +# pcap used only in examples, pkg-config used only to check for pcre # which is fixed 8.41 version requirement (nixpkgs have 8.42+, and # I not see any reason (for now) to backport 8.41. @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { Hyperscan uses hybrid automata techniques to allow simultaneous matching of large numbers (up to tens of thousands) of regular - expressions and for the matching of regular expressions across + expressions and for the matching of regular expressions across streams of data. Hyperscan is typically used in a DPI library stack. diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 7d80152103835..b98588eb410f2 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, - pkgconfig, autoreconfHook, + pkg-config, autoreconfHook, flex, yacc, zlib, libxml2 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0cb0kp6mpmgz74kbymqw4xxads8ff7jh0n59dsm76xy6nn8hpqcz"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ flex yacc zlib libxml2 ]; # Normally, igraph wants us to call bootstrap.sh, which will call diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix index 7f7645edc91fb..d9c01ab5fcf3b 100644 --- a/pkgs/development/libraries/iksemel/default.nix +++ b/pkgs/development/libraries/iksemel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }: +{ stdenv, autoreconfHook, libtool, pkg-config, gnutls, fetchFromGitHub, texinfo }: stdenv.mkDerivation rec { pname = "iksemel"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook libtool texinfo ]; + nativeBuildInputs = [ pkg-config autoreconfHook libtool texinfo ]; buildInputs = [ gnutls ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index 6f789174ec07b..26e63747523f7 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, directfb, libsigcxx, libxml2, fontconfig }: +{ stdenv, fetchurl, pkg-config, directfb, libsigcxx, libxml2, fontconfig }: # TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen, # Reflex, Wnn, NLS @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ directfb libsigcxx libxml2 fontconfig ]; configureFlags = [ diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 458b3d29d5203..aabfff908c1a3 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -3,7 +3,7 @@ , libjpeg, libtiff, giflib, libpng, libwebp # imlib2 can load images from ID3 tags. , libid3tag -, freetype , bzip2, pkgconfig +, freetype , bzip2, pkg-config , x11Support ? true, xlibsWrapper ? null }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { bzip2 freetype libid3tag ] ++ optional x11Support xlibsWrapper; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index 6ac74988dff46..f75ade98c6d8e 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, file -, pkgconfig, autoconf +, pkg-config, autoconf , glib, dbus-glib, json-glib , gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1xqsb6c1pwawabw854f7aybjrgyhc2r1316i9lyjspci51zk5m7v"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ glib dbus-glib json-glib diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index a523019e78c28..5588a157c4695 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -1,5 +1,5 @@ { stdenv, fetchbzr -, pkgconfig, systemd, autoreconfHook +, pkg-config, systemd, autoreconfHook , glib, dbus-glib, json-glib , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1f0jdyqqb5g86zdpbcyn16x94yjigsfiv2kf73dvni5rp1vafbq1"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib dbus-glib json-glib systemd diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 1635827340e2f..1663542521c01 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "0cy9l1vpsnfilxslvmn88hhq8iw8cnx3xpbnl78c0dgjyfv5xmhz"; + sha256 = "sha256-WTRfV6f764tDGKnQVd1jeYN/qXa/VRTFK0mMalc+9aU="; }; patches = [ diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 71e6d3d700ab6..1fe45a492581d 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11 +{ stdenv, fetchFromGitHub, cmake, pkg-config, gtest, libdrm, libpciaccess, libva, libX11 , libXau, libXdmcp, libpthreadstubs }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0qnq43qjcmzkn6v2aymzi3kycndk9xw6m5f5g5sz5x53nz556bp0"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs ]; diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index 5f8335efab2be..6a33b0feadbeb 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { version = common.version; src = fetchFromGitHub { - owner = "quiark"; - repo = "IrrlichtCMake"; - rev = "523a5e6ef84be67c3014f7b822b97acfced536ce"; - sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi"; + owner = "quiark"; + repo = "IrrlichtCMake"; + rev = "523a5e6ef84be67c3014f7b822b97acfced536ce"; + sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi"; }; postUnpack = '' cp -r ${common.src}/* $sourceRoot/ chmod -R 777 $sourceRoot - ''; + ''; patches = [ ./mac_device.patch ]; dontFixCmake = true; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 598ad52de0497..59a883e1f96b7 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper -, pkgconfig, libX11, libuuid, xz, vtk_7, Cocoa }: +, pkg-config, libX11, libuuid, xz, vtk_7, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; postInstall = '' - wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkgconfig}/bin" + wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" ''; meta = { diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix index c875e4a394357..36c4c8c61c535 100644 --- a/pkgs/development/libraries/jabcode/default.nix +++ b/pkgs/development/libraries/jabcode/default.nix @@ -3,7 +3,7 @@ , lib , subproject ? "library" # one of "library", "reader" or "writer" , zlib, libpng, libtiff -, jabcode +, jabcode }: let subdir = lib.getAttr subproject { diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 6d4dfbfe61c6d..fd4bfb2970681 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; buildInputs = [ jdk unzip ]; - buildPhase = + buildPhase = '' cd source javac $(find . -name \*.java) diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index b96c91713248b..4cbdca9932ff7 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2 +{ stdenv, lib, fetchurl, unzip, jdk, pkg-config, gtk2 , libXt, libXtst, libXi, libGLU, libGL, webkitgtk, libsoup, xorg , pango, gdk-pixbuf, glib }: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; - nativeBuildInputs = [ unzip pkgconfig ]; + nativeBuildInputs = [ unzip pkg-config ]; buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ]; NIX_LFLAGS = toString (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) + diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix index d328ab8016a18..85b4fb100f742 100644 --- a/pkgs/development/libraries/jemalloc/jemalloc450.nix +++ b/pkgs/development/libraries/jemalloc/jemalloc450.nix @@ -1,4 +1,4 @@ import ./common.nix { version = "4.5.0"; sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl"; -} +} diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix index 4c3095681ed04..b15fead626993 100644 --- a/pkgs/development/libraries/jose/default.nix +++ b/pkgs/development/libraries/jose/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , zlib, jansson, openssl }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "15ac8a656m66rd9qg4dj53smykwaagqv606h18w7fiqn0ykxl4vi"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ zlib jansson openssl ]; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index f89d4bc453410..07e6d679aa76f 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, meson, ninja, pkgconfig, gettext +{ stdenv, fetchurl, glib, meson, ninja, pkg-config, gettext , gobject-introspection, fixDarwinDylibNames, gnome3 }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] + nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 61f357689c4de..da84578d7804d 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: +{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; version = "3.38.0"; outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ glib json-glib ]; src = fetchurl { diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 645d05afc2bec..0aa400c644d66 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, cmake, pkgconfig }: +{ mkDerivation, lib, cmake, pkg-config }: mkDerivation { name = "extra-cmake-modules"; @@ -9,7 +9,7 @@ mkDerivation { outputs = [ "out" ]; # this package has no runtime components - propagatedBuildInputs = [ cmake pkgconfig ]; + propagatedBuildInputs = [ cmake pkg-config ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 2eb9262d189e6..e56dfd4583443 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex , texinfo, perlPackages , openldap, libcap_ng, sqlite, openssl, db, libedit, pam , CoreFoundation, Security, SystemConfiguration @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./heimdal-make-missing-headers.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex texinfo ] + nativeBuildInputs = [ autoreconfHook pkg-config python2 perl yacc flex texinfo ] ++ (with perlPackages; [ JSON ]); buildInputs = optionals (stdenv.isLinux) [ libcap_ng ] ++ [ db sqlite openssl libedit openldap pam] diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 004d7d2227c1a..022b6db1a2450 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds +{ stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds , openssl, openldap, libedit, keyutils # Extra Arguments @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "ac_cv_printf_positional=yes" ]; - nativeBuildInputs = [ pkgconfig perl ] + nativeBuildInputs = [ pkg-config perl ] ++ optional (!libOnly) yacc # Provides the mig command used by the build scripts ++ optional stdenv.isDarwin bootstrap_cmds; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index e3084b9733e45..6b42cff790328 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3 +{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3 , gtk-doc, gtk2, python2Packages, lua, gobject-introspection }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool gnome3.gnome-common gtk-doc gtk2 python pygtk lua gobject-introspection diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index 1c8dbfdcd8186..dde4e80f070b5 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3 +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3 , gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "196ibn86j54fywfwwgyh89i9wygm4vh7ls19fn20vrnm6ijlzh9r"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ gnome3.gnome-common gtk-doc gtk3 libX11 libXext libXrender gobject-introspection diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index f00d7e59b743b..02d216ca59ca3 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm +{ stdenv, fetchFromGitHub, cmake, pkg-config, libdrm , withPython ? false, python }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { cmakeFlags = stdenv.lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libdrm python ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 4829d67de45a5..913353a32fe68 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive +, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive , libxml2, icu , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "frog-v${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 icu languageMachines.ticcutils diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 196a697d8f6f4..3560ae8e460b8 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, libtool, pkg-config, autoconf-archive }: let @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "frogdata-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool autoconf-archive ]; diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index 852615cbf3b2c..297967351d9ba 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, icu, bzip2, libtar , languageMachines }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "libfolia-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ]; preConfigure = "sh bootstrap.sh"; diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index 9477abeef3fc2..7fee1ea3a3faf 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive +, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive , libxml2 , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "mbt-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index 8676e08e41749..c3999d1c558f8 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, zlib, bzip2, libtar }: let @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "ticcutils-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool autoconf-archive libxml2 # optional: zlib bzip2 libtar diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index b912ed97bd5a0..2e758257cbb15 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, bzip2, libtar , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "timbl-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index e0634103a7eec..56245f922d3a1 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive +, automake, autoconf, bzip2, libtar, libtool, pkg-config, autoconf-archive , libxml2 , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "timblserver-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index d60ff5fa24600..e089942cd74df 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, libtool, pkg-config, autoconf-archive , libxml2, icu, bzip2, libtar , languageMachines }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "ucto-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf bzip2 libtool autoconf-archive icu libtar libxml2 languageMachines.ticcutils diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 29eaf78b75a85..9d36a95b4981f 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, libtool, pkg-config, autoconf-archive }: let @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "uctodata-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool autoconf-archive ]; preConfigure = "sh bootstrap.sh"; diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix index b3742514ced6e..25d858cb64a68 100644 --- a/pkgs/development/libraries/lasem/default.nix +++ b/pkgs/development/libraries/lasem/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk-pixbuf +{ fetchurl, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf , libxml2, cairo, pango, gnome3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0fds3fsx84ylsfvf55zp65y8xqjj5n8gbhcsk02vqglivk7izw4v"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + nativeBuildInputs = [ pkg-config intltool gobject-introspection ]; propagatedBuildInputs = [ glib gdk-pixbuf libxml2 cairo pango diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index c79b4a51262af..f2224a872ddb4 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }: +{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkg-config, python27Packages, xmlsec, zlib }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ autoconf automake glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; configurePhase = '' diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index a0f0814fec53d..de874cea3f183 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, which, gnuplot +{ stdenv, fetchurl, autoreconfHook, pkg-config, which, gnuplot , giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "192bs676ind8627f0v3v8d1q7r4xwc7q0zvbdbxn1fgvmv14d77c"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index e8ef17081c9fa..7cf6329a77e66 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl }: - + stdenv.mkDerivation rec { name = "levmar-2.6"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp liblevmar.a $out/lib ''; - meta = { + meta = { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; homepage = "https://www.ics.forth.gr/~lourakis/levmar/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix index 406b61e439384..39e3e2e660fbf 100644 --- a/pkgs/development/libraries/lib3ds/default.nix +++ b/pkgs/development/libraries/lib3ds/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip }: - + stdenv.mkDerivation rec { name = "lib3ds-1.3.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - meta = { + meta = { description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; homepage = "http://lib3ds.sourceforge.net/"; license = "LGPL"; diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix index 54dbb349eb6da..c2d81e31f3eaf 100644 --- a/pkgs/development/libraries/libabigail/default.nix +++ b/pkgs/development/libraries/libabigail/default.nix @@ -3,7 +3,7 @@ , autoreconfHook , elfutils , libxml2 -, pkgconfig +, pkg-config , strace , python3 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config strace ]; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 91107ad4cb06b..4e33f30e8c14a 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }: +{ stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl }: stdenv.mkDerivation rec { pname = "libabw"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost doxygen gperf librevenge libxml2 perl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 07e0a3500a768..3467b6c84c8ad 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales -, libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: +, libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { pname = "libaccounts-glib"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 616879a979cb1..708aaff9bda30 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc +{ stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc , libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU, libGL , libsndfile, portaudio, libmysqlclient, fontconfig }: @@ -26,7 +26,7 @@ stdenv.mkDerivation { outputs = [ "out" "devdoc" ]; - nativeBuildInputs = [ pkgconfig libtool gettext ]; + nativeBuildInputs = [ pkg-config libtool gettext ]; buildInputs = [ bsdbuild perl xlibsWrapper libXinerama SDL libGL libmysqlclient mandoc diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 3ecee2599f615..e702e292a0ff9 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, libpulseaudio, alsaLib, libcap +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, libpulseaudio, alsaLib, libcap , CoreAudio, CoreServices, AudioUnit , usePulseAudio }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ alsaLib libcap ] ++ lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with stdenv.lib; { longDescription = '' diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 2c67e6ac1588f..2ebabe3273f45 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }: +{ stdenv, fetchgit, yasm, perl, cmake, pkg-config, python3 }: stdenv.mkDerivation rec { pname = "libaom"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./outputs.patch ]; nativeBuildInputs = [ - yasm perl cmake pkgconfig python3 + yasm perl cmake pkg-config python3 ]; preConfigure = '' diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix index c33f3a873a683..38c501a8287df 100644 --- a/pkgs/development/libraries/libaosd/default.nix +++ b/pkgs/development/libraries/libaosd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cairo, pango, +{ stdenv, fetchFromGitHub, pkg-config, cairo, pango, libX11, libXcomposite, autoconf, automake }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a"; }; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ cairo pango libX11 libXcomposite ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 7a7ad22756c71..469235e2e6af5 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -1,7 +1,7 @@ # TODO: Resolve the issues with the Mono bindings. { stdenv, fetchgit, lib -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , glib, dbus-glib, gtkVersion ? "3" , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "0xjvbl4gn7ra2fs6gn2g9s787kzb5cg9hv79iqsz949rxh4iw32d"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection gtk-doc ]; + nativeBuildInputs = [ pkg-config autoreconfHook vala gobject-introspection gtk-doc ]; propagatedBuildInputs = if gtkVersion == "2" diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 787745a6bdad9..6bc2ddb7d1366 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,5 +1,5 @@ { - fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, + fetchFromGitHub, stdenv, pkg-config, autoreconfHook, acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd, # Optional but increases closure only negligibly. Also, while libxml2 @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isUnix sharutils ++ [ zlib bzip2 openssl xz lzo zstd ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] ++ stdenv.lib.optional xarSupport libxml2; - # Without this, pkgconfig-based dependencies are unhappy + # Without this, pkg-config-based dependencies are unhappy propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ]; configureFlags = stdenv.lib.optional (!xarSupport) "--without-xml2"; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 9d8cf7434c232..031d36b58a8b7 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm +{ stdenv, fetchurl, pkg-config, yasm , freetype, fribidi, harfbuzz , encaSupport ? true, enca ? null # enca support , fontconfigSupport ? true, fontconfig ? null # fontconfig support @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { (mkFlag largeTilesSupport "large-tiles") ]; - nativeBuildInputs = [ pkgconfig yasm ]; + nativeBuildInputs = [ pkg-config yasm ]; buildInputs = [ freetype fribidi harfbuzz ] ++ optional encaSupport enca diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index dfe2dd76ef7dd..8dae2f92b4da1 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig }: +, pkg-config }: stdenv.mkDerivation rec { pname = "libast"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "Library of Assorted Spiffy Things"; diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index ad33c624b141f..a1ee01100b4d9 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus-glib }: +{ stdenv, fetchurl, pkg-config, glib, dbus-glib }: stdenv.mkDerivation rec { name = "libaudclient-3.5-rc2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib dbus-glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 15b6a275214d7..a712678b7939f 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl, bash +{ stdenv, fetchurl, pkg-config, yasm, bzip2, zlib, perl, bash , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -81,7 +81,7 @@ let "--enable-cross-compile" ]; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ lame yasm zlib bzip2 SDL bash ] ++ [ perl ] # for install-man target ++ optional mp3Support lame diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index 01f39052e930b..8f4a678cb379e 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libraw1394 }: +{ stdenv, fetchurl, pkg-config, libraw1394 }: stdenv.mkDerivation rec { name = "libavc1394-0.5.4"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libraw1394 ]; - meta = { + meta = { description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; homepage = "https://sourceforge.net/projects/libavc1394/"; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 39646db87ecdd..1ea610883b5c2 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, gtk-doc +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - autoreconfHook pkgconfig gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 + autoreconfHook pkg-config gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 python3 gobject-introspection autoconf-archive makeWrapper ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index a00e2272d6689..948b48b192d1d 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook, DiskArbitration +{ stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk ? null, ant ? null , withAACS ? false, libaacs ? null , withBDplus ? false, libbdplus ? null @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { patches = optional withJava ./BDJ-JARFILE-path.patch; - nativeBuildInputs = [ pkgconfig autoreconfHook ] + nativeBuildInputs = [ pkg-config autoreconfHook ] ++ optionals withJava [ ant ] ; diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index c93a59d462fe1..f972feacda3d9 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext , gtk-doc, libxslt, docbook_xml_dtd_43, docbook_xsl , python3, pcre2, gmp, mpfr }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ]; + nativeBuildInputs = [ autoreconfHook pkg-config gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ]; buildInputs = [ pcre2 gmp mpfr ]; diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 84df50e117a5f..642b0a27aa6c8 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, zlib, pkgconfig, imlib2 +{ stdenv, fetchurl, ncurses, zlib, pkg-config, imlib2 , x11Support ? !stdenv.isDarwin, libX11, libXext }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ] + propagatedBuildInputs = [ ncurses zlib pkg-config (imlib2.override { inherit x11Support; }) ] ++ stdenv.lib.optionals x11Support [ libX11 libXext ]; postInstall = '' diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index 474e51e8c4655..8ba9e34c9d3ce 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, nss }: +{ stdenv, fetchurl, pkg-config, glib, nss }: stdenv.mkDerivation rec { pname = "libcacard"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib nss ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 9dea5956d652a..fb806aa249669 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, libtool , gtk ? null , libpulseaudio, gst_all_1, libvorbis, libcap , CoreServices @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; }; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ libpulseaudio libvorbis gtk ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index b71b630675dee..506c3a3d3d61e 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }: +{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }: stdenv.mkDerivation rec { pname = "libcangjie"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool m4 sqlite ]; configureScript = "./autogen.sh"; - + preConfigure = '' find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' ''; diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index 8ad3231dc36b1..9282077261948 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig, +{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkg-config, libiconv, IOKit, DiskArbitration}: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1wjgmmaca4baw7k5c3vdap9hnjc49ciagi5kvpvync3aqfmdvkha"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libcdio ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ]; diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index b0b7b55a19db7..e7705362894ae 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv, Carbon, IOKit }: +{ stdenv, fetchurl, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }: stdenv.mkDerivation rec { name = "libcdio-2.1.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - nativeBuildInputs = [ pkgconfig help2man ]; + nativeBuildInputs = [ pkg-config help2man ]; buildInputs = [ libcddb ncurses ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 72996e28996c1..20f45bc1bced9 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }: +{ stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { name = "libcdr-0.1.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 792d899333e07..e8c649c9660e8 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }: +{ stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }: let version = "4.0.7"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0nii8qh3qrn92g8x3canj4glb2bjn6gc1p3f6hfp59ckd4vjrndw"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ udev libcec_platform ] ++ stdenv.lib.optional (libraspberrypi != null) libraspberrypi; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 6a74941a3a0f7..adf85428eea0d 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkgconfig, glib, gtk3, cairo, sqlite, gnome3 +{ fetchurl, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3 , clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ sqlite libsoup ]; diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index d2040b72311c3..6e8ed7a04a2f4 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, zlib, bzip2, libgcrypt , gdbm, gperf, tdb, gnutls, db, libuuid -, lzo, pkgconfig, guile, rpcsvc-proto, libtirpc +, lzo, pkg-config, guile, rpcsvc-proto, libtirpc }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./gets-undeclared.patch ./size_t.patch ./0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch ]; - nativeBuildInputs = [ pkgconfig gperf rpcsvc-proto ]; + nativeBuildInputs = [ pkg-config gperf rpcsvc-proto ]; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index 8415b964bb998..bd8e8bd4aaf07 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.0.6"; + version = "4.0.7"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "1bgzsyz1i0hvla5ax0lawp1kw25fkhzh9ddhq92mplizrj9y05c1"; + sha256 = "sha256-/S5LcaIIAXq9QiH8wGPSw8KpWC3afX9HqiHrWHmGQ6s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix index 87c86ea2fbeab..37f77bb0d76d8 100644 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }: +{ stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }: # TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "-Denable-gtk-doc=true" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl ]; buildInputs = [ glib ]; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index b086dfc08f685..c02a913613d34 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }: +{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkg-config }: stdenv.mkDerivation rec { pname = "libclxclient"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libclthreads libX11 libXft xorg.xorgproto ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/include -I${libXft.dev}/include"; diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 8b1093ac21fc9..1a97e544bb2b2 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, boost, libxml2, pkgconfig, docbook2x, curl, autoreconfHook, cppunit }: +{ stdenv, fetchFromGitHub, boost, libxml2, pkg-config, docbook2x, curl, autoreconfHook, cppunit }: stdenv.mkDerivation rec { pname = "libcmis"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0s6prfh55hn11vrs72ph1gs01v0vngly81pvyjm5v1sgwymdxx57"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig docbook2x ]; + nativeBuildInputs = [ autoreconfHook pkg-config docbook2x ]; buildInputs = [ boost libxml2 curl cppunit ]; configureFlags = [ diff --git a/pkgs/development/libraries/libco-canonical/default.nix b/pkgs/development/libraries/libco-canonical/default.nix index 56974fcca7b6e..689fbbb65bfd4 100644 --- a/pkgs/development/libraries/libco-canonical/default.nix +++ b/pkgs/development/libraries/libco-canonical/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig }: +{ stdenv, fetchFromGitHub, pkg-config }: with stdenv.lib; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0r5b1r0sxngx349s5a3zkkvfw5by9y492kr34b25gjspzvjchlxq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 92b000bc4efe7..aab90f8e37f17 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}: +{ stdenv, fetchFromGitHub, cmake, pkg-config, libevent, openssl}: stdenv.mkDerivation rec { pname = "libcouchbase"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libevent openssl ]; # Running tests in parallel does not work diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index df1558a1e49a4..6a9b87d00d9ce 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: stdenv.mkDerivation rec { pname = "libcryptui"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ./fix-gnupg-2.2.patch # based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch ]; - nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + nativeBuildInputs = [ pkg-config intltool autoreconfHook ]; buildInputs = [ glib gtk3 gnupg22 gpgme dbus-glib libgnome-keyring ]; propagatedBuildInputs = [ dbus-glib ]; diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index b13805aa37aac..d463e4af28909 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { description = "C++ utility library from Code Synthesis"; longDescription = '' libcutl is a C++ utility library. - It contains a collection of generic and independent components such as + It contains a collection of generic and independent components such as meta-programming tests, smart pointers, containers, compiler building blocks, etc. ''; homepage = "https://codesynthesis.com/projects/libcutl/"; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 6c430682251f7..a4cc7d96593c2 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection, libxml2 +{ stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1"; }; - nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; + nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; buildInputs = [ glib gtk3 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 5e11864b1f174..8e9fe4de88ae9 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, file -, pkgconfig, intltool +, pkg-config, intltool , glib, dbus-glib, json-glib , gobject-introspection, vala , gtkVersion ? null, gtk2 ? null, gtk3 ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; - nativeBuildInputs = [ vala pkgconfig intltool gobject-introspection ]; + nativeBuildInputs = [ vala pkg-config intltool gobject-introspection ]; buildInputs = [ glib dbus-glib json-glib diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index 6c2f3b8e10716..a398a6fab7280 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { version = "1.0.8"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 5d00d6b01ff35..b674087c75991 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL -, libX11, pkgconfig, OpenGL +, libX11, pkg-config, OpenGL }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index d966631dc276e..ad0f5f50bf2c9 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl -, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: +, xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { version = "3.14.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1x72icq5lp5cfv6kyxqc3863wa164s0g41nbi6gldr8syprzdk1l"; }; - nativeBuildInputs = [ cmake pkgconfig xxd ]; + nativeBuildInputs = [ cmake pkg-config xxd ]; buildInputs = [ libdigidoc minizip pcsclite opensc openssl xercesc diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 698aac87b8928..bdfb5d8b3041b 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, cmake, pkgconfig, darwin }: +{ stdenv, fetchurl, cmake, pkg-config, darwin }: stdenv.mkDerivation rec { pname = "libdiscid"; version = "0.6.2"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; - + src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz"; sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r"; diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 0bdf3fbe15a0d..bd23b6831a0ca 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { name = "libdmtx-0.7.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = { description = "An open source software for reading and writing Data Matrix barcodes"; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index b9825d9cfdff0..3b5daad854c21 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libpthreadstubs, libpciaccess , withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "bin" ]; - nativeBuildInputs = [ pkgconfig meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ libpthreadstubs libpciaccess ] ++ lib.optional withValgrind valgrind-light; diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix index c8ebf180b315a..f5264587a16f2 100644 --- a/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libdvdread}: +{stdenv, fetchurl, pkg-config, libdvdread}: stdenv.mkDerivation { name = "libdvdnav-4.2.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libdvdread]; configureScript = "./configure2"; # wtf? diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 2afc11c600959..5f26b943537e2 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libdvdread}: +{stdenv, fetchurl, pkg-config, libdvdread}: stdenv.mkDerivation rec { pname = "libdvdnav"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0nzf1ir27s5vs1jrisdiw9ag2sc160k3gv7nplv9ypppm5gb35zn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libdvdread]; meta = { diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix index 33b04b0f7c033..7f35c651b9293 100644 --- a/pkgs/development/libraries/libdvdread/4.9.9.nix +++ b/pkgs/development/libraries/libdvdread/4.9.9.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "libdvdread-4.9.9"; - + src = fetchurl { url = "http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz"; sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 805b1869ac38c..96b341dceae90 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu +{ stdenv, fetchurl, gperf, pkg-config, librevenge, libxml2, boost, icu , cppunit, zlib, liblangtag }: @@ -13,7 +13,7 @@ let sha256="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gperf librevenge libxml2 boost icu cppunit zlib liblangtag ]; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 29c4b4c3b09f7..4d8d2c10b6752 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libebml"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "052v4mjynndj9xgfl4lmlsnx9ai0pah0kjyr5fm34l7gj8vhc5s7"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index 36d88f88786dd..e8ffa37379e2b 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libestr }: +{ stdenv, fetchurl, pkg-config, libestr }: stdenv.mkDerivation { name = "libee-0.4.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libestr]; meta = { diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index b8b28f49d1d53..54520116129ee 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: +{ stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: let avahiWithGtk = avahi.override { gtk3Support = true; }; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool gtk-doc ]; diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index 9050320773af0..b4b48dcb777d7 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -1,31 +1,29 @@ -{ stdenv, fetchFromGitHub -, autoconf -, automake -, libtool -, openssl +{ stdenv, lib, fetchFromGitHub +, autoconf, automake, libtool, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "libetpan"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "dinhviethoa"; repo = "libetpan"; rev = version; - sha256 = "19g4qskg71jv7sxfxsdkjmrxk9mk5kf9b6fhw06g6wvm3205n95f"; + sha256 = "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn"; }; - nativeBuildInputs = [ libtool autoconf automake ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ openssl ]; configureScript = "./autogen.sh"; - meta = with stdenv.lib; { - description = "An efficient, portable library for different kinds of mail access: IMAP, SMTP, POP, and NNTP"; + meta = with lib; { + description = "Mail Framework for the C Language"; homepage = "http://www.etpan.org/libetpan.html"; license = licenses.bsd3; + maintainers = with maintainers; [ oxzi ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libevdevplus/default.nix b/pkgs/development/libraries/libevdevplus/default.nix index 0f2b3e0526655..d094bc3514225 100644 --- a/pkgs/development/libraries/libevdevplus/default.nix +++ b/pkgs/development/libraries/libevdevplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libevdevplus"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "18z6pn4j7fhmwwh0q22ip5nn7sc1hfgwvkdzqhkja60i8cw2cvvj"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index ff644599b8a68..759c0e40adca9 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib, openssl, libuuid, pkgconfig }: +{ fetchurl, stdenv, zlib, openssl, libuuid, pkg-config }: stdenv.mkDerivation rec { version = "20201129"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "168k1az9hm0lajh57zlbknsq5m8civ1rzp81zz4sd7v64xilzxdk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib openssl libuuid ]; meta = { diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index f7e9606bbe773..68c4fe807b394 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis -, exiv2, libgsf, rpm, pkgconfig, fetchpatch +, exiv2, libgsf, rpm, pkg-config, fetchpatch , gstreamerSupport ? true, gst_all_1 ? null # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool gettext zlib bzip2 flac libvorbis exiv2 libgsf rpm - pkgconfig + pkg-config ] ++ stdenv.lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index f95d150cc250c..4e7cc1df06909 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }: +{ stdenv, fetchurl, libX11, libXi, libXtst, pkg-config, xorgproto }: stdenv.mkDerivation rec { pname = "libfakekey"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXi libXtst xorgproto ]; NIX_LDFLAGS = "-lX11"; diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index 48b457b09ded3..75b483de6ac5d 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , cmake -, pkgconfig +, pkg-config , hidapi , libcbor , openssl @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "08iizxq3w8mpkwfrfpl59csffc20yz8x398bl3kf23rrr4izk42r"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hidapi libcbor openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ udev ]; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index e5b76b1435fa0..c9be4c6ba7f7e 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -4,7 +4,7 @@ , gettext , gnutls , nettle -, pkgconfig +, pkg-config , libiconv , ApplicationServices }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0akvki7n5rwmc52wss25i3h4nwl935flhjypf8dx3lvf4jszxxiv"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext gnutls nettle ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix index 23d828033e3ef..6b931105415ac 100644 --- a/pkgs/development/libraries/libfishsound/default.nix +++ b/pkgs/development/libraries/libfishsound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvorbis, speex, flac, pkgconfig }: +{ stdenv, fetchurl, libvorbis, speex, flac, pkg-config }: stdenv.mkDerivation rec { name = "libfishsound-1.0.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libvorbis speex flac ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { homepage = "https://xiph.org/fishsound/"; diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 2670f94fbc2f8..0f6ad84fe7550 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , cmake , ninja -, pkgconfig +, pkg-config , eigen , zlib , libpng @@ -23,7 +23,7 @@ mkDerivation { sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg"; }; - nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkgconfig ]; + nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; buildInputs = [ eigen zlib libpng boost guile ]; # Link "Studio" binary to "libfive-studio" to be more obvious: diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 4fdb22f8bd494..2c0ba2dcc3c72 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "libfixposix"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with stdenv.lib; { homepage = "https://github.com/sionescu/libfixposix"; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 94476984de009..163a633df5c2a 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala +{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala , extraOnly ? false , withGtk3 ? false, gtk2, gtk3 }: let @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn"; }; - nativeBuildInputs = [ vala pkgconfig intltool ]; + nativeBuildInputs = [ vala pkg-config intltool ]; buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; configureFlags = [ diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 11051f70e4488..2464679ac8a50 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitLab -, pkgconfig +, pkg-config , meson , ninja , gusb @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gtk-doc diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index 4af7d44a2945f..d9c0e10dad660 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnfc, openssl +{ stdenv, fetchurl, pkg-config, libnfc, openssl , libobjc ? null }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix index e1c7f892aabdb..5edfd622347e1 100644 --- a/pkgs/development/libraries/libfsm/default.nix +++ b/pkgs/development/libraries/libfsm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - # fix up multi-output install. we also have to fix the pkgconfig libdir + # fix up multi-output install. we also have to fix the pkg-config libdir # file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in # our case; libdir should really be set to the $lib output. postInstall = '' diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 0e2e24d0f3b48..6c128e2947f0e 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libusb1, libconfuse +{ stdenv, fetchurl, cmake, pkg-config, libusb1, libconfuse , cppSupport ? true, boost ? null , pythonSupport ? true, python3 ? null, swig ? null , docSupport ? true, doxygen ? null @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = with stdenv.lib; [ libconfuse ] ++ optionals cppSupport [ boost ] ++ optionals pythonSupport [ python3 swig ] diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix index b3d58c446cffd..2d79a1b64dc5b 100644 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gettext +{ stdenv, fetchurl, cmake, pkg-config, gettext , gtk2, libcanberra, libnotify, pcre, sqlite, xorg , harfbuzz }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" "bin" ]; - nativeBuildInputs = [ cmake pkgconfig gettext ]; + nativeBuildInputs = [ cmake pkg-config gettext ]; propagatedBuildInputs = [ gtk2 libcanberra libnotify pcre sqlite xorg.libXdmcp xorg.libpthreadstubs diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index be3e2e469ade5..ea0484f710e8e 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glibmm, libgda, libxml2, gnome3 +{ stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3 , mysqlSupport ? false , postgresSupport ? false }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { sha256 = "1fyh15b3f8hmwbswalxk1g4l04yvvybksn5nm7gznn5jl5q010p9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glibmm libxml2 ]; propagatedBuildInputs = [ gda ]; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 50eac40570620..9c8ea6bb1c0f8 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , meson , ninja , nixosTests @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 70043d1132d0d..4a518818e8b09 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, cairo, Carbon, fontconfig +{ stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig , libtiff, giflib, libjpeg, libpng , libXrender, libexif, autoreconfHook, fetchpatch }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = stdenv.lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index c2d1c197fe960..a531a433a8808 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobject-introspection, gnome3 }: +{ stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "libgee"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; - nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ]; + nativeBuildInputs = [ pkg-config autoconf vala gobject-introspection ]; buildInputs = [ glib ]; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index cf62e0cabc9d2..abd73ea5b75fb 100644 --- a/pkgs/development/libraries/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, gnome3 +{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3 , webkitgtk, libsoup, libxml2, libarchive }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; passthru = { diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 84d44969a142f..baa9917cad2b1 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }: +{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkg-config, libuuid }: stdenv.mkDerivation rec { pname = "libgig"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ libsndfile libuuid ]; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index 9a05a01bee61d..b07b5b9124905 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, vala, libssh2 +{ stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2 , gtk-doc, gobject-introspection, libgit2, glib, python3 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig vala gtk-doc gobject-introspection + meson ninja pkg-config vala gtk-doc gobject-introspection ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 9ead3a97c0481..8c9905a4287c7 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, +{ stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perlPackages, autoreconfHook, intltool, docbook_xsl, xauth }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoreconfHook intltool docbook_xsl wrapGAppsHook + pkg-config autoreconfHook intltool docbook_xsl wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 3a4737d483bf5..92783d3ae0c1d 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkg-config, libX11, libXext, xorgproto, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "libglvnd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10x7fgb114r4gikdg6flszl3kwzcb9y5qa7sj9936mk0zxhjaylz"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig python3 addOpenGLRunpath ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 33a6a075ae44a..fbb2499f24a69 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool }: +{ stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }: stdenv.mkDerivation rec { pname = "libgnome-keyring"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ glib dbus libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; meta = { inherit (glib.meta) platforms maintainers; diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index c02fd503eb0d8..17adb362cdb86 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }: +{ stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { pname = "libgnomekbd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ file intltool - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 5daeba2c06e63..e7e16d769e7ac 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, groff, perl, pkgconfig, python2, zlib, gnutls, +{ stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls, libidn2, libunistring, nghttp2 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi"; }; - nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; + nativeBuildInputs = [ libtool groff perl pkg-config python2 ]; buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ]; diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 89bca2ee75fbf..db9e03a045ad2 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext , libusb1 , libtool , libexif @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config gettext libtool ]; diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index a3178e5480480..8f6d9fcab5ed9 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkgconfig, kmod +{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config, kmod , enable-tools ? true , enablePython ? false, python3, ncurses }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; nativeBuildInputs = [ autoconf-archive - pkgconfig + pkg-config autoreconfHook ]; diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 323f5af70973b..102361e5fb21b 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }: +{ stdenv, fetchurl, pkg-config, zlib, bzip2, libmcrypt, libmhash }: stdenv.mkDerivation rec { pname = "libgringotts"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib bzip2 libmcrypt libmhash ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index fdad5369813f5..132fc6a87122f 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: +{ stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: let version = "0.7.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7"; }; - nativeBuildInputs = [ pkgconfig vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ pkg-config vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ glib libxml2 libsoup ]; configureFlags = [ diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 34cb1ef3381f0..bdc024094c0c6 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 +{ fetchurl, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2 , perl, gdk-pixbuf, libiconv, libintl, gnome3 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"; }; - nativeBuildInputs = [ pkgconfig intltool libintl ]; + nativeBuildInputs = [ pkg-config intltool libintl ]; buildInputs = [ gettext bzip2 zlib ]; checkInputs = [ perl ]; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 65f5e2750e518..165b80184435e 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , glib -, pkgconfig +, pkg-config , perl , gettext , gobject-introspection @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gtk-doc perl gettext diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index c7c3064acb8d2..d1ddf3812c04b 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , udev , glib , gobject-introspection @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; buildInputs = [ udev glib ]; # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway. diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index d6e45deadcf80..ccc2778c0c019 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper +{ stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db , gmp, readline, file, numactl, libapparmor, jansson @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "ad6562c48c38e922a314cb45a90996843d81045595c4917f66b02a6c2dfe8058"; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; buildInputs = [ ncurses cpio gperf jansson cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 5493343fc239d..80f897a1a5373 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk3, gettext, libsoup +{ stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup , gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; + nativeBuildInputs = [ meson ninja pkg-config gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ]; postPatch = '' diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index 095b5c8f61cf7..c52898298510f 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, cairo +{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo , libarchive, freetype, libjpeg, libtiff, gnome3, lcms2 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs"; }; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; buildInputs = [ glib cairo freetype libjpeg libtiff lcms2 ]; propagatedBuildInputs = [ libarchive ]; diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index 9cf4f615dd28a..5a7ab456acc64 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala +{ stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk3, gnome3 , dbus, xvfb_run, libxml2 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gobject-introspection vala libxml2 + meson ninja pkg-config gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ]; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 7dce08b4cc24a..794502ed9b882 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" "dev" "devdoc" "glade" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0b8wvjabv5mg8jbng8rsd5g84lk571nm0qpna20pwp0njh2qvmrs"; + sha256 = "sha256-VZuzrMLDYkiJF+ty7SW9wYH0riaslNF3Y0zF00yGf3o="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala ]; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; - # Uses define_variable in pkgconfig, but we still need it to use the glade output + # Uses define_variable in pkg-config, but we still need it to use the glade output PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 4a5f6ab3bd887..ca8c189a9c88e 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libde265, x265, libpng, libjpeg, libaom }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0hjs1i076jmy4ryj8y2zs293wx53kzg38y8i42cbcsqydvsdp6hz"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libde265 x265 libpng libjpeg libaom ]; # TODO: enable dav1d and rav1e codecs when libheif can find them via pkg-config diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 2de7e08fb0258..f4edb39af5d42 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch +{ stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch , gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }: let @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; }; - nativeBuildInputs = [ vala gobject-introspection meson ninja pkgconfig ]; + nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ]; buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ]; # Fixes build with vala >=0.42 diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index c03367da97ba2..7802f9752023d 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -9,7 +9,7 @@ , libxml2 , ninja , perl -, pkgconfig +, pkg-config , libical , python3 , tzdata @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cmake ninja perl - pkgconfig + pkg-config # Docs building fails: # https://github.com/NixOS/nixpkgs/pull/67204 # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 77b2424bfee79..2f2d2d190e8e3 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libraw1394 }: +{ stdenv, fetchurl, pkg-config, libraw1394 }: stdenv.mkDerivation rec { version = "1.2.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "7c7879c6b9add3148baea697dfbfdcefffbc8ac74e8e6bcf46125ec1d21b373a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libraw1394 ]; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index a9a2fb6b4c187..f5038e45d3ae4 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig, gnutls +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls , libgcrypt, libtasn1, glib, libplist, libusbmuxd }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config ]; propagatedBuildInputs = [ glib diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index 8bb90180300c9..139672f6d8058 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, file -, pkgconfig +, pkg-config , gtkVersion ? "3", gtk2 ? null, gtk3 ? null }: with lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ (if gtkVersion == "2" then gtk2 else gtk3) ]; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index e018c1a9f5eac..b980e0a279f40 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -1,6 +1,6 @@ { gtkWidgets ? false # build GTK widgets for libinfinity , avahiSupport ? false # build support for Avahi in libinfinity -, stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl +, stdenv, fetchurl, pkg-config, glib, libxml2, gnutls, gsasl , gobject-introspection , gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss , libintl }: @@ -13,15 +13,15 @@ let self = stdenv.mkDerivation rec { pname = "libinfinity"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "http://releases.0x539.de/libinfinity/${pname}-${version}.tar.gz"; - sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; + url = "https://github.com/gobby/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; + sha256 = "17i3g61hxz9pzl3ryd1yr15142r25m06jfzjrpdy7ic1b8vjjw3f"; }; outputs = [ "bin" "out" "dev" "man" "devdoc" ]; - nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; + nativeBuildInputs = [ pkg-config gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ] ++ stdenv.lib.optional gtkWidgets gtk3 ++ stdenv.lib.optional avahiSupport avahi; @@ -43,7 +43,7 @@ let }; meta = { - homepage = "http://gobby.0x539.de/"; + homepage = "https://gobby.github.io/"; description = "An implementation of the Infinote protocol written in GObject-based C"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index dff2ca8295592..cf0af9127f725 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja +{ stdenv, fetchFromGitLab, pkg-config, meson, ninja , libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "--libexecdir=${placeholder "bin"}/libexec" ]; - nativeBuildInputs = [ pkgconfig meson ninja ] + nativeBuildInputs = [ pkg-config meson ninja ] ++ optionals documentationSupport [ doxygen graphviz sphinx-build ]; buildInputs = [ diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index c80a9bb1f9204..f2b7eaa8f54ca 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, gtk2, Carbon +{ config, stdenv, fetchurl, pkg-config, gtk2, Carbon , useGTK ? config.libiodbc.gtk or false }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = stdenv.lib.optionals useGTK [ gtk2 ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index bc91593a960d0..26a39516d252f 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config , libusb1 , readline }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 240636d518c34..4d9df889851d5 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libconfuse }: stdenv.mkDerivation rec { pname = "libite"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kad501mrvn0s0sw9pz5spjq7ymk117hnff249z6026gswrxv1mh"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libconfuse ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 1226d1c489ef3..2dc009b9b1ce9 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, file, protobufc }: stdenv.mkDerivation rec { pname = "libivykis"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0abi0rc3wnncvr68hy6rmzp96x6napd7fs1mff20dr8lb0jyvy3f"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ file protobufc ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 1eca110f8cb5e..a6ad6d4bb649e 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.4"; + version = "0.1.5"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "156sykcdzdfmd7va59qld4gyzhbf2yk1dfgifi494g6i99zyigfh"; + sha256 = "sha256-xf/hzTzhxKJDL5Way0Qbrs8pXCvAQ+ADtgJO2GbEvmc="; }; patches = [ diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index b724789188cdd..30342ea24c86a 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext -, pkgconfig, glib, libxml2, gobject-introspection, gnome-common, unzip +, pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common unzip ]; - nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config ]; meta = { inherit version; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 830e125685e7b..2bf33bab4166a 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, cmake +{ stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, cmake , fftwSinglePrec, libsamplerate, qtbase , darwin }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "04r14prydxshjgfws3pjajjmp2msszhjjs1mjh8s66yg29vq620l"; })]; - nativeBuildInputs = [ pkgconfig which cmake ]; + nativeBuildInputs = [ pkg-config which cmake ]; buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index 46152e792763e..4bf8fb7bf65be 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, curl, openssl }: +{ stdenv, fetchurl, pkg-config, curl, openssl }: stdenv.mkDerivation { name = "liblastfm-SF-0.5"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ curl openssl ]; diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 82ac1b3144ea8..3783bd408f1be 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, expat, icu }: stdenv.mkDerivation rec { pname = "liblcf"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0b0bz9ydpc98mxbg78bgf8kil85kxyqgkzxgsjq7awzmyw7f3c1c"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ expat icu ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 7d7f035f77f16..5c06dea390f41 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -34,7 +34,7 @@ , openldap , ortp , pango -, pkgconfig +, pkg-config , python , readline , soci @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { graphviz intltool makeWrapper - pkgconfig + pkg-config ]; # Some grammar files needed to be copied too from some dependencies. I suppose diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index b9b787f418294..5602231e34d84 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , systemd ? null }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "14xz00mq07qmcgprlj5b2r21ljgpa4sbwmpr6jm2wrf8wms6331k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ systemd ]; configureFlags = [ diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index bef1048dde46c..d3a6b59974298 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libestr, json_c, pcre, fastJson }: +{ stdenv, fetchurl, pkg-config, libestr, json_c, pcre, fastJson }: stdenv.mkDerivation rec { name = "liblognorm-2.0.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1wpn15c617r7lfm1z9d5aggmmi339s6yn4pdz698j0r2bkl5gw6g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libestr json_c pcre fastJson ]; configureFlags = [ "--enable-regexp" ]; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index d29cbf6a71956..3e83e34ee812b 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub , stdenv , autoreconfHook -, pkgconfig +, pkg-config , gettext , python3 , texinfo @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config gettext python3 # Docs, man, info diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 5f37989c20b8e..936469c01c616 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { name = "liblqr-1-0.4.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index 101e11deaa51e..4ee37dc0b9f37 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }: +{ stdenv, fetchurl, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "liblscp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; preConfigure = "make -f Makefile.git"; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 0cb233ad271c1..96593fb50bf06 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -2,7 +2,7 @@ , fetchurl , ninja , meson -, pkgconfig +, pkg-config , vala , gobject-introspection , gtk-doc @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala gobject-introspection gtk-doc diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index a24b931c66058..b794c1f7217cb 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, guile, autoconf, flex, fetchpatch }: +{ stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }: stdenv.mkDerivation rec { version = "1.1.11"; pname = "libmatheval"; - nativeBuildInputs = [ pkgconfig autoconf flex ]; + nativeBuildInputs = [ pkg-config autoconf flex ]; buildInputs = [ guile ]; src = fetchurl { diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 5d065636a9229..ab8107b39c47e 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , libebml }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0yhr9hhgljva1fx3b0r4s3wkkypdfgsysbl35a4g3krkbhaa9rsd"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libebml ]; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index a29fca45a99f5..59498170a1d40 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation { name = "libmcrypt-2.5.8"; - + src = fetchurl { url = "mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz"; sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 38adebb2a4877..1007123619f06 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: +{ stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: stdenv.mkDerivation rec { pname = "libmediaart"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib gdk-pixbuf ]; patches = [ diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 31d64101e6bf6..0974371c41ee4 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { version = "20.09"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzen zlib ]; sourceRoot = "./MediaInfoLib/Project/GNU/Library/"; diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix index 69dd052dc0368..5bed556a27332 100644 --- a/pkgs/development/libraries/libmicrodns/default.nix +++ b/pkgs/development/libraries/libmicrodns/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix index 9b817f21b94ca..99407d22b7518 100644 --- a/pkgs/development/libraries/libmicrohttpd/generic.nix +++ b/pkgs/development/libraries/libmicrohttpd/generic.nix @@ -1,11 +1,11 @@ -{ stdenv, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl, version, src }: +{ stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src }: stdenv.mkDerivation rec { pname = "libmicrohttpd"; inherit version src; outputs = [ "out" "dev" "devdoc" "info" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgcrypt curl gnutls libiconv libintl ]; preCheck = '' diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix index 3753101ebf984..a56b18fe19908 100644 --- a/pkgs/development/libraries/libmms/default.nix +++ b/pkgs/development/libraries/libmms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig }: +{ stdenv, fetchurl, glib, pkg-config }: stdenv.mkDerivation rec { name = "libmms-0.6.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "Library for downloading (streaming) media files using the mmst and mmsh protocols"; diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix index d608a08d2d920..2848298016dd7 100644 --- a/pkgs/development/libraries/libmodule/default.nix +++ b/pkgs/development/libraries/libmodule/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub -, cmake, pkgconfig }: +, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libmodule"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "FedeDP"; repo = "libmodule"; rev = version; - sha256 = "1cf81sl33xmfn5g150iqcdrjn0lpjlgp53mganwi6x7jda2qk7r6"; + sha256 = "sha256-wkRiDWO9wUyxkAeqvm99u22Jq4xnQJx6zS7Sb+R8iMg="; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix index b3231d1af91ce..f07dbd84a95cb 100644 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }: stdenv.mkDerivation rec { name = "libmongo-client-0.1.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ]; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index aa70e4c4ddff3..fbd7cbe7ad611 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, curl, libnxml, pkgconfig}: +{stdenv, fetchurl, curl, libnxml, pkg-config}: stdenv.mkDerivation { name = "libmrss-0.19.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ curl libnxml ]; meta = { diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index e9cfd0f9856ae..bbc3e94905386 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkgconfig +{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkg-config , libusb1 , libiconv }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { automake gettext libtool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 2ab23015af32f..1889fc1508fcd 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}: +{stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}: let s = # Generated upstream information rec { @@ -10,7 +10,7 @@ let sha256="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost cppunit zlib libwpg libwpd librevenge ]; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 623c872fa1ac5..ace5503b6571e 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, libtool, pkgconfig, automake, autoconf, intltool +, libtool, pkg-config, automake, autoconf, intltool , glib, gobject-introspection, gtk2, gtk-doc , clutter, clutter-gtk }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool intltool diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 074e38429331b..d3e0ff53528fe 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -6,7 +6,7 @@ , intltool , json_c , libtool -, pkgconfig +, pkg-config , python3 }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { automake intltool libtool - pkgconfig + pkg-config python3 ]; diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 6ca6c30183167..aac9f8e8acfde 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook -, asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt +, asciidoctor, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , json_c, kmod, which, util-linux, udev, keyutils }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = - [ autoreconfHook asciidoctor pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt + [ autoreconfHook asciidoctor pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt which ]; diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix index 268da3813e732..98d89d67ef6c7 100644 --- a/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { version = "1.0.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 851357f6404f4..a97e77c5334eb 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: +{ stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_conntrack"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "Userspace library providing an API to the in-kernel connection tracking state table"; diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index ca16719898994..b700c0e9d9ac3 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_cthelper"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; meta = { diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index 64bcc08ffb911..23de648159200 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_cttimeout"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; meta = { diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index 18346814750bc..9bec269e6acb2 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: +{ stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_log"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "Userspace library providing interface to packets that have been logged by the kernel packet filter"; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 7a0796166270f..6889f7702e6a9 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }: +{ stdenv, fetchurl, pkg-config, libmnl, libnfnetlink }: stdenv.mkDerivation rec { version = "1.0.5"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1xdra6i4p8jkv943ygjw646qx8df27f7p5852kc06vjx608krzzr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl libnfnetlink ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 3da2ccce4422f..a546eeebdc576 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmnl }: +{ stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { version = "1.1.8"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index e7b01ca29cb16..b4e1682ab7e1e 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , python3 , gobject-introspection , gtk-doc @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 gobject-introspection diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index 0c38a9c17d7c3..497e3aa6679e6 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus, expat }: +{ stdenv, fetchurl, pkg-config, dbus, expat }: let version = "1.0.3"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus expat ]; doCheck = false; # fails 1 of 17 test diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix index 5741d4cb5b8ad..f1661f222cca2 100644 --- a/pkgs/development/libraries/libnixxml/default.nix +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, libxml2, gd, glib, getopt, libxslt, nix }: +{ fetchFromGitHub, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: stdenv.mkDerivation { name = "libnixxml"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-gd" "--with-glib" ]; CFLAGS = "-Wall"; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ pkgconfig libxml2 gd.dev glib getopt libxslt nix ]; + buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ]; doCheck = false; postPatch = '' ./bootstrap diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 34d8d800c38b8..2675098a826e0 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , libxslt , docbook-xsl-ns , glib @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config libxslt docbook-xsl-ns ]; diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index 76aa3c99e3356..ab7527c7c76e6 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkg-config }: stdenv.mkDerivation rec { pname = "libnsl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dayj5i4bh65gn7zkciacnwv2a0ghm6nn58d78rsi4zby4lyj5w5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libtirpc ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index c816bdc90e577..8980a145dc9ae 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, nss, nspr, pkgconfig }: +{ fetchurl, stdenv, nss, nspr, pkg-config }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ nss nspr ]; diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index 1723219e85978..9af9a3864d298 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}: +{stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.7/libodfgen-0.1.7.tar.xz"; sha256="0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost cppunit zlib libwpg libwpd librevenge ]; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 692bddeab7dd6..f11489eaf9f90 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, opensp, pkgconfig, libxml2, curl +{ stdenv, fetchFromGitHub, opensp, pkg-config, libxml2, curl , autoconf, automake, libtool, gengetopt, libiconv }: stdenv.mkDerivation rec { @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; - nativeBuildInputs = [ pkgconfig libtool autoconf automake gengetopt ]; + nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ]; buildInputs = [ opensp libxml2 curl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; - meta = { + meta = { description = "Opensource implementation of the Open Financial eXchange specification"; homepage = "http://libofx.sourceforge.net/"; license = "LGPL"; diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index 07613f0564b00..687e1d9c43d87 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, pkgconfig }: +{ stdenv, fetchurl, libogg, pkg-config }: stdenv.mkDerivation rec { name = "liboggz-1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libogg ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { homepage = "https://xiph.org/oggz/"; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 22adceccecf22..c1c41ce559fc9 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig }: +{stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { name = "liboil-0.3.17"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # oil-bugreport - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix" # errors diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix index 6438fd5eb3229..75fa4a80a31d8 100644 --- a/pkgs/development/libraries/liboop/default.nix +++ b/pkgs/development/libraries/liboop/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "liboop-1.0"; - + src = fetchurl { url = "http://download.ofb.net/liboop/liboop.tar.gz"; sha256 = "34d83c6e0f09ee15cb2bc3131e219747c3b612bb57cf7d25318ab90da9a2d97c"; diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix index 989dfc517f0da..9aaf52abdf1f4 100644 --- a/pkgs/development/libraries/libopusenc/default.nix +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libopus }: +{ stdenv, fetchurl, pkg-config, libopus }: let version = "0.2.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { doCheck = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libopus ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 6e75125359493..4d4ab13e8c5d4 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , gettext @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja vala diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix index d7e83e7a9e3de..80a84974b7aab 100644 --- a/pkgs/development/libraries/libow/default.nix +++ b/pkgs/development/libraries/libow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }: +{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, libtool }: stdenv.mkDerivation rec { version = "3.2p4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s"; }; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; meta = with stdenv.lib; { description = "1-Wire File System full library"; diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index a1e6d05440c0f..26a95090ef63d 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config , openssl }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "--with-enginesdir=${placeholder "out"}/lib/engines" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 9447b83af1709..f8e9d6e4a0b78 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsigcxx }: +{ stdenv, fetchurl, pkg-config, libsigcxx }: let version = "0.4"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsigcxx ]; patches = [ ./libpar2-0.4-external-verification.patch ]; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 604fd3ee44653..2999b3d317203 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, bluez, pkgconfig, withBluez ? false }: +{ stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ flex bison ] - ++ optionals withBluez [ bluez.dev pkgconfig ]; + ++ optionals withBluez [ bluez.dev pkg-config ]; # We need to force the autodetection because detection doesn't # work in pure build environments. diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 1d360b45052a6..51717e84259e0 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3 +{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3 , glib, gtk3, gobject-introspection, python3, ncurses }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2"; }; - nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ]; + nativeBuildInputs = [ pkg-config meson ninja gettext gobject-introspection ]; buildInputs = [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ]; propagatedBuildInputs = [ # Required by libpeas-1.0.pc diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index 918c663dfb460..0ec92b369d06b 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkgconfig, protobuf, icu }: +{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }: stdenv.mkDerivation rec { pname = "phonenumber"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gmock - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index 63035f74ea0ee..a3274fc9053d6 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -2,7 +2,7 @@ , autoreconfHook , glib , db -, pkgconfig +, pkg-config }: let @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { tar -xzf ${modelData} -C $sourceRoot/data ''; - nativeBuildInputs = [ autoreconfHook glib db pkgconfig ]; + nativeBuildInputs = [ autoreconfHook glib db pkg-config ]; meta = with stdenv.lib; { description = "Library for intelligent sentence-based Chinese pinyin input method"; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 1f311dda9f02c..447440b9c76cc 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig, enablePython ? false, python, glib }: +{ stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }: stdenv.mkDerivation rec { pname = "libplist"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = ["bin" "dev" "out" ] ++ stdenv.lib.optional enablePython "py"; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook ] ++ stdenv.lib.optionals enablePython [ python diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index 0f31115f50f0c..6f70663439122 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_45 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gtk-doc docbook-xsl-nons docbook_xml_dtd_45 diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 7fcc8c58c1ce2..4876de5551d66 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , cmake , zlib , fetchpatch @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "py3" ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake makeWrapper ]; diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index e08feaddc606a..d5418ec09d82b 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, ncurses}: +{stdenv, fetchurl, pkg-config, glib, ncurses}: stdenv.mkDerivation rec { name = "libpseudo-1.2.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ncurses ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 67e87a5faab47..ed6d63aa5241f 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -8,7 +8,7 @@ , libidn2 , libunistring , libxslt -, pkgconfig +, pkg-config , python3 , valgrind , publicsuffix-list @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 gtk-doc lzip - pkgconfig + pkg-config python3 libxslt ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index e69cc04d6f0ba..829bea9351e16 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, boost, libgsf, - pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: + pkg-config, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { name = "libpst-0.6.75"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost libgsf bzip2 xmlto gettext imagemagick doxygen diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index b61bcd0302702..ca1bfecfadba8 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkgconfig, doxygen, +{ stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkg-config, doxygen, autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ]; + nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ]; buildInputs = [ curl gettext libiconv readline ]; configureFlags = ["--with-readline=${readline.dev}"]; propagatedBuildInputs = [ libxml2 mpfr icu ]; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index 244dcf0999b46..7f3ca25ec40f0 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { name = "libqb-0.17.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1zpl45p3n6dn1jgbsrrmccrmv2mvp8aqmnl0qxfjf7ymkrj9qhcs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { homepage = "https://github.com/clusterlabs/libqb"; diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/development/libraries/libr3/default.nix index 0584203a581ad..d838c07de8707 100644 --- a/pkgs/development/libraries/libr3/default.nix +++ b/pkgs/development/libraries/libr3/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , pcre -, pkgconfig +, pkg-config , check , autoreconfHook }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "09cixbms817p6nb77wz3rxp0znnac8ybycvsrrzgwlbfn58a3zwl"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ check ]; propagatedBuildInputs = [ pcre ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index f59f63c38ac76..123bd87ae3015 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: stdenv.mkDerivation rec { pname = "libraw"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ lcms2 ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index d9b94a668c603..ff8679b86abca 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2, perl }: +{ stdenv, fetchurl, librdf_raptor2, gmp, pkg-config, pcre, libxml2, perl }: stdenv.mkDerivation rec { name = "rasqal-0.9.33"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0z6rrwn4jsagvarg8d5zf0j352kjgi33py39jqd29gbhcnncj939"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp pcre libxml2 ]; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index a85500d2c6ec3..f9863b922c73a 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl +{ stdenv, fetchurl, pkg-config, openssl, libxslt, perl , curl, pcre, libxml2, librdf_rasqal, gmp , libmysqlclient, withMysql ? false , postgresql, withPostgresql ? false @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681"; }; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl libxslt curl pcre libxml2 gmp ] ++ stdenv.lib.optional withMysql libmysqlclient diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index 71667460e2394..358a8490e6967 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] ++ lib.optional enablePython swig; buildInputs = [ pcre2 ] diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 2768c20d65763..0a56e4199e43b 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -2,7 +2,7 @@ , autoreconfHook , gnutls , openssl -, pkgconfig +, pkg-config , zlib }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0miqjck9zh1hgsx1v395n0d4f1a1p5a8khybv2nsfjq04g9359c9"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls zlib openssl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index bed92477a3fc2..747f9495015ad 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , readline, texinfo , gdbm, gmp, libffi }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ readline texinfo ]; propagatedBuildInputs = [ gdbm gmp libffi ]; diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index e1d7b336273db..bff441589c24d 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobject-introspection, gnome3 }: +{ stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "rest"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; buildInputs = [ glib libsoup ]; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index 2c6e792ae8ce0..d36157a883c4a 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib}: +{stdenv, fetchurl, boost, pkg-config, cppunit, zlib}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz"; sha256="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost cppunit zlib ]; diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix index b49fb3f7ee77c..f1df19dc2e5b7 100644 --- a/pkgs/development/libraries/librevisa/default.nix +++ b/pkgs/development/libraries/librevisa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ stdenv, fetchurl, pkg-config, libusb1 }: # TODO: add VXI development files, for VXI-11 (TCPIP) support @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index ecf518d04daed..7e2956d31cb14 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2 +{ lib, stdenv, fetchurl, pkg-config, glib, gdk-pixbuf, pango, cairo, libxml2 , bzip2, libintl, darwin, rustc, cargo, gnome3 , vala, gobject-introspection }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gdk-pixbuf cairo ]; - nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ] + nativeBuildInputs = [ pkg-config rustc cargo vala gobject-introspection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 92958f389f042..645c742aca0c2 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsndfile, ApplicationServices, Carbon, CoreServices }: +{ stdenv, fetchurl, pkg-config, libsndfile, ApplicationServices, Carbon, CoreServices }: let inherit (stdenv.lib) optionals optionalString; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ] ++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index c9c105d1b18ae..472f7fdc51c29 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}: +{stdenv, fetchFromGitHub, automake, autoconf, pkg-config, libtool, python2Packages, glib, jansson}: stdenv.mkDerivation rec { version = "3.2.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./libsearpc.pc.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ]; propagatedBuildInputs = [ glib jansson ]; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index d614ab01297ef..abc4b5949a8e1 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, gettext, libxslt, python3 +{ stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 , docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala , gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ - pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl + pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl gobject-introspection vala gtk-doc glib ]; buildInputs = [ libgcrypt ]; diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index c7f34362f39f1..f016e13fd8999 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, darwin }: +{ stdenv, fetchurl, pkg-config, udev, darwin }: stdenv.mkDerivation rec { name = "libserialport-0.1.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = stdenv.lib.optional stdenv.isLinux udev ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit; diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 075855fada46f..7bd65bbdfb2f8 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , libvorbis, libtheora, speex }: -# need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc +# need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc stdenv.mkDerivation rec { name = "libshout-2.4.4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libvorbis libtheora speex ]; meta = { diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 5845916239c35..d5f8dd6e5730d 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, pkgconfig +, pkg-config , docSupport ? true , doxygen ? null , graphviz ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "04vdrrkh5y9x9rrmj6gdp242ah70b4sslwqfby8wp2riis4hr9z0"; }; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ optionals docSupport [ doxygen graphviz ]; installTargets = [ "install" ] diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 0fc19d207596b..09552f86fa759 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, m4}: +{stdenv, fetchurl, pkg-config, m4}: stdenv.mkDerivation rec { name = "libsigc++-1.2.7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ m4]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 8f883626d8232..4cc741a71c1d2 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnum4, gnome3 }: +{ stdenv, fetchurl, pkg-config, gnum4, gnome3 }: stdenv.mkDerivation rec { pname = "libsigc++"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9"; }; - nativeBuildInputs = [ pkgconfig gnum4 ]; + nativeBuildInputs = [ pkg-config gnum4 ]; doCheck = true; diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index 1f453dc291e48..4ac48c4985fd9 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, nix-update-script, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }: +{ stdenv, fetchgit, nix-update-script, pkg-config, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }: stdenv.mkDerivation rec { pname = "libsignon-glib"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index e5fd031b5fff4..a950064cf6a52 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, - libtool, gettext, pkgconfig, + libtool, gettext, pkg-config, vala, gnome-common, gobject-introspection, libgee, json-glib, skk-dicts, libxkbcommon }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ skk-dicts libxkbcommon ]; - nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkgconfig ]; + nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkg-config ]; propagatedBuildInputs = [ libgee json-glib ]; preConfigure = '' diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix index bb3de08cf72e9..ceda7b5d93691 100644 --- a/pkgs/development/libraries/libsmartcols/default.nix +++ b/pkgs/development/libraries/libsmartcols/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3 }: stdenv.mkDerivation rec { name = "libsmartcols"; version = "v2.36.1"; - nativeBuildInputs = [ autoreconfHook pkgconfig python3 ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3 ]; src = fetchFromGitHub { owner = "karelzak"; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 739bc7d733239..d154a7194bbf2 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkgconfig, python3 +{ stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkg-config, python3 , Carbon, AudioToolbox }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1rh79y4s4m2wcm2kahmzs2kijpdpayif2gyca6m71f3k7jbhgcwa"; }; - nativeBuildInputs = [ autoreconfHook autogen pkgconfig python3 ]; + nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; buildInputs = [ flac libogg libopus libvorbis ] ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 88c6a359ba8db..d052cbdc87727 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, libsysprof-capture +{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome3, libsysprof-capture , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala , libpsl, python3, brotli }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ libsysprof-capture ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ]; + nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala glib ]; propagatedBuildInputs = [ glib libxml2 ]; NIX_CFLAGS_COMPILE = [ "-lpthread" ]; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index bdc4504ad5acb..2e9dadf0bf5d8 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }: +{ stdenv, lib, fetchurl, pkg-config, libxml2, sqlite, zlib, proj, geos, libiconv }: with lib; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 sqlite zlib proj geos libiconv ]; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 11400a6a3e232..ec2a6242d9ec9 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, ghostscript, cairo }: +{ fetchurl, stdenv, pkg-config, ghostscript, cairo }: stdenv.mkDerivation rec { name = "libspectre-0.2.7"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ # Need `libgs.so'. - pkgconfig ghostscript cairo /*for tests*/ + pkg-config ghostscript cairo /*for tests*/ ]; doCheck = true; diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix index 24b9b9241c218..8922bedccdc8d 100644 --- a/pkgs/development/libraries/libspectrum/default.nix +++ b/pkgs/development/libraries/libspectrum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, pkgconfig, audiofile, bzip2, glib, libgcrypt, zlib }: +{ lib, stdenv, fetchurl, perl, pkg-config, audiofile, bzip2, glib, libgcrypt, zlib }: stdenv.mkDerivation rec { name = "libspectrum-1.4.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1cc0jx617sym6qj1f9fm115q44cq5azsxplqq2cgrg0pmlmjpyzx"; }; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ audiofile bzip2 glib libgcrypt zlib ]; diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index a77e209119bb1..d466b4e85a938 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -1,4 +1,4 @@ -{stdenv, pkgconfig, autoreconfHook, fetchFromGitHub }: +{stdenv, pkg-config, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libspiro"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; meta = with stdenv.lib; { description = "A library that simplifies the drawing of beautiful curves"; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 69cd24dfd6e82..feb1f8e1736da 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey ? null, unzip, gnused }: +{ stdenv, fetchurl, libspotify, alsaLib, readline, pkg-config, apiKey ? null, unzip, gnused }: let version = "12.1.51"; @@ -65,7 +65,7 @@ else stdenv.mkDerivation { pname = "libspotify-samples"; inherit version; src = libspotify.src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libspotify readline ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples"; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index c6accad9c3c8f..95d4dc02029ed 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: +{ stdenv, fetchurl, pkg-config, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { pname = "libssh"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl libsodium ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "SSH client library"; diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index c1c506ef5e322..d6eb2647fbdd6 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, perl }: +{ stdenv, fetchurl, pkg-config, cmake, perl }: with stdenv.lib; stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1ga7rqmppa8ady665736cx443icscqlgflkqmxd4xbkzypmdj9bk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ cmake perl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix index df500cd7a4193..7ce5b2f3214d5 100644 --- a/pkgs/development/libraries/libtelnet/default.nix +++ b/pkgs/development/libraries/libtelnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }: +{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, zlib }: stdenv.mkDerivation { pname = "libtelnet"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1lp6gdbndsp2w8mhy88c2jknxj2klvnggvq04ln7qjg8407ifpda"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ zlib ]; meta = { diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index bb2e1b05bcec1..4be42ff745e7b 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, libtool, pkgconfig, ncurses, unibilium }: +{ stdenv, lib, fetchzip, libtool, pkg-config, ncurses, unibilium }: stdenv.mkDerivation rec { pname = "libtermkey"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - nativeBuildInputs = [ libtool pkgconfig ]; + nativeBuildInputs = [ libtool pkg-config ]; buildInputs = [ ncurses unibilium ]; meta = with lib; { diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 656204fb0ce8e..94af9d76e78ac 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libvorbis, pkgconfig}: +{stdenv, fetchurl, libogg, libvorbis, pkg-config}: stdenv.mkDerivation rec { name = "libtheora-1.1.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputDoc = "devdoc"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libogg libvorbis ]; # GCC's -fforce-addr flag is not supported by clang diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 6d4109621826b..9bb572a912c69 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , zlib , libjpeg @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection) diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index fbc726a451983..094ff565b3c5e 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libkate, pango, cairo, pkgconfig, darwin }: +{ stdenv, lib, fetchurl, libkate, pango, cairo, pkg-config, darwin }: stdenv.mkDerivation rec { name = "libtiger-0.3.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libkate pango cairo ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix index b2c958795f3e3..649d73b49b87d 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf +{ stdenv, lib, fetchFromGitHub, pkg-config, automake, autoconf , zlib, boost, openssl, libtool, python, libiconv, ncurses }: @@ -22,7 +22,7 @@ in stdenv.mkDerivation { }; enableParallelBuilding = true; - nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + nativeBuildInputs = [ automake autoconf libtool pkg-config ]; buildInputs = [ boostPython openssl zlib python libiconv ncurses ]; preConfigure = "./autotool.sh"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 42c35e68edd90..727516cad9315 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack -, libvpx, check, libconfig, pkgconfig }: +, libvpx, check, libconfig, pkg-config }: let generic = { version, sha256 }: @@ -26,7 +26,7 @@ let libopus libvpx ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; doCheck = false; # hangs, tries to access the net? checkInputs = [ check ]; diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index 6cd5f9122a4f7..d28fcf4a60d13 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus -, libvpx, check, libconfig, pkgconfig }: +, libvpx, check, libconfig, pkg-config }: stdenv.mkDerivation { name = "tox-core-new-20160727"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ autoreconfHook libsodium ncurses check libconfig ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 21108fa108e45..73114d5bc96e3 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libxkbcommon, pkgconfig, cmake }: +{ stdenv, fetchFromGitHub, libxkbcommon, pkg-config, cmake }: stdenv.mkDerivation rec { pname = "libtsm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "Terminal-emulator State Machine"; diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index a9c62673115a5..fd8eada261cb0 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, json_c, hidapi }: +{ stdenv, fetchurl, fetchpatch, pkg-config, json_c, hidapi }: stdenv.mkDerivation rec { pname = "libu2f-host"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ json_c hidapi ]; doCheck = true; diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix index cd961cde1d28b..b1187177f30dc 100644 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, json_c, openssl, check, file, help2man, which, gengetopt }: +{ stdenv, fetchurl, fetchpatch, pkg-config, json_c, openssl, check, file, help2man, which, gengetopt }: stdenv.mkDerivation rec { name = "libu2f-server-1.1.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ json_c openssl check file help2man which gengetopt ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 2cd5bd8a34125..f8dfa80a95979 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cmake, pkgconfig, json_c }: +{ stdenv, lib, fetchgit, cmake, pkg-config, json_c }: stdenv.mkDerivation { pname = "libubox"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ json_c ]; meta = with lib; { diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 5cb19f863cccf..74bc597c56908 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, Cocoa }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }: let shortName = "libui"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "0bm6xvqk4drg2kw6d304x6mlfal7gh8mbl5a9f0509smmdzgdkwm"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux gtk3 ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; diff --git a/pkgs/development/libraries/libuinputplus/default.nix b/pkgs/development/libraries/libuinputplus/default.nix index 700a4701fc879..9f6f18555f7f1 100644 --- a/pkgs/development/libraries/libuinputplus/default.nix +++ b/pkgs/development/libraries/libuinputplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libuinputplus"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jy5i7bmjad7hw1qcyjl4swqribp2027s9g3609zwj7lj8z5x0bg"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index e960117125e63..14c84199c5074 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , dbus, dbus-glib, gtk3, gobject-introspection , gtk-doc, docbook_xml_dtd_45, docbook_xsl , libxslt, libxml2 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0f70lkw66v9cj72q0iw1s2546r6bwwcd8idcm3621fg2fgh2rw58"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 502fd27ebb6c2..45f5e6f786d68 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }: +{ stdenv, fetchurl, pkg-config, glib, gtk2, dbus-glib }: stdenv.mkDerivation rec { pname = "libunique"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ./1.1.6-include-terminator.patch ] ++ [ ./gcc7-bug.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 dbus-glib ]; # Don't make deprecated usages hard errors diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index 037e84069b421..287c185385fa8 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchgit -, pkgconfig +, pkg-config , glib , vala , dee @@ -28,7 +28,7 @@ stdenv.mkDerivation { autoreconfHook gobject-introspection intltool - pkgconfig + pkg-config python3 vala ]; diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix index 2830ef284587e..41fe7cc6f1ec3 100644 --- a/pkgs/development/libraries/libusb-compat/0.1.nix +++ b/pkgs/development/libraries/libusb-compat/0.1.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , patchelf -, pkgconfig +, pkg-config , libusb1 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # get rid of propagating systemd closure outputBin = "dev"; - nativeBuildInputs = [ autoreconfHook patchelf pkgconfig ]; + nativeBuildInputs = [ autoreconfHook patchelf pkg-config ]; buildInputs = [ libusb1 ]; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 10310e22da7be..fef3d168c96e1 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , udev ? null , libobjc @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = stdenv.lib.optional enableUdev udev ++ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index e2e0a6d9d75d6..cb8e1761d82f2 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libplist }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libplist }: stdenv.mkDerivation rec { pname = "libusbmuxd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "139pzsnixkck6ly1q6p0diqr0hgd0mx0pr4xx1jamm3f3656kpf9"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libplist ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index fa661446b9a1a..187b8574eefe1 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { version = "1.40.0"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { sed '/${tdRegexp}/d' -i test/test-list.h ''; - nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + nativeBuildInputs = [ automake autoconf libtool pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 1debefed0ad9c..dbd23c5abc985 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi +{ stdenv, lib, fetchurl, libX11, pkg-config, libXext, libdrm, libXfixes, wayland, libffi , libGL, mesa , minimal ? false, libva1-minimal }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 98176cd41f143..5224da5d9e773 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp +{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp , libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg_3 libGLU ]; doCheck = false; # fails. needs DRI access diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index cbb312e0f0d81..42066bd2bf0ab 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, mesa, meson, ninja }: +{ stdenv, fetchurl, pkg-config, xorg, mesa, meson, ninja }: stdenv.mkDerivation rec { pname = "libvdpau"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = with xorg; [ xorgproto libXext ]; propagatedBuildInputs = [ xorg.libX11 ]; diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index f9c695aedf71f..7ebabaf72571c 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, ncurses, gpm}: +{stdenv, fetchurl, pkg-config, glib, ncurses, gpm}: stdenv.mkDerivation rec { name = "libviper-1.4.6"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ncurses gpm]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index bf8d0b373f083..e7dbd2456cb81 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gobject-introspection, intltool, vala +{ stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala , libcap_ng, libvirt, libxml2 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz"; }; - nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ]; + nativeBuildInputs = [ pkg-config intltool vala gobject-introspection ]; buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix index b880d36427450..024a667a4da62 100644 --- a/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/pkgs/development/libraries/libvirt/5.9.0.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit -, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch +, pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr , iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ makeWrapper pkgconfig rpcsvc-proto ]; + nativeBuildInputs = [ makeWrapper pkg-config rpcsvc-proto ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index b84ba92e2bfb4..4d17f3a8c0e32 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib, gperf +{ stdenv, fetchurl, boost, libwpd, libwpg, pkg-config, zlib, gperf , librevenge, libxml2, icu, perl, cppunit, doxygen }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg"; }; - nativeBuildInputs = [ pkgconfig cppunit doxygen ]; + nativeBuildInputs = [ pkg-config cppunit doxygen ]; buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ]; configureFlags = [ diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 8fe53acc24568..9559a604f0a8b 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { name = "libvisual-0.4.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 1603d32ba797b..0f4bb4950f9a6 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -4,7 +4,7 @@ bison, flex, glib, - pkgconfig, + pkg-config, json_c, xen, libvirt, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib libvirt json_c ] ++ (optional xenSupport xen); - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; + nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; configureFlags = optional (!xenSupport) "--disable-xen"; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 2a9f97cf67f55..7ad8174cd4840 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, pkgconfig }: +{ stdenv, fetchurl, libogg, pkg-config }: stdenv.mkDerivation rec { name = "libvorbis-1.3.7"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libogg ]; doCheck = true; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index 40324ec493274..6c37dc23ad786 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, ncurses }: +{ stdenv, fetchurl, pkg-config, glib, ncurses }: stdenv.mkDerivation rec { name = "libvterm-0.99.7"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ncurses ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 6ae116356f8aa..fe9aaaed1255b 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, glib, pkgconfig, udev, libgudev, doxygen }: +{ stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen }: stdenv.mkDerivation rec { pname = "libwacom"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "10wphlk5v591mlvcyr6bjqp60zmhbpqg3lmsq9dza738v97ws8ci"; }; - nativeBuildInputs = [ pkgconfig meson ninja doxygen ]; + nativeBuildInputs = [ pkg-config meson ninja doxygen ]; mesonFlags = [ "-Dtests=disabled" ]; diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index 5c684c7fd778e..c7232ef6ba0f8 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ stdenv, fetchFromGitHub, pkg-config , freetype, glib, imagemagick, libjpeg, libpng, libxml2, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0i2w5hg8mbgmgabxyd48qp1gx2mhk33hgr3jqvg72k0nhkd2jhf6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib imagemagick libpng glib freetype libjpeg libxml2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 78aa231bda3a3..8b0e186850130 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -3,7 +3,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gtk-doc , docbook_xsl , docbook_xml_dtd_412 @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext gobject-introspection gtk-doc diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 2872181a36d86..f4305cde7d7bc 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, intltool, xorg }: +{ stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }: stdenv.mkDerivation rec { pname = "libwnck"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; # ?another optional: startup-notification diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index f47208cda4402..f924afd4e1aaf 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }: +{ stdenv, fetchurl, pkg-config, glib, libgsf, libxml2, bzip2 }: stdenv.mkDerivation rec { name = "libwpd-0.8.14"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libgsf libxml2 ]; - nativeBuildInputs = [ pkgconfig bzip2 ]; + nativeBuildInputs = [ pkg-config bzip2 ]; meta = with stdenv.lib; { description = "Library for importing WordPerfect documents"; diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 3464c55805dda..7ddc7965c0526 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2, librevenge }: +{ stdenv, fetchurl, zlib, pkg-config, glib, libgsf, libxml2, librevenge }: stdenv.mkDerivation rec { name = "libwpd-0.10.0"; - + src = fetchurl { url = "mirror://sourceforge/libwpd/${name}.tar.xz"; sha256 = "0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx"; }; - + buildInputs = [ glib libgsf libxml2 zlib librevenge ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "A library for importing and exporting WordPerfect documents"; diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index c844daf51f037..bbdb10f3f0f36 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }: +{ stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge }: stdenv.mkDerivation rec { name = "libwpg-0.3.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libwpd zlib librevenge ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { homepage = "http://libwpg.sourceforge.net"; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 3d40d204bdc66..252b13dd6da7f 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }: +{ stdenv, fetchurl, boost, pkg-config, librevenge, zlib }: stdenv.mkDerivation rec { pname = "libwps"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16c6vq6hhi5lcvgyb9dwarr3kz69l1g5fs39b2hwqhkwzx5igpcl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost librevenge zlib ]; NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; diff --git a/pkgs/development/libraries/libx86/src-for-default.nix b/pkgs/development/libraries/libx86/src-for-default.nix index 30be467f9fd29..a681d9e589021 100644 --- a/pkgs/development/libraries/libx86/src-for-default.nix +++ b/pkgs/development/libraries/libx86/src-for-default.nix @@ -4,6 +4,6 @@ rec { hash="0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; url="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz"; advertisedUrl="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz"; - - + + } diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 9ecfa0ffd1adf..4ab63e0e9c4d8 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, libjpeg, libpng, libX11, zlib }: stdenv.mkDerivation rec { pname = "libxcomp"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libjpeg libpng libX11 zlib ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; preAutoreconf = '' cd nxcomp/ diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index a73fb7cb870e3..75043b02e57bc 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }: +{ stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }: stdenv.mkDerivation rec { name = "libxkbcommon-0.7.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ yacc flex xkeyboard_config libxcb ]; configureFlags = [ diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index febe7f7b38caa..88c3ae60cf386 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl +{ stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl , glib, isocodes, gobject-introspection }: let @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; - nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ]; + nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc docbook_xsl ]; buildInputs = [ gobject-introspection ]; diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 97e8d23c07001..182f2d7962086 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -7,7 +7,7 @@ , gtk-doc , meson , ninja -, pkgconfig +, pkg-config , python3 , shared-mime-info , nixosTests @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gtk-doc meson ninja - pkgconfig + pkg-config (python3.withPackages (pkgs: with pkgs; [ setuptools ])) shared-mime-info ]; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index c80808081ffb9..88f3bec6b9537 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl, gnome3 }: +{ stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; propagatedBuildInputs = [ libxml2 glibmm ]; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index be5c019e31ee9..c01d62989efbc 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }: +{ stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" "devdoc" ]; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ glibmm ]; diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix index ea900477f356b..33ece6aed42d9 100644 --- a/pkgs/development/libraries/libykclient/default.nix +++ b/pkgs/development/libraries/libykclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, curl }: stdenv.mkDerivation { pname = "libykclient"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "01b19jgv2lypih6lhw9yjjsfl8q1ahl955vhr2ai8ccshh0050yj"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig help2man ]; + nativeBuildInputs = [ autoreconfHook pkg-config help2man ]; buildInputs = [ curl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index cb4f3bec01180..614b66fdea389 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pcsclite, libzip, help2man }: +{ stdenv, fetchurl, pkg-config, pcsclite, libzip, help2man }: stdenv.mkDerivation rec { name = "libykneomgr-0.1.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12gqblz400kr11m1fdr1vvwr85lgy5v55zy0cf782whpk8lyyj97"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcsclite libzip help2man ]; configureFlags = [ diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 4341b1e20412f..1177196ed1871 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: +{ stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: stdenv.mkDerivation rec { pname = "libzapojit"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + nativeBuildInputs = [ pkg-config intltool gobject-introspection ]; propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc passthru = { diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 79933d402f7a9..27c046814f329 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6"; }; - # Fix pkgconfig file paths + # Fix pkg-config file paths postPatch = '' sed -i CMakeLists.txt \ -e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \ diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index d3cbc430efc46..a2013604deb71 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}: +{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkg-config, cppunit}: stdenv.mkDerivation rec { pname = "libzmf"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost icu libpng librevenge zlib cppunit ]; - nativeBuildInputs = [ doxygen pkgconfig ]; + nativeBuildInputs = [ doxygen pkg-config ]; configureFlags = [ "--disable-werror" ]; meta = { diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 2f7740aa467e9..d47c7b50abef5 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake , opentracing-cpp, protobuf, zlib , enableGrpc ? false, grpc ? null, openssl ? null, c-ares ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig + cmake pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 7bca0c295c4b8..4683f374470e6 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , autoreconfHook , givaro -, pkgconfig +, pkg-config , blas , lapack , fflas-ffpack @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 97079be096230..9184c7330ed46 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3, +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3, alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { touch lib/lirc/input_map.inc ''; - nativeBuildInputs = [ autoreconfHook pkgconfig help2man + nativeBuildInputs = [ autoreconfHook pkg-config help2man (python3.withPackages (p: with p; [ pyyaml setuptools ])) ]; buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ]; diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index e00fc07480e25..de2f1b7c5c39c 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib }: +{ stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }: stdenv.mkDerivation rec { version = "1.5.3"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl libidn glib zlib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "A lightweight C library for the Jabber protocol"; diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix index 80c8702b0b94f..b37749385ba90 100644 --- a/pkgs/development/libraries/lrdf/default.nix +++ b/pkgs/development/libraries/lrdf/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ config, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , librdf_raptor2, ladspaH, openssl, zlib , doCheck ? config.doCheckByDefault or false, ladspaPlugins }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ librdf_raptor2 ]; diff --git a/pkgs/development/libraries/luksmeta/default.nix b/pkgs/development/libraries/luksmeta/default.nix index 9e01605d2df1d..afefcfed82c7f 100644 --- a/pkgs/development/libraries/luksmeta/default.nix +++ b/pkgs/development/libraries/luksmeta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, asciidoc , cryptsetup }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "10nslwk7m1qwskd12c204ipa3cbad0q6fn0v084z2f7q6xxbkd2d"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ]; + nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ]; buildInputs = [ cryptsetup ]; meta = { diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 51fd6962e7041..46f95148d8223 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, jdk}: stdenv.mkDerivation rec { - pname = "martyr"; + pname = "martyr"; version = "0.3.9"; - src = fetchurl { - url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz"; - sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; - }; + src = fetchurl { + url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz"; + sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; + }; buildInputs = [ ant jdk ]; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 64ddba517df8f..a4d4f408f90a8 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -23,7 +23,7 @@ , libv4l , libvpx , ortp -, pkgconfig +, pkg-config , python , SDL , speex @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { cmake doxygen intltool - pkgconfig + pkg-config python ]; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 45b3c83bfe24e..527c395963f1c 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -4,7 +4,7 @@ , fetchpatch , mediastreamer , openh264 -, pkgconfig +, pkg-config , stdenv }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "140hs5lzpshzswvl39klcypankq3v2qck41696j22my7s4wsa0hr"; }; - nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; buildInputs = [ mediastreamer openh264 ]; # Do not build static libraries diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index d7b39c28a425d..36e3c8c67004f 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, libfm-extra }: +{ stdenv, fetchurl, glib, pkg-config, libfm-extra }: let name = "menu-cache-1.1.0"; in @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libfm-extra ]; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 9679ddb94e8c2..1f42828907afd 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }: +{ stdenv, fetchurl, pkg-config, libGL, ApplicationServices }: stdenv.mkDerivation rec { pname = "glu"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1g2m634p73mixkzv1qz1d0flwm390ydi41bwmchiqvdssqnlqnpv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libGL ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 55264888e2a45..217aff58966a8 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, buildPackages -, pkgconfig, intltool, ninja, meson +, pkg-config, intltool, ninja, meson , file, flex, bison, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, python3Packages @@ -129,10 +129,10 @@ stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] ++ lib.optional withValgrind valgrind-light; - depsBuildBuild = [ pkgconfig ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ - pkgconfig meson ninja + pkg-config meson ninja intltool bison flex file python3Packages.python python3Packages.Mako ] ++ lib.optionals (elem "wayland" eglPlatforms) [ diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 1f2915c5071b5..7423c0e5c7720 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif -, libvorbis, libxml2, movit, pkgconfig, sox, fftw, opencv4, SDL2 +, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 , gtk2, genericUpdater, common-updater-scripts, libebur128 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkgconfig sox libexif gtk2 fftw libebur128 + makeWrapper movit pkg-config sox libexif gtk2 fftw libebur128 opencv4 SDL2 ]; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f8ec278ea78bb..599209fa57d51 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -9,7 +9,7 @@ , libvorbis , libxml2 , movit -, pkgconfig +, pkg-config , sox , qtbase , qtsvg @@ -45,7 +45,7 @@ mkDerivation rec { libvorbis libxml2 movit - pkgconfig + pkg-config qtbase qtsvg sox diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index d011419cea7f0..523de7cc6bf2c 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, perl, pkgconfig, libbson +{ stdenv, fetchzip, perl, pkg-config, libbson , openssl, which, zlib, snappy }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; }; - nativeBuildInputs = [ pkgconfig which perl ]; + nativeBuildInputs = [ pkg-config which perl ]; buildInputs = [ openssl zlib ]; propagatedBuildInputs = [ libbson snappy ]; diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index d9c1636e59baa..672d29e20f44b 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono4, gtk-sharp-2_0 }: stdenv.mkDerivation rec { pname = "mono-addins"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "018g3bd8afjc39h22h2j5r6ldsdn08ynx7wg889gdvnxg3hrxgl2"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged buildInputs = [ mono4 gtk-sharp-2_0 ]; diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index f03ba81e8686b..144f11355e1d5 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool +{ stdenv, fetchurl, pkg-config, libtool , xlibsWrapper, xbitmaps, libXrender, libXmu, libXt , expat, libjpeg, libpng, libiconv , flex @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { expat libjpeg libpng libiconv ]; - nativeBuildInputs = [ pkgconfig flex ]; + nativeBuildInputs = [ pkg-config flex ]; propagatedBuildInputs = [ libXp libXau ]; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 901d299728fa5..3201de460ff34 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }: +{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkg-config }: stdenv.mkDerivation rec { pname = "movit"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ eigen epoxy ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 fftw gtest ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix index 26066f1194f07..0411a8bf6237f 100644 --- a/pkgs/development/libraries/msgpuck/default.nix +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "msgpuck"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file''; diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index 601e70427a138..c388a291cc522 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ilbc, mediastreamer, pkgconfig }: +{ stdenv, fetchurl, ilbc, mediastreamer, pkg-config }: stdenv.mkDerivation rec { name = "msilbc-2.1.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ ilbc mediastreamer ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "ILBC_LIBS=ilbc" "ILBC_CFLAGS=-I${ilbc}/include" diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 842d144005d75..dff15bdc606bd 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchpatch , cmake -, pkgconfig +, pkg-config , boost17x , openssl , zlib @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ spdlog diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix index f936fc8b3df6e..02f0cd671f280 100644 --- a/pkgs/development/libraries/mumlib/default.nix +++ b/pkgs/development/libraries/mumlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , boost, openssl, log4cpp, libopus, protobuf }: with lib; stdenv.mkDerivation { pname = "mumlib"; @@ -12,7 +12,7 @@ with lib; stdenv.mkDerivation { }; buildInputs = [ boost openssl libopus protobuf log4cpp ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; installPhase = '' install -Dm555 libmumlib.so $out/lib/libmumlib.so cp -a ../include $out diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix index 570588e22fb77..07a57c664801a 100644 --- a/pkgs/development/libraries/mypaint-brushes/1.0.nix +++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix @@ -2,7 +2,7 @@ , autoconf , automake , fetchFromGitHub -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake - pkgconfig + pkg-config ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix index d2fb8ed143a03..08ac20e447c06 100644 --- a/pkgs/development/libraries/mypaint-brushes/default.nix +++ b/pkgs/development/libraries/mypaint-brushes/default.nix @@ -2,7 +2,7 @@ , autoconf , automake , fetchFromGitHub -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake - pkgconfig + pkg-config ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index 1cd8612c3bb01..b4983455675f6 100644 --- a/pkgs/development/libraries/mythes/default.nix +++ b/pkgs/development/libraries/mythes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hunspell, ncurses, pkgconfig, perl }: +{ stdenv, fetchurl, hunspell, ncurses, pkg-config, perl }: stdenv.mkDerivation rec { name = "mythes-1.2.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ hunspell ]; - nativeBuildInputs = [ ncurses pkgconfig perl ]; + nativeBuildInputs = [ ncurses pkg-config perl ]; meta = { homepage = "http://hunspell.sourceforge.net/"; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 5f6c85411b18c..bb8dee2be61ed 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { - version = "4.9.6"; + version = "4.9.7"; pname = "nco"; nativeBuildInputs = [ flex which ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "0f8vf66700dcr48jqd371bbldc61xkrilby13xp8j5l9q4xal808"; + sha256 = "sha256-Q4okOoyodofAsMrSmAhFISeY05Be+i7OX4qy2annQq4="; }; prePatch = '' diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 17a924e6e74c5..742de6cf92e75 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , abiVersion ? "6" , mouseSupport ? false @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ - pkgconfig + pkg-config ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.ncurses ]; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 6f0dbf032a9ab..a6b6e88cec327 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, readline, makeWrapper }: stdenv.mkDerivation { name = "neardal-0.7-post-git-20150930"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool glib readline makeWrapper ]; preConfigure = '' diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index c60f5e60fb8f6..89b48221ca80a 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkgconfig, perl +{ stdenv, fetchurl, libxml2, pkg-config, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? false @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl] ++ stdenv.lib.optional compressionSupport zlib; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index e9ce6ee18b4fa..935a17d3d78f0 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkgconfig, perl +{ stdenv, fetchurl, libxml2, pkg-config, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? stdenv.hostPlatform.isStatic @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl] ++ stdenv.lib.optional compressionSupport zlib; diff --git a/pkgs/development/libraries/networking-ts-cxx/default.nix b/pkgs/development/libraries/networking-ts-cxx/default.nix new file mode 100644 index 0000000000000..72981175c0bc3 --- /dev/null +++ b/pkgs/development/libraries/networking-ts-cxx/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "networking-ts-cxx"; + version = "2019-02-27"; + + # Used until https://github.com/chriskohlhoff/networking-ts-impl/issues/17 is + # resolved and we can generate in Nix. + src = fetchFromGitHub { + owner = "chriskohlhoff"; + repo = "networking-ts-impl"; + rev = "c97570e7ceef436581be3c138868a19ad96e025b"; + sha256 = "12b5lg989nn1b8v6x9fy3cxsf3hs5hr67bd1mfyh8pjikir7zv6j"; + }; + + installPhase = '' + mkdir -p $out/{include,lib/pkgconfig} + cp -r include $out/ + substituteAll ${./networking_ts.pc.in} $out/lib/pkgconfig/networking_ts.pc + ''; + + meta = with stdenv.lib; { + description = "Experimental implementation of the C++ Networking Technical Specification"; + homepage = "https://github.com/chriskohlhoff/networking-ts-impl"; + license = licenses.boost; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in b/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in new file mode 100644 index 0000000000000..d52f68f4c155e --- /dev/null +++ b/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in @@ -0,0 +1,8 @@ +prefix=@out@ +includedir=${prefix}/include + +Name: networking_ts +Description: Experimental implementation of the C++ Networking Technical Specification +URL: https://github.com/chriskohlhoff/networking-ts-impl +Version: ${networking_ts_version} +Cflags: -isystem${includedir} diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 7bcdf8feb3025..0ec941ff1829a 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config # Optional Dependencies , openssl ? null, zlib ? null @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "lib" ] ++ optional enablePython "python"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ optional enableLibEv libev ++ [ zlib ] diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index f7a608d5c0a97..94c4bd84d9ae5 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: +{ stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }: let version = "6.0.0"; in stdenv.mkDerivation { pname = "nix-plugins"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ nix boost ]; diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index 189e36c1b448e..7b9bffb9bc95a 100644 --- a/pkgs/development/libraries/notcurses/default.nix +++ b/pkgs/development/libraries/notcurses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, pandoc, libunistring, ncurses, ffmpeg, +{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg, fetchFromGitHub, lib, multimediaSupport ? true }: @@ -11,7 +11,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkgconfig pandoc ]; + nativeBuildInputs = [ cmake pkg-config pandoc ]; buildInputs = [ libunistring ncurses ] ++ lib.optional multimediaSupport ffmpeg; diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index 58d35767d1e0d..a1a7a9ad6cb7a 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitLab, pkg-config, autoreconfHook , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoreconfHook + pkg-config autoreconfHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 17a294adc4b76..47fd43d7e35e0 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, pkgconfig, libnl, python }: +{ stdenv, fetchurl, qt4, pkg-config, libnl, python }: let version = "016"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl qt4 ]; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkg-config python ]; # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index bc6ceff837899..cafcf96e46b11 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, icu, catch2, pandoc }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2, pandoc }: stdenv.mkDerivation rec { pname = "nuspell"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-sQ3Q2+FOf2bXCKcgd6XvEb+QZzzDccs/4+CpJbEd1PQ="; }; - nativeBuildInputs = [ cmake pkgconfig pandoc ]; + nativeBuildInputs = [ cmake pkg-config pandoc ]; buildInputs = [ icu ]; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index 9a8c092406cc1..7e87ac4340870 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }: +{ stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }: stdenv.mkDerivation rec { pname = "ogre-paged"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ ois ogre libX11 boost ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF" ]; diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index c0b2366ab7fc9..ad17e7dcac7df 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, - pkgconfig, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, + pkg-config, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, OpenCL, Cocoa }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "17wy8dcf44vqisishv1jjf3cmcxyygqq29y9c3wjdj983qi2hsig"; }; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ libGL libGLU libXmu freetype fontconfig expat freeimage vtk gl2ps tbb diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index a60051dbd5f58..6745d6bf0ce79 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, boost, pkgconfig, lcms2, tinyxml, git }: +{ stdenv, lib, fetchFromGitHub, cmake, boost, pkg-config, lcms2, tinyxml, git }: with lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; # TODO: Investigate whether git can be dropped: It's only used to apply patches - nativeBuildInputs = [ cmake pkgconfig git ]; + nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ lcms2 tinyxml ] ++ optional stdenv.isDarwin boost; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index 4848ef864bf2d..f011def0eb90c 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -2,7 +2,7 @@ let version = "0.1.5"; -in +in stdenv.mkDerivation { pname = "opencore-amr"; inherit version; @@ -10,10 +10,10 @@ stdenv.mkDerivation { url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; }; - + meta = { homepage = "https://opencore-amr.sourceforge.io/"; - description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. + description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.kiloreux ]; diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index 27a832daf475d..c0a021a9d3b43 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb-compat-0_1 +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcsclite, libusb-compat-0_1 , doxygen, libxslt }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcsclite libusb-compat-0_1 doxygen libxslt ]; preInstall = '' diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index a861591f85f4f..8a8468080801a 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub, fetchpatch -, cmake, pkgconfig, unzip, zlib, pcre, hdf5 +, cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf , config @@ -206,7 +206,7 @@ stdenv.mkDerivation { propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; - nativeBuildInputs = [ cmake pkgconfig unzip ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 0d225127dd80b..3d845b7368b69 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl, fetchFromGitHub, fetchpatch -, cmake, pkgconfig, unzip, zlib, pcre, hdf5 +, cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf , config @@ -216,7 +216,7 @@ stdenv.mkDerivation { propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; - nativeBuildInputs = [ cmake pkgconfig unzip ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 055377b09f568..0d4d2c6e00187 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unzip +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip , zlib , enablePython ? false, pythonPackages , enableGtk2 ? false, gtk2 @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; - nativeBuildInputs = [ cmake pkgconfig unzip ]; + nativeBuildInputs = [ cmake pkg-config unzip ]; NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "bindnow" "relro" ]; - # Fix pkgconfig file that gets broken with multiple outputs + # Fix pkg-config file that gets broken with multiple outputs postFixup = '' sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_old=.*|includedir_old=$dev/include/opencv|" sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_new=.*|includedir_new=$dev/include|" diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 7cbd85055ef6d..b40b3bc4def50 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libbsd, openssl, libmilter +{ stdenv, fetchurl, pkg-config, libbsd, openssl, libmilter , autoreconfHook, perl, makeWrapper }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; buildInputs = [ libbsd openssl libmilter perl ]; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index f9da637cb6e20..5ed35844eb0ab 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , libpng, libtiff, lcms2, jpylyzer , mj2Support ? true # MJ2 executables , jpwlLibSupport ? true # JPWL library & executables @@ -54,7 +54,7 @@ stdenv.mkDerivation { (mkFlag testsSupport "BUILD_TESTING") ] ++ extraFlags; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ ] ++ optionals jpipServerSupport [ curl fcgi ] diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 0edf6dfa72836..779e17e4c811b 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig +{ stdenv, fetchgit, autoreconfHook, pkg-config , boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index e2a52a9333334..78c37e94b9355 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libX11, libXinerama, libXrandr, libGLU, libGL, glib, ilmbase, libxml2, pcre, zlib, AGL, Carbon, Cocoa, Foundation, @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sha256 = "0x8hdbzw0b71j91fzp9cwmy9a7ava8v8wwyj8nxijq942vdx1785"; }; - nativeBuildInputs = [ pkgconfig cmake doxygen ]; + nativeBuildInputs = [ pkg-config cmake doxygen ]; buildInputs = [ libX11 libXinerama libXrandr libGLU libGL diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index a16b8356e6187..e139a1f509c00 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , curl, libxml2, pam, sblim-sfcc }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "19dj38jyzhhhvk863cikcwk5awzlq3337pxmsaqqm4wrcygrkfmx"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl libxml2 pam sblim-sfcc ]; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index dd7a367652d7e..641776cc94462 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, doxygen, fontconfig, graphviz-nox, libxml2, pkgconfig, which +, doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which , systemd }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation { sha256 = "04g8fb4f4ihakvvsmzcnncgfdd2ikmki7s22i9c6layzdwavbwf1"; }; - nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkgconfig which ]; + nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkg-config which ]; buildInputs = [ systemd ]; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { --replace dir= dir=$out substituteInPlace $out/bin/ozw_config \ - --replace pcfile=${pkgconfig} pcfile=$out + --replace pcfile=${pkg-config} pcfile=$out ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index e34a80e1d4a54..f1aa1968493f1 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }: +{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkg-config, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo glib gobject-introspection diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 31a7e7e908672..a93bc6763c06a 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, which +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, which , gettext, libffi, libiconv, libtasn1 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # at the same time, libtasn1 in buildInputs provides the libasn1 library # to link against for the target platform. # hence, libtasn1 is required in both native and build inputs. - nativeBuildInputs = [ autoreconfHook pkgconfig which libtasn1 ]; + nativeBuildInputs = [ autoreconfHook pkg-config which libtasn1 ]; buildInputs = [ gettext libffi libiconv libtasn1 ]; autoreconfPhase = '' diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index b3dd2062ca0bc..ff1fcb945cad9 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, cairo, harfbuzz +{ stdenv, fetchurl, fetchpatch, pkg-config, cairo, harfbuzz , libintl, libthai, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf , meson, ninja, glib @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja glib # for glib-mkenum - pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 + pkg-config gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ fribidi diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 5fbd9595766a0..4cb90e297cf33 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libGL, glew +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew , xorg , ffmpeg_3, python3 , libjpeg, libpng, libtiff, eigen , Carbon ? null, Cocoa ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0"; }; - nativeBuildInputs = [ cmake pkgconfig doxygen ]; + nativeBuildInputs = [ cmake pkg-config doxygen ]; buildInputs = [ libGL diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index b0488435ded65..1443e74d60822 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, gnome3 +{ stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3 , ApplicationServices }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config ] ++ stdenv.lib.optional stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index 26d012e81e1df..ff23a7f30f2c1 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, pango}: +{stdenv, fetchurl, pkg-config, glib, pango}: stdenv.mkDerivation { name = "pangoxsl-1.6.0.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib pango diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index e9c5301aac56c..8301d1a6f1a67 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchFromGitHub -, autoconf, automake, which, libtool, pkgconfig +, autoconf, automake, which, libtool, pkg-config , portaudio, alsaLib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0"; }; - nativeBuildInputs = [ autoconf automake which libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake which libtool pkg-config ]; buildInputs = [ portaudio ] ++ lib.optionals stdenv.isLinux [ alsaLib ] diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 06f5499b901bc..0c57e8b4b6833 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake -, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase +, qhull, flann, boost, vtk, eigen, pkg-config, qtbase , libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qhull flann boost eigen libusb1 libpcap libpng vtk qtbase libXt ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL ]; diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix index 16d19f570d1c1..dbc7e0c3a59bb 100644 --- a/pkgs/development/libraries/phash/default.nix +++ b/pkgs/development/libraries/phash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }: +{ stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }: stdenv.mkDerivation rec { pname = "pHash"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # at runtime propagatedBuildInputs = [ imagemagick ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = ["--enable-video-hash=no" "--enable-audio-hash=no"]; postInstall = '' diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 5c0901596b04e..c066e15a8f966 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig +{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkg-config , extra-cmake-modules, qttools, qtbase, qtx11extras , debug ? false }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { gst-libav ]); in toString [ - # This flag should be picked up through pkgconfig, but it isn't. + # This flag should be picked up through pkg-config, but it isn't. "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" ''-DGST_PLUGIN_PATH_1_0="${gstPluginPaths}"'' @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index d54ee6e56304b..3dc5071ba15dd 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, libvlc +{ stdenv, lib, fetchurl, cmake, phonon, pkg-config, libvlc , extra-cmake-modules, qttools, qtbase, qtx11extras , debug ? false }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config qttools extra-cmake-modules ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 85ba37a9d8a6c..926b8593c5996 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -4,7 +4,7 @@ , cmake , libGLU , libGL -, pkgconfig +, pkg-config , libpulseaudio , extra-cmake-modules , qtbase @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config extra-cmake-modules ]; diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index eaedc2c0ac3ef..70ab98439cc3e 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind , glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf }: @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "doc" ]; nativeBuildInputs = [ - meson ninja pkgconfig doxygen graphviz valgrind + meson ninja pkg-config doxygen graphviz valgrind ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index c9697ee1a424d..b8be63f8e535a 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -6,7 +6,7 @@ , meson , ninja , systemd -, pkgconfig +, pkg-config , doxygen , graphviz , valgrind @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { graphviz meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index d7f5b34e5d752..ef9ae533ca1cb 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }: +{ stdenv, fetchurl, pkg-config, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { pname = "pixman"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng ]; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index cb8e05b6a76ec..debb0309e916f 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }: +{ stdenv, fetchFromGitHub, pkg-config, openssl, autoreconfHook }: stdenv.mkDerivation rec { pname = "pkcs11-helper"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1idrqip59bqzcgddpnk2inin5n5yn4y0dmcyaggfpdishraiqgd5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix index fe3176f9f76e5..3bd5aa46be510 100644 --- a/pkgs/development/libraries/pmdk/default.nix +++ b/pkgs/development/libraries/pmdk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, autoconf, libndctl, pkgconfig +, autoconf, libndctl, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1833sq0f1msaqwn31dn1fp37a6d5zp995i9gkazanydmppi2qy0i"; }; - nativeBuildInputs = [ autoconf pkgconfig ]; + nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ libndctl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index 0f9be199d9583..71b36cedb81de 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , sphinxbase -, pkgconfig +, pkg-config , python27 # >= 2.6 , swig2 # 2.0 }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ sphinxbase ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python27 swig2 ]; meta = { diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index c0f74630757ac..1f2d43fce3c38 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }: +{ stdenv, fetchurl, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }: stdenv.mkDerivation rec { pname = "poco"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1jilzh0h6ik5lr167nax7q6nrpzxl99p11pkl202ig06pgh32nbz"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ]; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 242645ebfdbcc..ba743bb6053b5 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig -, openssl, libpng, lua5, pkgconfig, libidn, expat, fetchpatch +, openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat lua5 ]; diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix index b13335561ac0a..a758146d40682 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib, qt4 }: +{ stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkgconfig automoc4 ]; + nativeBuildInputs = [ cmake pkg-config automoc4 ]; propagatedBuildInputs = [ polkit glib qt4 ]; diff --git a/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/pkgs/development/libraries/polkit-qt-1/qt-5.nix index f6cbf7e972b33..76efca9717b4b 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-5.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, polkit, glib, qtbase }: +{ stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; propagatedBuildInputs = [ polkit glib qtbase ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 2ec49a2d3c088..6382097d398c3 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, expat, pam, perl, fetchpatch +{ stdenv, fetchurl, pkg-config, glib, expat, pam, perl, fetchpatch , intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus , docbook_xml_dtd_412, gtk-doc, coreutils , useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ glib gtk-doc pkgconfig intltool perl ] + [ glib gtk-doc pkg-config intltool perl ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = [ expat pam spidermonkey_78 ] diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/pkgs/development/libraries/poly2tri-c/default.nix index a3e42b3ae4b2d..60d75d340e6d0 100644 --- a/pkgs/development/libraries/poly2tri-c/default.nix +++ b/pkgs/development/libraries/poly2tri-c/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , glib }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; src = fetchFromGitHub { - owner = "Paul-Browne"; + owner = "Mattey40"; repo = "poly2tri-c"; rev = "p2tc-${version}"; sha256 = "158vm3wqfxs22b74kqc4prlvjny38qqm3kz5wrgasmx0qciwh0g8"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index 0603f49fad41f..bc14107597334 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl +{ stdenv, lib, fetchurl, cmake, ninja, pkg-config, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ++ optional qt5Support qtbase ++ optional introspectionSupport gobject-introspection; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; # Not sure when and how to pass it. It seems an upstream bug anyway. CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index e7b9a26f19fdf..80d5ba19d2b7a 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkgconfig, libiconv, libintl +{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkg-config, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ++ optional utils nss ++ optional introspectionSupport gobject-introspection; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; # Workaround #54606 preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index aa8afb7ac97fa..da4c3933aaac9 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, pkgconfig, libjack2 +{ stdenv, fetchurl, alsaLib, pkg-config, libjack2 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index 4b0d273ac44d5..c9c246f1910fe 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -1,5 +1,5 @@ { stdenv, src, version -, autoreconfHook, pkgconfig, protobuf, zlib +, autoreconfHook, pkg-config, protobuf, zlib , ... }: @@ -9,7 +9,7 @@ stdenv.mkDerivation { inherit src; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ protobuf zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix index 08accd5d7df19..35c4f7c3b2d5c 100644 --- a/pkgs/development/libraries/pslib/default.nix +++ b/pkgs/development/libraries/pslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, zlib, libpng, libjpeg, libungif, libtiff +{ stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, libungif, libtiff }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0m191ckqj1kj2yvxiilqw26x4vrn7pnlc2vy636yphjxr02q8bk4"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib libpng libjpeg libungif libtiff ]; doCheck = true; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 06de3f7c56939..c735b15336af4 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }: +{ stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }: stdenv.mkDerivation rec { pname = "qca-qt5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ openssl qtbase ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; # Without this patch cmake fails with a "No known features for CXX compiler" # error on darwin diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 6520d4a64a355..b637b49138784 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, cmake, pkgconfig, qt, darwin }: +{ stdenv, fetchurl, openssl, cmake, pkg-config, qt, darwin }: stdenv.mkDerivation rec { pname = "qca"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl qt ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 3ff642bbfb980..f739c1bc275e0 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , nix-update-script -, pkgconfig +, pkg-config , gtk3 , glib , qtbase @@ -33,7 +33,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config qmake ]; diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index 2c60c4c10d070..3b4764151e349 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, SDL2, libpng, libiconv }: +{ stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv }: stdenv.mkDerivation rec { pname = "qrencode"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; configureFlags = [ diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 3deea882bb6c2..c92218f9fe5e6 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, substituteAll , libXrender, libXinerama, libXcursor, libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng -, libmng, which, libGLU, openssl, dbus, cups, pkgconfig +, libmng, which, libGLU, openssl, dbus, cups, pkg-config , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi , alsaLib , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms @@ -199,7 +199,7 @@ stdenv.mkDerivation rec { ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; - nativeBuildInputs = [ perl pkgconfig which ]; + nativeBuildInputs = [ perl pkg-config which ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 5d6f91a79113f..24f1d6f81a24b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -2,7 +2,7 @@ stdenv, lib, src, patches, version, qtCompatVersion, - coreutils, bison, flex, gdb, gperf, lndir, perl, pkgconfig, python3, + coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3, which, # darwin support darwin, libiconv, @@ -87,7 +87,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir perl pkgconfig which ]; + [ bison flex gperf lndir perl pkg-config which ]; propagatedNativeBuildInputs = [ lndir ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix index 281f6e0b8ecd1..6bc023eb9bbdc 100644 --- a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix +++ b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -1,9 +1,9 @@ -{ qtModule, qtbase, qtdeclarative, pkgconfig }: +{ qtModule, qtbase, qtdeclarative, pkg-config }: qtModule { name = "qtgamepad"; qtInputs = [ qtbase qtdeclarative ]; buildInputs = [ ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 42ed23bb6dc90..b9e757833b3fe 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -1,4 +1,4 @@ -{ qtModule, stdenv, qtbase, qtdeclarative, pkgconfig +{ qtModule, stdenv, qtbase, qtdeclarative, pkg-config , alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland }: @@ -7,7 +7,7 @@ with stdenv.lib; qtModule { name = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base libpulseaudio ] ++ optional (stdenv.isLinux) alsaLib ++ optional (versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index c7a7704f28372..5291ea9c9a787 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -1,9 +1,9 @@ -{ qtModule, qtbase, qtquickcontrols, wayland, pkgconfig }: +{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }: qtModule { name = "qtwayland"; qtInputs = [ qtbase qtquickcontrols ]; buildInputs = [ wayland ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index b98b711c0f5d8..e6ab23073b130 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,7 +1,7 @@ { qtModule , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel -, bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which +, bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which , xorg, libXcursor, libXScrnSaver, libXrandr, libXtst , fontconfig, freetype, harfbuzz, icu, dbus, libdrm @@ -24,7 +24,7 @@ qtModule { name = "qtwebengine"; qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ - bison coreutils flex git gperf ninja pkgconfig python2 which gn + bison coreutils flex git gperf ninja pkg-config python2 which gn ] ++ optional stdenv.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 3d9e72bb54fae..d8d53690b24c1 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -2,7 +2,7 @@ , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel , fontconfig, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake -, bison, flex, gdb, gperf, perl, pkgconfig, python2, ruby +, bison, flex, gdb, gperf, perl, pkg-config, python2, ruby , darwin , flashplayerFix ? false }: @@ -31,7 +31,7 @@ qtModule { ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ ICU OpenGL ]) ++ optional usingAnnulenWebkitFork hyphen; nativeBuildInputs = [ - bison flex gdb gperf perl pkgconfig python2 ruby + bison flex gdb gperf perl pkg-config python2 ruby ] ++ optional usingAnnulenWebkitFork cmake; cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ] diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index ddfdc2f67d30e..60eb19ac0c7e8 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4 ? null +{ stdenv, fetchFromGitHub, cmake, pkg-config, qt4 ? null , withQt5 ? false, qtbase ? null, qttools ? null , darwin ? null , libsecret @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret ; buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libsecret ] diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index 1970dd183c1c3..7f340ce1eefac 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }: mkDerivation { name = "qtstyleplugins-2017-03-11"; @@ -12,7 +12,7 @@ mkDerivation { patches = [ ./fix-build-against-Qt-5.15.patch ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ gtk2 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 916e381ab4da3..9c9352d3c29c1 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkgconfig }: +{ stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "qtutilities"; diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix index 3104aefb9edb5..503e1b14c1fba 100644 --- a/pkgs/development/libraries/qxt/default.nix +++ b/pkgs/development/libraries/qxt/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "qxt"; version = "0.6.2"; - + src = fetchzip { url = "https://bitbucket.org/libqxt/libqxt/get/v${version}.tar.gz"; sha256 = "0zmqfn0h8cpky7wgaaxlfh0l89r9r0isi87587kaicyap7a6kxwz"; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 68c4a95d0b68b..5d7e94ff0aa9c 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file, libuv }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv }: stdenv.mkDerivation rec { pname = "raft-canonical"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0swn95cf11fqczllmxr0nj3ig532rw4n3w6g3ckdnqka8520xjyr"; }; - nativeBuildInputs = [ autoreconfHook file pkgconfig ]; + nativeBuildInputs = [ autoreconfHook file pkg-config ]; buildInputs = [ libuv ]; preConfigure = '' diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index ea91c1507dc34..52a0877e77f34 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake }: +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake }: stdenv.mkDerivation rec { pname = "rapidjson"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace "-Werror" "" diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index 1e2d954fa942b..291454f141020 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: +{stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: let pname = "rarian"; version = "0.8.1"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 libxslt ] ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ]; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index da595dfb3b675..0da318808f37a 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }: +{ stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }: stdenv.mkDerivation rec { pname = "rdkafka"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "12cc7l5vpxyrm8ca0cpm8sdl54hb8dranal8sz55r9y8igz1q1wb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib perl python openssl ]; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 0f8caecf8083e..ab35139ce712c 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, librep, gtk2 }: +{ stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }: with stdenv.lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ]; propagatedBuildInputs = [ librep gtk2 ]; diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index 168b82eec160e..74f4d69356927 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "resolv_wrapper-1.1.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "13k76l4s0v032xyyaf19qw6p4qc81ybx1wynkz2pzjhiljazsdpa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "A wrapper for the user, group and hosts NSS API"; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index ee9bcea5e52b9..ca608c5254362 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw +{ stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw , vamp-plugin-sdk, ladspaH }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index d3710043e6f60..381c58e3f7d5a 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsndfile }: +{ stdenv, fetchurl, pkg-config, libsndfile }: stdenv.mkDerivation rec { name = "sbc-1.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 712138b0edfc7..8d16ae10889af 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, orc, pkgconfig, fetchpatch, autoreconfHook }: +{ stdenv, fetchurl, orc, pkg-config, fetchpatch, autoreconfHook }: stdenv.mkDerivation { name = "schroedinger-1.0.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ orc ]; doCheck = (!stdenv.isDarwin); diff --git a/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/pkgs/development/libraries/science/biology/bpp-seq/default.nix index 79fd0fe67716d..ef3f3d5756e90 100644 --- a/pkgs/development/libraries/science/biology/bpp-seq/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-seq/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - meta = bpp-core.meta // { + meta = bpp-core.meta // { changelog = "https://github.com/BioPP/bpp-seq/blob/master/ChangeLog"; }; } diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index c240a19cca675..8408763b4fe17 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}" ln -s libblas.so.${version} "$out/lib/libblas.so.3" ln -s libblas.so.${version} "$out/lib/libblas.so" - # Write pkgconfig alias. + # Write pkg-config alias. # See also openblas/default.nix mkdir $out/lib/pkgconfig cat <<EOF > $out/lib/pkgconfig/blas.pc diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index 175de67ad7ee7..0d8e3415e2076 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , boost , m4ri , gd @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index 4e89aeebe2b7e..3f88d4de026ed 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -233,8 +233,8 @@ let export CMAKE_PREFIX_PATH=${pybind11}/share/cmake/pybind11:$CMAKE_PREFIX_PATH substituteInPlace setup.py --replace "pybind11==2.2.4" "pybind11" substituteInPlace dolfin/jit/jit.py \ - --replace 'pkgconfig.exists("dolfin")' 'pkgconfig.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \ - --replace 'pkgconfig.parse("dolfin")' 'pkgconfig.parse("${dolfin}/lib/pkgconfig/dolfin.pc")' + --replace 'pkg-config.exists("dolfin")' 'pkg-config.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \ + --replace 'pkg-config.parse("dolfin")' 'pkg-config.parse("${dolfin}/lib/pkgconfig/dolfin.pc")' ''; buildInputs = [ dolfin diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index b6f367ff4fe9f..aa340b6dafad6 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gfortran, pkgconfig +{ stdenv, lib, fetchurl, gfortran, pkg-config , blas, zlib, bzip2 , withGurobi ? false, gurobi , withCplex ? false, cplex }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { [ blas zlib bzip2 ] ++ lib.optional withGurobi gurobi ++ lib.optional withCplex cplex; - nativeBuildInputs = [ gfortran pkgconfig ]; + nativeBuildInputs = [ gfortran pkg-config ]; configureFlags = lib.optionals withGurobi [ "--with-gurobi-incdir=${gurobi}/include" "--with-gurobi-lib=-lgurobi${gurobi.libSuffix}" ] ++ lib.optionals withCplex [ "--with-cplex-incdir=${cplex}/cplex/include/ilcplex" "--with-cplex-lib=-lcplex${cplex.libSuffix}" ]; diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix index ad10a4333de33..3f3e1871f4399 100644 --- a/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { chmod -R +w $out ${patchLibs} - # Write pkgconfig file. + # Write pkg-config file. mkdir $out/lib/pkgconfig cat > $out/lib/pkgconfig/tensorflow.pc << EOF Name: TensorFlow diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 88fd1ea82d3b0..bf8c596a7957e 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, wafHook }: +{ stdenv, fetchurl, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "serd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "168rn3m32c59qbar120f83ibcnnd987ij9p053kybgl7cmm6358c"; }; - nativeBuildInputs = [ pkgconfig python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; meta = with stdenv.lib; { homepage = "http://drobilla.net/software/serd"; diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 92dde2111fc8a..c83ecaca7c0ee 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos -, pkgconfig, libiconv }: +, pkg-config, libiconv }: stdenv.mkDerivation rec { name = "serf-1.3.9"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; - nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; buildInputs = [ apr openssl aprutil zlib libiconv ] ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos; diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 77b9714066dd4..d6065c925e87e 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }: +{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkg-config, xercesc, xml-security-c, xml-tooling-c }: stdenv.mkDerivation rec { pname = "shibboleth-sp"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ]; configureFlags = [ diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix index 9d0aca0ab14ba..77090a19ba365 100644 --- a/pkgs/development/libraries/silgraphite/default.nix +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }: +{ stdenv, fetchurl, pkg-config, freetype, libXft, pango, fontconfig }: stdenv.mkDerivation rec { version = "2.3.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype libXft pango fontconfig]; NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 564c32bf10dbe..60c454bc14598 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, cmake, python }: +{ stdenv, fetchurl, pkg-config, freetype, cmake, python }: stdenv.mkDerivation rec { version = "1.3.14"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1790ajyhk0ax8xxamnrk176gc9gvhadzy78qia4rd8jzm89ir7gr"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ freetype ]; patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ]; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 3a34bf54c3cbc..335712ac35a1e 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, libGLU, libGL, makeWrapper }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL gtk2 libGLU libGL ]; - nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; preConfigure = '' touch NEWS AUTHORS ChangeLog @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { $out/include/smpeg/*.h wrapProgram $out/bin/smpeg-config \ - --prefix PATH ":" "${pkgconfig}/bin" \ + --prefix PATH ":" "${pkg-config}/bin" \ --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" ''; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 7aa7cf3d452f3..2297fd07eb1e4 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -1,6 +1,6 @@ # alsaLib vorbis-tools python can be made optional -{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkgconfig, xlibsWrapper }: +{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: stdenv.mkDerivation { name = "snack-2.2.10"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { postUnpack = ''sourceRoot="$sourceRoot/unix"''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 188405365cd3d..d00af92335d7a 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "socket_wrapper-1.2.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1wb3gq0rj5h92mhq6f1hb2qy4ypkxvn8y87ag88c7gc71nkpa1fx"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "A library passing all socket communications through unix sockets"; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index f8b1c1028520b..8e38b96048047 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, openssl, pkgconfig, autoreconfHook }: +{ stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "sofia-sip"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib openssl ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with stdenv.lib; { description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 40ec30c6c858d..861e1d76c1d49 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc -, pkgconfig }: +, pkg-config }: stdenv.mkDerivation rec { name = "soprano-2.9.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # We disable the Java backend, since we do not need them and they make the closure size much bigger buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = { homepage = "http://soprano.sourceforge.net/"; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 8d69c328eed97..fba7dd806426f 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, coin3d, qtbase, cmake, pkgconfig }: +{ fetchFromGitHub, stdenv, coin3d, qtbase, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "soqt"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ coin3d qtbase ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { homepage = "https://github.com/coin3d/soqt"; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index eb91ec2986a38..66803a066b568 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, serd, pcre, wafHook }: +{ stdenv, fetchurl, pkg-config, python3, serd, pcre, wafHook }: stdenv.mkDerivation rec { pname = "sord"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1mwh4qvp9q4vgrgg5bz9sgjhxscncrylf2b06h0q55ddwzs9hndi"; }; - nativeBuildInputs = [ pkgconfig python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ pcre ]; propagatedBuildInputs = [ serd ]; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 939371e9209f0..2e6a7ff219989 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, sqlite, expat, zlib, proj, geos, libspatialite, readosm }: +{ stdenv, fetchurl, pkg-config, sqlite, expat, zlib, proj, geos, libspatialite, readosm }: stdenv.mkDerivation rec { name = "spatialite-tools-4.1.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite expat zlib proj geos libspatialite readosm ]; configureFlags = [ "--disable-freexl" ]; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 483b8eeb2065b..a3c0f7b2ad8a8 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -1,6 +1,6 @@ { stdenv , substituteAll -, pkgconfig +, pkg-config , fetchurl , python3Packages , gettext @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gettext libtool diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index f7c3fc50fd795..cd48a591307d7 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw, speexdsp }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }: stdenv.mkDerivation rec { name = "speex-1.2.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw speexdsp ]; # TODO: Remove this will help with immediate backward compatability diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 421b3ec08c489..75d8b7fbc93e6 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, fftw }: stdenv.mkDerivation rec { name = "speexdsp-1.2.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw ]; configureFlags = [ diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index 008fb608ca089..40ef277268102 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , bison -, pkgconfig +, pkg-config , python27 # >= 2.6 , swig2 # 2.0 , multipleOutputs ? false #Uses incomplete features of nix! @@ -15,7 +15,7 @@ stdenv.mkDerivation (rec { sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ swig2 python27 bison ]; meta = { diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 22370cee448ec..03066e8990c05 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -23,7 +23,7 @@ , perl , phodav , pixman -, pkgconfig +, pkg-config , polkit , python3 , spice-protocol @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meson ninja perl - pkgconfig + pkg-config python3 python3.pkgs.pyparsing python3.pkgs.six diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 2e158b98b5839..86aa56f6c30c7 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , pixman , alsaLib , openssl @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config spice-protocol python3 python3.pkgs.six diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index e8a3ca9443431..7380838b78eaf 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ stdenv, fetchFromGitHub, pkg-config , openssl ? null, libpcap ? null }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # libsrtp.pc references -lcrypto -lpcap without -L propagatedBuildInputs = [ openssl libpcap ]; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index bf2522ca780b7..ec9a18ef47690 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, libxcb, pkgconfig, xcbutil}: +{stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}: let version = "0.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb xcbutil ]; meta = { diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index bf3b6a9ffd13e..d7dcdd5006695 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, check, cppunit, perl, pythonPackages }: +{ stdenv, fetchurl, pkg-config, check, cppunit, perl, pythonPackages }: # NOTE: for subunit python library see pkgs/top-level/python-packages.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1h7i5ifcx20qkya24j11nbwa829klw7dvnlljdgivgvcx6b20y80"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ check cppunit perl pythonPackages.wrapPython ]; propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ]; diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index 628ab7e28ef16..c7320f7722baa 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nss, nspr }: +{ stdenv, fetchurl, pkg-config, nss, nspr }: stdenv.mkDerivation rec { pname = "svrcore"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ nss nspr ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 7349d7f81eb6c..54c2b6fae0dbb 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, icu, clucene_core, curl }: +{ stdenv, fetchurl, pkg-config, icu, clucene_core, curl }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "14syphc47g6svkbg018nrsgq4z6hid1zydax243g8dx747vsi6nf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ icu clucene_core curl ]; prePatch = '' diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 2419cf5544214..4f11f42de5207 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl }: - + stdenv.mkDerivation rec { pname = "szip"; version = "2.1.1"; diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix index 89d676cf3a349..fe1bc5fcd5955 100644 --- a/pkgs/development/libraries/taglib-sharp/default.nix +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }: +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono }: stdenv.mkDerivation rec { pname = "taglib-sharp"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook which ]; + nativeBuildInputs = [ pkg-config autoreconfHook which ]; buildInputs = [ mono ]; dontStrip = true; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index 455c761f6ee99..a30d8d01c4968 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, telepathy-glib, farstream, dbus-glib }: +{ stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }: stdenv.mkDerivation rec { name = "${pname}-0.6.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call"; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index ee2f34776d66d..ec9dfab120f1f 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt +{ stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt , gobject-introspection, vala, glibcLocales }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; propagatedBuildInputs = [ dbus-glib glib ]; - nativeBuildInputs = [ pkgconfig libxslt gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ]; buildInputs = [ glibcLocales python2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index ff8ff83fb9ae8..888d98b957ff3 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python3Packages, dbus-glib, dbus +{ stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "bf8e2a09060addb80475a4938105b9b41d9e6837999b7a00e5351783857e18ad"; }; - nativeBuildInputs = [ cmake pkgconfig python ]; + nativeBuildInputs = [ cmake pkg-config python ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; buildInputs = [ dbus-glib ]; checkInputs = [ dbus.daemon dbus-python ]; diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 385b198a755a3..0c4fd9da147cf 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: let version = "3.34.0"; pname = "template-glib"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1"; }; - buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ]; + buildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ]; nativeBuildInputs = [ glib gobject-introspection ]; mesonFlags = [ diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 646cc60406a5e..85dc2c75afb90 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - + installFlags = [ "PREFIX=$(out)" ]; # fix the libtheft.pc file to use the right installation @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/pkgconfig/libtheft.pc \ --replace "/usr/local" "$out" ''; - + meta = with stdenv.lib; { description = "A C library for property-based testing"; homepage = "https://github.com/silentbicycle/theft/"; diff --git a/pkgs/development/libraries/thrift/0.10.nix b/pkgs/development/libraries/thrift/0.10.nix index d626673a227a9..25da474099c5e 100644 --- a/pkgs/development/libraries/thrift/0.10.nix +++ b/pkgs/development/libraries/thrift/0.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison +{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison , flex, twisted }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost zlib libevent openssl python bison flex twisted ]; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 6abddbbdbe508..5a9547a959ffb 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkgconfig +{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config , bison, flex, twisted , static ? stdenv.hostPlatform.isStatic }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; - nativeBuildInputs = [ cmake pkgconfig bison flex ]; + nativeBuildInputs = [ cmake pkg-config bison flex ]; buildInputs = [ boost zlib libevent openssl ] ++ stdenv.lib.optionals (!static) [ python twisted ]; diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/development/libraries/timezonemap/default.nix index 131d66e45cce8..6f561eac04eb8 100644 --- a/pkgs/development/libraries/timezonemap/default.nix +++ b/pkgs/development/libraries/timezonemap/default.nix @@ -1,7 +1,7 @@ { stdenv , autoreconfHook , fetchbzr -, pkgconfig +, pkg-config , gtk3 , glib , file @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook gobject-introspection ]; diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index 9c909d5e14d6c..7b6b0f9390ef8 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { }; patches = [ - # add pkgconfig file + # add pkg-config file ./2.6.2-add-pkgconfig.patch # https://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559 diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index f0b460b6f3dcb..52fffb42aa2f3 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz"; sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn"; }; - patches = [ + patches = [ (fetchpatch { name = "tix-8.4.3-tcl8.5.patch"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ tcl tk ]; # the configure script expects to find the location of the sources of # tcl and tk in {tcl,tk}Config.sh - # In fact, it only needs some private headers. We copy them in + # In fact, it only needs some private headers. We copy them in # the private_headers folders and trick the configure script into believing # the sources are here. preConfigure = '' diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 1cbf4026cb882..1d04ce5a1b9cf 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, src, pkgconfig, tcl, libXft, patches ? [] +{ stdenv, lib, src, pkg-config, tcl, libXft, patches ? [] , enableAqua ? stdenv.isDarwin, darwin , ... }: @@ -31,7 +31,7 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit" ++ stdenv.lib.optional enableAqua "--enable-aqua"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]); propagatedBuildInputs = [ tcl libXft ]; diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 7e8aa2983cfdd..93b760bc88f63 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { pname = "tnt"; version = "3.0.12"; - + src = fetchurl { url = "https://math.nist.gov/tnt/tnt_3_0_12.zip"; sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7"; diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index 5b58bf4167246..e970fb6786c2d 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, tokyocabinet, pkgconfig }: +{ fetchurl, stdenv, tokyocabinet, pkg-config }: stdenv.mkDerivation rec { name = "tokyotyrant-1.1.41"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "13xqcinhydqmh7231qlir6pymacjwcf98drybkhd9597kzxp1bs2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ tokyocabinet ]; doCheck = false; # FIXME diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index 266538d43c251..27498fdaaf852 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, gobject-introspection, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { pname = "totem-pl-parser"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection ]; buildInputs = [ libxml2 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 0670fdcdbd15b..dc6d30061d643 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -11,7 +11,7 @@ , tracker , meson , ninja -, pkgconfig +, pkg-config , vala , wrapGAppsHook , bzip2 @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index e37db9f253307..f883268cc28ff 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -4,7 +4,7 @@ , gettext , meson , ninja -, pkgconfig +, pkg-config , asciidoc , gobject-introspection , python3 @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config asciidoc gettext libxslt @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_45 python3 # for data-generators systemd # used for checks to install systemd user service - dbus # used for checks and pkgconfig to install dbus service/s + dbus # used for checks and pkg-config to install dbus service/s ]; buildInputs = [ diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index 722094f859c57..f7ac1a57f4ac1 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, libogg }: +{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, libogg }: stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ libogg ]; preConfigure = '' diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index cb8ee14535dc1..6ccd853de0a6e 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig +, autoreconfHook, pkg-config , libsndfile }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1rq3yc8ygzdqid9zk6pixmm4w9sk2vrlx217lhn5bjaglv7iyf7x"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libsndfile ]; doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found" diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix index aa2a88653bb35..951e62cae0dca 100644 --- a/pkgs/development/libraries/uci/default.nix +++ b/pkgs/development/libraries/uci/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchgit, pkgconfig, libubox }: +{ stdenv, cmake, fetchgit, pkg-config, libubox }: stdenv.mkDerivation { pname = "uci"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { hardeningDisable = [ "all" ]; cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; buildInputs = [ libubox ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "OpenWrt Unified Configuration Interface"; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 1c20ce6d9c835..5b1af300bab10 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkg-config , openssl ? null, zlib ? null, gnutls ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # disable flaky networking test postPatch = '' diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index 65e88f8fd8c14..6b75b7e683fb7 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "udunits"; version = "2.2.27.6"; - + src = fetchFromGitHub { owner = "Unidata"; repo = "UDUNITS-2"; diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 085741a66f88f..5420eb204e3d9 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobject-introspection }: +{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkg-config, glib, libsoup, gobject-introspection }: stdenv.mkDerivation rec { version="0.5.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobject-introspection ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index e78e72bf9b87b..62c105f3b9035 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { name = "uid_wrapper-1.2.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0swm9d8l69dw7nbrw6xh7rdy7cfrqflw3hxshicsrhd9v03iwvqf"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with stdenv.lib; { description = "A wrapper for the user, group and hosts NSS API"; diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index dca24c7f9ea50..da5dc2fed7a81 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }: +{ stdenv, lib, fetchFromGitHub, libtool, pkg-config, perl, ncurses }: stdenv.mkDerivation rec { pname = "unibilium-unstable"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ libtool ncurses ]; meta = with lib; { diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index cea35519ad87b..ce3dfa24faa47 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , cmake }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0jgnyaq6ykpbg5hrwc0p3pargmr9hpzqfsj6ymp4k07pxnqal76j"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; meta = with stdenv.lib; { description = "Lightweight multi-platform CPU emulator library"; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 2ac7c823e22aa..159296facc4b7 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ stdenv, fetchurl, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "usbredir"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libusb1 ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index e6696626cb5d5..40c551d826a41 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, fetchFromGitHub -, gn, ninja, python, glib, pkgconfig, icu +, gn, ninja, python, glib, pkg-config, icu , xcbuild, darwin , fetchpatch }: @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { # to be exceeded NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess"; - nativeBuildInputs = [ gn ninja pkgconfig python ] + nativeBuildInputs = [ gn ninja pkg-config python ] ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; buildInputs = [ glib icu ]; diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix index 782d324c8be0e..71e14a82c3e5d 100644 --- a/pkgs/development/libraries/v8/plv8_6_x.nix +++ b/pkgs/development/libraries/v8/plv8_6_x.nix @@ -4,7 +4,7 @@ # 2019-08-29, nixpkgs does not have v8 6.x, and v8_5 is bumped to 5.4.232, which # is a bit outdated. plv8 3.x is planned to support v8 7.x -{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig +{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkg-config , doCheck ? false , snapshot ? true }: @@ -158,7 +158,7 @@ stdenv.mkDerivation rec { use_custom_libcxx_for_host=false ''; - nativeBuildInputs = [ gn ninja pkgconfig ]; + nativeBuildInputs = [ gn ninja pkg-config ]; buildInputs = [ python glib ]; buildPhase = '' diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix index 6462bfd5e6244..c9dba3d00c907 100644 --- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }: +{ stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }: stdenv.mkDerivation rec { pname = "intel-hybrid-driver"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ cmrt libdrm libva libX11 libGL wayland ]; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 94f96b867d550..66f6b1c6fa550 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkgconfig }: +{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkg-config }: stdenv.mkDerivation rec { pname = "libva-vdpau-driver"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "1m4is6lk580mppsx2mvdv1xifj6gvx724si4qynsm9qrdfdc9fby"; }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvdpau libGLU libGL libva ]; postPatch = '' diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 1030aefc1a54c..024976e0b0f29 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, +{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, vapoursynth, nasm, fftwFloat }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoreconfHook nasm vapoursynth fftwFloat diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 050de50d7972f..58ed50f9bd9b6 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, makeWrapper +{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper , zimg, libass, python3, libiconv , ApplicationServices , ocrSupport ? false, tesseract ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; buildInputs = [ zimg libass (python3.withPackages (ps: with ps; [ sphinx cython ])) diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index c7f375c207896..0235912ce539e 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt +{ stdenv, lib, fetchurl, pkg-config, libcdio, libxml2, popt , libiconv, darwin }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 popt libiconv ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]); diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 8951ed4b002ae..fd39d8b30bd89 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, meson, ninja, pkgconfig, python3 +{ stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3 , libGLU, epoxy, libX11, libdrm, mesa }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; - nativeBuildInputs = [ cmake meson ninja pkgconfig python3 ]; + nativeBuildInputs = [ cmake meson ninja pkg-config python3 ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index e0c58096cfa51..a28f63cd3c432 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub -, gsasl, gnutls, pkgconfig, cmake, zlib, libtasn1, libgcrypt, gtk3 +, gsasl, gnutls, pkg-config, cmake, zlib, libtasn1, libgcrypt, gtk3 # this will not work on non-nixos systems , sendmailPath ? "/run/wrappers/bin/sendmail" }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gsasl gnutls zlib libtasn1 libgcrypt gtk3 ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; cmakeFlags = [ "-DVMIME_SENDMAIL_PATH=${sendmailPath}" diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 6d1dc7d4786dd..a5eb2c83f94d6 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, lapack +{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, lapack , Accelerate, CoreGraphics, CoreVideo }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./disable-cpack.patch #disable the need of cpack/rpm ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ boost lapack ] ++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 084b42c9a2dcd..85736b79b1f28 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3 +{ stdenv, fetchgit, autoreconfHook, pkg-config, gettext, python3 , ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme , autoconf, automake, libtool , buildPackages @@ -18,7 +18,7 @@ in stdenv.mkDerivation { outputs = [ "out" "man" "dev" "py" ]; - nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext swig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config gettext swig ]; buildInputs = [ autoreconfHook glib cryptsetup nss util-linux gpgme ncurses ]; diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index 59d0acada137e..6b65014103e25 100644 --- a/pkgs/development/libraries/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk3, ncurses, gobject-introspection }: +{ stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }: stdenv.mkDerivation rec { versionMajor = "0.36"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gobject-introspection intltool glib gtk3 ncurses ]; configureFlags = [ "--enable-introspection" ]; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 014b2615d5bfd..2ccc07c67a2cb 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -3,7 +3,7 @@ , fetchurl , fetchpatch , gettext -, pkgconfig +, pkg-config , meson , ninja , gnome3 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 67ff1be075de1..d84587b00d249 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkg-config , xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0w9i2pliw4ccmjyfzff4i2f3hxwsfd54jg7ahv2v634qmx59bsbi"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ]; preConfigure = '' diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 2b18bc31a4526..7ec8936267bb6 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -3,7 +3,7 @@ , fetchurl , fetchpatch , meson -, pkgconfig +, pkg-config , substituteAll , ninja , libffi @@ -57,12 +57,12 @@ stdenv.mkDerivation rec { ''; depsBuildBuild = [ - pkgconfig + pkg-config ]; nativeBuildInputs = [ meson - pkgconfig + pkg-config ninja ] ++ lib.optionals isCross [ wayland # For wayland-scanner during the build diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 66d5d50c9d817..23258aff3e93b 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , wayland }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rsdgvkkvxs3cjhpl6agvbkm53vm7k8rg127j9y2vn33m2hvg0lp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ wayland ]; diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 5fc466cec2014..923329ab3fde5 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , pugixml , wayland , libGL @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" ]; - nativeBuildInputs = [ cmake pkgconfig ] ++ optional docSupport doxygen; + nativeBuildInputs = [ cmake pkg-config ] ++ optional docSupport doxygen; buildInputs = [ pugixml wayland libGL libffi ]; outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index ed97e1c8a85b3..77650b322d7ae 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -7,7 +7,7 @@ , gperf , cmake , ninja -, pkgconfig +, pkg-config , gettext , gobject-introspection , libnotify @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { gperf ninja perl - pkgconfig + pkg-config python3 ruby glib # for gdbus-codegen diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 9fa64be4d53ea..0ababf305c8ea 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig, wxGTK +, pkg-config, wxGTK , ffmpeg_3, libexif , cairo, pango }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0agmmwg0zlsw1idygvqjpj1nk41akzlbdha0hsdk1k8ckz6niq8d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ wxGTK ffmpeg_3 libexif ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index deb7d19c0de1a..4e0481cc47d26 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto +{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , libX11, cairo , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ] ++ optional withMesa libGLU; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 5db7cfc26ba91..d1b0d56576bf3 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto +{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms @@ -36,7 +36,7 @@ stdenv.mkDerivation { ++ optional withMesa libGLU ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index df90342a972ef..e77b0097d4775 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, pkgconfig +{ stdenv, fetchFromGitHub, fetchurl, pkg-config , libXinerama, libSM, libXxf86vm , gtk2, gtk3 , xorgproto, gst_all_1, setfile @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 8b0e6811efff2..a75b5c1270b7a 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , fetchurl -, pkgconfig +, pkg-config , libXinerama , libSM , libXxf86vm @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index a496e3886d83a..6028982d98770 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }: +{ stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }: stdenv.mkDerivation rec { pname = "xapian-omega"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ xapian perl pcre zlib libmagic ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with stdenv.lib; { description = "Indexer and CGI search front-end built on Xapian library"; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 5457487edcc7b..2cdf8850e2d95 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig +{ stdenv, fetchgit, autoconf, automake, libtool, pkg-config , xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { gperf libtool libxcb - pkgconfig + pkg-config xorg.utilmacros xorg.xcbutilimage xorg.xcbutilrenderutil diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix index 38d7d447e2893..0ad18ff70d4ca 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , libxslt , docbook_xsl , docbook_xml_dtd_43 @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config libxslt docbook_xsl docbook_xml_dtd_43 diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index c6faa4fc017a1..16f9e7edb690d 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, wayland-protocols +, meson, ninja, pkg-config, wayland-protocols , pipewire, wayland, elogind, systemd, libdrm }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "12k92h9dmn1fyn8nzxk69cyv0gnb7g9gj7a66mw5dcl5zqnl07nc"; }; - nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; buildInputs = [ pipewire wayland elogind systemd libdrm ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 83b4dda0c6e26..52f089126a97a 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -3,7 +3,7 @@ , nixosTests , substituteAll , autoreconfHook -, pkgconfig +, pkg-config , libxml2 , glib , pipewire @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config libxml2 wrapGAppsHook ]; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 4322278e2fd61..f5aa4f397abfe 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, xorg, alsaLib, libGLU, libGL, aalib +{ stdenv, fetchurl, fetchpatch, pkg-config, xorg, alsaLib, libGLU, libGL, aalib , libvorbis, libtheora, speex, zlib, perl, ffmpeg_3 , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "13clir4qxl2zvsvvjd9yv3yrdhsnvcn5s7ambbbn5dzy9604xcrj"; }; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index 3a784a2e38b25..eb09b0e085930 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }: +{ stdenv, fetchurl, xalanc, xercesc, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "xml-security-c"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "--with-xalan" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xalanc xercesc openssl ]; meta = { diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index d5e1eb08fa495..8671c124ab26b 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig +{ stdenv, fetchgit, autoreconfHook, pkg-config , boost, curl, openssl, log4shib, xercesc, xml-security-c }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 6d310443e70c7..f45979b847edb 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool +{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool # nss_3_53 is used instead of the latest due to a number of issues: # https://github.com/lsh123/xmlsec/issues?q=is%3Aissue+is%3Aopen+nss , openssl, nss_3_53, lib, runCommandCC, writeText }: @@ -25,7 +25,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss_3_53 ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation { passthru.tests.libxmlsec1-crypto = runCommandCC "libxmlsec1-crypto-test" { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ self libxml2 libxslt libtool ]; } '' $CC $(pkg-config --cflags --libs xmlsec1) -o crypto-test ${writeText "crypto-test.c" '' diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index 60d3defcb1ffe..bfe09b0e94c97 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config , asciidoc, libxslt, docbook_xsl , pam, yubikey-personalization, libyubikey, libykclient }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc libxslt docbook_xsl ]; + nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ]; buildInputs = [ pam yubikey-personalization libyubikey libykclient ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index a0cb85ed71abb..67d4320b8982d 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , zstd @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 95f09f595048b..37ab1b1ec4778 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitLab , fetchpatch -, pkgconfig +, pkg-config , glib , sqlite , gobject-introspection @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config gettext gobject-introspection vala diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix index 98211e6e3eb56..0a7438fbc3239 100644 --- a/pkgs/development/libraries/zmqpp/default.nix +++ b/pkgs/development/libraries/zmqpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, zeromq }: stdenv.mkDerivation rec { pname = "zmqpp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; propagatedBuildInputs = [ zeromq ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 8e77c19024716..eec969f99caf4 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -108,7 +108,7 @@ with super; lgi = super.lgi.override({ nativeBuildInputs = [ - pkgs.pkgconfig + pkgs.pkg-config ]; buildInputs = [ pkgs.glib diff --git a/pkgs/development/misc/resholve/README.md b/pkgs/development/misc/resholve/README.md index ddba7fc149340..6b99aebb59790 100644 --- a/pkgs/development/misc/resholve/README.md +++ b/pkgs/development/misc/resholve/README.md @@ -6,9 +6,28 @@ until then I'll outline how to use the `resholvePackage` function. > Fair warning: resholve does *not* aspire to resolving all valid Shell > scripts. It depends on the OSH/Oil parser, which aims to support most (but -> not all) Bash, and aims to be a ~90% sort of solution. +> not all) Bash. resholve aims to be a ~90% sort of solution. -Let's start with a simple example from one of my own projects: +## API Concepts + +The main difference between `resholvePackage` and other builder functions +is the `solutions` attrset, which describes which scripts to resolve and how. +Each "solution" (k=v pair) in this attrset describes one resholve invocation. + +> NOTE: For most shell packages, one invocation will probably be enough: +> - Packages with a single script will only need one solution. +> - Packages with multiple scripts can still use one solution if the scripts +> don't require conflicting directives. +> - Packages with scripts that require conflicting directives can use multiple +> solutions to resolve the scripts separately, but produce a single package. + +## Basic Example + +Here's a simple example from one of my own projects, with annotations: +<!-- +TODO: ideally this will use a nixpkgs example; but we don't have any IN yet +and the first package PR (bashup-events) is too complex for this context. +--> ```nix { stdenv, lib, resholvePackage, fetchFromGitHub, bashup-events44, bashInteractive_5, doCheck ? true, shellcheck }: @@ -22,10 +41,20 @@ resholvePackage rec { }; solutions = { + # Give each solution a short name. This is what you'd use to + # override its settings, and it shows in (some) error messages. profile = { - # the only *required* arguments + # the only *required* arguments are the 3 below + + # Specify 1 or more $out-relative script paths. Unlike many + # builders, resholvePackage modifies the output files during + # fixup (to correctly resolve in-package sourcing). scripts = [ "bin/shellswain.bash" ]; + + # "none" for no shebang, "${bash}/bin/bash" for bash, etc. interpreter = "none"; + + # packages resholve should resolve executables from inputs = [ bashup-events44 ]; }; }; @@ -39,100 +68,91 @@ resholvePackage rec { } ``` -I'll focus on the `solutions` attribute, since this is the only part -that differs from other derivations. - -Each "solution" (k=v pair) -describes one resholve invocation. For most shell packages, one -invocation will probably be enough. resholve will make you be very -explicit about your script's dependencies, and it may also need your -help sorting out some references or problems that it can't safely -handle on its own. - -If you have more than one script, and your scripts need conflicting -directives, you can specify more than one solution to resolve the -scripts separately, but still produce a single package. - -Let's take a closer look: - -```nix - solutions = { - # each solution has a short name; this is what you'd use to - # override the settings of this solution, and it may also show up - # in (some) error messages. - profile = { - # specify one or more $out-relative script paths (unlike many - # builders, resholve will modify the output files during fixup - # to correctly resolve scripts that source within the package) - scripts = [ "bin/shellswain.bash" ]; - # "none" for no shebang, "${bash}/bin/bash" for bash, etc. - interpreter = "none"; - # packages resholve should resolve executables from - inputs = [ bashup-events44 ]; - }; - }; -``` - -resholve has a (growing) number of options for handling more complex -scripts. I won't cover these in excruciating detail here. You can find -more information about these in `man resholve` via `nixpkgs.resholve`. - -Instead, we'll look at the general form of the solutions attrset: - -```nix -solutions = { - shortname = { - # required - # $out-relative paths to try resolving - scripts = [ "bin/shunit2" ]; - # packages to resolve executables from - inputs = [ coreutils gnused gnugrep findutils ]; - # path for shebang, or 'none' to omit shebang - interpreter = "${bash}/bin/bash"; - - # optional - fake = { fake directives }; - fix = { fix directives }; - keep = { keep directives }; - # file to inject before first code-line of script - prologue = file; - # file to inject after last code-line of script - epilogue = file; - # extra command-line flags passed to resholve; generally this API - # should align with what resholve supports, but flags may help if - # you need to override the version of resholve. - flags = [ ]; - }; -}; -``` - -The main way you'll adjust how resholve handles your scripts are the -fake, fix, and keep directives. The manpage covers their purpose and -how to format them on the command-line, so I'll focus on how you'll -need to translate them into Nix types. +## Options + +`resholvePackage` maps Nix types/idioms into the flags and environment variables +that the `resholve` CLI expects. Here's an overview: + +| Option | Type | Containing | +| ------------- | ------- | ----------------------------------------------------- | +| scripts | list | $out-relative string paths to resolve | +| inputs | list | packages to resolve executables from | +| interpreter | string | 'none' or abspath for shebang | +| prologue | file | text to insert before the first code-line | +| epilogue | file | text to isnert after the last code-line | +| flags | list | strings to pass as flags | +| fake | attrset | [directives](#controlling-resolution-with-directives) | +| fix | attrset | [directives](#controlling-resolution-with-directives) | +| keep | attrset | [directives](#controlling-resolution-with-directives) | + +## Controlling resolution with directives + +In order to resolve a script, resholve will make you disambiguate how it should +handle any potential problems it encounters with directives. There are currently +3 types: +1. `fake` directives tell resholve to pretend it knows about an identifier + such as a function, builtin, external command, etc. if there's a good reason + it doesn't already know about it. Common examples: + - builtins for a non-bash shell + - loadable builtins + - platform-specific external commands in cross-platform conditionals +2. `fix` directives give resholve permission to fix something that it can't + safely fix automatically. Common examples: + - resolving commands in aliases (this is appropriate for standalone scripts + that use aliases non-interactively--but it would prevent profile/rc + scripts from using the latest current-system symlinks.) + - resolve commands in a variable definition + - resolve an absolute command path from inputs as if it were a bare reference +3. `keep` directives tell resholve not to raise an error (i.e., ignore) + something it would usually object to. Common examples: + - variables used as/within the first word of a command + - pre-existing absolute or user-relative (~) command paths + - dynamic (variable) arguments to commands known to accept/run other commands + +> NOTE: resholve has a (growing) number of directives detailed in `man resholve` +> via `nixpkgs.resholve`. + +Each of these 3 types is represented by its own attrset, where you can think +of the key as a scope. The value should be: +- `true` for any directives that the resholve CLI accepts as a single word +- a list of strings for all other options +<!-- +TODO: these should be fully-documented here, but I'm already maintaining +more copies of their specification/behavior than I like, and continuing to +add more at this early date will only ensure that I spend more time updating +docs and less time filling in feature gaps. + +Full documentation may be greatly accellerated if someone can help me sort out +single-sourcing. See: https://github.com/abathur/resholve/issues/19 +--> + +This will hopefully make more sense when you see it. Here are CLI examples +from the manpage, and the Nix equivalents: ```nix # --fake 'f:setUp;tearDown builtin:setopt source:/etc/bashrc' fake = { - function = [ "setUp" "tearDown" ]; - builtin = [ "setopt" ]; - source = [ "/etc/bashrc" ]; + # fake accepts the initial of valid identifier types as a CLI convienience. + # Use full names in the Nix API. + function = [ "setUp" "tearDown" ]; + builtin = [ "setopt" ]; + source = [ "/etc/bashrc" ]; }; # --fix 'aliases xargs:ls $GIT:gix' fix = { - # all single-word directives use `true` as value - aliases = true; - xargs = [ "ls" ]; - "$GIT" = [ "gix" ]; + # all single-word directives use `true` as value + aliases = true; + xargs = [ "ls" ]; + "$GIT" = [ "gix" ]; }; # --keep 'which:git;ls .:$HOME $LS:exa /etc/bashrc ~/.bashrc' keep = { - which = [ "git" "ls" ]; - "." = [ "$HOME" ]; - "$LS" = [ "exa" ]; - "/etc/bashrc" = true; - "~/.bashrc" = true; + which = [ "git" "ls" ]; + "." = [ "$HOME" ]; + "$LS" = [ "exa" ]; + "/etc/bashrc" = true; + "~/.bashrc" = true; }; ``` diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index 9e2d406303c87..fae1c1731ae0e 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: +{ lib, stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkg-config }: stdenv.mkDerivation rec { pname = "yelp-tools"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ]; doCheck = true; diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index f562adb1dd054..85bf2fb44906c 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, fuse, adb }: stdenv.mkDerivation rec { pname = "adbfs-rootless"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; postPatch = '' diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix index 08f25a53bf689..eca29dd2fabdc 100644 --- a/pkgs/development/mobile/webos/novacom.nix +++ b/pkgs/development/mobile/webos/novacom.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, webos, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, webos, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "novacom"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "12s6g7l20kakyjlhqpli496miv2kfsdp17lcwhdrzdxvxl6hnf4n"; }; - nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; + nativeBuildInputs = [ cmake pkg-config webos.cmake-modules ]; postInstall = '' install -Dm755 -t $out/bin ../scripts/novaterm diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index c39f36b93f688..dc330ce6d4e97 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, -webos, cmake, pkgconfig, +webos, cmake, pkg-config, libusb-compat-0_1 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; + nativeBuildInputs = [ cmake pkg-config webos.cmake-modules ]; buildInputs = [ libusb-compat-0_1 ]; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 36ba75df33f86..569b0c978b066 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -225,7 +225,7 @@ let }; vega-cli = super.vega-cli.override { - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ super.node-pre-gyp pixman @@ -273,5 +273,13 @@ let echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home ''; }; + + yaml-language-server = super.yaml-language-server.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/yaml-language-server" \ + --prefix NODE_PATH : ${self.prettier}/lib/node_modules + ''; + }; }; in self diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index bf129c7bc442c..93de77fb322b4 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, buildDunePackage, ocaml -, pkgconfig, cairo +, pkg-config, cairo }: buildDunePackage rec { @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "1ik4qf4b9443sliq2z7x9acd40rmzvyzjh3bh98wvjklxbb84a9i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo ]; doCheck = !(stdenv.isDarwin diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 92a4ff9535c99..9cb3a3d4cb872 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkgconfig, ncurses, integers }: +{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkg-config, ncurses, integers }: if !lib.versionAtLeast ocaml.version "4.02" then throw "ctypes is not available for OCaml ${ocaml.version}" @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ integers libffi ]; diff --git a/pkgs/development/ocaml-modules/faillib/default.nix b/pkgs/development/ocaml-modules/faillib/default.nix index d045bd5a37af5..63040fadda5dd 100644 --- a/pkgs/development/ocaml-modules/faillib/default.nix +++ b/pkgs/development/ocaml-modules/faillib/default.nix @@ -11,7 +11,7 @@ buildOcaml rec { src = fetchurl { url = "https://github.com/janestreet/faillib/archive/${version}.tar.gz"; - sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v"; + sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v"; }; propagatedBuildInputs = [ camlp4 herelib ]; diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index 8f804988129bb..55e8e9418955c 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, fontconfig, ocaml }: +{ stdenv, lib, fetchFromGitHub, pkg-config, fontconfig, ocaml }: stdenv.mkDerivation { name = "ocaml-fontconfig-20131103"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml fontconfig ]; makeFlags = [ "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${lib.getVersion ocaml}/site-lib/" diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 145cc38452994..29df5ce8f4e45 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: +{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkg-config}: let pname = "gmetadom"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ocaml findlib gdome2 libxslt]; propagatedBuildInputs = [gdome2]; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index a7b145c2d4efb..3d57c4e40ed60 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; version = "1.05"; - src = fetchurl { + src = fetchurl { url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz"; sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; }; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 02fd7004a56b0..232621ad83ba6 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: +{ stdenv, lib, fetchurl, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: if lib.versionAtLeast ocaml.version "4.04" then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 2aa031f419c8c..09487ac9dad74 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: +{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview }: let param = let check = lib.versionAtLeast ocaml.version; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { pname = "lablgtk"; inherit (param) version src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 767e087a7f066..1f6b0ad76b9aa 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkgconfig, buildDunePackage, gtk3, cairo2 }: +{ lib, fetchurl, pkg-config, buildDunePackage, gtk3, cairo2 }: buildDunePackage rec { version = "3.1.1"; @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "1ygc1yh99gh44h958yffw1vxdlfpn799d4x1s36c2jfbi8f0dir2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ gtk3 cairo2 ]; meta = { diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 759f0deedf1fa..83146ef9104b3 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml +{ lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml , cppo, ocaml-migrate-parsetree, ocplib-endian, result , mmap, seq }: @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "15hgy3220m2b8imipa514n7l65m1h5lc6l1hanqwwvs7ghh2aqp2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cppo ocaml-migrate-parsetree ] ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; diff --git a/pkgs/development/ocaml-modules/magick/default.nix b/pkgs/development/ocaml-modules/magick/default.nix index 4fcf267e9c0e1..016c059573b0c 100644 --- a/pkgs/development/ocaml-modules/magick/default.nix +++ b/pkgs/development/ocaml-modules/magick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, which, pkgconfig, ocaml, findlib, imagemagick }: +{ stdenv, lib, fetchurl, which, pkg-config, ocaml, findlib, imagemagick }: if lib.versionAtLeast ocaml.version "4.06" then throw "magick is not available for OCaml ${ocaml.version}" @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0gn9l2qdr8gby2x8c2mb59x1kipb2plr45rbq6ymcxyi0wmzfh3q"; }; - nativeBuildInputs = [ which pkgconfig ]; + nativeBuildInputs = [ which pkg-config ]; buildInputs = [ ocaml findlib imagemagick ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index f384704a1c4ac..4418c50568c88 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -4,12 +4,12 @@ buildDunePackage rec { pname = "mdx"; - version = "1.7.0"; + version = "1.8.0"; useDune2 = true; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "0vpc30sngl3vpychrfvjwyi93mk311x3f2azlkxasgcj69fq03i7"; + sha256 = "1p2ip73da271as0x1gfbajik3mf1bkc8l54276vgacn1ja3saj52"; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 1411d32d40c30..49c8fe5470b6c 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }: +{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkg-config, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }: let pname = "ocaml-cairo"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./META.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml automake gnum4 autoconf unzip findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ]; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 110f51cc079bf..1da80a2202d7d 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip +{ stdenv, lib, fetchurl, pkg-config, ncurses, ocaml, findlib, ocaml_pcre, camlzip , gnutls, nettle }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1x703mjqsv9nvffnkj5i36ij2s5zfvxxll2z1qj6a7p428b2yfnm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 4103b48a979a9..7c782b5268fdd 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: +{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: let pname = "ocamlsdl"; @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; version = "0.9.1"; - src = fetchurl { + src = fetchurl { url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz"; sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ocaml findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl]; - propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkgconfig ]; + propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkg-config ]; createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index e5d5a21cc8e90..83668b30cecde 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses, lwt }: +{ stdenv, lib, pkg-config, ocaml, findlib, fetchurl, curl, ncurses, lwt }: if lib.versionOlder ocaml.version "4.02" then throw "ocurl is not available for OCaml ${ocaml.version}" @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6"; }; - buildInputs = [ pkgconfig ocaml findlib ncurses ]; + buildInputs = [ pkg-config ocaml findlib ncurses ]; propagatedBuildInputs = [ curl lwt ]; createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 343fb28b6ad81..b78d070962e79 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y"; }) ; - + createFindlibDestdir = true; buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index bbd7746d36657..d7bc4b55b4527 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.6.15"; pname = "piqi"; name = "ocaml${ocaml.version}-${pname}-${version}"; - + src = fetchFromGitHub { owner = "alavrik"; repo = pname; diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index 2573c95c62811..ac38657f776c5 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ result ]; - + inherit (topkg) buildPhase installPhase; meta = { diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 660282ad131a6..1b8f9d629e39b 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, sqlite, pkgconfig, buildDunePackage }: +{ lib, fetchurl, sqlite, pkg-config, buildDunePackage }: buildDunePackage rec { pname = "sqlite3"; @@ -10,7 +10,7 @@ buildDunePackage rec { sha256 = "0sba74n0jvzxibrclhbpqscil36yfw7i9jj9q562yhza6rax9p82"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/toml/default.nix b/pkgs/development/ocaml-modules/toml/default.nix index 0e25d9bc6b658..6980a148e1059 100644 --- a/pkgs/development/ocaml-modules/toml/default.nix +++ b/pkgs/development/ocaml-modules/toml/default.nix @@ -4,12 +4,15 @@ buildDunePackage rec { pname = "toml"; - version = "5.0.0"; + version = "6.0.0"; + + useDune2 = true; + src = fetchFromGitHub { owner = "ocaml-toml"; repo = "to.ml"; - rev = "v${version}"; - sha256 = "1505kwcwklcfaxw8wckajm8kc6yrlikmxyhi8f8cpvhlw9ys90nj"; + rev = version; + sha256 = "08ywzqckllvwawl1wpgg7qzvx6jhq7d6vysa0d5hj7qdwq213ggm"; }; buildInputs = [ menhir ]; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 81ba44647e3df..7c09e8cd9d7a8 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config, ocb-stubblr }: if !lib.versionAtLeast ocaml.version "4.03" then throw "tsdl is not available for OCaml ${ocaml.version}" @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ SDL2 ctypes ]; diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index 0ca48ebee285f..a6db0dc787057 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { make all make opt ''; - + installPhase = '' make install_ocamlfind mkdir -p $out/share diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index d937c95a97298..bddf2a2448fdb 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, ocaml, findlib, pkgconfig, perl +, ocaml, findlib, pkg-config, perl , gmp }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit (source) version; src = fetchurl { inherit (source) url sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib perl ]; propagatedBuildInputs = [ gmp ]; diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix index 781b5abbc3837..940150ac9867e 100644 --- a/pkgs/development/php-packages/event/default.nix +++ b/pkgs/development/php-packages/event/default.nix @@ -18,7 +18,7 @@ buildPecl { ':' ''; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ openssl libevent ]; internalDeps = [ php.extensions.sockets ]; diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 8f9eed0c1c30e..f697b44affd60 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -20,7 +20,7 @@ buildPecl { ]; configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pcre' ]; meta.maintainers = lib.teams.php.members; diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index b2d9333f29494..3eb1da463b9f6 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -23,7 +23,7 @@ buildPecl { "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ cyrus_sasl zlib ]; meta.maintainers = lib.teams.php.members; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 2ebdaa2f577ca..18bb515d15e1e 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -6,7 +6,7 @@ buildPecl { version = "1.9.0"; sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs"; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ cyrus_sasl icu64 diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 6bd3fb00c4e58..c363150babcfc 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.59"; + version = "0.12.68"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0lp25d9b7w8lk4ffrd17mjw93i234qnfpwz42k8lww1lrk5abnfa"; + sha256 = "sha256-qplQi12ecZjtaM8XawiO+qSwEdTXByrxWZLf3N7gfNc="; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index 473b035d23aa1..1de01d1d09d1d 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "psalm"; - version = "4.3.1"; + version = "4.4.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "1hv9r5m1mdywm7qi9rs9054jp77cpip3jyw048iq3l7s0vpslkc5"; + sha256 = "sha256-4hqgAPflzNmeQQaxQATpWYBB5Pz7jKu8Vlw3BiMyhtw="; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index 6ad3b778f827e..edb1b97df246f 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -8,7 +8,7 @@ buildPecl { configureFlags = [ "--with-yaml=${pkgs.libyaml}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix index e99c87ec70659..7f5d6412fbb53 100644 --- a/pkgs/development/pure-modules/audio/default.nix +++ b/pkgs/development/pure-modules/audio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, portaudio, fftw, libsndfile, libsamplerate }: +{ stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }: stdenv.mkDerivation rec { baseName = "audio"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix index 4745593cb7f8e..2bcc740726678 100644 --- a/pkgs/development/pure-modules/avahi/default.nix +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, avahi }: +{ stdenv, fetchurl, pkg-config, pure, avahi }: stdenv.mkDerivation rec { baseName = "avahi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure avahi ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix index 501271df8c099..2518424649b28 100644 --- a/pkgs/development/pure-modules/csv/default.nix +++ b/pkgs/development/pure-modules/csv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "csv"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix index c009b23f4eef2..b25cf7c6572a1 100644 --- a/pkgs/development/pure-modules/doc/default.nix +++ b/pkgs/development/pure-modules/doc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "doc"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix index 622ea140f66c6..18d42aecf05e9 100644 --- a/pkgs/development/pure-modules/fastcgi/default.nix +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, fcgi }: +{ stdenv, fetchurl, pkg-config, pure, fcgi }: stdenv.mkDerivation rec { baseName = "fastcgi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure fcgi ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix index 1f5b443fe3888..e513ecc567d39 100644 --- a/pkgs/development/pure-modules/faust/default.nix +++ b/pkgs/development/pure-modules/faust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, faust, libtool }: +{ stdenv, fetchurl, pkg-config, pure, faust, libtool }: stdenv.mkDerivation rec { baseName = "faust"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure faust libtool ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix index 8518c2cb01f39..7a42cde65585f 100644 --- a/pkgs/development/pure-modules/ffi/default.nix +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, libffi }: +{ stdenv, fetchurl, pkg-config, pure, libffi }: stdenv.mkDerivation rec { baseName = "ffi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure libffi ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index 9956c142dafa5..3fcf8118a84ed 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - pkgconfig, pure, haskellPackages }: + pkg-config, pure, haskellPackages }: stdenv.mkDerivation rec { baseName = "gen"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ hsEnv pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 77173870bca63..20dd048e945c2 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, freeglut, libGLU, libGL, xlibsWrapper }: +{ stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "gl"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure freeglut libGLU libGL xlibsWrapper ]; makeFlags = [ "libdir=${placeholder ''out''}/lib" diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index a70dbbd047a28..6cb620a452580 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, - pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }: + pkg-config, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }: stdenv.mkDerivation rec { baseName = "glpk"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--with-gmp=yes" ]; }); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure glpkWithExtras ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index 998c8f1972ac7..ed919e94eea35 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, gnuplot }: +{ stdenv, fetchurl, pkg-config, pure, gnuplot }: stdenv.mkDerivation rec { baseName = "gplot"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure gnuplot ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix index 6c6a381f285b3..3d11f29fed32e 100644 --- a/pkgs/development/pure-modules/gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pure, pkgconfig, gsl }: +{ stdenv, fetchurl, pure, pkg-config, gsl }: stdenv.mkDerivation rec { baseName = "gsl"; version = "0.12"; name = "pure-${baseName}-${version}"; - + src = fetchurl { url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure gsl ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix index ff619226a81f0..55281957df6f6 100644 --- a/pkgs/development/pure-modules/gtk/default.nix +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, pure-ffi, gtk2 }: +{ stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }: stdenv.mkDerivation rec { baseName = "gtk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure pure-ffi gtk2 ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix index a633ad7c1d77e..864578ae00767 100644 --- a/pkgs/development/pure-modules/liblo/default.nix +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, liblo }: +{ stdenv, fetchurl, pkg-config, pure, liblo }: stdenv.mkDerivation rec { baseName = "liblo"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure liblo ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix index 85a504c90823b..12a15b41a087c 100644 --- a/pkgs/development/pure-modules/lilv/default.nix +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, lilv, lv2, serd, sord, sratom }: +{ stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }: stdenv.mkDerivation rec { baseName = "lilv"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ]; makeFlags = [ "CFLAGS=-I${lilv}/include/lilv-0" "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix index 6e8f38cf2a9c8..590179516b582 100644 --- a/pkgs/development/pure-modules/lv2/default.nix +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, lv2 }: +{ stdenv, fetchurl, pkg-config, pure, lv2 }: stdenv.mkDerivation rec { baseName = "lv2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure lv2 ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix index 3e2a3993fc1a7..86303c057d3a6 100644 --- a/pkgs/development/pure-modules/midi/default.nix +++ b/pkgs/development/pure-modules/midi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, portmidi }: +{ stdenv, fetchurl, pkg-config, pure, portmidi }: stdenv.mkDerivation rec { baseName = "midi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure portmidi ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix index 13c9eee1bd9fc..a6496617558b6 100644 --- a/pkgs/development/pure-modules/mpfr/default.nix +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "mpfr"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index d064eeb0d41f1..20f87fb9fc653 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, octave }: +{ stdenv, fetchurl, pkg-config, pure, octave }: stdenv.mkDerivation rec { baseName = "octave"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure octave ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix index e95e1c3d1c198..8b69c3a28dc59 100644 --- a/pkgs/development/pure-modules/odbc/default.nix +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, libiodbc }: +{ stdenv, fetchurl, pkg-config, pure, libiodbc }: stdenv.mkDerivation rec { baseName = "odbc"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure libiodbc ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix index fc615690df1c8..beef19d7c5e44 100644 --- a/pkgs/development/pure-modules/pandoc/default.nix +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, pandoc, gawk, getopt }: +{ stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }: stdenv.mkDerivation rec { baseName = "pandoc"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pure ]; propagatedBuildInputs = [ pandoc gawk getopt ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix index be230141a4a5c..cfc11b7b0ee74 100644 --- a/pkgs/development/pure-modules/rational/default.nix +++ b/pkgs/development/pure-modules/rational/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "rational"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix index 24f64d944704c..e112b3e389310 100644 --- a/pkgs/development/pure-modules/readline/default.nix +++ b/pkgs/development/pure-modules/readline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, readline }: +{ stdenv, fetchurl, pkg-config, pure, readline }: stdenv.mkDerivation rec { baseName = "readline"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure readline ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix index e80d66f3ab841..75165be0447e2 100644 --- a/pkgs/development/pure-modules/sockets/default.nix +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "sockets"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix index c658ee0c55624..8c917c6285c80 100644 --- a/pkgs/development/pure-modules/sql3/default.nix +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, sqlite }: +{ stdenv, fetchurl, pkg-config, pure, sqlite }: stdenv.mkDerivation rec { baseName = "sql3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure sqlite ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix index ae28055a2f92e..fba4a2de44491 100644 --- a/pkgs/development/pure-modules/stldict/default.nix +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "stldict"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix index 9d35794b1900b..6a7475a691354 100644 --- a/pkgs/development/pure-modules/stllib/default.nix +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure }: +{ stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { baseName = "stllib"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index 496da2a20ea69..843c617c95fb4 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, xlibsWrapper }: +{ stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "tk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure tcl tk xlibsWrapper ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix index ac4f1f0e6b072..62b41d2880604 100644 --- a/pkgs/development/pure-modules/xml/default.nix +++ b/pkgs/development/pure-modules/xml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, libxml2, libxslt }: +{ stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }: stdenv.mkDerivation rec { baseName = "xml"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pure libxml2 libxslt ]; makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix index 07330ebbca9d4..e4ce48158f642 100644 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "MechanicalSoup"; - version = "0.12.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1g976rk79apz6rc338zq3ml2yps8hb88nyw3a698d0brm4khd9ir"; + sha256 = "37d3b15c1957917d3ae171561e77f4dd4c08c35eb4500b8781f6e7e1bb6c4d07"; }; checkInputs = [ pytest pytestrunner requests-mock pytestcov ]; diff --git a/pkgs/development/python-modules/aioflo/default.nix b/pkgs/development/python-modules/aioflo/default.nix new file mode 100644 index 0000000000000..60288178def58 --- /dev/null +++ b/pkgs/development/python-modules/aioflo/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aioflo"; + version = "0.4.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1ppsinmjph6snj7s4hg28p3qa67kpkadc98ikjjg6w65vcm3dlaz"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aresponses + pytest-aiohttp + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "aioflo" ]; + + meta = with lib; { + description = "Python library for Flo by Moen Smart Water Detectors"; + homepage = "https://github.com/bachya/aioflo"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioh2/default.nix b/pkgs/development/python-modules/aioh2/default.nix index 6af4c4230b0e2..1ae997c60e8c6 100644 --- a/pkgs/development/python-modules/aioh2/default.nix +++ b/pkgs/development/python-modules/aioh2/default.nix @@ -19,5 +19,6 @@ buildPythonPackage rec { description = "HTTP/2 implementation with hyper-h2 on Python 3 asyncio"; license = licenses.bsd3; maintainers = [ maintainers.qyliss ]; + broken = true; # requires h2<4 }; } diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index ce1e702a7bacc..968fdf2402c58 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta-server"; - version = "8.1.0"; + version = "8.2.0"; src = fetchPypi { inherit pname version; - sha256 = "32a97eee95aea5527f6efa844c18b727fe4a6d61356ea3c0769a29a163ddcb7e"; + sha256 = "ee06d0f828b679402847989de9013a1271db282af377f5dce776347623dde345"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix index 2407adefd5ceb..53353a1378865 100644 --- a/pkgs/development/python-modules/aresponses/default.nix +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -5,12 +5,13 @@ , isPy3k , pytest , pytest-asyncio +, pytest-cov , pytestCheckHook }: buildPythonPackage rec { pname = "aresponses"; - version = "2.1.0"; + version = "2.1.2"; disabled = !isPy3k; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "CircleUp"; repo = pname; rev = version; - sha256 = "0dc1y4s6kpmr0ar63kkyghvisgbmb8qq5wglmjclrpzd5180mjcl"; + sha256 = "007wrk4wdy97a81imgzxd6sm5dly9v7abmxh9fyfi0vp1p7s75bw"; }; propagatedBuildInputs = [ @@ -32,8 +33,9 @@ buildPythonPackage rec { checkInputs = [ aiohttp - pytestCheckHook pytest-asyncio + pytest-cov + pytestCheckHook ]; # Disable tests which requires network access @@ -42,6 +44,8 @@ buildPythonPackage rec { "test_passthrough" ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "aresponses" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 594ac42018b27..c2edbdcf6a382 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -4,7 +4,7 @@ , isPy27 , numpy , ffmpeg -, pkgconfig +, pkg-config }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ numpy ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg ]; # Tests require downloading files from internet diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index f33df1fdbe8da..5a414388c4c84 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -23,8 +23,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "azure.synapse.artifacts" ]; meta = with lib; { - description = "CHANGE"; - homepage = "https://github.com/CHANGE/azure-synapse-artifacts/"; + description = "Microsoft Azure Synapse Artifacts Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 614a1ad98a91e..6ee8b6499b581 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -1,26 +1,27 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , click, click-log, pure-pcapy3 -, pyserial, pyserial-asyncio, voluptuous, zigpy -, asynctest, pytest, pytest-asyncio }: +, pyserial-asyncio, voluptuous, zigpy +, asynctest, pytestCheckHook, pytest-asyncio }: -let +buildPythonPackage rec { pname = "bellows"; version = "0.21.0"; -in buildPythonPackage rec { - inherit pname version; - - src = fetchPypi { - inherit pname version; - sha256 = "fd2ac40c1f3550580dc561ae58d7d15cfa12e6a7cc5d35ee80e7a1cb6a4cda4f"; + src = fetchFromGitHub { + owner = "zigpy"; + repo = "bellows"; + rev = version; + sha256 = "1gja7cb1cyzbi19k8awa2gyc3bjam0adapalpk5slxny0vxlc73a"; }; propagatedBuildInputs = [ - click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy + click click-log pure-pcapy3 pyserial-asyncio voluptuous zigpy ]; checkInputs = [ - asynctest pytest pytest-asyncio + asynctest + pytestCheckHook + pytest-asyncio ]; prePatch = '' diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index 34b9f4cf5ff0a..dcb684a55e0dd 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -3,7 +3,7 @@ , sphinx , hypothesis , py -, pytest +, pytestCheckHook , pytest-benchmark , sortedcollections , sortedcontainers @@ -23,23 +23,14 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ sphinx ]; - # this can be removed >0.19.0 - postPatch = '' - substituteInPlace setup.py \ - --replace "setuptools_scm < 4" "setuptools_scm" - ''; - checkInputs = [ hypothesis py - pytest + pytestCheckHook pytest-benchmark sortedcollections sortedcontainers ]; - checkPhase = '' - pytest tests - ''; meta = with lib; { homepage = "https://github.com/jab/bidict"; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 771753fdbb9c2..92972470f1c04 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.16.56"; # N.B: if you change this, change botocore too + version = "1.16.57"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-RxUe1XHDFkWPSTHNJCKZW6DJ9oGMXffXX0n8hFII5C4="; + sha256 = "sha256-SkmcwvU91VeojG22pVJ0iiq9g//tpwzrcdyNs5oCcxQ="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 831a546014b5f..a17e6c728cf75 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.19.56"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.19.57"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-AUluTCwGqreWifLDRaDizOtf4dp4WKfn3xibz5dwMiM="; + sha256 = "sha256-x1bWX/qYnFwOkheBdeQav3sYrRmy/i6C4ZLwheJk4Do="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix new file mode 100644 index 0000000000000..8c5184240f624 --- /dev/null +++ b/pkgs/development/python-modules/catboost/default.nix @@ -0,0 +1,56 @@ +{ buildPythonPackage, fetchFromGitHub, fetchpatch, lib, pythonOlder +, clang_7, python2 +, graphviz, matplotlib, numpy, pandas, plotly, scipy, six +, withCuda ? false, cudatoolkit }: + +buildPythonPackage rec { + pname = "catboost"; + version = "0.24.4"; + + disabled = pythonOlder "3.4"; + + src = fetchFromGitHub { + owner = "catboost"; + repo = "catboost"; + rev = "v${version}"; + sha256 = "sha256-pzmwEiKziB4ldnKgeCsP2HdnisX8sOkLssAzNfcSEx8="; + }; + + nativeBuildInputs = [ clang_7 python2 ]; + + propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ] + ++ lib.optional withCuda [ cudatoolkit ]; + + patches = [ + ./nix-support.patch + (fetchpatch { + name = "format.patch"; + url = "https://github.com/catboost/catboost/pull/1528/commits/a692ba42e5c0f62e5da82b2f6fccfa77deb3419c.patch"; + sha256 = "sha256-fNGucHxsSDFRLk3hFH7rm+zzTdDpY9/QjRs8K+AzVvo="; + }) + ]; + + preBuild = '' + cd catboost/python-package + ''; + setupPyBuildFlags = [ "--with-ymake=no" ]; + CUDA_ROOT = lib.optional withCuda cudatoolkit; + enableParallelBuilding = true; + + # Tests use custom "ya" tool, not yet supported. + dontUseSetuptoolsCheck = true; + pythonImportsCheck = [ "catboost" ]; + + meta = with lib; { + description = "High-performance library for gradient boosting on decision trees."; + longDescription = '' + A fast, scalable, high performance Gradient Boosting on Decision Trees + library, used for ranking, classification, regression and other machine + learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU. + ''; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + homepage = "https://catboost.ai"; + maintainers = with maintainers; [ PlushBeaver ]; + }; +} diff --git a/pkgs/development/python-modules/catboost/nix-support.patch b/pkgs/development/python-modules/catboost/nix-support.patch new file mode 100644 index 0000000000000..feaf97d57070b --- /dev/null +++ b/pkgs/development/python-modules/catboost/nix-support.patch @@ -0,0 +1,181 @@ +diff --git a/catboost/python-package/setup.py b/catboost/python-package/setup.py +index 17f1d8ff14..07da618cd1 100644 +--- a/catboost/python-package/setup.py ++++ b/catboost/python-package/setup.py +@@ -80,7 +80,7 @@ class Helper(object): + self.with_cuda = os.environ.get('CUDA_PATH') or os.environ.get('CUDA_ROOT') or None + self.os_sdk = 'local' + self.with_ymake = True +- self.parallel = None ++ self.parallel = os.environ.get('NIX_BUILD_CORES') or None + + def finalize_options(self): + if os.path.exists(str(self.with_cuda)): +@@ -222,11 +222,12 @@ class build_ext(_build_ext): + + def build_with_make(self, topsrc_dir, build_dir, catboost_ext, put_dir, verbose, dry_run): + logging.info('Buildling {} with gnu make'.format(catboost_ext)) +- makefile = 'python{}.{}CLANG50-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') ++ makefile = 'python{}.{}CLANG7-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') + make_cmd = [ + 'make', '-f', '../../make/' + makefile, +- 'CC=clang-5.0', +- 'CXX=clang++-5.0', ++ 'CC=clang', ++ 'CXX=clang++', ++ 'PYTHON=python2', + 'BUILD_ROOT=' + build_dir, + 'SOURCE_ROOT=' + topsrc_dir, + ] +diff --git a/make/python2.CLANG7-LINUX-X86_64.makefile b/make/python2.CLANG7-LINUX-X86_64.makefile +index e54b7078e8..fb7b208af9 100644 +--- a/make/python2.CLANG7-LINUX-X86_64.makefile ++++ b/make/python2.CLANG7-LINUX-X86_64.makefile +@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) + SOURCE_ROOT = $(shell pwd) + PYTHON = $(shell which python) + +-ifneq ($(MAKECMDGOALS),help) +-define _CC_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) +-$(info _CC_VERSION = '$(_CC_VERSION)') +- +-ifneq '$(_CC_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +-ifneq ($(MAKECMDGOALS),help) +-define _CXX_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) +-$(info _CXX_VERSION = '$(_CXX_VERSION)') +- +-ifneq '$(_CXX_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +- + all\ + ::\ + $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ +diff --git a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile +index 2a22a79b25..522fb54a7c 100644 +--- a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile ++++ b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile +@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) + SOURCE_ROOT = $(shell pwd) + PYTHON = $(shell which python) + +-ifneq ($(MAKECMDGOALS),help) +-define _CC_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) +-$(info _CC_VERSION = '$(_CC_VERSION)') +- +-ifneq '$(_CC_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +-ifneq ($(MAKECMDGOALS),help) +-define _CXX_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) +-$(info _CXX_VERSION = '$(_CXX_VERSION)') +- +-ifneq '$(_CXX_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +- + all\ + ::\ + $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ +diff --git a/make/python3.CLANG7-LINUX-X86_64.makefile b/make/python3.CLANG7-LINUX-X86_64.makefile +index fee6750bcb..dc55908371 100644 +--- a/make/python3.CLANG7-LINUX-X86_64.makefile ++++ b/make/python3.CLANG7-LINUX-X86_64.makefile +@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) + SOURCE_ROOT = $(shell pwd) + PYTHON = $(shell which python) + +-ifneq ($(MAKECMDGOALS),help) +-define _CC_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) +-$(info _CC_VERSION = '$(_CC_VERSION)') +- +-ifneq '$(_CC_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +-ifneq ($(MAKECMDGOALS),help) +-define _CXX_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) +-$(info _CXX_VERSION = '$(_CXX_VERSION)') +- +-ifneq '$(_CXX_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +- + all\ + ::\ + $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ +diff --git a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile +index 5146830476..ff8535b03e 100644 +--- a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile ++++ b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile +@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) + SOURCE_ROOT = $(shell pwd) + PYTHON = $(shell which python) + +-ifneq ($(MAKECMDGOALS),help) +-define _CC_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) +-$(info _CC_VERSION = '$(_CC_VERSION)') +- +-ifneq '$(_CC_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +-ifneq ($(MAKECMDGOALS),help) +-define _CXX_TEST +-__clang_major__ __clang_minor__ +-endef +- +-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) +-$(info _CXX_VERSION = '$(_CXX_VERSION)') +- +-ifneq '$(_CXX_VERSION)' '7 0' +- $(error clang 7.0 is required) +-endif +-endif +- +- + all\ + ::\ + $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 8dcedac421258..f793ecfae3726 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ + checkInputs = [ pytest-cov pytestCheckHook ]; diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix new file mode 100644 index 0000000000000..561d9651fed8c --- /dev/null +++ b/pkgs/development/python-modules/censys/default.nix @@ -0,0 +1,50 @@ +{ lib +, backoff +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, requests +, pytestcov +, requests-mock +, parameterized +}: + +buildPythonPackage rec { + pname = "censys"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "censys"; + repo = "censys-python"; + rev = "v${version}"; + sha256 = "0vvd13g48i4alnqil98zc09zi5kv6l2s3kdfyg5syjxvq4lfd476"; + }; + + propagatedBuildInputs = [ + backoff + requests + ]; + + checkInputs = [ + pytestcov + pytestCheckHook + requests-mock + parameterized + ]; + + # The tests want to write a configuration file + preCheck = '' + export HOME=$(mktemp -d) + mkdir -p $HOME + ''; + # All other tests require an API key + pytestFlagsArray = [ "tests/test_config.py" ]; + pythonImportsCheck = [ "censys" ]; + + meta = with lib; { + description = "Python API wrapper for the Censys Search Engine (censys.io)"; + homepage = "https://github.com/censys/censys-python"; + license = with licenses; [ asl20 ]; + maintainers = [ maintainers.fab ]; + }; +} diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix index 1ddf2a2ba6843..8dc0380128529 100644 --- a/pkgs/development/python-modules/crccheck/default.nix +++ b/pkgs/development/python-modules/crccheck/default.nix @@ -1,21 +1,24 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k , nose }: -buildPythonPackage rec { +let pname = "crccheck"; - version = "0.6"; + version = "1.0"; +in buildPythonPackage { + inherit pname version; - buildInputs = [ nose ]; + checkInputs = [ nose ]; src = fetchPypi { inherit pname version; - sha256 = "0ckymm6s5kw08i1j35fy2cfha1hyq94pq1kc66brb552qgjs91jn"; - extension = "zip"; + sha256 = "1ay9lgy80j7lklm07iw2wq7giwnv9fbv50mncblqlc39y322vi0p"; }; + disabled = !isPy3k; + meta = with lib; { description = "Python library for CRCs and checksums"; - homepage = "https://bitbucket.org/martin_scharrer/crccheck"; + homepage = "https://sourceforge.net/projects/crccheck/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 70e817dc29912..410248b0193b8 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "csvw"; - version = "1.8.1"; + version = "1.10.0"; disabled = isPy27; src = fetchFromGitHub { owner = "cldf"; repo = "csvw"; rev = "v${version}"; - sha256 = "1cafwgkspkc299shsa5x8wfzkx1d63p9rvslj9jwr68fipd1830w"; + sha256 = "0cvfzfi1a2m1xqpm34mwp9r3bhgsnfz4pmslvgn81i42n5grbnis"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index ceacad12059d7..89946964544ed 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "8.0.1"; + version = "8.1.0"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "f10ada7f821a325c6befdd6fef1cac44ebc830736d0b75dda7b8ac9f851087b2"; + sha256 = "e1698c5522ee1355e552b30bfa0a58e6e772475b882c5d69d158bd7e6aed45de"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index aadf53e99255f..a6e2e28c6f590 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy +{ lib, fetchPypi, buildPythonPackage, python, pkg-config, dbus, dbus-glib, isPyPy , ncurses, pygobject3, isPy3k }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { disabled = isPyPy; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus dbus-glib ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index bca1de711f24f..a64ed0b9d9928 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, buildPythonPackage, - wrapt, pytest, tox }: + wrapt, pytest, tox }: buildPythonPackage rec { pname = "Deprecated"; diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix new file mode 100644 index 0000000000000..1e388fd3a1171 --- /dev/null +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -0,0 +1,49 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-cov +, pytest-mock +, requests +, zeroconf +, websocket_client +, pytest-runner +}: + +buildPythonPackage rec { + pname = "devolo-home-control-api"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "2Fake"; + repo = "devolo_home_control_api"; + rev = "v${version}"; + sha256 = "19zzdbx0dxlm8pq0yk00nn9gqqblgpp16fgl7z6a98hsa6459zzb"; + }; + + nativeBuildInputs = [ pytest-runner ]; + + propagatedBuildInputs = [ + requests + zeroconf + websocket_client + ]; + + checkInputs = [ + pytestCheckHook + pytest-cov + pytest-mock + ]; + + # Disable test that requires network access + disabledTests = [ "test__on_pong" ]; + pythonImportsCheck = [ "devolo_home_control_api" ]; + + meta = with lib; { + description = "Python library to work with devolo Home Control"; + homepage = "https://github.com/2Fake/devolo_home_control_api"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index 01ab12b1ab511..da9ad934032c1 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkgconfig, fuse }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, fuse }: buildPythonPackage rec { pname = "fuse-python"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ fuse ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # no tests in the Pypi archive doCheck = false; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 1c76e5622b8d5..5922377ab3a15 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll +{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll , python, util-linux, pygit2, gitMinimal, git-annex, cacert }: @@ -17,6 +17,11 @@ buildPythonPackage rec { }; patches = [ + # fix tests with recent versions of git-annex + (fetchpatch { + url = "https://github.com/alpernebbi/git-annex-adapter/commit/6c210d828e8a57b12c716339ad1bf15c31cd4a55.patch"; + sha256 = "17kp7pnm9svq9av4q7hfic95xa1w3z02dnr8nmg14sjck2rlmqsi"; + }) (substituteAll { src = ./git-annex-path.patch; gitAnnex = "${git-annex}/bin/git-annex"; diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 46bafa43388b6..85744d295934f 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchPypi , buildPythonPackage -, pkgconfig +, pkg-config , gtk3 , gobject-introspection , pygtk @@ -24,7 +24,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection ]; diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index e5b42c5310f76..90978ad2cba78 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -19,11 +19,6 @@ buildPythonPackage rec { sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "audio-metadata>=0.8,<0.9" "audio-metadata" - ''; - propagatedBuildInputs = [ appdirs audio-metadata diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index a25c855149028..0dd68918aed64 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, buildPythonPackage -, pkgconfig +, pkg-config , libgphoto2 }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "48b4c4ab70826d3ddaaf7440564d513c02d78680fa690994b0640d383ffb8a7d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgphoto2 ]; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index f531c547f9cc9..1a0e6d903a474 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -6,21 +6,21 @@ , makeFontsConf , freefont_ttf , mock -, pytest +, pytestCheckHook , pytest-mock , pytestcov }: buildPythonPackage rec { pname = "graphviz"; - version = "0.14.1"; + version = "0.16"; # patch does not apply to PyPI tarball due to different line endings src = fetchFromGitHub { owner = "xflr6"; repo = "graphviz"; rev = version; - sha256 = "02bdiac5x93f2mjw5kpgs6kv81hzg07y0mw1nxvhyg8aignzmh3c"; + sha256 = "147vi60mi57z623lhllwwzczzicv2iwj1yrmllj5xx5788i73j6g"; }; patches = [ @@ -35,11 +35,7 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ mock pytest pytest-mock pytestcov ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ mock pytestCheckHook pytest-mock pytestcov ]; meta = with lib; { description = "Simple Python interface for Graphviz"; diff --git a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch b/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch index d6da1ff47ce7f..fa2f634bbc294 100644 --- a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch +++ b/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch @@ -1,19 +1,28 @@ diff --git a/graphviz/backend.py b/graphviz/backend.py -index 6f4cc0c..bc4781e 100644 +index d2c4b97..f7175cd 100644 --- a/graphviz/backend.py +++ b/graphviz/backend.py @@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None): raise ValueError('unknown formatter: %r' % formatter) output_format = [f for f in (format_, renderer, formatter) if f is not None] -- cmd = [engine, '-T%s' % ':'.join(output_format)] -+ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % ':'.join(output_format)] +- cmd = ['dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)] ++ cmd = ['@graphviz@/bin/dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)] if filepath is None: rendered = None -@@ -255,7 +255,7 @@ def version(): - subprocess.CalledProcessError: If the exit status is non-zero. - RuntimmeError: If the output cannot be parsed into a version number. +@@ -275,7 +275,7 @@ def unflatten(source, + if fanout and stagger is None: + raise RequiredArgumentError('fanout given without stagger') + +- cmd = ['unflatten'] ++ cmd = ['@graphviz@/bin/unflatten'] + if stagger is not None: + cmd += ['-l', str(stagger)] + if fanout: +@@ -304,7 +304,7 @@ def version(): + Graphviz Release version entry format + https://gitlab.com/graphviz/graphviz/-/blob/f94e91ba819cef51a4b9dcb2d76153684d06a913/gen_version.py#L17-20 """ - cmd = ['dot', '-V'] + cmd = ['@graphviz@/bin/dot', '-V'] @@ -21,10 +30,10 @@ index 6f4cc0c..bc4781e 100644 stdout=subprocess.PIPE, stderr=subprocess.STDOUT) diff --git a/tests/test_backend.py b/tests/test_backend.py -index 9f307f5..e43bf5b 100644 +index d10ef1a..e4aba58 100644 --- a/tests/test_backend.py +++ b/tests/test_backend.py -@@ -50,7 +50,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'): +@@ -52,7 +52,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'): m.decode.assert_called_once_with(encoding) @@ -33,34 +42,43 @@ index 9f307f5..e43bf5b 100644 @pytest.mark.usefixtures('empty_path') @pytest.mark.parametrize('func, args', [ (render, ['dot', 'pdf', 'nonfilepath']), -@@ -143,7 +143,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803 +@@ -146,7 +146,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803 assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf' -- Popen.assert_called_once_with(['dot', '-Tpdf', '-O', 'nonfilepath'], -+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpdf', '-O', 'nonfilepath'], +- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'], ++ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=None, startupinfo=mocker.ANY) -@@ -201,7 +201,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803 +@@ -208,7 +208,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803 assert e.value.stdout is mocker.sentinel.out e.value.stdout = mocker.sentinel.new_stdout assert e.value.stdout is mocker.sentinel.new_stdout -- Popen.assert_called_once_with(['dot', '-Tpng'], -+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'], +- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'], ++ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, -@@ -224,7 +224,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 +@@ -231,7 +231,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out -- Popen.assert_called_once_with(['dot', '-Tpng'], -+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'], +- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'], ++ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'], + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +@@ -259,7 +259,7 @@ def test_unflatten_mocked(capsys, mocker, Popen): + proc.communicate.return_value = (b'nonresult', b'') + + assert unflatten('nonsource') == 'nonresult' +- Popen.assert_called_once_with(['unflatten'], ++ Popen.assert_called_once_with(['@graphviz@/bin/unflatten'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, -@@ -250,7 +250,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803 +@@ -290,7 +290,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803 with pytest.raises(RuntimeError, match=r'nonversioninfo'): version() @@ -69,7 +87,7 @@ index 9f307f5..e43bf5b 100644 stdout=subprocess.PIPE, stderr=subprocess.STDOUT, startupinfo=mocker.ANY) -@@ -269,7 +269,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803 +@@ -312,7 +312,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803 assert version() == expected diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index c66ceedc3ceef..30c26b19c08da 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -3,7 +3,7 @@ , meson , ninja , stdenv -, pkgconfig +, pkg-config , python3 , pygobject3 , gobject-introspection @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 gobject-introspection gst-plugins-base diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 61c23ac202222..0ceeda045827d 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkgconfig, chardet, lxml }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }: buildPythonPackage rec { pname = "html5-parser"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ]; doCheck = false; # No such file or directory: 'run_tests.py' diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 0caff88496786..65ae47ed87b02 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , nose -, pkgconfig +, pkg-config , libjpeg , libpng , libtiff @@ -21,7 +21,7 @@ buildPythonPackage rec { }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ nose libjpeg libpng libtiff libwebp ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 3cc2bb69e0e91..371fd4b88309b 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "bca1f458206fc8be82d790685b603d4158e2034a651f2e148e31526984b9d551"; + sha256 = "sha256-uRyeRP1y3GS7tXb0kHLBi7+trJRme/Ke3xgOY+LqZ6k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index 2a4550d6b423c..e3694bffe3786 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -3,12 +3,13 @@ , fetchPypi , twisted , passlib -, pycrypto , pyopenssl , pyparsing , service-identity , zope_interface , isPy3k +, pythonAtLeast +, python }: buildPythonPackage rec { @@ -21,13 +22,15 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - twisted passlib pycrypto pyopenssl pyparsing service-identity zope_interface + twisted passlib pyopenssl pyparsing service-identity zope_interface ]; - disabled = isPy3k; + # https://github.com/twisted/ldaptor/pull/210 + disabled = !isPy3k || pythonAtLeast "3.9"; - # TypeError: None is neither bytes nor unicode - doCheck = false; + checkPhase = '' + ${python.interpreter} -m twisted.trial ldaptor + ''; meta = { description = "A Pure-Python Twisted library for LDAP"; diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix index 72147fb70f206..fc45622a671d7 100644 --- a/pkgs/development/python-modules/libasyncns/default.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchurl -, libasyncns, pkgconfig }: +, libasyncns, pkg-config }: buildPythonPackage rec { pname = "libasyncns-python"; @@ -13,7 +13,7 @@ buildPythonPackage rec { patches = [ ./libasyncns-fix-res-consts.patch ]; buildInputs = [ libasyncns ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = false; # requires network access meta = with lib; { diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index dafaf412f07ac..d54a176f68623 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }: buildPythonPackage rec { pname = "libversion"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1h8x9hglrqi03f461lhw3wwz23zs84dgw7hx4laxcmyrgvyzvcq1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libversion ]; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/libvirt/5.9.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix index c751734e15337..1134d4f1c57b6 100644 --- a/pkgs/development/python-modules/libvirt/5.9.0.nix +++ b/pkgs/development/python-modules/libvirt/5.9.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }: +{ lib, stdenv, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt lxml ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index af0344b8009d8..d29cf5a7a85f8 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkgconfig, lxml, libvirt, nose }: +{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkg-config, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-A3eRfzQAfubyPefDlq5bAiFJ/G90D2JKdJO2Em0wE00="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt lxml ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 35235aaab40b8..77ec8322d68cf 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which +{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which , contextlib2, osxfuse }: @@ -23,7 +23,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = optionals stdenv.isLinux [ fuse ] ++ optionals stdenv.isDarwin [ osxfuse ]; diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index 17a9fb246bd71..ed6ebb1af490d 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver -, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 +, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 , fetchpatch , enableGhostscript ? false, ghostscript ? null, gtk3 , enableGtk3 ? false, cairo @@ -39,7 +39,7 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which sphinx ] ++ stdenv.lib.optional enableGhostscript ghostscript diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index f075ba47ce8a0..11ea3251e0a1b 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver -, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection +, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection , certifi, pillow , enableGhostscript ? true, ghostscript ? null, gtk3 , enableGtk3 ? false, cairo @@ -32,7 +32,7 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which sphinx ] ++ stdenv.lib.optional enableGhostscript ghostscript diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index f7e97bb955c38..2102718ab6ef4 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -5,23 +5,25 @@ , python , python_magic , six -, urllib3 }: +, urllib3 +, pytestCheckHook +, pytest-mock +, aiohttp +, gevent +, redis +, requests +, sure +}: buildPythonPackage rec { pname = "mocket"; - version = "3.9.35"; + version = "3.9.39"; src = fetchPypi { inherit pname version; - sha256 = "d822a2adfd8e028a2856785fbfe78e7dd8c7a3b623516298aef6d42a4c9149d1"; + sha256 = "1mbcgfy1vfwwzn54vkq8xmfzdyc28brfpqk4d55r3a6abwwsn6a4"; }; - patchPhase = '' - sed -iE "s,python-magic==.*,python-magic," requirements.txt - sed -iE "s,urllib3==.*,urllib3," requirements.txt - substituteInPlace setup.py --replace 'setup_requires=["pipenv"]' "setup_requires=[]" - ''; - propagatedBuildInputs = [ decorator http-parser @@ -30,8 +32,36 @@ buildPythonPackage rec { six ] ++ lib.optionals (isPy27) [ six ]; - # Pypi has no runtests.py, github has no requirements.txt. No way to test, no way to install. - doCheck = false; + checkInputs = [ + pytestCheckHook + pytest-mock + aiohttp + gevent + redis + requests + sure + ]; + + pytestFlagsArray = [ + "--ignore=tests/main/test_pook.py" # pook is not packaged + "--ignore=tests/main/test_redis.py" # requires a live redis instance + ] ++ lib.optionals (pythonOlder "3.8") [ + # uses IsolatedAsyncioTestCase which is only available >= 3.8 + "--ignore=tests/tests38/test_http_aiohttp.py" + ]; + + disabledTests = [ + # tests that require network access (like DNS lookups) + "test_truesendall" + "test_truesendall_with_chunk_recording" + "test_truesendall_with_gzip_recording" + "test_truesendall_with_recording" + "test_wrongpath_truesendall" + "test_truesendall_with_dump_from_recording" + "test_truesendall_with_recording_https" + "test_truesendall_after_mocket_session" + "test_real_request_session" + ]; pythonImportsCheck = [ "mocket" ]; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index 3ac24f7430d92..c8969d9e2d4df 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.21.0"; + version = "0.22.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "v${version}"; - sha256 = "02amfdirdw3nc0kgiyax7yndk5b65g83kbjvwwxbgnlcrb9vjzcd"; + sha256 = "14n9rl8w3i1fq96f3jzsg7gy331d7fmrapva6m38ih53rnf38bdf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index 65eb2d44ffccc..d32905e7e6113 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -20,9 +20,7 @@ buildPythonPackage { postPatch = '' substituteInPlace python/setup.py \ - --replace "graphviz<0.9.0," "graphviz" \ - --replace "numpy<=1.15.2," "numpy" \ - --replace "requests<2.19.0," "requests" + --replace "graphviz<0.9.0," "graphviz" ''; preConfigure = '' diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index e67bdcc319462..91195abce1cd1 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -34,6 +34,5 @@ buildPythonPackage rec { description = "Access a multitude of neuroimaging data formats"; license = licenses.mit; maintainers = with maintainers; [ ashgillman ]; - platforms = platforms.x86_64; # https://github.com/nipy/nibabel/issues/861 }; } diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index bb2a20cf62f3d..c0aa86a3763dc 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; nativeBuildInputs = [ setuptools_scm ]; - + propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index cd2aac6275e58..4aaaea406774b 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch +{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkg-config, fetchpatch , substituteAll }: @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; buildInputs = [ qtbase.dev poppler ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ sip pyqt5.dev ]; # no tests, just bindings for `poppler_qt5` diff --git a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix index ec87186a4fddd..25a81510c7dce 100644 --- a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix +++ b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix @@ -1,9 +1,12 @@ -{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }: +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, twisted, ldaptor, configobj }: buildPythonPackage rec { pname = "privacyidea-ldap-proxy"; version = "0.6.1"; + # https://github.com/privacyidea/privacyidea-ldap-proxy/issues/50 + disabled = isPy3k; + src = fetchFromGitHub { owner = "privacyidea"; repo = pname; diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index fba5a41389c75..9ab4cbf72bdfa 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -4,11 +4,8 @@ , lxml , networkx , dateutil -, six -, pydotplus , rdflib , pydot -, glibcLocales }: buildPythonPackage rec { @@ -20,28 +17,17 @@ buildPythonPackage rec { sha256 = "b6438f2195ecb9f6e8279b58971e02bc51814599b5d5383366eef91d867422ee"; }; - prePatch = '' - substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0" - ''; - propagatedBuildInputs = [ lxml networkx dateutil - six - pydotplus rdflib ]; checkInputs = [ pydot - glibcLocales ]; - preCheck = '' - export LC_ALL="en_US.utf-8" - ''; - meta = with lib; { description = "A Python library for W3C Provenance Data Model (PROV)"; homepage = "https://github.com/trungdong/prov"; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index a2aeaceef6dd2..71314a08eebc1 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -33,9 +33,8 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ - pytz requests tzlocal i3ipc pydbus pygobject3 pyserial setuptools dbus-python + pytz requests tzlocal i3ipc pydbus pygobject3 pyserial setuptools dbus-python file ]; - buildInputs = [ file ]; prePatch = '' sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 82f8f5da3d9c9..780c8c2df854e 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { python3 = python; }; @@ -12,7 +12,7 @@ buildPythonPackage rec { sourceRoot = "apache-arrow-${version}/python"; - nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; + nativeBuildInputs = [ cmake cython pkg-config setuptools_scm ]; propagatedBuildInputs = [ numpy six ]; checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 6ac0c776fcd2d..5e96f642c2859 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: buildPythonPackage rec { pname = "pyatspi"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ at-spi2-core diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 74c8ecd92b17e..6fc9d2af1cbc4 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie +{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie , sqlite, buildPythonPackage, cython }: @@ -14,7 +14,7 @@ in buildPythonPackage { sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05"; }; - nativeBuildInputs = [ pkgconfig libtool autoconf automake cython ]; + nativeBuildInputs = [ pkg-config libtool autoconf automake cython ]; buildInputs = [ libcangjie sqlite ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pydotplus/default.nix b/pkgs/development/python-modules/pydotplus/default.nix deleted file mode 100644 index f794a150ec15a..0000000000000 --- a/pkgs/development/python-modules/pydotplus/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv -, buildPythonPackage -, fetchPypi -, pyparsing -, graphviz -}: - -buildPythonPackage rec { - pname = "pydotplus"; - version = "2.0.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1i05cnk3yh722fdyaq0asr7z9xf7v7ikbmnpxa8j6pdqx6g5xs4i"; - }; - - propagatedBuildInputs = [ - pyparsing - graphviz - ]; - - meta = with lib; { - homepage = "https://github.com/erocarrera/pydot"; - description = "An improved version of the old pydot project that provides a Python Interface to Graphviz’s Dot language"; - license = licenses.mit; - maintainers = with maintainers; [ ashgillman ]; - }; -} diff --git a/pkgs/development/python-modules/pygobject/3.36.nix b/pkgs/development/python-modules/pygobject/3.36.nix index 59e192271960d..1cbf264d1e2cc 100644 --- a/pkgs/development/python-modules/pygobject/3.36.nix +++ b/pkgs/development/python-modules/pygobject/3.36.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection, +{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { "-Dpython=python${if isPy3k then "3" else "2" }" ]; - nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ]; + nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ]; buildInputs = [ glib gobject-introspection ] ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 68f1bfa7b26d1..b42a772ed735d 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection, +{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ]; + nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ]; buildInputs = [ glib gobject-introspection ] ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 0b72561e870b0..cf4f9d5cfbb4d 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib, isPy3k, pythonAtLeast }: +{ stdenv, fetchurl, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }: buildPythonPackage rec { pname = "pygobject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { configureFlags = [ "--disable-introspection" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; # in a "normal" setup, pygobject and pygtk are installed into the diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 0b3e99dd28b71..f239647bafa57 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz -, pkgconfig, doctest-ignore-unicode, mock, nose }: +, pkg-config, doctest-ignore-unicode, mock, nose }: buildPythonPackage rec { pname = "pygraphviz"; @@ -13,7 +13,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ graphviz ]; checkInputs = [ doctest-ignore-unicode mock nose ]; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 22a44ce760792..b3d84c2138710 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, gtk2, pygobject2, pycairo, pango +{ lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango , buildPythonPackage, libglade ? null, isPy3k }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ] ++ stdenv.lib.optional (libglade != null) libglade; diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index 947b5733a7e52..57a21f1e17849 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }: +{ lib, fetchurl, python, buildPythonPackage, pkg-config, pygobject2, glib, pygtk, gnome2 }: buildPythonPackage rec { pname = "pygtksourceview"; @@ -12,7 +12,7 @@ buildPythonPackage rec { patches = [ ./codegendir.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ python pygobject2 glib pygtk gnome2.gtksourceview ]; meta = { diff --git a/pkgs/development/python-modules/pymata-express/default.nix b/pkgs/development/python-modules/pymata-express/default.nix new file mode 100644 index 0000000000000..1a50a91a30929 --- /dev/null +++ b/pkgs/development/python-modules/pymata-express/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pymata-express"; + version = "1.19"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "MrYsLab"; + repo = pname; + rev = "v${version}"; + sha256 = "0gfjmqcxwsnfjgll6ql5xd1n3xp4klf4fcaajaivh053i02p0a79"; + }; + + propagatedBuildInputs = [ pyserial ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pymata_express" ]; + + meta = with lib; { + description = "Python Asyncio Arduino Firmata Client"; + longDescription = '' + Pymata-Express is a Python Firmata Protocol client. When used in conjunction + with an Arduino Firmata sketch, it permits you to control and monitor Arduino + hardware remotely over a serial link. + ''; + homepage = "https://mryslab.github.io/pymata-express/"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 05cf0aba354b9..54abcddd5d881 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkgconfig, lndir, dbus, makeWrapper }: +{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkg-config, lndir, dbus, makeWrapper }: buildPythonPackage rec { pname = "PyQt-x11-gpl"; @@ -42,7 +42,7 @@ buildPythonPackage rec { "--verbose" ]; - nativeBuildInputs = [ pkgconfig lndir makeWrapper qt4 ]; + nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ]; buildInputs = [ qt4 dbus ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 0c32985cfaae0..338b8f44e03d3 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, pkgconfig +{ lib, pythonPackages, pkg-config , dbus , qmake, lndir , qtbase @@ -41,7 +41,7 @@ in buildPythonPackage rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig + pkg-config qmake lndir sip diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 51506598ca18b..262c5a17504a6 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, pkgconfig +{ lib, pythonPackages, pkg-config , qmake, qtbase, qtsvg, qtwebengine , wrapQtAppsHook }: @@ -27,7 +27,7 @@ in buildPythonPackage rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig + pkg-config qmake sip qtbase diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index eff4dd58c1dbb..6834a78f4286f 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchPypi -, samba, pkgconfig +, samba, pkg-config , setuptools }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "14b75f358ical7zzqh3g1qkh2dxwxn2gz7sah5f5svndqkd3z8jy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ setuptools samba ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-instafail/default.nix b/pkgs/development/python-modules/pytest-instafail/default.nix new file mode 100644 index 0000000000000..f9942dd5bcd38 --- /dev/null +++ b/pkgs/development/python-modules/pytest-instafail/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage +, fetchPypi +, lib +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-instafail"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "10lpr6mjcinabqynj6v85bvb1xmapnhqmg50nys1r6hg7zgky9qr"; + }; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "pytest_instafail" ]; + meta = { + description = "pytest plugin that shows failures and errors instantly instead of waiting until the end of test session"; + homepage = "https://github.com/pytest-dev/pytest-instafail"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.jacg ]; + }; +} diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index bfd14ab3635d2..44e35a186e215 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , buildPythonPackage -, pkgconfig +, pkg-config , python , dbus-python , enlightenment @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ enlightenment.efl ]; diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index 51d544eb5f81a..728d47b1f9679 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, lib, isPy3k -, pkgconfig, igraph +, pkg-config, igraph , texttable }: buildPythonPackage rec { @@ -7,7 +7,7 @@ buildPythonPackage rec { version = "0.8.3"; disabled = !isPy3k; # fails to build - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ igraph ]; propagatedBuildInputs = [ texttable ]; diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index 7c7151ed92835..2c5357297ea74 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchPypi, isPy3k -, pkgconfig +, pkg-config , systemd, libyaml, openzwave, cython, pyserial , six, pydispatcher, urwid }: @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ systemd libyaml openzwave cython ]; propagatedBuildInputs = [ six urwid pydispatcher pyserial ]; diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 82ddb8c810b08..d0054f7076a14 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -6,7 +6,7 @@ , pytest , pycparser , psutil -, pkgconfig +, pkg-config , dotnetbuildhelpers , clang , glib @@ -53,7 +53,7 @@ buildPythonPackage rec { pytest pycparser - pkgconfig + pkg-config dotnetbuildhelpers clang diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix index 9387f3775beba..3e15f18a3dd1e 100644 --- a/pkgs/development/python-modules/roboschool/default.nix +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -9,7 +9,7 @@ , assimp , gym , bullet-roboschool -, pkgconfig +, pkg-config , which }: @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config qtbase # needs the `moc` tool which ]; diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index b41935c582561..3a12568c4d6d4 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -5,18 +5,14 @@ buildPythonPackage rec { pname = "samsungtvws"; - version = "1.5.3"; + version = "1.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "054rr8hiacdjfxqssnxnd3xp9hh8350zjzzjvh1199bpps4l1l6n"; + sha256 = "09nls4n0lbnr8nj8105lagr9h2my8lb1s2k285kmsbli36ywd8lj"; }; - patchPhase = '' - substituteInPlace setup.py --replace "websocket-client==" "websocket-client>=" - ''; - propagatedBuildInputs = [ websocket_client requests diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 3cd6b2fe3ccd0..78ddb269f3db8 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pkgconfig +, pkg-config , pytest , pytestrunner , cffi @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "a3b43e02d321c09eafa769a6fc2c156f555cab3a7db62175ef2fd21e16cdf20c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; checkInputs = [ pytest pytestrunner ]; propagatedBuildInputs = [ cffi secp256k1 ]; diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index 8c2e22708aabf..00953a8e90902 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "segments"; - version = "2.1.3"; + version = "2.2.0"; disabled = isPy27; src = fetchFromGitHub { owner = "cldf"; repo = pname; rev = "v${version}"; - sha256 = "12lnpk834r3y7hw5x7nvswa60ddh69ylvr44k46gqcfba160hhb0"; + sha256 = "04yc8q79zk09xj0wnal0vdg5azi9jlarfmf2iyljqyr80p79gwvv"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/sentencepiece/default.nix b/pkgs/development/python-modules/sentencepiece/default.nix index 430e61399b2f3..dd324260f8360 100644 --- a/pkgs/development/python-modules/sentencepiece/default.nix +++ b/pkgs/development/python-modules/sentencepiece/default.nix @@ -1,14 +1,14 @@ { buildPythonPackage , stdenv , sentencepiece -, pkgconfig +, pkg-config }: buildPythonPackage rec { pname = "sentencepiece"; inherit (sentencepiece) version src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ sentencepiece.dev ]; sourceRoot = "source/python"; diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index d7791fcf96cba..568ce67d14345 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { export LD=$CC ''; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ]; propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix index 7bdeeffc0869f..9f9f99a1856c8 100644 --- a/pkgs/development/python-modules/sortedcollections/default.nix +++ b/pkgs/development/python-modules/sortedcollections/default.nix @@ -1,24 +1,28 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub +, pytest-cov , pytestCheckHook , sortedcontainers }: buildPythonPackage rec { pname = "sortedcollections"; - version = "1.2.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "grantjenks"; repo = "python-sortedcollections"; rev = "v${version}"; - sha256 = "06ifkbhkj5fpsafibw0fs7b778g7q0gd03crvbjk04k0f3wjxc5z"; + sha256 = "sha256-GkZO8afUAgDpDjIa3dhO6nxykqrljeKldunKMODSXfg="; }; propagatedBuildInputs = [ sortedcontainers ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytest-cov + pytestCheckHook + ]; pythonImportsCheck = [ "sortedcollections" ]; diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index de1b8123dd97a..26013e71158df 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -44,8 +44,7 @@ buildPythonPackage rec { sed -i /pyqtwebengine/d setup.py substituteInPlace setup.py \ --replace "pyqt5<5.13" "pyqt5" \ - --replace "parso==0.7.0" "parso" \ - --replace "jedi==0.17.1" "jedi" + --replace "parso==0.7.0" "parso" ''; postInstall = '' diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 99a6369de5596..2bb700f675577 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.2"; + version = "3.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "83d60e0f0de5e4a367e2ad414dc008c0602e2af35325b09e41c7b2c69808dcc1"; + sha256 = "1linla3za1gb3w0n0k6h3q8in62qhipizff259p14gzmyr95rjjv"; }; propagatedBuildInputs = [ @@ -37,11 +37,6 @@ buildPythonPackage rec { hypothesis ]; - # disabled until upstream updates tests - disabledTests = lib.optionals (lib.versionAtLeast sqlite.version "3.34.0") [ - "test_optimize" - ]; - meta = with lib; { description = "Python CLI utility and library for manipulating SQLite databases"; homepage = "https://github.com/simonw/sqlite-utils"; diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index 63ad1023b871a..2035ce8b26ba9 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }: buildPythonPackage rec { pname = "systemd"; @@ -12,7 +12,7 @@ buildPythonPackage rec { }; buildInputs = [ systemd ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; doCheck = false; diff --git a/pkgs/development/python-modules/url-normalize/default.nix b/pkgs/development/python-modules/url-normalize/default.nix new file mode 100644 index 0000000000000..ea7825d9ffd2b --- /dev/null +++ b/pkgs/development/python-modules/url-normalize/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry +, pytest-cov +, pytest-flakes +, pytest-mock +, pytest-socket +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "url-normalize"; + version = "1.4.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "niksite"; + repo = pname; + rev = version; + sha256 = "09nac5nh94x0n4bfazjfxk96b20mfsx6r1fnvqv85gkzs0rwqkaq"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ + pytest-cov + pytest-flakes + pytest-mock + pytest-socket + pytestCheckHook + ]; + + pythonImportsCheck = [ "url_normalize" ]; + + meta = with lib; { + description = "URL normalization for Python"; + homepage = "https://github.com/niksite/url-normalize"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix index 9ab89e9ac0dda..072fd25c7f07a 100644 --- a/pkgs/development/python-modules/virtkey/default.nix +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }: +{ lib, buildPythonPackage, fetchurl, pkg-config, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }: let majorVersion = "0.63"; @@ -12,7 +12,7 @@ in buildPythonPackage rec { sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xorgproto ]; diff --git a/pkgs/development/python-modules/waqiasync/default.nix b/pkgs/development/python-modules/waqiasync/default.nix new file mode 100644 index 0000000000000..3b8dfce61146a --- /dev/null +++ b/pkgs/development/python-modules/waqiasync/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "waqiasync"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yxls7ywfg954c3vxgnp98qa1b8dsq9b2fld11fb9sx1k4mjc29d"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "waqiasync" ]; + + meta = with lib; { + description = "Python library for http://aqicn.org"; + homepage = "https://github.com/andrey-git/waqi-async"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index c4bc74a58d230..29279cc1a4480 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -39,5 +39,5 @@ buildPythonPackage rec { homepage = "http://wrf-python.rtfd.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mhaselsteiner ]; - }; + }; } diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index dc15c1c01bee0..6649c5f693154 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -6,7 +6,7 @@ , libX11 , wxGTK , wxmac -, pkgconfig +, pkg-config , buildPythonPackage , pyopengl , isPy3k @@ -35,7 +35,7 @@ buildPythonPackage rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ]) ++ (lib.optionals stdenv.isDarwin [ wxmac ]); diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index a1cee317e345a..d72d4aa35d4d9 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi -, pkgconfig +, pkg-config , which , cairo , pango @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; - nativeBuildInputs = [ pkgconfig which doxygen ] + nativeBuildInputs = [ pkg-config which doxygen ] ++ (if stdenv.isDarwin then [ wxmac ] else [ wxGTK ]); buildInputs = [ ncurses libintl ] diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index 6d07f8b5e2817..e4cb6ec79e014 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -3,7 +3,7 @@ , fetchPypi , buildPythonPackage , which -, pkgconfig +, pkg-config , python , isPy27 , pyopengl @@ -30,7 +30,7 @@ buildPythonPackage rec { # https://github.com/wxWidgets/Phoenix/issues/1316 doCheck = false; - nativeBuildInputs = [ which doxygen wxGTK pkgconfig ]; + nativeBuildInputs = [ which doxygen wxGTK pkg-config ]; buildInputs = [ wxGTK.gtk diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 716b13726452c..af7bb7692f66c 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, fetchPypi, buildPythonPackage +{ lib, stdenv, pkg-config, fetchPypi, buildPythonPackage , buildPackages , zstd, pytest }: @@ -13,10 +13,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "/usr/bin/pkg-config" "${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config" + --replace "/usr/bin/pkg-config" "${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zstd ]; setupPyBuildFlags = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 362e7b81da4ed..e79504bdaab38 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -246,7 +246,7 @@ let Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ]; Cardinal = [ pkgs.which ]; chebpol = [ pkgs.fftw ]; - ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ]; + ChemmineOB = [ pkgs.openbabel pkgs.pkg-config ]; cit = [ pkgs.gsl_1 ]; curl = [ pkgs.curl.dev ]; data_table = [pkgs.zlib.dev] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; @@ -257,12 +257,13 @@ let fftwtools = [ pkgs.fftw.dev ]; Formula = [ pkgs.gmp ]; gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ]; - git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkgconfig ]; + git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkg-config ]; GLAD = [ pkgs.gsl_1 ]; glpkAPI = [ pkgs.gmp pkgs.glpk ]; gmp = [ pkgs.gmp.dev ]; graphscan = [ pkgs.gsl_1 ]; gsl = [ pkgs.gsl_1 ]; + gert = [ pkgs.libgit2 ]; haven = [ pkgs.libiconv pkgs.zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl_1 ]; @@ -279,7 +280,8 @@ let mvabund = [ pkgs.gsl_1 ]; mwaved = [ pkgs.fftw.dev ]; ncdf4 = [ pkgs.netcdf ]; - nloptr = [ pkgs.nlopt pkgs.pkgconfig ]; + nloptr = [ pkgs.nlopt pkgs.pkg-config ]; + n1qn1 = [ pkgs.gfortran ]; odbc = [ pkgs.unixODBC ]; pander = [ pkgs.pandoc pkgs.which ]; pbdMPI = [ pkgs.openmpi ]; @@ -329,7 +331,7 @@ let rtiff = [ pkgs.libtiff.dev ]; runjags = [ pkgs.jags ]; RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; - rzmq = [ pkgs.zeromq pkgs.pkgconfig ]; + rzmq = [ pkgs.zeromq pkgs.pkg-config ]; clustermq = [ pkgs.zeromq ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; sdcTable = [ pkgs.gmp pkgs.glpk ]; @@ -385,37 +387,42 @@ let nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; - clustermq = [ pkgs.pkgconfig ]; + clustermq = [ pkgs.pkg-config ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; RcppEigen = [ pkgs.libiconv ]; RCurl = [ pkgs.curl.dev ]; - R2SWF = [ pkgs.pkgconfig ]; + R2SWF = [ pkgs.pkg-config ]; rgl = [ pkgs.libGLU pkgs.libGLU.dev pkgs.libGL pkgs.xlibsWrapper ]; - RGtk2 = [ pkgs.pkgconfig ]; - RProtoBuf = [ pkgs.pkgconfig ]; - Rpoppler = [ pkgs.pkgconfig ]; - XML = [ pkgs.pkgconfig ]; - cairoDevice = [ pkgs.pkgconfig ]; - chebpol = [ pkgs.pkgconfig ]; - fftw = [ pkgs.pkgconfig ]; - gdtools = [ pkgs.pkgconfig ]; + RGtk2 = [ pkgs.pkg-config ]; + RProtoBuf = [ pkgs.pkg-config ]; + Rpoppler = [ pkgs.pkg-config ]; + XML = [ pkgs.pkg-config ]; + cairoDevice = [ pkgs.pkg-config ]; + chebpol = [ pkgs.pkg-config ]; + fftw = [ pkgs.pkg-config ]; + gdtools = [ pkgs.pkg-config ]; jqr = [ pkgs.jq.lib ]; - kza = [ pkgs.pkgconfig ]; - magick = [ pkgs.pkgconfig ]; - mwaved = [ pkgs.pkgconfig ]; - odbc = [ pkgs.pkgconfig ]; - openssl = [ pkgs.pkgconfig ]; - pdftools = [ pkgs.pkgconfig ]; - sf = [ pkgs.pkgconfig pkgs.sqlite.dev pkgs.proj.dev ]; - showtext = [ pkgs.pkgconfig ]; - spate = [ pkgs.pkgconfig ]; - stringi = [ pkgs.pkgconfig ]; - sysfonts = [ pkgs.pkgconfig ]; - systemfonts = [ pkgs.pkgconfig ]; - tesseract = [ pkgs.pkgconfig ]; - Cairo = [ pkgs.pkgconfig ]; - Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; + kza = [ pkgs.pkg-config ]; + magick = [ pkgs.pkg-config ]; + mwaved = [ pkgs.pkg-config ]; + odbc = [ pkgs.pkg-config ]; + openssl = [ pkgs.pkg-config ]; + pdftools = [ pkgs.pkg-config ]; + sf = [ pkgs.pkg-config pkgs.sqlite.dev pkgs.proj.dev ]; + showtext = [ pkgs.pkg-config ]; + spate = [ pkgs.pkg-config ]; + stringi = [ pkgs.pkg-config ]; + sysfonts = [ pkgs.pkg-config ]; + systemfonts = [ pkgs.pkg-config ]; + tesseract = [ pkgs.pkg-config ]; + Cairo = [ pkgs.pkg-config ]; + CLVTools = [ pkgs.gsl ]; + JMcmprsk = [ pkgs.gsl ]; + mashr = [ pkgs.gsl ]; + hadron = [ pkgs.gsl ]; + AMOUNTAIN = [ pkgs.gsl ]; + Rsymphony = [ pkgs.pkg-config pkgs.doxygen pkgs.graphviz pkgs.subversion ]; tcltk2 = [ pkgs.tcl pkgs.tk ]; tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ]; gridGraphics = [ pkgs.which ]; @@ -802,7 +809,7 @@ let openssl = old.openssl.overrideDerivation (attrs: { preConfigure = '' patchShebangs configure - ''; + ''; PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include"; PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto"; }); @@ -857,6 +864,12 @@ let ''; }); + libgeos = old.libgeos.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + protolite = old.protolite.overrideDerivation (attrs: { preConfigure = '' patchShebangs configure diff --git a/pkgs/development/r-modules/patches/qtbase.patch b/pkgs/development/r-modules/patches/qtbase.patch deleted file mode 100644 index 14427b72630ed..0000000000000 --- a/pkgs/development/r-modules/patches/qtbase.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru -x '*~' qtbase_orig/src/Makefile qtbase/src/Makefile ---- qtbase_orig/src/Makefile 2012-03-03 03:57:47.000000000 +0900 -+++ qtbase/src/Makefile 2014-11-01 23:06:51.383876323 +0900 -@@ -10,6 +10,9 @@ - -DR_INCLUDES=${R_INCLUDE_DIR} \ - -DCMAKE_INSTALL_PREFIX=../src; \ - make install -+# I could not control RPATH via CMake. HELP WANTED! -+ patchelf --set-rpath ${CMAKE_LIBRARY_PATH} qtbase.so -+ find ../inst/local/ -executable -type f -print0 | xargs -0 patchelf --set-rpath ${CMAKE_LIBRARY_PATH} - - clean: - rm -rf ../kdebindings-build diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index b4cfa356b2776..a0f251bfe9105 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgconfig, rustPlatform, fetchFromGitHub, openssl }: +{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }: rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index 3cc16c07ec598..56d3554bf7502 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "emma-2.0.5312"; - + src = fetchurl { url = "mirror://sourceforge/emma/emma-2.0.5312.zip"; sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj"; diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 8c75842d1b69a..b8e456b1c1eae 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}: +{stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}: stdenv.mkDerivation rec { pname = "kcov"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; preConfigure = "patchShebangs src/bin-to-c-source.py"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index cbc736e1a26c0..4cd16a80a943b 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake -, pkgconfig, makeWrapper }: +, pkg-config, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "panopticon"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = with qt5; [ qt5.qtbase diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index d4a102ac097b2..6d9543e3836fa 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, mkDerivation # nativeBuildInputs -, qmake, pkgconfig +, qmake, pkg-config # Qt , qtbase, qtsvg, qtwebengine # buildInputs @@ -30,12 +30,12 @@ mkDerivation rec { --replace "include(lib_radare2.pri)" "" ''; - nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkg-config python3 wrapQtAppsHook ]; propagatedBuildInputs = [ python3.pkgs.pyside2 ]; buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ]; qmakeFlags = with python3.pkgs; [ - "CONFIG+=link_pkgconfig" + "CONFIG+=link_pkg-config" "PKGCONFIG+=r_core" # Leaving this enabled doesn't break build but generates errors # at runtime (to console) about being unable to load needed bits. diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a3c02503b3794..c6cc555e05085 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub , buildPackages -, pkgconfig +, pkg-config , libusb-compat-0_1, readline, libewf, perl, zlib, openssl , libuv, file, libzip, xxHash , gtk2 ? null, vte ? null, gtkdialog ? null @@ -78,7 +78,7 @@ let enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ] ++ optional useX11 [ gtkdialog vte gtk2 ] ++ optional rubyBindings [ ruby ] diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index 1d2255027a4ff..1701abeb25fd0 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -9,7 +9,7 @@ , autoconf , automake , libtool -, pkgconfig +, pkg-config , bison , flex , groff @@ -145,7 +145,7 @@ in stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config bison flex groff diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 1443c31192df3..e29f06fca8ef4 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, sqlite, pkgconfig, perl +{ stdenv, fetchgit, sqlite, pkg-config, perl , buildllvmsparse ? true , buildc2xml ? true , llvm ? null, libxml2 ? null @@ -16,7 +16,7 @@ stdenv.mkDerivation { sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [sqlite perl] ++ stdenv.lib.optional buildllvmsparse llvm ++ stdenv.lib.optional buildc2xml libxml2; diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 945f6c80af52f..29ee980b4874a 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libxml2, llvm }: +{ fetchurl, stdenv, pkg-config, libxml2, llvm }: stdenv.mkDerivation rec { name = "sparse-0.5.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 llvm ]; doCheck = true; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index d38f42e4b3382..67adc2438c7f1 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkg-config , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ setupHook pkgconfig ]; + nativeBuildInputs = [ setupHook pkg-config ]; buildInputs = [] ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index e09277e498d2d..c73b7149a361f 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub, git, pkgconfig }: +{ lib, python3, fetchFromGitHub, git, pkg-config }: # Note: # Conan has specific dependency demands; check @@ -72,7 +72,7 @@ in newPython.pkgs.buildPythonApplication rec { ]; checkInputs = [ - pkgconfig + pkg-config git ] ++ (with newPython.pkgs; [ codecov diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index a83281c4e961f..c2ce00eee2177 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }: +{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: -assert guileSupport -> ( pkgconfig != null && guile != null ); +assert guileSupport -> ( pkg-config != null && guile != null ); let version = "4.2.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ./glibc-2.27-glob.patch ]; - nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; + nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ]; buildInputs = stdenv.lib.optionals guileSupport [ guile ]; configureFlags = stdenv.lib.optional guileSupport "--with-guile" diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index f01f38ecd2335..213d43c735ca0 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }: +{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: -assert guileSupport -> ( pkgconfig != null && guile != null ); +assert guileSupport -> ( pkg-config != null && guile != null ); let version = "4.3"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ./impure-dirs.patch ]; - nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; + nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ]; buildInputs = stdenv.lib.optionals guileSupport [ guile ]; configureFlags = stdenv.lib.optional guileSupport "--with-guile" diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 890c457da059a..74d96d4af002f 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { # 0.45 update enabled tests but they are failing doCheck = false; - # checkInputs = [ ninja pkgconfig ]; + # checkInputs = [ ninja pkg-config ]; # checkPhase = "python ./run_project_tests.py"; postFixup = '' diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 628e0c4797b38..ebdad7be8fa53 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fuse3, pkgconfig, pcre }: +{ stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }: stdenv.mkDerivation rec { pname = "tup"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse3 pcre ]; configurePhase = '' diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index 3008c15d848a7..cf2e565fe4582 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform +{ stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform , CoreServices, Security }: @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0i9xp7vd1rp6xgkbbrspm3qq4hxwfwa00di3k73z1x64d3d8r5fm"; - nativeBuildInputs = [ openssl perl pkgconfig ]; + nativeBuildInputs = [ openssl perl pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index 564c5dcbcb53e..f7c806c89a384 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl , darwin }: @@ -17,7 +17,7 @@ buildRustPackage rec { cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [] ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ]) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index f993faf544d7a..855fd879a8e22 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "6.7.2"; + version = "6.7.3"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0c5alf2a0088i25mglla9dl4m3wr5y8pnl5cczgn06sz8qp9a0s0"; + sha256 = "sha256-XaoM/1YuHBl8ndPz3EByW1X0CzTuvJ5ju11mStbJnEU="; }; - vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; + vendorSha256 = "sha256-xeptlcJLj+R1BdC8Rdi3hsJVxdrmvfeTMsrhMNGrXi8="; doCheck = false; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index a0f69033923c7..54836216c54d4 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.0.8"; + version = "2.0.9"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-7dNJUMZu6YY3076cnjWHRisJZVn1NPRH1VC+cJjfI/8="; + sha256 = "sha256-jqSv9VBLotl6YVWgWNznvTThRIiMUStQ0WbN6u01b1c="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index 6a447dd57c929..a1ae7cfc86ebe 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkgconfig, Security +{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security , sqliteSupport ? true, sqlite , postgresqlSupport ? true, postgresql , mysqlSupport ? true, mysql, zlib, libiconv @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ optional stdenv.isDarwin Security ++ optional (stdenv.isDarwin && mysqlSupport) libiconv diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 54c37fa618370..a5bbfbc908856 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool, gnome3 +{ stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 , python2Packages }: python2Packages.buildPythonApplication rec { @@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec { sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"; }; - nativeBuildInputs = [ intltool pkgconfig libxslt.dev ]; + nativeBuildInputs = [ intltool pkg-config libxslt.dev ]; buildInputs = [ libxslt ]; configureFlags = [ "--disable-scrollkeeper" ]; diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 8d4480945bda3..f3b6639420710 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { MkDocs is a fast, simple and downright gorgeous static site generator that's geared towards building project documentation. Documentation source files are written in Markdown, and configured with a single YAML configuration file. - + MkDocs can also be used to generate general-purpose Websites. ''; homepage = "http://mkdocs.org/"; diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix index c052db92e0c7f..c64ab8534daa7 100644 --- a/pkgs/development/tools/drm_info/default.nix +++ b/pkgs/development/tools/drm_info/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , libdrm, json_c, pciutils -, meson, ninja, pkgconfig +, meson, ninja, pkg-config }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libdrm json_c pciutils ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index e424c5ce70b7e..025b7413cebca 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -21,7 +21,7 @@ with lib; let - pVersion = "1.10.0.20200225"; + pVersion = "1.11.0.20201202"; pVersionTriple = splitVersion pVersion; majorVersion = elemAt pVersionTriple 0; minorVersion = elemAt pVersionTriple 1; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; - sha256 = "11cg01gjjvlm6lr6z6rwqs1r31xx5pxddnz55ca0s33lrnywf9fx"; + sha256 = "sha256-HtIKcGfdjb2wovGGSxv16ud7y1cPQFBn77pkhiekAkI="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 79c8236a065d9..beafe0654db8f 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -11,7 +11,7 @@ , gettext , libxml2 , libxslt -, pkgconfig +, pkg-config , xmlto , acl @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { gettext libxml2 libxslt - pkgconfig + pkg-config xmlto ]; diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix index 71365c01bfdd9..46a132389612a 100644 --- a/pkgs/development/tools/fmbt/default.nix +++ b/pkgs/development/tools/fmbt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, autoreconfHook, pkgconfig, makeWrapper +{ stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper , flex , gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz , tesseract, gts, libXtst @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "1jb9nb2mipc5cg99a80dny4m06vz2zral0q30fv75rz2cb6ja4zp"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper + nativeBuildInputs = [ autoreconfHook pkg-config flex makeWrapper python.pkgs.wrapPython ]; buildInputs = [ python gettext libedit glib imagemagick libxml2 boost - gnuplot graphviz tesseract gts + gnuplot graphviz tesseract gts ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 500c9a55c1d85..2b775de4e43d9 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "0fg0fijghcz7hvbc9y8dfksz0qmsz700kc2mfb03y90kja99v68y"; + sha256 = "sha256-d5B+SSUXtOD4x+dChQsUCkiHuHcW3lOrL4QhQekY7cA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 3507131082e8b..004125adead3a 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, rustPlatform -, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2, libssh2 +, openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2 }: with rustPlatform; @@ -36,7 +36,7 @@ buildRustPackage rec { LIBGIT2_SYS_USE_PKG_CONFIG = true; LIBSSH2_SYS_USE_PKG_CONFIG = true; - nativeBuildInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkg-config perl ]; buildInputs = [ openssl zlib curl libgit2 libssh2 ]; postBuild = '' diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 84b3d2a6b1ee0..76c75af2d5f88 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage +{ stdenv, fetchFromGitHub, glfw, pkg-config, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi , libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook , Cocoa @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7"; }; - nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook python3Packages.six ]; + nativeBuildInputs = [ pkg-config ensureNewerSourcesForZipFilesHook python3Packages.six ]; buildInputs = [ glfw libGLU glfw libXrandr libXdamage libXext libXrender libXinerama libXcursor libXxf86vm diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index e0dc9ecda80ab..f63a46793a375 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -1,7 +1,7 @@ { stdenv , glib , autoreconfHook -, pkgconfig +, pkg-config , systemd , fetchFromGitLab }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 492430cc7c702..303040768c71d 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor +{ stdenv, lib, fetchFromGitHub, scons, pkg-config, libX11, libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio ? null , libXi ? null, libXext, libXfixes, freetype, openssl , alsaLib, libGLU, zlib, yasm ? null }: @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { sha256 = "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ scons libX11 libXcursor libXinerama libXrandr libXrender libXi libXext libXfixes freetype openssl alsaLib libpulseaudio diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 3e3ae19a382a8..ece194f00030a 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "0w0s2qvwnb69s18gvkkbwsx9zh7yi8ksnnrfpl8az8sybk6m1iaz"; + sha256 = "sha256-eJxrdR3JYqF+GexcwnyHV4xO75stEDNFzxDtky7PVc8="; }; - vendorSha256 = "09cifc69z1ashjw1mqgbi0gh90h2sypqyl0jswxxcqk89ibgy3am"; + vendorSha256 = "sha256-VQ3/VkxoYtY71xJQj6/XAoIEH4jr4Rq4hFqFnwxzkSU="; doCheck = false; diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 15233979e158e..33572c70b13ff 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }: +{ fetchurl, stdenv, guile, guile-lib, libffi, pkg-config, glib }: stdenv.mkDerivation rec { pname = "g-wrap"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # Note: Glib support is optional, but it's quite useful (e.g., it's used by # Guile-GNOME). diff --git a/pkgs/development/tools/halfempty/default.nix b/pkgs/development/tools/halfempty/default.nix index c8c267f918724..5b96d338f52fb 100644 --- a/pkgs/development/tools/halfempty/default.nix +++ b/pkgs/development/tools/halfempty/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, util-linux, scowl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, util-linux, scowl }: stdenv.mkDerivation rec { pname = "halfempty"; - version = "0.30"; + version = "0.40"; src = fetchFromGitHub { owner = "googleprojectzero"; repo = pname; rev = "v${version}"; - sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc"; + sha256 = "sha256-YGq6fneAMo2jCpLPrjzRJ0eeOsStKaK5L+lwQfqcfpY="; }; - nativeBuildInputs = [ pkgconfig util-linux ]; + nativeBuildInputs = [ pkg-config util-linux ]; buildInputs = [ glib ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index feaea18be18be..5b07f982aacd5 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, pkgconfig, libftdi1 +, pkg-config, libftdi1 , python3, pypy3 # PyPy yields large improvements in build time and runtime performance, and @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sha256 = "0vxhqs2fampglg3xlfwb35229iv96kvlwp1gyxrdrmlpznhkqdrk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ passthru.pythonPkg libftdi1 ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 50a349d8ff716..8e549b54f1ff6 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkgconfig, which +{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkg-config, which , openssl, readline, libyaml, zlib }: crystal.buildCrystalPackage rec { @@ -16,7 +16,7 @@ crystal.buildCrystalPackage rec { buildInputs = [ libyaml openssl readline zlib ]; - nativeBuildInputs = [ makeWrapper pkgconfig which ]; + nativeBuildInputs = [ makeWrapper pkg-config which ]; # tests are failing due to our sandbox doCheck = false; diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 85c643537af81..0d0f6824ce770 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "ineffassign-unstable"; version = "2018-09-09"; - rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; + rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; goPackagePath = "github.com/gordonklaus/ineffassign"; excludedPackages = ''testdata''; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index a9ba82e53f6c9..11f22fbef3fb8 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.58.0"; + version = "0.62.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256:08haij8nzzf2759ddzx0i6808g2if0v2fc21mlz00kmggjc03xz3"; + sha256 = "sha256-Ffh08477Wc4yEUo2YBM2yxC288Kq05ZkKXf/XSW2iXc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix index 8592e38de7f7e..c3553a5b5010c 100644 --- a/pkgs/development/tools/jo/default.nix +++ b/pkgs/development/tools/jo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkgconfig}: +{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkg-config}: stdenv.mkDerivation rec { pname = "jo"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook pandoc pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pandoc pkg-config ]; meta = with stdenv.lib; { description = "A small utility to create JSON objects"; diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index 6e7db6b35c6bd..01323281dfe53 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }: +{ stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }: stdenv.mkDerivation rec { pname = "kafkacat"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib rdkafka yajl ]; diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 4e104a79d5d23..0846cc9d87a6d 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi1, check +{ stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check , libserialport, librevisa, doxygen, glibmm, python , version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4" }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa doxygen glibmm python ]; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index e78afc1a86147..d97afa5604f34 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: +{ stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { name = "libsigrokdecode-0.5.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib python3 libsigrok check ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix index a05615a22d9ed..1577392c8bca1 100644 --- a/pkgs/development/tools/makerpm/default.nix +++ b/pkgs/development/tools/makerpm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }: +{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "1.0"; pname = "makerpm"; diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index 5c8924ee21beb..d6f34a0a9d215 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib }: +{ stdenv, fetchurl, intltool, pkg-config, glib }: stdenv.mkDerivation { name = "gnu-mdk-1.3.0"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "https://ftp.gnu.org/gnu/mdk/v1.3.0/mdk-1.3.0.tar.gz"; sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool glib ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 0937ccb598714..729ab88c680bd 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.8"; + version = "0.9.10"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1gn7v1478sqhz4hv53pgvaw2nqziyiavvhn5q152lkzyvghq08wk"; + outputHash = "1i91jq1p27kkzxk57mm438sablnrx8j5pfyl0yg64wzrashba1xa"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 23235499cfbda..1bf3a0c2832f9 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkgconfig, perl, guile, libxml2 }: +{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }: stdenv.mkDerivation rec { pname = "autogen"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; nativeBuildInputs = [ - which pkgconfig perl autoreconfHook/*patches applied*/ + which pkg-config perl autoreconfHook/*patches applied*/ ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # autogen needs a build autogen when cross-compiling buildPackages.buildPackages.autogen buildPackages.texinfo diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix index b1e627e7aa8c2..24a0455042805 100644 --- a/pkgs/development/tools/misc/awf/default.nix +++ b/pkgs/development/tools/misc/awf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ gtk2 gtk3 ]; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 03539eb2cc84b..e768bdde146b7 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }: +{ stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }: 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 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 48ae364a26ebf..c49187273c465 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig +, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config , python, pythonPackages }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gcc-arm-embedded pkgconfig + gcc-arm-embedded pkg-config ]; buildInputs = [ diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix index 6ba8064c094dc..6491ff83ec786 100644 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }: +{ stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }: stdenv.mkDerivation rec { pname = "bsdbuild"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl mandoc ed ]; - nativeBuildInputs = [ pkgconfig libtool gettext ]; + nativeBuildInputs = [ pkg-config libtool gettext ]; prePatch = '' #ignore unfamiliar flags diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index f8cad56f09958..43392b2a89cba 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }: +{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkg-config }: stdenv.mkDerivation rec { pname = "coccinelle"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = with ocamlPackages; [ ocaml findlib menhir ocaml_pcre pycaml - python ncurses pkgconfig + python ncurses pkg-config ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 53ba94c7e81e6..6ee366ae2c64d 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,5 +1,5 @@ { stdenv -, pkgconfig +, pkg-config , fetchurl , meson , ninja @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { itstool meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index 9af9ddc0df7cb..c570b1a7997ad 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ stdenv, fetchurl, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "dfu-util"; version = "0.10"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; src = fetchurl { diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 3894ed58728d7..8a315a61e98ee 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand +{ stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand , gcc, autoconf, automake, which, procps, libiberty_static , runtimeShell , sysconfDir ? "" # set this parameter to override the default value $out/etc @@ -17,8 +17,8 @@ let sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake which procps libiberty_static]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [popt avahi pkg-config python gtk2 autoconf automake which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 3c6fa76616fcc..a1528cfca3e6c 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -7,16 +7,16 @@ stdenv.mkDerivation { sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2"; }; buildInputs = [ python ]; - + makeFlags = [ "PREFIX=$(out)" ]; - + preInstall = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 cp manlifter $out/bin cp manlifter.1 $out/share/man/man1 ''; - + meta = { description = "Lift documents in nroff markups to XML-DocBook"; homepage = "http://www.catb.org/esr/doclifter"; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index d1211c9fcecde..198bbabb19f27 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }: +{ stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }: stdenv.mkDerivation rec { name = "eggdbus-0.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib dbus dbus-glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix index e5cd2e0e2ddfb..3ec4d0f8efb4c 100644 --- a/pkgs/development/tools/misc/fujprog/default.nix +++ b/pkgs/development/tools/misc/fujprog/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , IOKit , libftdi1 , libusb-compat-0_1 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index d9bac6e3c83c3..f77ab03b8107b 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ { stdenv, targetPackages # Build time -, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ./darwin-target-match.patch ]; - nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]; + nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ]; buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ] ++ stdenv.lib.optional pythonSupport python3 diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index b1e107368ba77..e34b5733b2234 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, bison, flex, gnome3 }: +{ stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }: stdenv.mkDerivation rec { pname = "gob2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # configure script looks for d-bus but it is only needed for tests - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib bison flex ]; passthru = { diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index 182d28375b610..5a3cdad80407e 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin +{ stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin , makeWrapper }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ globalplatform pcsclite makeWrapper ]; postFixup = '' diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 6cdcce77ffdca..2b2a831894722 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, pkgconfig }: +{stdenv, fetchurl, gtk2, pkg-config }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; meta = { diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index 82ee291727782..feda9faf59aab 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, pkgconfig, libintl }: +{ stdenv, fetchurl, gtk2, pkg-config, libintl }: stdenv.mkDerivation { name = "gtkperf-0.40.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libintl ]; # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index 10ecd8174af40..837128e297744 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }: +{ stdenv, lib, pkg-config, openssl, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "hydra-cli"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index eb8ffb472852f..7aaee31b50422 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -1,5 +1,5 @@ { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub -, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx +, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx , top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar @@ -92,7 +92,7 @@ in stdenv.mkDerivation rec { gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 19556aeafc01d..9f442cfee1486 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev +{ stdenv, fetchurl, pkg-config, libdrm, libpciaccess, cairo, xorgproto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod , procps, utilmacros, gtk-doc, openssl, peg, elfutils }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "04fx7xclhick3k7fyk9c4mn8mxzf1253j1r0hrvj9sl40j7lsia0"; }; - nativeBuildInputs = [ pkgconfig utilmacros ]; + nativeBuildInputs = [ pkg-config utilmacros ]; buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps gtk-doc openssl peg elfutils ]; diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index fa413511dc01b..ea82b0a4e6eab 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses, pythonPackages }: +{ stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }: stdenv.mkDerivation rec { basename = "kconfig-frontends"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ]; configureFlags = [ diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 03e370aeeb4ba..87cf20c0cb847 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: +{ stdenv, fetchurl, pkg-config, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: stdenv.mkDerivation rec { pname = "lttng-tools"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index abcc476d59471..ab5fa418dc790 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }: +{ stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }: stdenv.mkDerivation rec { name = "lttv-1.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 popt babeltrace ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 0e28f729fe9df..0990b8d973368 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2, gnome3 }: +{ stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }: stdenv.mkDerivation rec { pname = "msitools"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac"; }; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [ glib libgsf libuuid gcab bzip2 ]; passthru = { diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 84f6c330f8c56..9b8f01b24e710 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.29.2"; src = fetchurl { - url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz"; + url = "https://pkg-config.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; }; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 843059b335628..9c4fa70891041 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }: +{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkg-config, glib, openssl, darwin }: rustPlatform.buildRustPackage rec { version = "0.2.14"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=all" ]; nativeBuildInputs = [ - pkgconfig cargo rustc + pkg-config cargo rustc ]; buildInputs = [ openssl diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 616a1cbc3fbd0..fb9b19660158d 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config , libmysqlclient, libaio }: @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "sysbench"; version = "1.0.20"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libmysqlclient libaio ]; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 0bf902eccff8d..b086b3cdc48f0 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv, jansson }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }: stdenv.mkDerivation { pname = "universal-ctags"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; + nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ]; buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; # to generate makefile.in diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 18926a85528cc..5cbe627b55375 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, makeWrapper +{ stdenv, lib, fetchurl, pkg-config, makeWrapper , libusb1, tcl, util-linux, coreutils, bash }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ libusb1 tcl ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; meta = with stdenv.lib; { description = "A mode switching tool for controlling 'multi-mode' USB devices"; diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix index 191b172134952..2f51f0d9338b3 100644 --- a/pkgs/development/tools/nemiver/default.nix +++ b/pkgs/development/tools/nemiver/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , fetchpatch -, pkgconfig +, pkg-config , gnome3 , gtk3 , libxml2 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libxml2 intltool itstool - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 177fa96f5b963..8183e106aa7ba 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, fetchpatch }: +{ stdenv, fetchurl, ocaml, findlib }: if stdenv.lib.versionOlder ocaml.version "4.08" then throw "dune is not available for OCaml ${ocaml.version}" @@ -6,25 +6,17 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "0pcjf209gynjwipnpplaqyvyivnawqiwhvqnivhkybisicpqyln3"; + sha256 = "12yly2lp93ijhy7b72p6y2q3cr3yy3hk7rlmrh072py8a6d4s407"; }; buildInputs = [ ocaml findlib ]; buildFlags = "release"; - patches = [ - # Fix setup.ml configure path. Remove with the next release. - (fetchpatch { - url = "https://github.com/ocaml/dune/commit/8a3d7f2f2015b71384caa07226d1a89dba9d6c25.patch"; - sha256 = "0dw4q10030h9xcdlxw2vp7qm0hd2qpkb98rir5d55m9vn65w8j28"; - }) - ]; - dontAddPrefix = true; installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 6a3c0c20d85f2..b840cb7736b7b 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { # # configureFlags = if transitional then "--transitional" else "--strict"; # -# buildFlags = [ "world.opt" ]; +# buildFlags = [ "world.opt" ]; meta = { description = "Omake build system"; diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index 086cd818a4673..82ed82a67bdce 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchgit , autoreconfHook -, pkgconfig +, pkg-config , qtbase }: @@ -18,7 +18,7 @@ mkDerivation { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index f97611c778535..c09331de59804 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "03iy4a5jlsmmzn8cpyp35sc2kgz6shg18ah0qdzkadqqalqlldy8"; + sha256 = "sha256-xYG605Z8WGFH5byJA+sHPBjBmWi8b+TTtWRnQnmYN/4="; }; - vendorSha256 = "0dls086lw3sbal4rf0l3xb0sp6g393n9ylkpzppp75myj7v900vv"; + vendorSha256 = "sha256-0ZowddIiVHVg1OKhaCFo+vQKcUe6wZ6L0J8RdMvZyGk="; doCheck = false; diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index 349a6b10104ee..e9dd2f08d3aec 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , autoreconfHook , libgsf -, pkgconfig +, pkg-config , openssl , curl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3"; }; - nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ]; + nativeBuildInputs = [ autoreconfHook libgsf pkg-config openssl curl ]; meta = with lib; { homepage = "https://github.com/mtrojnar/osslsigncode"; diff --git a/pkgs/development/tools/parsing/antlr/4.8.nix b/pkgs/development/tools/parsing/antlr/4.8.nix index 411364e203bf3..acf46a4401f46 100644 --- a/pkgs/development/tools/parsing/antlr/4.8.nix +++ b/pkgs/development/tools/parsing/antlr/4.8.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, jre -, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }: +, fetchFromGitHub, cmake, ninja, pkg-config, libuuid, darwin }: let version = "4.8"; @@ -18,7 +18,7 @@ let outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = stdenv.lib.optional stdenv.isLinux libuuid ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index b6cb2447710c8..0a9dfdec0163f 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, glib, pkgconfig, python, scons }: +{ lib, stdenv, fetchgit, glib, pkg-config, python, scons }: stdenv.mkDerivation { pname = "hammer"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib python scons ]; meta = with lib; { diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 22627f3df1bc6..3106575891410 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -56,7 +56,7 @@ self: super: av = super.av.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig + pkgs.pkg-config ]; buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; } @@ -234,8 +234,8 @@ self: super: h5py = super.h5py.overridePythonAttrs ( old: if old.format != "wheel" then rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; + buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkg-config self.cython ]; configure_flags = "--hdf5=${pkgs.hdf5}"; postConfigure = '' ${self.python.executable} setup.py configure ${configure_flags} @@ -386,7 +386,7 @@ self: super: ); libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: { - nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkg-config ]; propagatedBuildInputs = [ pkgs.libvirt ]; }); @@ -421,7 +421,7 @@ self: super: lxml = super.lxml.overridePythonAttrs ( old: { - nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; + nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkg-config libxml2.dev libxslt.dev ]; buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; } ); @@ -452,7 +452,7 @@ self: super: ++ lib.optional stdenv.isDarwin [ Cocoa ]; nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig + pkgs.pkg-config ]; postPatch = '' @@ -637,7 +637,7 @@ self: super: pillow = super.pillow.overridePythonAttrs ( old: { - nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; + nativeBuildInputs = [ pkgs.pkg-config ] ++ old.nativeBuildInputs; buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; } ); @@ -706,7 +706,7 @@ self: super: nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython - pkgs.pkgconfig + pkgs.pkg-config pkgs.cmake ]; @@ -755,7 +755,7 @@ self: super: nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.meson pkgs.ninja - pkgs.pkgconfig + pkgs.pkg-config ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ @@ -822,7 +822,7 @@ self: super: pygobject = super.pygobject.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; } ); @@ -873,7 +873,7 @@ self: super: format = "other"; nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig + pkgs.pkg-config pkgs.qt5.qmake pkgs.xorg.lndir pkgs.qt5.qtbase @@ -1012,7 +1012,7 @@ self: super: pyzmq = super.pyzmq.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; } ); @@ -1117,7 +1117,7 @@ self: super: tables = super.tables.overridePythonAttrs ( old: { HDF5_DIR = "${pkgs.hdf5}"; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; } ); diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index ca346cd1f1491..335b9bef4cdd5 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, pkgconfig +, fetchurl, pkg-config , libbfd, popt, zlib, linuxHeaders, libiberty_static , withGUI ? false, qt4 ? null }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --replace "/bin/cp" "${buildPackages.coreutils}/bin/cp" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbfd zlib popt linuxHeaders libiberty_static ] ++ stdenv.lib.optionals withGUI [ qt4 ]; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 6974800e87f82..8144bae48c86f 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -10,7 +10,7 @@ , libxml2 , meson, ninja , pango -, pkgconfig +, pkg-config , polkit , shared-mime-info , systemd @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config shared-mime-info wrapGAppsHook gnome3.adwaita-icon-theme diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index c1f38a6241843..c978d8bd96a76 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper +{ fetchgit, pkg-config, gettext, runCommand, makeWrapper , elfutils, kernel, gnumake, python2, python2Packages }: @@ -17,7 +17,7 @@ let pname = "systemtap"; inherit version; src = fetchgit { inherit url rev sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ elfutils gettext python2 python2Packages.setuptools ]; enableParallelBuilding = true; }; diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/development/tools/pxview/default.nix index 30d109beb9702..20049215a70d8 100644 --- a/pkgs/development/tools/pxview/default.nix +++ b/pkgs/development/tools/pxview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }: +{ lib, stdenv, fetchurl, pkg-config, perl, perlPackages, pxlib }: stdenv.mkDerivation rec { pname = "pxview"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "--with-pxlib=${pxlib.out}" ]; diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 5edd73eba9506..a8973cd508430 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkgconfig, libunwind, python3 }: +{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3 }: rustPlatform.buildRustPackage rec { pname = "py-spy"; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 464178a11d628..ec3fcf9cd3949 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }: +{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }: stdenv.mkDerivation rec { pname = "rtags"; version = "2.38"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ llvmPackages.llvm openssl emacs ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/development/tools/rust/cargo-binutils/Cargo.lock b/pkgs/development/tools/rust/cargo-binutils/Cargo.lock new file mode 100644 index 0000000000000..a1e4cdde3b877 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-binutils/Cargo.lock @@ -0,0 +1,419 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "addr2line" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" + +[[package]] +name = "aho-corasick" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "backtrace" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "cargo-binutils" +version = "0.3.3" +dependencies = [ + "anyhow", + "cargo_metadata", + "clap", + "regex", + "rustc-cfg", + "rustc-demangle", + "rustc_version", + "serde", + "toml", +] + +[[package]] +name = "cargo_metadata" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3a567c24b86754d629addc2db89e340ac9398d07b5875efcff837e3878e17ec" +dependencies = [ + "semver 0.10.0", + "serde", + "serde_json", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "gimli" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" + +[[package]] +name = "hermit-abi" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +dependencies = [ + "libc", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" + +[[package]] +name = "memchr" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + +[[package]] +name = "miniz_oxide" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "object" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" + +[[package]] +name = "proc-macro2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", + "thread_local", +] + +[[package]] +name = "regex-syntax" +version = "0.6.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" + +[[package]] +name = "rustc-cfg" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ad221fe7cd09334f8735dcc157b1178e343f43dfaefcd1b09d7fd4fc0921b6f" +dependencies = [ + "failure", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190" +dependencies = [ + "semver-parser", + "serde", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "syn" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "synstructure" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thread_local" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix new file mode 100644 index 0000000000000..b79611ff5ecbc --- /dev/null +++ b/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform, runCommand }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-binutils"; + version = "0.3.3"; + + # Upstream doesn't commit `Cargo.lock`, see https://github.com/rust-embedded/cargo-binutils/pull/99 + src = let + repo = fetchFromGitHub { + owner = "rust-embedded"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Dgn+f4aSsDSh+RC8yvt3ydkdtwib5jEVsnZkod5c7Vo="; + }; + in runCommand "source" { } '' + cp -R ${repo} $out + chmod -R +w $out + cp ${./Cargo.lock} $out/Cargo.lock + ''; + + cargoSha256 = "sha256-Zrl269PacPi81TrGTIDzmVndgGY5i5lYyspiOj43rpw="; + + meta = with lib; { + description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain"; + homepage = "https://github.com/rust-embedded/cargo-binutils"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ stupremee ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 63aadf4f1fcb7..4c2ee35bdf726 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -2,7 +2,7 @@ , lib , rustPlatform , fetchFromGitHub -, perl, pkgconfig, openssl, Security, libiconv, curl +, perl, pkg-config, openssl, Security, libiconv, curl }: rustPlatform.buildRustPackage rec { @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 1a5273feeca5e..9daa3b251e8e3 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, rustPlatform, pkgconfig, openssl +, rustPlatform, pkg-config, openssl # testing packages , cargo-insta # darwin dependencies @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { ''; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. # CFURLSetResourcePropertyForKey is defined in the headers but there's no diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 21b986f9a5daf..3a4c4c44ae7d4 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config, libiconv, curl }: rustPlatform.buildRustPackage rec { pname = "cargo-generate"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 6f06648a057a1..56e38f78ca05a 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform -, pkgconfig, curl, libgit2, openssl, Security }: +, pkg-config, curl, libgit2, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-raze"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1z20xc508a3slc1ii3hy09swvlyib14zwf9akxc0h24d5m48as1c"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl libgit2 openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index df30ec5d3604a..9da28921ea766 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, CoreServices, Security, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "17931z5nbigfzvvhr6k64s2j9p1sp9nvmy5fyf92j3ci02dplm5c"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ]; diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 882622bff7b88..b2340b21689c0 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig +{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkg-config , darwin }: let @@ -16,7 +16,7 @@ in rustPlatform.buildRustPackage rec { cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index a031d552253bb..8ff596d475c8f 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2021-01-04"; + rev = "2021-01-18"; version = "unstable-${rev}"; - sha256 = "sha256-VRnmx5SfmdMIVQjixWBSaMioqFUlo9VOIKsPvC5t3t4="; - cargoSha256 = "sha256-X63FjFpfwjvQayw4X6Sqfyh4FHsc3flE3OtQpzqowjc="; + sha256 = "sha256-eFiZdFBJZuBfwH8tqZTayNaWiq8fWUzlzBRRvdPbmW8="; + cargoSha256 = "sha256-rRoo0TrXa03okJ8wktzVSAn8tRO1d9kcDprotZ1hZ6w="; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index dcb435d514031..fa9b39e84a787 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform, makeWrapper -, pkgconfig, curl, zlib, Security, CoreServices }: +, pkg-config, curl, zlib, Security, CoreServices }: let libPath = lib.makeLibraryPath [ @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1zkrrg5m0j9rk65g51v2zh404529p9z84qqb7bfyjmgiqlnh48ig"; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ curl zlib diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix index 97f94e2d61b51..2449769e07f3a 100644 --- a/pkgs/development/tools/scaff/default.nix +++ b/pkgs/development/tools/scaff/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitLab, pkgconfig, openssl }: +{ lib, rustPlatform, fetchFromGitLab, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "scaff"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; meta = with lib; { diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index 79b4a6acdf63d..b4173c7aebb0e 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }: +{ lib, stdenv, fetchurl, pkg-config, glib, libsigrok, libsigrokdecode }: stdenv.mkDerivation rec { name = "sigrok-cli-0.7.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libsigrok libsigrokdecode ]; meta = with lib; { diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 5fd99f1407483..987765a321765 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut +{ lib, stdenv, fetchFromGitHub, libelf, which, pkg-config, freeglut , avrgcc, avrlibc , libGLU, libGL , GLUT }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; - nativeBuildInputs = [ which pkgconfig avrgcc ]; + nativeBuildInputs = [ which pkg-config avrgcc ]; buildInputs = [ libelf freeglut libGLU libGL ] ++ stdenv.lib.optional stdenv.isDarwin GLUT; diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index 009172d772519..ae9c7c833928c 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, zlib }: stdenv.mkDerivation { name = "sunxi-tools-20181113"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1yhl6jfl2cws596ymkyhm8h9qkcvp67v8hlh081lsaqv1i8j9yig"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 zlib ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix index cb3ed5217f08a..823496693f25f 100644 --- a/pkgs/development/tools/swiftformat/default.nix +++ b/pkgs/development/tools/swiftformat/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "swiftformat"; - version = "0.44.9"; + version = "0.47.10"; src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; rev = version; - sha256 = "0zajvbaf3r02k53lv5zdxf13apc6chnjmj69zkyac48lpnpbcxq6"; + sha256 = "1gqxpymbhpmap0i2blg9akarlql4mkzv45l4i212gsxcs991b939"; }; preConfigure = "LD=$CC"; diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 927b792b6ba42..2dcc32e7389d6 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: +{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkg-config, freetype, Carbon, AppKit, capstone }: stdenv.mkDerivation rec { pname = "tracy"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0s39kimpc03x48kh7lyhblfs8y4mdzcz3g7f806h90x7zndsmfxj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glfw capstone ] ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 9441a3217b77a..5c41a1dac931b 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { version = "${ver}x${build}"; src = fetchurl { - url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; + url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv"; }; diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index 73ab21716b7e4..a45ced8a49222 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pantheon -, pkgconfig +, pkg-config , vala , gettext , wrapGAppsHook @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index 5c3b2abe4a47a..315a896929dc2 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub -, cmake, git, pkgconfig, wget, zip +, cmake, git, pkg-config, wget, zip , qtbase, qtx11extras , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf @@ -26,7 +26,7 @@ mkDerivation { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ git wget zip diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 48e3b39b9557b..fdf66004deb38 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -8,7 +8,7 @@ , vulkan-headers , vulkan-loader , glslang -, pkgconfig +, pkg-config , xlibsWrapper , libxcb , libXrandr @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config cmake python3 ]; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 5794f5cc335eb..0024c43e05df1 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, openssl, pkgconfig, stdenv, curl, Security +{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security , runCommand }: @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ''; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; cargoSha256 = "1wrfly7c3an1mjqm7v13mlvx57hwlcxfjijkimicck04q6qdhbp6"; cargoBuildFlags = [ "-p" pname ]; diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index c5e5190feb37a..c2a70f2de29a6 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , rustPlatform -, pkgconfig +, pkg-config , libressl , curl , Security @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ # LibreSSL works around segfault issues caused by OpenSSL being unable to diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 63f2b0e4933d1..2acbf13e2789d 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre -, libtool, pkgconfig, openssl +, libtool, pkg-config, openssl , confFile ? config.watchman.confFile or null , withApple ? stdenv.isDarwin, CoreServices }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal"; }; - nativeBuildInputs = [ autoconf automake pkgconfig libtool ]; + nativeBuildInputs = [ autoconf automake pkg-config libtool ]; buildInputs = [ pcre openssl ] ++ lib.optionals withApple [ CoreServices ]; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 479494e515d7b..878661e74ce0b 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "3.4.1"; + version = "4.4.1"; src = fetchFromGitHub { owner = "mikefarah"; - rev = version; + rev = "v${version}"; repo = "yq"; - sha256 = "09kcqa15assjhp3kdffa3yhc2vykinzgscjzg996qa85kjircy9b"; + sha256 = "sha256-U1nMSwWKzPvyvxUx8J50AMB251ET4s9xcSrjGGjkYus="; }; - vendorSha256 = "0l5bhbp8dfq04hb4xcpx96ksfwx4xvk0pj5ma00rk3z913ikygcd"; + vendorSha256 = "sha256-CUELy6ajaoVzomY5lMen24DFJke3IyFzqWYyF7sws5g="; doCheck = false; @@ -19,7 +19,7 @@ buildGoModule rec { postInstall = '' for shell in bash fish zsh; do - $out/bin/yq shell-completion --variation $shell > yq.$shell + $out/bin/yq shell-completion $shell > yq.$shell installShellCompletion yq.$shell done ''; diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index 549cc5046c4ce..05c1b62477b0a 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "yuicompressor"; version = "2.4.8"; - + src = fetchurl { url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar"; sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \ "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor" ''; - + meta = with lib; { description = "A JavaScript and CSS minifier"; homepage = "http://yui.github.io/yuicompressor/"; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 63d60547bec02..96893870fa9c4 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.154"; + version = "0.0.161"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "0hf33jm0ph4a79jg9irz0ynvdyah942cm5hb6j04hmg24x1037jm"; + sha256 = "sha256-mM+jo1zKfA8u0IxtruQp4va0f7PldJQJV1/ypF1K0fI="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "0fmbwk0j2aayvi3cx8cfp4b3h89v88qm4kslbmhlj8mny9rd7lys"; + vendorSha256 = "sha256-8rzXltsAXF9qIX1BrBwwi+145nQcXjrEBdIXgSgVYRw="; doCheck = false; diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 152094b4498bf..cd4b70624f583 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, fetchFromGitHub, libbsd }: +{ lib, stdenv, pkg-config, fetchFromGitHub, libbsd }: stdenv.mkDerivation rec { pname = "kcgi"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { patchPhase = ''substituteInPlace configure \ --replace /usr/local / ''; - - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ; dontAddPrefix = true; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 4358d6134e82e..5308149c26bbc 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser -, pkgconfig, which +, pkg-config, which # Updater dependencies , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell , gnupg @@ -28,7 +28,7 @@ let "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib" /** Closure notes: we explicitly avoid specifying --shared-*-includes, * as that would put the paths into bin/nodejs. - * Including pkgconfig in build inputs would also have the same effect! + * Including pkg-config in build inputs would also have the same effect! */ ]) (builtins.attrNames sharedLibDeps) ++ [ "--with-intl=system-icu" @@ -55,7 +55,7 @@ in buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ zlib libuv openssl http-parser icu ]; - nativeBuildInputs = [ which util-linux pkgconfig python ] + nativeBuildInputs = [ which util-linux pkg-config python ] ++ optionals stdenv.isDarwin [ xcbuild ]; configureFlags = let diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index d9cc433fd8470..ff4cd324b5dbc 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -10,7 +10,7 @@ let rev = "10b9500b67983f0a9c42d8ce8bf8e8c469f7078c"; sha256 = "1yy8by15kfklw8lwh17z1swpj067q0skjjih12yawbryraig41m0"; }; - + nodePackages = import ./nodepkgs.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index 59db90741d347..847943d83bcf6 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, pkgconfig, fetchFromGitHub, glib, vala, ctpl +{ lib, stdenv, meson, ninja, pkg-config, fetchFromGitHub, glib, vala, ctpl , libgee, libsoup, fcgi }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "15lnk91gykm60rv31x3r1swp2bhzl3gwp12mf39smzi4bmf7h38f"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib vala ctpl libgee libsoup fcgi ]; meta = with lib; { diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index fd296d37f87ee..b264b216298ab 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -1,4 +1,4 @@ -{ brotli, cmake, pkgconfig, fetchFromGitHub, lib, stdenv +{ brotli, cmake, pkg-config, fetchFromGitHub, lib, stdenv , static ? stdenv.hostPlatform.isStatic }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # Need to explicitly link to brotlicommon patches = stdenv.lib.optional static ./brotli-static.patch; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DCANONICAL_PREFIXES=ON" diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index d53942766bb22..860db7c6d5ae6 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,14 +1,14 @@ -{ wxGTK, newScope }: - +{ wxGTK, stdenv, newScope }: let callPackage = newScope self; self = { - zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; }; + zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK stdenv; }; - zeroad-data = callPackage ./data.nix { }; + zeroad-data = callPackage ./data.nix { inherit stdenv; }; zeroad = callPackage ./wrapper.nix { }; }; -in self +in +self diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index f98fbdf298cd5..1ba975aa88542 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -47,10 +47,10 @@ stdenv.mkDerivation rec { # Delete shipped libraries which we don't need. rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} - # Workaround invalid pkgconfig name for mozjs - mkdir pkgconfig - ln -s ${spidermonkey_38}/lib/pkgconfig/* pkgconfig/mozjs-38.pc - PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH" + # Workaround invalid pkg-config name for mozjs + mkdir pkg-config + ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc + PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH" # Update Makefiles pushd build/workspaces diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/games/alephone/marathon/default.nix index 1d0787067afc8..4518215a3374e 100644 --- a/pkgs/games/alephone/marathon/default.nix +++ b/pkgs/games/alephone/marathon/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon"; desktopName = "Marathon"; - version = "20190331"; + version = "20200904"; icon = alephone.icons + "/marathon.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; - sha256 = "1d18a7hn8s50rqcs9i72ak5fq5a76hwk7nylfinrxjb134c9vlpz"; + sha256 = "sha256-x5M8RkxH+Rn8hUJIIq/AFC5Ibn0zF95BqZIDEwM6wVg="; }; meta = { diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index 2b04e31f548fa..432600e879f4d 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.9.2"; + version = "5.10.0"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0fkw9z66sjcz7k528wyla6mgi4impqimn93yhqmc194ycrjirraa"; + sha256 = "sha256-hRdd5ZrcVBU7tn1juvrLdbenULzu6OsXefG0oLjjFIg="; }; postPatch = '' diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 6871a611784c4..bd75a66b4879d 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -6,10 +6,10 @@ let inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini"; in - + stdenv.mkDerivation { name = "dwarf-therapist-${dwarf-therapist.version}"; - + wrapper = ./dwarf-therapist.in; paths = [ dwarf-therapist ]; diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix index 6da6d97ff244a..1efae4d2802ad 100644 --- a/pkgs/games/dwarf-fortress/legends-browser/default.nix +++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix @@ -8,7 +8,7 @@ let url = "https://github.com/robertjanetzko/LegendsBrowser/releases/download/${version}/legendsbrowser-${version}.jar"; sha256 = "05b4ksbl4481rh3ykfirbp6wvxhppcd5mvclhn9995gsrcaj8gx9"; }; - + script = writeShellScriptBin "legends-browser" '' set -eu BASE="$HOME/.local/share/df_linux/legends-browser/" diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 79b63e3ce9ee0..73288ab659f32 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -60,7 +60,7 @@ let '' + lib.optionalString enableTWBT '' substituteInPlace $out/data/init/init.txt \ --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' - '' + + '' + lib.optionalString enableTextMode '' substituteInPlace $out/data/init/init.txt \ --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TEXT]' diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index a077d01f3b65f..e911709dffcc3 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub }: - + stdenv.mkDerivation { pname = "frogatto-data"; version = "unstable-2018-12-18"; - + src = fetchFromGitHub { owner = "frogatto"; repo = "frogatto"; diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index f25b1084b852d..9150541afd085 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { patches = [ ./header-order.patch ./public-buildproject.patch (fetchpatch { - url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw"; - sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k"; - }) + url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw"; + sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k"; + }) ]; postPatch = '' diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix index 240481b7bba0b..6f91b10345815 100644 --- a/pkgs/games/gnujump/default.nix +++ b/pkgs/games/gnujump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer }: +{ lib, stdenv, makeDesktopItem, copyDesktopItems, fetchurl, SDL, SDL_image, SDL_mixer }: stdenv.mkDerivation rec { pname = "gnujump"; @@ -7,10 +7,25 @@ stdenv.mkDerivation rec { url = "mirror://gnu/gnujump/${pname}-${version}.tar.gz"; sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk"; }; + + nativeBuildInputs = [ copyDesktopItems ]; buildInputs = [ SDL SDL_image SDL_mixer ]; NIX_LDFLAGS = "-lm"; + desktopItems = [ (makeDesktopItem { + name = "gnujump"; + exec = "gnujump"; + icon = "gnujump"; + desktopName = "GNUjump"; + comment = "Jump up the tower to survive"; + categories = "Game;ArcadeGame;"; + }) ]; + + postInstall = '' + install -Dm644 ${./gnujump.xpm} $out/share/pixmaps/gnujump.xpm + ''; + meta = with lib; { homepage = "https://jump.gnu.sinusoid.es/index.php?title=Main_Page"; description = "A clone of the simple yet addictive game Xjump"; diff --git a/pkgs/games/gnujump/gnujump.xpm b/pkgs/games/gnujump/gnujump.xpm new file mode 100644 index 0000000000000..d8b6bcb4c8cb9 --- /dev/null +++ b/pkgs/games/gnujump/gnujump.xpm @@ -0,0 +1,64 @@ +/* XPM */ +static char *gnujump[] = { +/* columns rows colors chars-per-pixel */ +"32 32 26 1 ", +" c black", +". c #D10000", +"X c #E80000", +"o c #E90000", +"O c #F90000", +"+ c red", +"@ c #00C500", +"# c #00DC00", +"$ c #00DD00", +"% c #00EF00", +"& c #00FA00", +"* c #00FB00", +"= c green", +"- c #FFC882", +"; c #FFC982", +": c #FFD298", +"> c #FFD299", +", c #FFD399", +"< c #FFDAAB", +"1 c #FFDBAB", +"2 c #FFDBAC", +"3 c #FFE1BA", +"4 c #FFE5C3", +"5 c #FFE5C4", +"6 c #FFE7C7", +"7 c None", +/* pixels */ +"77777777777777777777777777777777", +"77777777777777777777777777777777", +"7777777777777 77777777777777", +"77777777777 777777777777", +"7777777777 77777777777", +"777777777 7777777777", +"777777777 ;;;-- 7777777777", +"77777777 ::>>,>1: 777777777", +"77777777 :<1<1:>2: 777777777", +"77777777 :1331: :: 7777 7777", +"77777777 :<3431: :, 777 o 777", +"777 777 ->236531>:2: 77 oo 777", +"77 .o 77 -,145443<1, 77 oOo 777", +"77 .ooo 7 -:13333312: 7 oOo 7777", +"777 oOOo :,11<<<:: oOOo 7777", +"7777 XOOooo :::>: XooO+Oo 7777", +"77777 oOOOOoo ooOOO+Oo 77777", +"777777 oOO+OOoooooOO++OOo 777777", +"7777777 XoOOOOOOOOOOOOoo 7777777", +"77777777 oooooooooooo 77777777", +"7777777777 7777777777", +"777777777 @@@@@@@@@@@@ 7777777", +"77777777 #######$$##$#### 777777", +"7777777 #%%%%%%%%%%%%%%%%# 77777", +"7777777 #%*&*&*%%%%%%*&*%# 77777", +"777777 #%*=**%%#####$%%&*%# 7777", +"777777 #%&*%%## ##%&%# 7777", +"77777 #%*%%## 777777 #%%# 7777", +"77777 #%%#$ 777777777 #%%# 777", +"7777 @%## 777777777777 #%# 777", +"7777 ## 7777777777777777 $# 777", +"77777 7777777777777777777 7777" +}; diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 462cbc48af6f3..1c700de7b435a 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.2.909"; + version = "2.2.1262"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "15x2imr8c4m2bjfs9y1l34fpvixxdf09gqls4bqb4rdvj1vhdrh2"; + sha256 = "09fklcnqmpvwykbfwg4lgwl82khr2wimvgyz7ssficm802xkicnc"; }; icon = fetchurl { diff --git a/pkgs/games/quake3/content/hires.nix b/pkgs/games/quake3/content/hires.nix new file mode 100644 index 0000000000000..7314028d54057 --- /dev/null +++ b/pkgs/games/quake3/content/hires.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchzip }: + +stdenv.mkDerivation { + pname = "quake3hires"; + version = "2020-01-20"; # Unknown version, used the date of web.archive.org capture. + + src = fetchzip { + url = "https://web.archive.org/web/20200120024216/http://ioquake3.org/files/xcsv_hires.zip"; + sha256 = "09vhrray8mh1ic2qgcwv0zlmsnz789y32dkkvrz1vdki4yqkf717"; + stripRoot = false; + }; + + buildCommand = '' + mkdir -p $out/baseq3 + install -Dm444 $src/xcsv_bq3hi-res.pk3 $out/baseq3/xcsv_bq3hi-res.pk3 + ''; + + preferLocalBuild = true; + + meta = with lib; { + description = "Quake 3 high-resolution textures"; + license = licenses.cc0; + platforms = platforms.all; + maintainers = with maintainers; [ rvolosatovs ]; + }; +} diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix index 381d00bf992c5..e7f2f2e781a4f 100644 --- a/pkgs/games/rimshot/default.nix +++ b/pkgs/games/rimshot/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { unpackPhase = '' unzip -j $src - ''; + ''; installPhase = '' diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index f8aa4397ddad8..e9186fbf5b78d 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -10,13 +10,13 @@ let pname = "shattered-pixel-dungeon"; - version = "0.8.2d"; + version = "0.9.1d"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - sha256 = "11lgalam1aacw01ar7nawiim4pbxqzrdrnxvj6wq9mg83hgsz65l"; + sha256 = "0f9vi1iffh477zi03hi07rmfbkb8i4chwvv43vs70mgjh4qx7247"; }; postPatch = '' @@ -34,6 +34,8 @@ let nativeBuildInputs = [ gradle_5 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${stdenv.lib.optionalString stdenv.isDarwin "export TERM=dumb"} gradle --no-daemon desktop:release ''; # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) @@ -54,6 +56,8 @@ in stdenv.mkDerivation rec { buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${stdenv.lib.optionalString stdenv.isDarwin "export TERM=dumb"} # point to offline repo sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle gradle --offline --no-daemon desktop:release @@ -78,6 +82,8 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 + broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix index e5419cef249e7..c0cad5f05d330 100644 --- a/pkgs/games/snake4/default.nix +++ b/pkgs/games/snake4/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { --replace "-o \$(OWNER) -g \$(GROUP)" "" \ --replace "4755" "755" ''; - + installFlags = [ "INSTLIBDIR=$(out)/lib" "INSTBINDIR=$(out)/bin" "INSTMANDIR=$(out)/man" ]; diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix index f021d9ac7a758..a20b52e78546a 100644 --- a/pkgs/games/xbill/default.nix +++ b/pkgs/games/xbill/default.nix @@ -1,9 +1,10 @@ -{ stdenv, lib, fetchurl, libX11, libXpm, libXt, motif, ... }: +{ stdenv, lib, makeDesktopItem, copyDesktopItems, fetchurl, libX11, libXpm, libXt, motif, ... }: stdenv.mkDerivation rec { pname = "xbill"; version = "2.1"; + nativeBuildInputs = [ copyDesktopItems ]; buildInputs = [ libX11 libXpm libXt motif ]; NIX_CFLAGS_LINK = "-lXpm"; @@ -18,6 +19,19 @@ stdenv.mkDerivation rec { sha256 = "13b08lli2gvppmvyhy0xs8cbjbkvrn4b87302mx0pxrdrvqzzz8f"; }; + desktopItems = [ (makeDesktopItem { + name = "xbill"; + exec = "xbill"; + icon = "xbill"; + desktopName = "XBill"; + comment = "Get rid of those Wingdows viruses!"; + categories = "Game;ArcadeGame;"; + }) ]; + + postInstall = '' + install -Dm644 pixmaps/icon.xpm $out/share/pixmaps/xbill.xpm + ''; + meta = with stdenv; { description = "Protect a computer network from getting infected"; homepage = "http://www.xbill.org/"; diff --git a/pkgs/misc/cups/drivers/carps-cups/default.nix b/pkgs/misc/cups/drivers/carps-cups/default.nix new file mode 100644 index 0000000000000..32e92da160847 --- /dev/null +++ b/pkgs/misc/cups/drivers/carps-cups/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitHub +, cups +}: + +stdenv.mkDerivation { + pname = "carps-cups"; + version = "unstable-2018-03-05"; + + src = fetchFromGitHub { + owner = "ondrej-zary"; + repo = "carps-cups"; + rev = "18d80d1d6f473dd9132e4b6d8b5c592c74982f17"; + sha256 = "0mjj9hs5lqxi0qamgb4sxfz4fvf7ggi66bxd37bkz3fl0g9xff70"; + }; + + preBuild = '' + export CUPS_DATADIR="${cups}/share/cups" + ''; + + installPhase = '' + CUPSDIR="$out/lib/cups" + CUPSDATADIR="$out/share/cups" + + mkdir -p "$CUPSDIR/filter" "$CUPSDATADIR/drv" "$CUPSDATADIR/usb" + + install -s rastertocarps $CUPSDIR/filter + install -m 644 carps.drv $CUPSDATADIR/drv/ + install -m 644 carps.usb-quirks $CUPSDATADIR/usb/ + ''; + + buildInputs = [ cups ]; + + meta = with lib; { + description = "CUPS Linux drivers for Canon printers"; + homepage = "https://www.canon.com/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + ewok + ]; + }; +} + diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix index 690a4e4841e7b..a5a32644c3a5d 100644 --- a/pkgs/misc/drivers/epson-201106w/default.nix +++ b/pkgs/misc/drivers/epson-201106w/default.nix @@ -13,7 +13,7 @@ in # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm" - "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm" + "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm" ]; sha256 = "1yig1xrh1ikblbp7sx706n5nnc237wy4mbch23ymy6akbgqg4aig"; diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 8d8951db249dd..bdb2839ab0b33 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7110" to get to the most recent - # version. + # version. # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz" diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 934f00d7492bb..f0289c2227244 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent - # version. + # version. # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix index 6de25dbe678dc..d5c57b35c32e8 100644 --- a/pkgs/misc/drivers/epson_201207w/default.nix +++ b/pkgs/misc/drivers/epson_201207w/default.nix @@ -63,11 +63,11 @@ in Epson L550 Series Epson L555 Series - To use the driver adjust your configuration.nix file: - services.printing = { - enable = true; - drivers = [ pkgs.epson_201207w ]; - }; + To use the driver adjust your configuration.nix file: + services.printing = { + enable = true; + drivers = [ pkgs.epson_201207w ]; + }; ''; license = with licenses; [ lgpl21 epson ]; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index b4afb6bbf9754..d092a87868389 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -2,13 +2,13 @@ mkDerivation { pname = "citra"; - version = "2020-03-21"; + version = "2020-12-07"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "8722b970c52f2c0d8e82561477edb62a53ae9dbb"; - sha256 = "0c1zn1f84h4f6n6p0aqz905yvv5qpdmkj2z58yla6bfgbzabfyrj"; + rev = "3f13e1cc2419fac837952c44d7be9db78b054a2f"; + sha256 = "1bbg8cwrgncmcavqpj3yp4dbfkip1i491krp6dcpgvsd5yfr7f0v"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index e8cda5170cc02..dbbbe4da5572a 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -1,7 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkg-config, wrapGAppsHook -, gtk2 ? null, gtk3 ? null, mednafen }: - -with lib; +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, mednafen +, gtk2 ? null +, gtk3 ? null +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "mednaffe"; @@ -14,13 +20,20 @@ stdenv.mkDerivation rec { sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7"; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ gtk2 gtk3 mednafen ]; - configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ]; - postInstall = "wrapProgram $out/bin/mednaffe --set PATH ${mednafen}/bin"; + configureFlags = [ (lib.enableFeature (gtk3 != null) "gtk3") ]; + + dontWrapGApps = true; + + postInstall = '' + wrapProgram $out/bin/mednaffe \ + --prefix PATH ':' "${mednafen}/bin" \ + "''${gappsWrapperArgs[@]}" + ''; - meta = { + meta = with lib; { description = "GTK-based frontend for mednafen emulator"; homepage = "https://github.com/AmatCoder/mednaffe"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 80009769afb6b..0d3a954b9b430 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -464,11 +464,12 @@ in rec { tmux-fzf = mkDerivation { pluginName = "tmux-fzf"; - version = "unstable-2020-11-23"; + rtpFilePath = "main.tmux"; + version = "unstable-2020-12-07"; src = fetchFromGitHub { owner = "sainnhe"; repo = "tmux-fzf"; - rev = "312685b2a7747b61f1f4a96bd807819f1450479d"; + rev = "5efeb91086040a3becf5372fb38258acd0579954"; sha256 = "1z0zmsf8asxs9wbwvkiyd81h93wb2ikl8nxxc26sdpi6l333q5s9"; }; postInstall = '' diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 997f8827c3b29..5e0121440b170 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -461,12 +461,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2021-01-16"; + version = "2021-01-18"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "2dc88ca328de4e00b37586aaf532b2cd90b5c3a0"; - sha256 = "0zjryprw2qdshshw7f8dkk7jf515sq11gc1w0lvssimkqdi47zaj"; + rev = "272d783f338107426cf75fa48b6f0a30860a8ac4"; + sha256 = "07dyy8v0j07w6gi89p08l0vcc0ba6d3qnz4wpsfj4hzf6cgifsw4"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -521,12 +521,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-01-15"; + version = "2021-01-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "a150d49a46ea85b4c78813e6ba0fcf9a2b0d86ea"; - sha256 = "067fhgvfnrvzw67hyag0fxv61m1fbl8160klgy5l0kjy7nx6hwiw"; + rev = "a9b682ad79cc4b7b836fc7e31f7d01ecd88d7c51"; + sha256 = "1gpz1d6cy4pmaqzgp5bq8dndpzq9qiwq0794vgi58hnk65sbjai9"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -594,12 +594,12 @@ let completion-buffers = buildVimPluginFrom2Nix { pname = "completion-buffers"; - version = "2020-09-26"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "steelsojka"; repo = "completion-buffers"; - rev = "441a58b77c04409e8ccb35fd4970598ae551462f"; - sha256 = "14q5n7h5kaqf71cfd9mlhwb0xsihm6d3kizrxhlfnzxk6zkn8p0s"; + rev = "c36871b2a44b59761387f4972c617b44dcec5e75"; + sha256 = "14rxmy3cjrl7lr4yvrk7nkhc5h8rlpj7xjixzgr0vmnbsl885kyh"; }; meta.homepage = "https://github.com/steelsojka/completion-buffers/"; }; @@ -690,12 +690,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-01-15"; + version = "2021-01-18"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "50c34a24bb6638fdf8f604f75cd036ec5252864d"; - sha256 = "1b5cs4yznz8vcmba6vk67kpd6071cz1m5jbfjpvyinvld5ipnapn"; + rev = "c58071ff5ad86baad107f43737c64a18b574cd3a"; + sha256 = "1pbkvxcwzvyy47bfv1r1ldzcf0qqkbbx2bq4jl93di5bg7kl57qb"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -894,12 +894,12 @@ let deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-01-14"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "f1bf4b1dc68d441936019f97a2f306327c52f5c4"; - sha256 = "0gd23blp723gybzp0g466kkf3rf9d0bd2zs76hadmw7w7992im2z"; + rev = "bd8d4d03d81d03db13d4b6eeb40c8a5c422c3ce6"; + sha256 = "19kk5mpisbil3jarl93sjq97jxb29sxbw5s2zsh1gih6dfp659d5"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1030,12 +1030,12 @@ let pname = "deoplete-lsp"; version = "2020-12-26"; src = fetchFromGitHub { - owner = "Shougo"; + owner = "deoplete-plugins"; repo = "deoplete-lsp"; rev = "760eb2f647a518144ca1dc1091cc449c0dbee71e"; sha256 = "0dcq79xqfb5qnjinwni0bi3vn2sfsri8wmc75wgvw2114vyf2k9a"; }; - meta.homepage = "https://github.com/Shougo/deoplete-lsp/"; + meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; deoplete-notmuch = buildVimPluginFrom2Nix { @@ -1473,6 +1473,18 @@ let meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; + galaxyline-nvim = buildVimPluginFrom2Nix { + pname = "galaxyline-nvim"; + version = "2021-01-17"; + src = fetchFromGitHub { + owner = "glepnir"; + repo = "galaxyline.nvim"; + rev = "64d6b8e31459057ba4f9b03a977fce0d2cc3d748"; + sha256 = "1w5cggvxvmnm3zparnsgb3iz1pkw7d8bwvflcxaxg4pilgsniqsa"; + }; + meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; + }; + gen_tags-vim = buildVimPluginFrom2Nix { pname = "gen_tags-vim"; version = "2020-10-12"; @@ -1545,6 +1557,18 @@ let meta.homepage = "https://github.com/vim-scripts/gitignore.vim/"; }; + gitsigns-nvim = buildVimPluginFrom2Nix { + pname = "gitsigns-nvim"; + version = "2021-19-01"; + src = fetchFromGitHub { + owner = "lewis6991"; + repo = "gitsigns.nvim"; + rev = "4440a0f716b76132f365f5ef5c7f7cdad4b7c98c"; + sha256 = "19hyqga7xj3dc7p629gih80c72a04z1my8qav37myz0jq3bllg2v"; + }; + meta.homepage = "https://github.com/lewis6991/gitsigns.nvim"; + }; + gitv = buildVimPluginFrom2Nix { pname = "gitv"; version = "2019-08-22"; @@ -1619,12 +1643,12 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2020-11-13"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "2636a0344d3fbacc62d9d914a456fcfdba8ca4cb"; - sha256 = "1w9j97g3dzadwnqyal1zw12ia61b512hz8mhywqy5xq6v9f6zkw6"; + rev = "c73e63203f76ab8e39b2b05369c0a8877a981435"; + sha256 = "0lwvv5chxq0fb9k1y73g5zr8v54xghlqnq64k0vx2v2ravp3313r"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -1655,12 +1679,12 @@ let haskell-vim = buildVimPluginFrom2Nix { pname = "haskell-vim"; - version = "2018-05-22"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "neovimhaskell"; repo = "haskell-vim"; - rev = "b1ac46807835423c4a4dd063df6d5b613d89c731"; - sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br"; + rev = "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e"; + sha256 = "1q3hf0vr5gpmymmvm208sl0r8nb69m7f3bdrkqrp7fwc2v1ylnz0"; }; meta.homepage = "https://github.com/neovimhaskell/haskell-vim/"; }; @@ -2676,24 +2700,24 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2021-01-12"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "7d2fb974a36b3c7773a90a749fcb92a40669e444"; - sha256 = "1vq4wkywidmjr2g8z9js5173b15lr6zawxb0z12fmvaiwxpbli4z"; + rev = "7be3292b8de5127a386bf20f1198704e90cf24e9"; + sha256 = "0bz6q80bbq1pl45ch37rcnnakljv6877qasqvdzb09w3jn6hz2vl"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-12-20"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "aaa946fb6bd79b9af86fbaf4b6b63fd81d839bd9"; - sha256 = "1fhwfwqlvz0pm5qdpjbmjx4dqlnchbp170jw63dc5fxin90h4ivh"; + rev = "7099f638edd3eda5cd5687b4e13d342bb7f9949d"; + sha256 = "1109acmcxwr6kfrw6ganpqwwarsf5l9vd3vxmmafz3c86ha6kkvw"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2866,14 +2890,26 @@ let meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; + nvim-jdtls = buildVimPluginFrom2Nix { + pname = "nvim-jdtls"; + version = "2021-01-19"; + src = fetchFromGitHub { + owner = "mfussenegger"; + repo = "nvim-jdtls"; + rev = "357d0b405235e3dfb0b15450f33ad6d10cbf2122"; + sha256 = "1gd4kjxpb73d6ixxgg4qyzj5alca590whx1i905j3m8j4sjb7vib"; + }; + meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; + }; + nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-01-15"; + version = "2021-01-18"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "87900ffcccd47bb6a09483ccf0d6840dc1d0d0d6"; - sha256 = "18qj8ql48fnncghm0p6wnbjggmkvs9gdf6lgffhdqinlrnrja9ry"; + rev = "1f88798c0efe9331e83243ce05605fbac0433e9d"; + sha256 = "042bgy356v7yy4zm76mngp55n53rnqrlclpm4lafjvl788fny7k4"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -2916,12 +2952,12 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-01-15"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "787cef2a1d4ccdd1058cd1486dfea509fab1d291"; - sha256 = "1n1cvrfz2vfx5rjslx4brv3rfqjmxymy9yxyvzhi5p3vwn0phr6f"; + rev = "bf59dd4a86f13eeb32ac04d7d1fadadd48662647"; + sha256 = "19kjxdspiylp5ww2h1xnhzd57fhlpzdbkyglg79a86xlsf1r1c7x"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -3156,24 +3192,24 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2020-12-17"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "0cba1b99cd6cfcd0379e57c317ea1df0c1c82b3a"; - sha256 = "1xs2g7inlmcjchzzmsa4qh1mf61xz6gdn96mzfkr8fs65g78861b"; + rev = "4a11cf237a6e505feb747f6097d48bf0195888b3"; + sha256 = "0d9xm63spsaa580n2nyqiiq2p81ilmm0dwzqg6jhw9c020r5rzg1"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-01-11"; + version = "2021-01-18"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "e9b81e2bb98e00e9f6ca2b6a698cc8452fe2943e"; - sha256 = "00j5gnx5jgrx7qmbxhrjsrdzp9krc5c7zij9a25jhz3l2j98xpdg"; + rev = "fecbbd23e425db8cc60b85d8298f02935d69940d"; + sha256 = "0q5hsg2rlzhldr221krvxppspdl04rj5qbiq3nk1a25nf5r24d0z"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3864,14 +3900,39 @@ let meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; + telescope-fzf-writer-nvim = buildVimPluginFrom2Nix { + pname = "telescope-fzf-writer-nvim"; + version = "2021-01-10"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-fzf-writer.nvim"; + rev = "9535863f519be3d5e57fd50916f96594241bfe16"; + sha256 = "0jmkzjqlcz47hzp44407xwkmirgprzkwrz6x8ax771gpk8cghfrx"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-writer.nvim/"; + }; + + telescope-fzy-native-nvim = buildVimPluginFrom2Nix { + pname = "telescope-fzy-native-nvim"; + version = "2021-01-02"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-fzy-native.nvim"; + rev = "654dffd924b29fb9a9252dcbd63528b1498ac9fb"; + sha256 = "01x9z3n03qharjw778cxb16gw1dsxzmsxph4xsbfy1avf21c6x9g"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/"; + }; + telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-01-17"; + version = "2021-01-18"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "c2039ca78d261392b0ab7bef85b3c5f1c8f507b9"; - sha256 = "0ca93m1nl14js4wgbqhgc786mr9is0zkiwkzp4fv5ny03nhd025w"; + rev = "7d4d3462e990e2af489eb285aa7041d0b787c560"; + sha256 = "013m8k7s5d2ix83q1d7x6nqi7s9vn5g221wnbngd41ywbdn61a9a"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4599,12 +4660,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-01-17"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "a9d1ccd9a3e9807d600abccab706634594ed0d2e"; - sha256 = "0smmgbsrqm757hgijq76y4yra0b68qhnxnyswfs37vrarcrqkfq3"; + rev = "7442976f0c5dea79f8cfb342e7abb25cea9a8daa"; + sha256 = "1gzc800i4zsxav4h7smqgapnrallarbgrq9arfhydrq41hy2h6wr"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5067,48 +5128,48 @@ let vim-erlang-compiler = buildVimPluginFrom2Nix { pname = "vim-erlang-compiler"; - version = "2020-11-16"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-compiler"; - rev = "17e47d28141c961e567b39d8d9956cbdb6e720d0"; - sha256 = "1j27zk2gfig3zv7cg7dwg5x0c3nsik5blcci8a16wq050pi8bsr1"; + rev = "a99e75f792650c8dae86d9a44c7af2411ea2ead7"; + sha256 = "13400kjf90sxlpx1pqs379ihdn65i3gpck3dwkjnf1xiv1p9rzvz"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/"; }; vim-erlang-omnicomplete = buildVimPluginFrom2Nix { pname = "vim-erlang-omnicomplete"; - version = "2020-08-29"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-omnicomplete"; - rev = "2f980dd8f1861e00ea14dcd5ecc370e71af695fb"; - sha256 = "1i3c7ybahmb4az2njzvfnvx39bqiyqhf43n32rhpc3xg05y3bk7d"; + rev = "924a50ed0ad93141063d0f27c9f62b1bea991baf"; + sha256 = "0zh730wsb0n9nk1x5qdbx78zgzhamd2a6fa5gxl4milvr5ddvdy9"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-omnicomplete/"; }; vim-erlang-runtime = buildVimPluginFrom2Nix { pname = "vim-erlang-runtime"; - version = "2020-11-22"; + version = "2021-01-08"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-runtime"; - rev = "8a8ec7cb54d52be5fc5dce2a028888c2a2f50e35"; - sha256 = "13qfyl9v0a82hn574x6h7rq9kl3rhg6ivlpj69n2jn0lf33ij8qq"; + rev = "47c643f51e4480541fc81e352ec5b2a361544d0b"; + sha256 = "0xlxkdqjq8fp9fpkhqv5nd2ipiq8nw1bdzd7hqibizwcdsisf91s"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; vim-erlang-tags = buildVimPluginFrom2Nix { pname = "vim-erlang-tags"; - version = "2020-10-16"; + version = "2021-01-09"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-tags"; - rev = "a5bc6a90a166073d74e5103f40735740ae40a3cb"; - sha256 = "02d3y2296nh8qv0kgx119c1niim6ci2bahi7q3k0jsl2f86fl7dy"; + rev = "22f7fbf1e4b669a305d93cedd85baf63253f3b78"; + sha256 = "1dvk0dim8vam8xsqlz9pjky22mhqi9ca5criyz7zvgj46hqj1wy3"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; }; @@ -5403,12 +5464,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-01-10"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "d68fc4d71d7c254c8fbd666a470b2d92c8a6d610"; - sha256 = "04py4c52hlb8adkgywkn4hnibrsiczvmmf8b82wfr2sa1k5b9hbx"; + rev = "3a8e3f6ded412b25fb3c13eecf76d5809fa175e8"; + sha256 = "0vj6wcvx87kkykmlxjdwnbnfiq8bbqjnki8x3qaiv4gx028m778d"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6029,24 +6090,24 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2021-01-16"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "104813da45c5bb620b9c6ce48cb918872f968dab"; - sha256 = "1x06zb9xa9v9ycg3vq1il45ylm7p2d3vflv347hpssmwcjzd6xyv"; + rev = "3012f39ce120ffdc5b89a85f074fc66d6f4905bf"; + sha256 = "157jm2wwvp4dp7rzilhrb4040paldjx7qkp116v4q5kj699w42i7"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-01-16"; + version = "2021-01-18"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "90d61f11149ffb380eabcb66f66a160f4fc31a5d"; - sha256 = "1gr9y12fjw89ym6kdzjki12j21bhwy4ch4gpsy4gzb04xhjqllgf"; + rev = "7380d31c4f49d76ce3895c386e2a7a40b2b2df08"; + sha256 = "082il6bk7rnqvxqqy1070y3182kqk34i1bgcczj4k43llnghskx9"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -7098,12 +7159,12 @@ let vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2020-12-25"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "1f5ee84b789384a273b3e27b6a5a7e2f54dbc30e"; - sha256 = "0977qb31hgss38g01m7ikx3qdqial3c7zw9cv72k7rnmcgy761wz"; + rev = "f83a157552a3bf393a7c034df1d21e3555123a4c"; + sha256 = "090rl4mfww5rmv04v25f58jfv3yx23bwi0pijkwxr442yhbg3rg2"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -7928,12 +7989,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-01-16"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7c7d6020f848864e091ac437e55f72139f9a59b4"; - sha256 = "10fl44xpjfsrfqr3sz2mbxhigmkz5ivky96smxp4yp9av0zvvcm4"; + rev = "5d3d96dcdf0f87273978c482e9c1b39201f4516f"; + sha256 = "04rn9w17mmf2ka4wqdl8x4nzwg5imnb0q1mnsm1hx8bvlr8zs0h6"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -8158,12 +8219,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-12-31"; + version = "2021-01-19"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "ef331a76f0d660a67504e1cd0d981c345db3607f"; - sha256 = "0976539h1zsxrnihp5x5lvra12iwvjbbrl5nw6f914yh09jqbgjf"; + rev = "17170fd1c31f00132a91fb1598d0f3df5927e28d"; + sha256 = "0k8s5via1frpgdb94kgsk29g7h6fjq3cazyfa8zww7vra418acsh"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 9640869ad1dec..e4130554ad4e4 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -654,7 +654,7 @@ self: super: { libiconv ]; - cargoSha256 = "6tgSdIC9ThKvyiX1Unihwozhez6+HsQiqebugzNrKVc="; + cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c="; }; in '' ln -s ${maple-bin}/bin/maple $target/bin/maple @@ -671,6 +671,31 @@ self: super: { ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) ''; }); + + telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { + preFixup = + let + fzy-lua-native-path = "deps/fzy-lua-native"; + fzy-lua-native = + stdenv.mkDerivation { + name = "fzy-lua-native"; + src = "${old.src}/${fzy-lua-native-path}"; + # remove pre-compiled binaries + preBuild = "rm -rf static/*"; + installPhase = '' + install -Dm 444 -t $out/static static/* + install -Dm 444 -t $out/lua lua/* + ''; + }; + in + '' + rm -rf $target/${fzy-lua-native-path}/* + ln -s ${fzy-lua-native}/static $target/${fzy-lua-native-path}/static + ln -s ${fzy-lua-native}/lua $target/${fzy-lua-native-path}/lua + ''; + meta.platforms = stdenv.lib.platforms.all; + }); + } // ( let nodePackageNames = [ diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a6ee59362e42f..88e3c1e22973b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -79,6 +79,7 @@ deoplete-plugins/deoplete-clang deoplete-plugins/deoplete-dictionary deoplete-plugins/deoplete-go deoplete-plugins/deoplete-jedi +deoplete-plugins/deoplete-lsp deoplete-plugins/deoplete-zsh derekelkins/agda-vim derekwyatt/vim-scala @@ -132,6 +133,7 @@ gentoo/gentoo-syntax GEverding/vim-hocon gfanto/fzf-lsp.nvim@main gibiansky/vim-textobj-haskell +glepnir/galaxyline.nvim@main glts/vim-textobj-comment godlygeek/csapprox godlygeek/tabular @@ -273,6 +275,7 @@ leanprover/lean.vim ledger/vim-ledger lepture/vim-jinja lervag/vimtex +lewis6991/gitsigns.nvim lfilho/cosco.vim lifepillar/vim-mucomplete lighttiger2505/deoplete-vim-lsp @@ -331,6 +334,7 @@ mengelbrecht/lightline-bufferline metakirby5/codi.vim mfukar/robotframework-vim mfussenegger/nvim-dap +mfussenegger/nvim-jdtls mg979/vim-visual-multi mhartington/oceanic-next mhinz/vim-crates @@ -402,6 +406,8 @@ nvim-lua/lsp-status.nvim nvim-lua/lsp_extensions.nvim nvim-lua/plenary.nvim nvim-lua/popup.nvim +nvim-telescope/telescope-fzf-writer.nvim +nvim-telescope/telescope-fzy-native.nvim nvim-telescope/telescope.nvim nvim-treesitter/completion-treesitter nvim-treesitter/nvim-treesitter @@ -493,7 +499,6 @@ Shougo/context_filetype.vim Shougo/defx.nvim Shougo/denite.nvim Shougo/deol.nvim -Shougo/deoplete-lsp Shougo/deoplete.nvim Shougo/echodoc.vim Shougo/neco-syntax diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index ae34596fc71b1..0b5612483b1f9 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -484,8 +484,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.9.7"; - sha256 = "0v599yssvk358gxfxnyzzkyk0y5krsbp8n4rkp9wb2ncxqsqladr"; + version = "1.9.10"; + sha256 = "1afmqzlw3bl9bv59l9b2jrljhbq8djb7vl8rjv58c5wi7nvm2qab"; }; meta = { license = lib.licenses.asl20; diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 0ba7a1d209ec0..8a814e9558de4 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,15 +1,10 @@ { stdenv, fetchurl, xar, cpio, pkgs, python3, pbzx, lib, darwin-stubs, print-reexports }: -let version = "10.12"; in - -# Ensure appleSdkVersion is up to date. -assert stdenv.isDarwin -> stdenv.appleSdkVersion == version; - let # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { pname = "MacOS_SDK"; - inherit version; + version = "10.12"; # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by: # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index 5c63b8e0dfb35..9daed151ce487 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -1,17 +1,25 @@ -{stdenv, lib, fetchFromGitHub, autoreconfHook, darwin}: +{stdenv, lib, fetchFromGitHub, autoreconfHook, ApplicationServices}: stdenv.mkDerivation rec { pname = "duti"; - version = "1.5.4pre"; + version = "1.5.5pre"; src = fetchFromGitHub { owner = "moretension"; repo = pname; - rev = "7dbcae86f99fedef5a6c4311f032a0f1ca0539cc"; - sha256 = "1z9sa0yk87vs57d5338y6lvm1v1vvynxb7dy1x5aqzkcr0imhljl"; + rev = "fe3d3dc411bcea6af7a8cbe53c0e08ed5ecacdb2"; + sha256 = "1pg4i6ghpib2gy1sqpml7dbnhr1vbr43fs2pqkd09i4w3nmgpic9"; }; + nativeBuildInputs = [autoreconfHook]; - buildInputs = [darwin.apple_sdk.frameworks.ApplicationServices]; - configureFlags = ["--with-macosx-sdk=/homeless-shelter"]; + buildInputs = [ApplicationServices]; + configureFlags = [ + "--with-macosx-sdk=/homeless-shelter" + + # needed to prevent duti from trying to guess our sdk + # NOTE: this is different than stdenv.hostPlatform.config! + "--host=x86_64-apple-darwin18" + ]; + meta = with lib; { description = "A command-line tool to select default applications for document types and URL schemes on Mac OS X"; longDescription = '' diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 5f5948ed0bf58..7375f45eb6db5 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook, fuse }: +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, fuse }: stdenv.mkDerivation { name = "afuse-0.4.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse ]; meta = { diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 54d7ce6222a3e..602d427818366 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: +{ stdenv, fetchurl, lib, pkg-config, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { pname = "alsa-plugins"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # ToDo: a52, etc.? buildInputs = diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 4feb99f6bef91..c4fdbacf95ba8 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, pkgconfig, gtk2, gtk3, fltk13 }: +{ lib, stdenv, fetchurl, alsaLib, pkg-config, gtk2, gtk3, fltk13 }: # Comes from upstream as as bundle of several tools, # some use gtk2, some gtk3 (and some even fltk13). @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jbkjmq038zapj66a7nkppdf644v2mwj581xbmh6k4i8w6mcglxz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib gtk2 gtk3 fltk13 ]; patchPhase = '' diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 8455374fc6874..ee167b31c9601 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, makeWrapper, autoreconfHook -, pkgconfig, which +, pkg-config, which , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders , gawk @@ -67,7 +67,7 @@ let autoreconfHook bison flex - pkgconfig + pkg-config swig ncurses which @@ -154,7 +154,7 @@ let src = apparmor-sources; nativeBuildInputs = [ - pkgconfig + pkg-config libapparmor gawk which @@ -206,7 +206,7 @@ let name = "apparmor-pam-${apparmor-version}"; src = apparmor-sources; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ libapparmor pam ]; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 7af451c15452b..96040f2828cf5 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: +{ lib, stdenv, fetchurl, pkg-config, gpsd, libcap, libnl }: let cfg = import ./version.nix; in @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gpsd libcap libnl ]; preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" + makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" ''; meta = { diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index ba9b5d09d8dec..079624c10ad66 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libnl }: +{ lib, stdenv, fetchurl, pkg-config, libnl }: let cfg = import ./version.nix; in @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl ]; preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" + makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" ''; meta = { diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index be7435fb1d0f4..29dceecad6ed1 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -6,7 +6,7 @@ , glib , json_c , libical -, pkgconfig +, pkg-config , python3 , readline , systemd @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config python3.pkgs.wrapPython ]; diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index a79926c0158f1..d692e30a03f9a 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , meson , ninja -, pkgconfig +, pkg-config , fetchFromGitLab , fetchpatch , python3 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config ] ++ lib.optional (!doCheck) python3; buildInputs = [ diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index afddb963cefbb..8edd9257fed2a 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, pkgconfig, flex, bison +, cmake, pkg-config, flex, bison , llvmPackages, kernel, elfutils , libelf, libbfd, libbpf, libopcodes, bcc }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libbpf libbfd libopcodes ]; - nativeBuildInputs = [ cmake pkgconfig flex bison ] + nativeBuildInputs = [ cmake pkg-config flex bison ] # libelf is incompatible with elfutils-libelf ++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 8aa1bf4889226..dc0b13ef59b44 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , python3, boost, fuse, libtorrent-rasterbar, curl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1cfjhyn9cjyyxyd0f08b2ra258pzkljwvkj0iwrjpd0nrbl6wkq5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost fuse libtorrent-rasterbar curl python3 ]; diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 89857a35d9214..9c30aae86fe88 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "20200910"; hardeningDisable = [ "pic" ]; - + src = fetchFromGitHub { owner = "hartkopp"; repo = "can-isotp"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = kernel.moduleBuildDependencies; - + meta = with lib; { description = "Kernel module for ISO-TP (ISO 15765-2)"; homepage = "https://github.com/hartkopp/can-isotp"; @@ -33,4 +33,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = [ maintainers.evck ]; }; -} +} diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index fa9cd34c1b3a7..c4ed4d4fc0f34 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,29 +1,27 @@ -{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkgconfig -, kerberos, keyutils, pam, talloc }: +{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config +, kerberos, keyutils, pam, talloc, python3 }: stdenv.mkDerivation rec { pname = "cifs-utils"; - version = "6.9"; + version = "6.12"; src = fetchurl { url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; - sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q"; + sha256 = "1vw570pvir73kl4y6fhd6ns936ankimkhb1ii43yh8lr0p1xqbcj"; }; - nativeBuildInputs = [ autoreconfHook docutils pkgconfig ]; + nativeBuildInputs = [ autoreconfHook docutils pkg-config ]; - buildInputs = [ kerberos keyutils pam talloc ]; + buildInputs = [ kerberos keyutils pam talloc python3 ]; - configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # AC_FUNC_MALLOC is broken on cross builds. "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; - makeFlags = [ "root_sbindir=$(out)/sbin" ]; - meta = with lib; { - homepage = "http://www.samba.org/linux-cifs/cifs-utils/"; + homepage = "https://wiki.samba.org/index.php/LinuxCIFS_utils"; description = "Tools for managing Linux CIFS client filesystems"; platforms = platforms.linux; license = licenses.lgpl3; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 2df08dbb2b5bd..61b66c6c861d8 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ config, lib, stdenv, fetchFromGitHub, pkg-config, cmake # dependencies , glib, libXinerama @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib libXinerama ] ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] ++ optional ncursesSupport ncurses diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index c41f1410b01a8..0b14398e58f64 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink +{ fetchurl, lib, stdenv, flex, bison, pkg-config, libmnl, libnfnetlink , libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout , libnetfilter_cthelper, systemd , libtirpc @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue libnetfilter_cttimeout libnetfilter_cthelper systemd libtirpc ]; - nativeBuildInputs = [ flex bison pkgconfig ]; + nativeBuildInputs = [ flex bison pkg-config ]; meta = with lib; { homepage = "http://conntrack-tools.netfilter.org/"; diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index a970451e0dd15..c337da2fe723e 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3Packages, wireless-regdb }: +{ lib, stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkg-config, python3Packages, wireless-regdb }: stdenv.mkDerivation rec { pname = "crda"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt libnl ]; nativeBuildInputs = [ - pkgconfig + pkg-config python3Packages.pycrypto ]; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 3c46595ed87c3..f48ed260c7685 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables -, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig +, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config , which, python3, makeWrapper, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ]; + nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ]; propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index e678996a852ac..d0e685cd0fa92 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, lvm2, json_c -, openssl, libuuid, pkgconfig, popt }: +, openssl, libuuid, pkg-config, popt }: stdenv.mkDerivation rec { pname = "cryptsetup"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "--with-crypto_backend=openssl" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lvm2 json_c openssl libuuid popt ]; doCheck = true; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 74b35c50de594..bffc90260c18a 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, docutils, meson, ninja, pkg-config , dbus, linuxHeaders, systemd }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ docutils meson ninja pkgconfig ]; + nativeBuildInputs = [ docutils meson ninja pkg-config ]; buildInputs = [ dbus linuxHeaders systemd ]; diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index fad9559cc6387..d20b69775bfd6 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, directfb, zlib, libjpeg, xorgproto }: stdenv.mkDerivation { pname = "directvnc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "16x7mr7x728qw7nbi6rqhrwsy73zsbpiz8pbgfzfl2aqhfdiz88b"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ directfb zlib libjpeg xorgproto ]; diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index efe578c596b17..ab1839368958a 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -1,7 +1,7 @@ { stdenv, lib , kernel , fetchurl -, pkgconfig, meson, ninja +, pkg-config, meson, ninja , libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap , doxygen, python3 , shared ? false }: @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { doxygen meson ninja - pkgconfig + pkg-config python3 python3.pkgs.sphinx ]; diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix index 915d79aabac57..288dea85cc820 100644 --- a/pkgs/os-specific/linux/dropwatch/default.nix +++ b/pkgs/os-specific/linux/dropwatch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , libnl, readline, libbfd, ncurses, zlib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1qmax0l7z1qik42c949fnvjh5r6awk4gpgzdsny8iwnmwzjyp8b8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libbfd libnl ncurses readline zlib ]; # To avoid running into https://sourceware.org/bugzilla/show_bug.cgi?id=14243 we need to define: diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 7d0b87609b367..76abeff42db99 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -1,21 +1,36 @@ -{ lib, stdenv, fetchurl, python2Packages }: +{ lib, fetchFromGitHub, fetchpatch, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "dstat"; format = "other"; - version = "0.7.3"; + version = "0.7.4"; - src = fetchurl { - url = "https://github.com/dagwieers/dstat/archive/${version}.tar.gz"; - sha256 = "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6"; + src = fetchFromGitHub { + owner = "dstat-real"; + repo = "dstat"; + rev = "v${version}"; + sha256 = "1qnmkhqmjd1m3if05jj29dvr5hn6kayq9bkkkh881w472c0zhp8v"; }; - propagatedBuildInputs = with python2Packages; [ python-wifi ]; + propagatedBuildInputs = with python3Packages; [ six ]; - patches = [ ./fix_pluginpath.patch ]; + patches = [ + ./fix_pluginpath.patch + # this fixes another bug with python3 + (fetchpatch { + url = https://github.com/efexgee/dstat/commit/220a785321b13b6df92a536080aca6ef1cb644ad.patch ; + sha256 = "08kcz3yxvl35m55y7g1pr73x3bjcqnv0qlswxqyq8cqxg9zd64cn"; + }) + ]; makeFlags = [ "prefix=$(out)" ]; + # remove deprecation warnings + preFixup = '' + sed -i "s/import collections/import collections.abc/g" $out/share/dstat/dstat.py $out/bin/dstat + sed -i "s/collections.Sequence/collections.abc.Sequence/g" "$out"/bin/dstat + ''; + meta = with lib; { homepage = "http://dag.wieers.com/home-made/dstat/"; description = "Versatile resource statistics tool"; diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix index 2045c4b112c8f..bca24d9c90507 100644 --- a/pkgs/os-specific/linux/ebtables/default.nix +++ b/pkgs/os-specific/linux/ebtables/default.nix @@ -9,16 +9,22 @@ stdenv.mkDerivation rec { sha256 = "0apxgmkhsk3vxn9q3libxn3dgrdljrxyy4mli2gk49m7hi3na7xp"; }; - makeFlags = - [ "LIBDIR=$(out)/lib" "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" - "ETCDIR=$(out)/etc" "INITDIR=$(TMPDIR)" "SYSCONFIGDIR=$(out)/etc/sysconfig" - "LOCALSTATEDIR=/var" - ]; + makeFlags = [ + "LIBDIR=$(out)/lib" "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" + "ETCDIR=$(out)/etc" "INITDIR=$(TMPDIR)" "SYSCONFIGDIR=$(out)/etc/sysconfig" + "LOCALSTATEDIR=/var" + ]; NIX_CFLAGS_COMPILE = "-Wno-error"; preInstall = "mkdir -p $out/etc/sysconfig"; + postInstall = '' + ln -s $out/sbin/ebtables-legacy $out/sbin/ebtables + ln -s $out/sbin/ebtables-legacy-restore $out/sbin/ebtables-restore + ln -s $out/sbin/ebtables-legacy-save $out/sbin/ebtables-save + ''; + meta = with lib; { description = "A filtering tool for Linux-based bridging firewalls"; homepage = "http://ebtables.sourceforge.net/"; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 183c82f467a5d..8c15ce825c069 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchgit , autoreconfHook -, pkgconfig +, pkg-config , dbus }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook ]; diff --git a/pkgs/os-specific/linux/erofs-utils/default.nix b/pkgs/os-specific/linux/erofs-utils/default.nix index ffa39dc58028b..e1ff63bce773a 100644 --- a/pkgs/os-specific/linux/erofs-utils/default.nix +++ b/pkgs/os-specific/linux/erofs-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, fuse, libuuid, lz4 }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fuse, libuuid, lz4 }: stdenv.mkDerivation rec { pname = "erofs-utils"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "07hvijq2hsn3gg1kb8abrfk23n83j57yx8kyv4wqgwhhvd30myjc"; }; - buildInputs = [ autoreconfHook pkgconfig fuse libuuid lz4 ]; + buildInputs = [ autoreconfHook pkg-config fuse libuuid lz4 ]; configureFlags = [ "--enable-fuse" ]; diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 862deef5582ac..30f33262bc926 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, glib, gperf, util-linux, kmod}: +{lib, stdenv, fetchurl, pkg-config, glib, gperf, util-linux, kmod}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let sha256 = "1z6lfhhbjs6j7pbp6ybn17ywjsdl87ql6g1p3m2y26aa10cqcqc9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gperf util-linux kmod ]; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index e1909eea8947c..72e886b91f55f 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}: +{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86}: let s = # Generated upstream information { @@ -18,7 +18,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; - nativeBuildInputs = [ pkgconfig ncurses ]; + nativeBuildInputs = [ pkg-config ncurses ]; inherit buildInputs; preConfigure = '' diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 96ebaf178bf7e..25f541d7a0039 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -11,7 +11,7 @@ , libiec61883 , libraw1394 , libxmlxx3 -, pkgconfig +, pkg-config , python3 , sconsPackages , which @@ -46,7 +46,7 @@ mkDerivation rec { nativeBuildInputs = [ desktop-file-utils sconsPackages.scons_3_1_2 - pkgconfig + pkg-config which python pyqt5 diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix index f9218b688a97e..a28189a9e4749 100644 --- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix +++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ zraexy ]; }; -} +} diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index e98de6bbe9e8e..c4649557b111d 100644 --- a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: +{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: rustPlatform.buildRustPackage rec { pname = "firmware-manager"; version = "0.1.1"; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 9d6d3dc7a809a..52fa42665773f 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: let inherit (lib) optionals; diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 3ca8f41be7c69..84d9dd4f33114 100644 --- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, efibootmgr, makeWrapper }: +{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, efibootmgr, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0yjv3a8r01ks91gc33rdwqmw52cqqwhq9f3rvw2xv3h8cqa5hfz0"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ lzma openssl dbus ]; diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 857d30859b5ae..1b5a0e3bdffed 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchzip, autoreconfHook, pkgconfig, glib, libtool, pcre +{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, libtool, pcre , json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }: stdenv.mkDerivation rec { pname = "fwts"; - version = "20.09.00"; + version = "20.11.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "1vzzlb7xdrk8rhi27jdw9baskild4dmk7g5d0hhfh6z3fx4lfhgk"; + sha256 = "0s8iz6c9qhyndcsjscs3qail2mzfywpbiys1x232igm5kl089vvr"; stripRoot = false; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ]; postPatch = '' diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index a4dfc7cad5f4d..c241ac02a649f 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -2,7 +2,7 @@ , lib, stdenv , fetchurl , intltool -, pkgconfig +, pkg-config , portaudio , SDL2 , ffmpeg @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool - pkgconfig + pkg-config ] ++ lib.optionals (useGtk) [ wrapGAppsHook ] ++ lib.optionals (useQt) [ wrapQtAppsHook ] diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index a24bf093f8cf8..70dab152c728c 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkgconfig, udisks2 }: +{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkg-config, udisks2 }: stdenv.mkDerivation { name = "hal-flash-0.3.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0dw9bx190mrh0dycw4rfvfmwwvh2sgypffr99nfnr36b38jrd6y6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake dbus glib libtool udisks2 ]; preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing"; diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 3364f01350478..06b23bdf1f6a5 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: +{ lib, stdenv, fetchurl, pkg-config, libnl, openssl, sqlite ? null }: stdenv.mkDerivation rec { pname = "hostapd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl openssl sqlite ]; patches = [ diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index 3f4a8e2348b57..971a1abffddbd 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake -, glib, gtk3, gtk-doc, libgudev, pkgconfig, systemd }: +, glib, gtk3, gtk-doc, libgudev, pkg-config, systemd }: stdenv.mkDerivation rec { pname = "iio-sensor-proxy"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gettext intltool libtool - pkgconfig + pkg-config ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index e40a8d9b406a3..14ddc21bb6b33 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { pname = "ima-evm-utils"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1dhfw6d9z4dv82q9zg2g025hgr179kamz9chy7v5w9b71aam8jf8"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl attr keyutils asciidoc libxslt ]; patches = [ ./xattr.patch ]; diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix index 3be25867c335d..36a203a47c76b 100644 --- a/pkgs/os-specific/linux/input-utils/default.nix +++ b/pkgs/os-specific/linux/input-utils/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "input-utils"; version = "1.3"; - + src = fetchurl { url = "https://www.kraxel.org/releases/input/input-${version}.tar.gz"; sha256 = "11w0pp20knx6qpgzmawdbk1nj2z3fzp8yd6nag6s8bcga16w6hli"; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 9d7c2baf1a6cc..980b1fad0dfb5 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , patchelf , cmake -, pkgconfig +, pkg-config , intel-gmmlib , intel-graphics-compiler @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "19scbbr6jf3yp2v7z8xyzzm01g44jym7xfkf1dz64d5nhvjw6ig5"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ intel-gmmlib intel-graphics-compiler libva ]; diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 083c9aa726c6c..220a08d993cb9 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "ipset"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02mkp7vmsh609dcp02xi290sxmsgq2fsch3875dxkwfxkrl16p5p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; configureFlags = [ "--with-kmod=no" ]; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 33a956d2aa836..82157ffa07915 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison +{ lib, stdenv, fetchurl, pkg-config, pruneLibtoolFiles, flex, bison , libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap , nftablesCompat ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0rvp0k8a72h2snrdx48cfn75bfa0ycrd2xl3kjysbymq7q6gxx50"; }; - nativeBuildInputs = [ pkgconfig pruneLibtoolFiles flex bison ]; + nativeBuildInputs = [ pkg-config pruneLibtoolFiles flex bison ]; buildInputs = [ libmnl libnetfilter_conntrack libnfnetlink libnftnl libpcap ]; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 46146e90c7c3d..0079aa79a22b9 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns +, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns , libcap, libidn2 }: @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ]; + nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] ++ optional (!stdenv.hostPlatform.isMusl) libidn2; diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index aab8c2c7c83f0..fbd4d8efdac89 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }: +{ lib, stdenv, fetchurl, pkg-config, libnl, popt, gnugrep }: stdenv.mkDerivation rec { pname = "ipvsadm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-lnl" "$(pkg-config --libs libnl-genl-3.0)" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl popt ]; preBuild = '' diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 8fff7a2742910..7cb05f7fe989a 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, ncurses, libcap_ng }: stdenv.mkDerivation rec { pname = "irqbalance"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1677ap6z4hvwga0vb8hrvpc0qggyarg9mlg11pxywz7mq94vdx19"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib ncurses libcap_ng ]; LDFLAGS = "-lncurses"; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 6a33790eead36..f1aa85cdd3f59 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -2,7 +2,7 @@ , fetchgit , fetchpatch , autoreconfHook -, pkgconfig +, pkg-config , ell , coreutils , docutils @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docutils - pkgconfig + pkg-config python3Packages.wrapPython ]; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 8572f8ebdb93b..b1bce496614a1 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libnl, iptables }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libnl, iptables }: let sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = sourceAttrs.src; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libnl iptables ]; makeFlags = [ "-C" "src/usr" ]; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 68aff5c9d8aab..2119c10b9cf07 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, - gzip, bzip2, pkgconfig, flex, check, + gzip, bzip2, pkg-config, flex, check, pam, coreutils }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { buildInputs = [ check pam ]; - nativeBuildInputs = [ autoreconfHook pkgconfig flex ]; + nativeBuildInputs = [ autoreconfHook pkg-config flex ]; makeFlags = [ "setowner=" ]; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 629d2c9a0866b..c75117769d1fe 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,21 +7,21 @@ }, "4.19": { "extra": ".a", - "name": "linux-hardened-4.19.168.a.patch", - "sha256": "09s9l5qf44ly41fjs745gh00vf0lkkzymcks44zyzmsznjsxm2xx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.168.a/linux-hardened-4.19.168.a.patch" + "name": "linux-hardened-4.19.169.a.patch", + "sha256": "0l3n1yjsa777pdxh4ib7phpfrw7c8vr1xwzgs8khnffllj9f16iq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.169.a/linux-hardened-4.19.169.a.patch" }, "5.10": { "extra": ".a", - "name": "linux-hardened-5.10.8.a.patch", - "sha256": "1nqn50c6g7j7ljdq7y50y6kgmilc5mb266lg6z6kz0cqpn2qaxxx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.8.a/linux-hardened-5.10.8.a.patch" + "name": "linux-hardened-5.10.9.a.patch", + "sha256": "0mkwyknafdbc2hqv4j7jjc6wsrrx6a76d69hxh7x90gi0s3f5rfw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.9.a/linux-hardened-5.10.9.a.patch" }, "5.4": { "extra": ".a", - "name": "linux-hardened-5.4.90.a.patch", - "sha256": "1x0fkcgsw7q99xa2f97i2cyybwj4kjf6vypbm2bwgl76ghpchydq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.90.a/linux-hardened-5.4.90.a.patch" + "name": "linux-hardened-5.4.91.a.patch", + "sha256": "0kqn9g6wh4rp9riwkjmzapmnwk0fd5z18z26j2rqfgq7x4r8d7rm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.91.a/linux-hardened-5.4.91.a.patch" }, "5.9": { "extra": "", diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 8ed7ed65b1517..bf072e4786458 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.168"; + version = "4.19.169"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1whkqklqj8rz9lv88aldvwkwnb9xvg0njdbcrk56r7z6f9zkhnmm"; + sha256 = "156y4ly7qyy5z7sbp2vccrs7za72k3zi2hfjpskqqd6civdlvln7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 5c4afea3a8e04..ca6f1eeaf49bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.8"; + version = "5.10.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w"; + sha256 = "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index e17a56a935706..28a481b2f8aee 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.90"; + version = "5.4.91"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "06pscvxjkpz35y6kbmyzdvn9mm4p7pfg0d49chi1q61z0sy3crv4"; + sha256 = "05swzh4gb0mk6wzza0k6b0283cygkvj8a2d2b2gab6sb0fxn208f"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index ed19559f95f4d..d733f0bdfa432 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.4-rt22"; # updated by ./update-rt.sh + version = "5.10.8-rt24"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh"; + sha256 = "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1wnp7w3k1z10ipg8vzgyh22lpfya1p3ckabjadk9hadpa1ialma0"; + sha256 = "06fqwx9flcxzbjr9gb0d7v4hidypzz69r6p2mfzhqh7ii0p89f30"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index de7d508c10ec6..b28e16590839f 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.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 }: @@ -36,7 +36,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/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 9feb4fe98216e..ef8296cf16f0d 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig +{ stdenv, lib, fetchurl, autoreconfHook, pkg-config , libxslt, xz, elf-header , withStatic ? stdenv.hostPlatform.isStatic }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; + nativeBuildInputs = [ autoreconfHook pkg-config libxslt ]; buildInputs = [ xz ] ++ lib.optional stdenv.isDarwin elf-header; configureFlags = [ diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index ee6a108301baf..f48895fc017ea 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -8,7 +8,7 @@ , libGLU, libGL , pango , pixman -, pkgconfig +, pkg-config , docbook_xsl , libxslt }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docbook_xsl - pkgconfig + pkg-config ]; configureFlags = [ diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 147b82c82bffe..6db3a9583ecda 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }: +{ lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }: stdenv.mkDerivation { name = "kmscube-2018-06-17"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1q5b5yvyfj3127385mp1bfmcbnpnbdswdk8gspp7g4541xk4k933"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libdrm libX11 libGL mesa ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index c7586a7d871c7..30ec6cdc7b51e 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, glib, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2 }: stdenv.mkDerivation rec { name = "latencytop-0.5"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses glib gtk2 ]; meta = { diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 5060df1638b66..c422f5e01bb4b 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, udev, buildPackages }: +{ lib, stdenv, fetchurl, pkg-config, udev, buildPackages }: stdenv.mkDerivation rec { name = "libatasmart-0.19"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index c454fc5f3b1e1..2e497584fab87 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , libelf, zlib , fetchpatch }: @@ -31,14 +31,14 @@ stdenv.mkDerivation rec { --replace '/bin/rm' 'rm' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libelf zlib ]; sourceRoot = "source/src"; enableParallelBuilding = true; makeFlags = [ "PREFIX=$(out)" ]; - # FIXME: Multi-output requires some fixes to the way the pkgconfig file is + # FIXME: Multi-output requires some fixes to the way the pkg-config file is # constructed (it gets put in $out instead of $dev for some reason, with # improper paths embedded). Don't enable it for now. diff --git a/pkgs/os-specific/linux/libevdevc/default.nix b/pkgs/os-specific/linux/libevdevc/default.nix index cb21eeaa75338..2417ef6da9db5 100644 --- a/pkgs/os-specific/linux/libevdevc/default.nix +++ b/pkgs/os-specific/linux/libevdevc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, pkgconfig, glib, jsoncpp }: +{ lib, stdenv, fetchFromGitHub, coreutils, pkg-config, glib, jsoncpp }: stdenv.mkDerivation rec { name = "libevdevc"; diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix index f6171220fb653..b1f9bada31505 100644 --- a/pkgs/os-specific/linux/libfabric/default.nix +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libpsm2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libpsm2 }: stdenv.mkDerivation rec { pname = "libfabric"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "17qq96mlfhbkbmsvbazhxzkjnh6x37xlh3r0ngp0rfqbl05z2pcr"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ] ; + nativeBuildInputs = [ pkg-config autoreconfHook ] ; buildInputs = [ libpsm2 ] ; diff --git a/pkgs/os-specific/linux/libgestures/default.nix b/pkgs/os-specific/linux/libgestures/default.nix index 9aaa1c2bce62e..bface8118be21 100644 --- a/pkgs/os-specific/linux/libgestures/default.nix +++ b/pkgs/os-specific/linux/libgestures/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, jsoncpp }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, jsoncpp }: stdenv.mkDerivation rec { name = "libgestures-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace '$(DESTDIR)/usr/include' '$(DESTDIR)/include' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib jsoncpp ]; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 551352fa46c6a..b7d08344e4088 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig +{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkg-config , pythonSupport ? false, swig ? null, python}: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig file ] + nativeBuildInputs = [ autoreconfHook bison flex pkg-config file ] ++ lib.optional pythonSupport swig; postBuild = lib.optionalString (pythonSupport) '' diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index b7163617ce53d..1ac4580b13f10 100644 --- a/pkgs/os-specific/linux/libpsm2/default.nix +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, numactl, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, numactl, pkg-config }: stdenv.mkDerivation rec { pname = "libpsm2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ numactl pkgconfig ]; + buildInputs = [ numactl pkg-config ]; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index 2a52e72cc91f0..14773d69440ce 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config , glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 , json-glib, libunistring }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gitMinimal swig check valgrind + meson ninja pkg-config gitMinimal swig check valgrind ]; buildInputs = [ diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 7a1b6539e5ea2..6582c6d8e8d6d 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcre, pkgconfig, libsepol +{ lib, stdenv, fetchurl, pcre, pkg-config, libsepol , enablePython ? true, swig ? null, python3 ? null , fts }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0cr4p0qkr4qd5z1x677vwhz6mlz55kxyijwi2dmrvbhxcw7v78if"; }; - nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python3 ]; + nativeBuildInputs = [ pkg-config ] ++ optionals enablePython [ swig python3 ]; buildInputs = [ libsepol pcre fts ] ++ optionals enablePython [ python3 ]; # drop fortify here since package uses it by default, leading to compile error: diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index f995ea5e45caa..d7255ac4587b1 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, audit +{ lib, stdenv, fetchurl, pkg-config, bison, flex, libsepol, libselinux, bzip2, audit , enablePython ? true, swig ? null, python ? null }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ] ++ optional enablePython "py"; - nativeBuildInputs = [ bison flex pkgconfig ]; + nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libsepol libselinux bzip2 audit ] ++ optionals enablePython [ swig python ]; diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 108568d0b5196..46d0e94bb14ce 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, help2man, gettext , libxml2, perl, python3, doxygen }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"; }; - nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ]; + nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkg-config ]; buildInputs = [ python3 ]; diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index 2168d48244237..ec56a89ce88fe 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkgconfig, systemd }: +{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }: stdenv.mkDerivation { name = "lightum-2014-06-07"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { libX11 libXScrnSaver libXext - pkgconfig + pkg-config systemd ]; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 65048ab4bd57a..76a74299ae526 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchpatch , fetchurl -, pkgconfig +, pkg-config , util-linux , libuuid , thin-provisioning-tools, libaio @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "1l0fkn9abrgk5mfn6jfh9qhdr86b59l1c5pk6lp8jh0491d69las"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev libuuid thin-provisioning-tools libaio ]; configureFlags = [ diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 16e7ef0a804a6..e6bdd70b915ca 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, perl, docbook2x +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, perl, docbook2x , docbook_xml_dtd_45, python3Packages, pam # Optional Dependencies @@ -9,15 +9,15 @@ with lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1976l9308rx1ria1gazasypk5rmmf5jiqdh54dfrws5bslbdcb5g"; + sha256 = "0qz4l7mlhq7hx53q606qgvkyzyr01glsw290v8ppzvxn1fydlrci"; }; nativeBuildInputs = [ - autoreconfHook pkgconfig perl docbook2x python3Packages.wrapPython + autoreconfHook pkg-config perl docbook2x python3Packages.wrapPython ]; buildInputs = [ pam libapparmor gnutls libselinux libseccomp libcap diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 1f8b7f0143c5e..ab148af72f234 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -1,20 +1,20 @@ -{ config, lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse +{ config, lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, fuse , util-linux, makeWrapper , enableDebugBuild ? config.lxcfs.enableDebugBuild or false }: with lib; stdenv.mkDerivation rec { pname = "lxcfs"; - version = "4.0.6"; + version = "4.0.7"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "lxcfs-${version}"; - sha256 = "1fp2q4y3ql4xd2lp4bpcl8s6xryr5xbb56da9d20w2cdr2d0lwyv"; + sha256 = "sha256-gC1Q+kG/oKfYvuHVKstpRWfL/thsemULrimPrV/eeaI="; }; - nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; + nativeBuildInputs = [ pkg-config help2man autoreconfHook ]; buildInputs = [ fuse makeWrapper ]; preConfigure = lib.optionalString enableDebugBuild '' diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index e2230da3d2c0a..8545d31c71ab7 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config , glib, readline, pcre, systemd, udev }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "05afqi33rv7k6pbkkw4mynj6p97vkzhhh13y5nh0yxkyhcgf45pm"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib pcre readline systemd udev ]; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index adeb71befe4b9..4784abc6c28ec 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }: +{ lib, stdenv, fetchurl, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }: stdenv.mkDerivation rec { pname = "multipath-tools"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { $(find * -name Makefile\*) ''; - nativeBuildInputs = [ gzip pkgconfig perl ]; + nativeBuildInputs = [ gzip pkg-config perl ]; buildInputs = [ systemd lvm2 libaio readline liburcu json_c ]; makeFlags = [ diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index 730b03e93feb4..ac9f27e2e6bdc 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/mxconf sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/Makefile ''; - + installPhase = '' install -v -D -m 644 ./driver/mxu11x0.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/usb/serial/mxu11x0.ko" install -v -D -m 644 ./driver/mxu11x0.ko "$out/lib/modules/${kernel.modDirVersion}/misc/mxu11x0.ko" diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 708430da397e9..c2d2996c54dc9 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, util-linux, libcap, libtirpc, libevent +{ stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers , python3, buildPackages, nixosTests, rpcsvc-proto , enablePython ? true @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # put it in the "lib" output, and the headers in "dev" outputs = [ "out" "dev" "lib" "man" ]; - nativeBuildInputs = [ pkgconfig buildPackages.stdenv.cc rpcsvc-proto ]; + nativeBuildInputs = [ pkg-config buildPackages.stdenv.cc rpcsvc-proto ]; buildInputs = [ libtirpc libcap libevent sqlite lvm2 diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 49b4da5c671c3..115c12ec5e4e5 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, bison, file, flex +{ lib, stdenv, fetchurl, pkg-config, bison, file, flex , asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl , libmnl, libnftnl, libpcap , gmp, jansson, readline @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig bison file flex + pkg-config bison file flex asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt ]; diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index a534ebaaac308..ba972bb6916a6 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, numactl, ncurses, check }: +{ lib, stdenv, fetchurl, pkg-config, numactl, ncurses, check }: stdenv.mkDerivation rec { pname = "numatop"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ numactl ncurses ]; checkInputs = [ check ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 4076a27ffc251..d5bbf40e2b8a6 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,6 +1,6 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchFromGitHub, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau +{ stdenv, lib, fetchFromGitHub, pkg-config, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau , librsvg, wrapGAppsHook , withGtk2 ? false, withGtk3 ? true }: @@ -45,7 +45,7 @@ stdenv.mkDerivation { version = nvidia_x11.settingsVersion; inherit src; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 621e6d1f54c33..b5610d35ddea1 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config , dpdk, libconfig, libpcap, numactl, openssl, zlib, libbsd, libelf, jansson }: let dpdk_18_11 = dpdk.overrideAttrs (old: rec { @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ dpdk_18_11 diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix index b392bf6f0ea8b..5defafeba805e 100644 --- a/pkgs/os-specific/linux/ofp/default.nix +++ b/pkgs/os-specific/linux/ofp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , openssl, libpcap, odp-dpdk, dpdk }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "05902593fycgkwzk5g7wzgk0k40nrrgybplkdka3rqnlj6aydhqf"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl libpcap odp-dpdk dpdk ]; dontDisableStatic = true; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 0adc6dbc3c21e..cbd1bbdf76335 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which , procps, libcap_ng, openssl, python3 , perl , kernel ? null }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper util-linux openssl libcap_ng pythonEnv perl procps which ]; diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index 59031d8a7069a..ddb5eff972303 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which , procps, libcap_ng, openssl, python2, iproute , perl , automake, autoconf, libtool, kernel ? null }: @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ autoconf libtool automake pkgconfig ]; + nativeBuildInputs = [ autoconf libtool automake pkg-config ]; buildInputs = [ makeWrapper util-linux openssl libcap_ng python2 perl procps which ]; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 45f901b42f09e..42b7ea9109232 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -20,9 +20,6 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81"; }) - # From adelie's package repo, using local copy since it seems to be currently offline. - # (we previously used similar patch from void, but stopped working with update to 1.3.1) - ./musl-fix-pam_exec.patch ]; outputs = [ "out" "doc" "man" /* "modules" */ ]; diff --git a/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch b/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch deleted file mode 100644 index 194e47b9e5b0b..0000000000000 --- a/pkgs/os-specific/linux/pam/musl-fix-pam_exec.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- ./modules/pam_exec/pam_exec.c.orig -+++ ./modules/pam_exec/pam_exec.c -@@ -103,11 +103,14 @@ - int optargc; - const char *logfile = NULL; - const char *authtok = NULL; -+ char authtok_buf[PAM_MAX_RESP_SIZE+1]; -+ - pid_t pid; - int fds[2]; - int stdout_fds[2]; - FILE *stdout_file = NULL; - -+ memset(authtok_buf, 0, sizeof(authtok_buf)); - if (argc < 1) { - pam_syslog (pamh, LOG_ERR, - "This module needs at least one argument"); -@@ -180,12 +183,12 @@ - if (resp) - { - pam_set_item (pamh, PAM_AUTHTOK, resp); -- authtok = strndupa (resp, PAM_MAX_RESP_SIZE); -+ authtok = strncpy(authtok_buf, resp, sizeof(authtok_buf)); - _pam_drop (resp); - } - } - else -- authtok = strndupa (void_pass, PAM_MAX_RESP_SIZE); -+ authtok = strncpy(authtok_buf, void_pass, sizeof(authtok_buf)); - - if (pipe(fds) != 0) - { - diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 464a2b04b2b41..7f26ae80ed67b 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }: stdenv.mkDerivation rec { pname = "pam_mount"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace @@NIX_UTILLINUX@@ ${util-linux}/bin ''; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; buildInputs = [ pam libHX util-linux libxml2 pcre perl openssl cryptsetup ]; diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index eece7b84c3d61..bca02c1706616 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, postgresql, libgcrypt, pam }: stdenv.mkDerivation rec { pname = "pam_pgsql"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1a68krq5m07zspdxwl1wmkr5j98zr9bdg4776kvplrsdcg97h4jk"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libgcrypt pam postgresql ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 852fb2d73ef88..760af73fecd26 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libfido2, pam, openssl }: +{ lib, stdenv, fetchurl, pkg-config, libfido2, pam, openssl }: stdenv.mkDerivation rec { pname = "pam_u2f"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01fwbrfnjkv93vvqm54jywdcxa1p7d4r32azicwnx75nxfbbzhqd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfido2 pam openssl ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index 57f0d97ae81de..1a66e986d8b28 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript, runtimeShell }: +{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, pythonPackages, writeScript, runtimeShell }: let @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper # pam_usb dependencies - dbus libxml2 pam pmount pkgconfig + dbus libxml2 pam pmount pkg-config # pam_usb's tools dependencies python # cElementTree is included with python 2.5 and later. diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index caa6b1848e7d0..1ef304c617f75 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, pkgconfig, gettext, fetchFromGitHub, python3 +{ lib, stdenv, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 , wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 , gobject-introspection }: @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1nfjnsiwg2rs6gkjsxzhr2708i6di149dgwq3cf6l12rxqpb8arj"; }; - nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; + nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ]; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 1e8bd3407d5d7..47ca709c44b99 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkgconfig +{ stdenv, lib, fetchurl, meson, ninja, pkg-config , dpdk, libbsd, libpcap, lua5_3, numactl, util-linux , gtk2, which, withGtk ? false }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1clfviz1qa4hysslcg6i29vsxwl9f6j1y7zf9wwx9br3yq08x956"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ dpdk libbsd libpcap lua5_3 numactl which ] diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 88575580e2a28..c167b202c8d6c 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxslt, docbook_xsl +{ stdenv, fetchurl, autoreconfHook, pkg-config, libxslt, docbook_xsl , gtk3, udev, systemd, lib }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook pkgconfig libxslt docbook_xsl + autoreconfHook pkg-config libxslt docbook_xsl ]; buildInputs = [ diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix index e5e8ea2feeabb..9e9cf149fefb8 100644 --- a/pkgs/os-specific/linux/pommed-light/default.nix +++ b/pkgs/os-specific/linux/pommed-light/default.nix @@ -4,7 +4,7 @@ , libconfuse , alsaLib , audiofile -, pkgconfig +, pkg-config , zlib , eject }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace pommed/cd_eject.c --replace /usr/bin/eject ${eject}/bin/eject ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pciutils libconfuse diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 6020139ad4b4e..12a92c36c6921 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { pname = "powerstat"; version = "0.02.24"; - + src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; sha256 = "0yrc1xi9flxn2mvmzp0b0vd0md5z4p8fd4y8bszc67xy12qiqy0j"; }; - + installFlags = [ "DESTDIR=${placeholder "out"}" ]; - + postInstall = '' mv $out/usr/* $out rm -r $out/usr ''; - + meta = with lib; { description = "Laptop power measuring tool"; homepage = "https://kernel.ubuntu.com/~cking/powerstat/"; diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index ad5b664b09a25..bbcf6e390f046 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkg-config, zlib }: stdenv.mkDerivation rec { pname = "powertop"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; patches = lib.optional stdenv.hostPlatform.isMusl ( diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 4942710f755e5..9f12ab695397e 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkg-config # `ps` with systemd support is able to properly report different # attributes like unit name, so we want to have it on linux. @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ] ++ lib.optional withSystemd systemd; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = [ "usrbin_execdir=$(out)/bin" ] ++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS="]; diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index f6ee22ee0fc6d..ef7dbc55a9ab9 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }: +{ lib, stdenv, fetchFromGitLab, meson, pkg-config, ninja, cairo }: stdenv.mkDerivation rec { pname = "pscircle"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ meson - pkgconfig + pkg-config cairo ninja ]; diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 0d50c6b41d877..01b83f8791199 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , autoreconfHook , pciutils -, pkgconfig +, pkg-config , xorg }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0mjk9wr9rsb17yy92j6yi16hfpa6v5r1dbyiy60zp4r125wr63za"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ xorg.libpciaccess ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index f1655c94b84d9..e6aa07e6cd171 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gettext, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, makeWrapper , ncurses, libdrm, libpciaccess, libxcb }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses libdrm libpciaccess libxcb ]; - nativeBuildInputs = [ pkgconfig gettext makeWrapper ]; + nativeBuildInputs = [ pkg-config gettext makeWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index fd7148b7eb634..b001ce966a92d 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, docutils +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils , pandoc, ethtool, iproute, libnl, udev, python, perl , makeWrapper } : @@ -17,7 +17,7 @@ in stdenv.mkDerivation { sha256 = "04q4z95nxxxjc674qnbwn19bv18nl3x7xwp6aql17h1cw3gdmhw4"; }; - 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/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 2c50c491d43f3..161db99114b86 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: +{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, pcre }: stdenv.mkDerivation { pname = "rewritefs"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { rev = "33fb844d8e8ff441a3fc80d2715e8c64f8563d81"; sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla"; }; - - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse pcre ]; prePatch = '' diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index d30c1bdf19bb0..1eba2511b9877 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig, gettext +{ lib, stdenv, fetchurl, cmake, pkg-config, gettext , dbus, dbus-glib, libgaminggear, libgudev, lua , harfbuzz }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }' libroccat/roccat_helper.c ''; - nativeBuildInputs = [ cmake pkgconfig gettext ]; + nativeBuildInputs = [ cmake pkg-config gettext ]; buildInputs = [ dbus dbus-glib libgaminggear libgudev lua ]; cmakeFlags = [ diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index 8138fb9c34650..fb41863c431d2 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, meson, ninja, pkgconfig, unixtools +, meson, ninja, pkg-config, unixtools , dbus, libcap, polkit, systemd }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ meson ninja pkgconfig unixtools.xxd ]; + nativeBuildInputs = [ meson ninja pkg-config unixtools.xxd ]; buildInputs = [ dbus libcap polkit systemd ]; mesonFlags = [ diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 4649ff8af56f3..2973b87210bfd 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen, - python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, + python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap, pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, nss_wrapper, ncurses, Po4a, http-parser, jansson, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss samba nfs-utils doxygen python python3 popt - talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos + talloc tdb tevent pkg-config ldb pam openldap pcre kerberos cifs-utils glib keyutils dbus fakeroot libxslt libxml2 libuuid ldap systemd nspr check cmocka uid_wrapper nss_wrapper ncurses Po4a http-parser jansson ]; diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 454527321fb13..af180b5e5241f 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji"; }; - patches = [ ./systemd.patch ./union-wait.patch ]; + patches = [ ./systemd.patch ./union-wait.patch ./fix-includes-for-musl.patch ]; NIX_CFLAGS_COMPILE = "-DSYSV"; diff --git a/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch b/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch new file mode 100644 index 0000000000000..87e56a10db8b5 --- /dev/null +++ b/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch @@ -0,0 +1,120 @@ +# this patch both fixes some include paths as well as removes glibc +# gates around defines that musl-libc also depends on. +diff -u sysklogd-1.5.1.orig/klogd.c sysklogd-1.5.1/klogd.c +--- sysklogd-1.5.1.orig/klogd.c 2014-10-04 15:47:18.000000000 -0400 ++++ sysklogd-1.5.1/klogd.c 2021-01-18 23:09:23.000000000 -0500 +@@ -260,11 +260,8 @@ + #include <unistd.h> + #include <signal.h> + #include <errno.h> +-#include <sys/fcntl.h> ++#include <fcntl.h> + #include <sys/stat.h> +-#if !defined(__GLIBC__) +-#include <linux/time.h> +-#endif /* __GLIBC__ */ + #include <stdarg.h> + #include <paths.h> + #include <stdlib.h> +@@ -277,13 +274,8 @@ + + #define __LIBRARY__ + #include <linux/unistd.h> +-#if !defined(__GLIBC__) +-# define __NR_ksyslog __NR_syslog +-_syscall3(int,ksyslog,int, type, char *, buf, int, len); +-#else + #include <sys/klog.h> + #define ksyslog klogctl +-#endif + + #define LOG_BUFFER_SIZE 4096 + #define LOG_LINE_LENGTH 1000 +diff -u sysklogd-1.5.1.orig/ksym_mod.c sysklogd-1.5.1/ksym_mod.c +--- sysklogd-1.5.1.orig/ksym_mod.c 2014-10-04 15:47:18.000000000 -0400 ++++ sysklogd-1.5.1/ksym_mod.c 2021-01-18 23:09:57.000000000 -0500 +@@ -113,12 +113,9 @@ + #include <unistd.h> + #include <signal.h> + #include <errno.h> +-#include <sys/fcntl.h> ++#include <fcntl.h> + #include <sys/stat.h> + #include "module.h" +-#if !defined(__GLIBC__) +-#include <linux/time.h> +-#endif /* __GLIBC__ */ + #include <stdarg.h> + #include <paths.h> + #include <linux/version.h> +diff -u sysklogd-1.5.1.orig/pidfile.c sysklogd-1.5.1/pidfile.c +--- sysklogd-1.5.1.orig/pidfile.c 2014-10-04 15:47:18.000000000 -0400 ++++ sysklogd-1.5.1/pidfile.c 2021-01-18 23:23:55.000000000 -0500 +@@ -25,6 +25,7 @@ + */ + + #include <stdio.h> ++#include <fcntl.h> + #include <unistd.h> + #include <sys/stat.h> + #include <sys/file.h> +diff -u sysklogd-1.5.1.orig/syslog.c sysklogd-1.5.1/syslog.c +--- sysklogd-1.5.1.orig/syslog.c 2014-10-04 15:47:18.000000000 -0400 ++++ sysklogd-1.5.1/syslog.c 2021-01-18 23:11:45.000000000 -0500 +@@ -55,7 +55,6 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/file.h> +-#include <sys/signal.h> + #include <sys/syslog.h> + #if 0 + #include "syslog.h" +@@ -64,6 +63,8 @@ + + #include <sys/uio.h> + #include <sys/wait.h> ++#include <signal.h> ++#include <fcntl.h> + #include <netdb.h> + #include <string.h> + #include <time.h> +diff -u sysklogd-1.5.1.orig/syslogd.c sysklogd-1.5.1/syslogd.c +--- sysklogd-1.5.1.orig/syslogd.c 2014-10-04 15:47:18.000000000 -0400 ++++ sysklogd-1.5.1/syslogd.c 2021-01-18 23:13:25.000000000 -0500 +@@ -519,9 +519,9 @@ + #include <time.h> + + #define SYSLOG_NAMES ++#include <errno.h> + #include <sys/syslog.h> + #include <sys/param.h> +-#include <sys/errno.h> + #include <sys/ioctl.h> + #include <sys/stat.h> + #include <sys/wait.h> +@@ -818,9 +818,7 @@ + void init(); + void cfline(char *line, register struct filed *f); + int decode(char *name, struct code *codetab); +-#if defined(__GLIBC__) + #define dprintf mydprintf +-#endif /* __GLIBC__ */ + static void dprintf(char *, ...); + static void allocate_log(void); + void sighup_handler(); +@@ -840,15 +838,9 @@ + register char *p; + #ifndef TESTING + ssize_t msglen; +-#endif +-#if !defined(__GLIBC__) +- int len, num_fds; +-#else /* __GLIBC__ */ +-#ifndef TESTING + socklen_t len; + #endif + int num_fds; +-#endif /* __GLIBC__ */ + /* + * It took me quite some time to figure out how this is + * supposed to work so I guess I should better write it down. diff --git a/pkgs/os-specific/linux/sysklogd/systemd.patch b/pkgs/os-specific/linux/sysklogd/systemd.patch index 0a7fb166bd75c..a170f67cadbb0 100644 --- a/pkgs/os-specific/linux/sysklogd/systemd.patch +++ b/pkgs/os-specific/linux/sysklogd/systemd.patch @@ -71,9 +71,9 @@ diff -ruN -x '*~' sysklogd-1.5-old/sd-daemon.c sysklogd-1.5/sd-daemon.c +#include <sys/stat.h> +#include <sys/socket.h> +#include <sys/un.h> -+#include <sys/fcntl.h> +#include <netinet/in.h> +#include <stdlib.h> ++#include <fcntl.h> +#include <errno.h> +#include <unistd.h> +#include <string.h> diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 51ccdd22b116e..421fc5986af32 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,7 +6,7 @@ , ninja , meson , m4 -, pkgconfig +, pkg-config , coreutils , gperf , getent @@ -250,7 +250,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ - pkgconfig + pkg-config gperf ninja meson diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix index e6cdf69d6d158..e532f9965aa88 100644 --- a/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -2,7 +2,7 @@ , boost , cmake , fetchFromGitHub -, pkgconfig +, pkg-config , txt2tags }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x"; }; - nativeBuildInputs = [ cmake pkgconfig txt2tags ]; + nativeBuildInputs = [ cmake pkg-config txt2tags ]; buildInputs = [ boost ]; cmakeFlags = [ diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index d304bd2533f98..453df94f8fb5d 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }: +{ lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }: stdenv.mkDerivation { name = "udisks-glue-1.3.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176"; }; - nativeBuildInputs = [ pkgconfig automake autoconf ]; + nativeBuildInputs = [ pkg-config automake autoconf ]; buildInputs = [ udisks1 dbus-glib glib libconfuse ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 8f48ae017f0f5..f20dc6b607654 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib +{ lib, stdenv, fetchurl, pkg-config, sg3_utils, udev, glib, dbus, dbus-glib , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm , libxslt, docbook_xsl, util-linux, libgudev }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { lvm2 libatasmart intltool libuuid libxslt docbook_xsl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ]; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index b2b65de10788d..7be729f4ac8d6 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkgconfig, gettext, gnused +{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkg-config, gettext, gnused , gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which , expat, libxslt, docbook_xsl, util-linux, mdadm, libgudev, libblockdev, parted , gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoconf automake pkgconfig libtool gettext which gobject-introspection + autoconf automake pkg-config libtool gettext which gobject-introspection gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl ]; diff --git a/pkgs/os-specific/linux/unstick/default.nix b/pkgs/os-specific/linux/unstick/default.nix index cca6e6210cb66..7d839f8acdb80 100644 --- a/pkgs/os-specific/linux/unstick/default.nix +++ b/pkgs/os-specific/linux/unstick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkgconfig, libseccomp }: +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, libseccomp }: stdenv.mkDerivation rec { name = "unstick"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libseccomp ]; meta = { diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 9a01d3980e80d..08bebefed136d 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , libxslt , docbook_xsl , udev @@ -30,7 +30,7 @@ stdenv.mkDerivation { gettext gobject-introspection libxslt - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index a2f0b99e8d816..cff6df4ac1f1e 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , asciidoc -, pkgconfig +, pkg-config , libxslt , libxml2 , docbook_xml_dtd_45 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook asciidoc - pkgconfig + pkg-config libxslt # xsltproc libxml2 # xmllint docbook_xml_dtd_45 diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index a723c18e8426b..9e298697d4b3f 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata , python3 }: +{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }: stdenv.mkDerivation rec { name = "usbutils-012"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libusb1 python3 ]; outputs = [ "out" "man" "python" ]; diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index c3c3c87dafc2e..d0c690a952748 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, dbus, libnotify, udisks2, gdk-pixbuf }: +{ lib, stdenv, fetchgit, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }: stdenv.mkDerivation { name = "usermount-0.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0gpp0vwiwr7kgbhh26jspv3255662mnvnav6g8i2h0qxar8hf8w2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus libnotify udisks2 gdk-pixbuf ]; NIX_CFLAGS_COMPILE = "-DENABLE_NOTIFICATIONS"; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 600d10888c568..d7629f0df04d2 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, zlib, shadow +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, zlib, shadow , ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }: stdenv.mkDerivation rec { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "usrsbin_execdir=${placeholder "bin"}/sbin" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib pam ] ++ lib.filter (p: p != null) [ ncurses systemd perl ]; diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix index 3d7fe1f5e150e..d5f3a729978de 100644 --- a/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libxml2 }: stdenv.mkDerivation { version = "0.3.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0s15xxgdx8lnka7vi8llbf6b0j4rhbjl6yp0qxaihysf890xj73s"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libxml2 ]; prePatch = '' diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index b9cbd48944c3f..81a5f74c42fc1 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl +{ stdenv, lib, fetchurl, pkg-config, perl , libjpeg, udev , withUtils ? true , withGUI ? true, alsaLib, libX11, qtbase, libGLU, wrapQtAppsHook @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h" ''; - nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional withQt wrapQtAppsHook; + nativeBuildInputs = [ pkg-config perl ] ++ lib.optional withQt wrapQtAppsHook; buildInputs = [ udev ] ++ lib.optionals withQt [ alsaLib libX11 qtbase libGLU ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 49fd957de1a30..32b61b02beecf 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, pkgconfig, libnl +{ lib, stdenv, fetchurl, openssl, pkg-config, libnl , dbus, readline ? null, pcsclite ? null }: @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libnl dbus readline pcsclite ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 diff --git a/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/pkgs/os-specific/linux/xf86-input-cmt/default.nix index e3ac4df2fd782..a973f844fd4a0 100644 --- a/pkgs/os-specific/linux/xf86-input-cmt/default.nix +++ b/pkgs/os-specific/linux/xf86-input-cmt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xorgserver, xorgproto, +{ lib, stdenv, fetchFromGitHub, pkg-config, xorgserver, xorgproto, utilmacros, libgestures, libevdevc }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./apply_patches.sh ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto utilmacros libgestures libevdevc diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index bea1871b0eb86..e404ac72f5c5b 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , xorgproto, libX11, libXext, libXi, libXrandr, libXrender -, ncurses, pkgconfig, xorgserver, udev, libXinerama, pixman }: +, ncurses, pkg-config, xorgserver, udev, libXinerama, pixman }: stdenv.mkDerivation rec { name = "xf86-input-wacom-0.36.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ xorgproto libX11 libXext libXi libXrandr libXrender - ncurses pkgconfig xorgserver udev libXinerama pixman ]; + ncurses pkg-config xorgserver udev libXinerama pixman ]; preConfigure = '' mkdir -p $out/share/X11/xorg.conf.d diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index dbd59d530ce86..7c93fa91854b7 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, autoreconfHook, xorgproto, libX11, libXext -, pixman, pkgconfig, utilmacros, xorgserver +, pixman, pkg-config, utilmacros, xorgserver }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ autoreconfHook xorgproto libX11 libXext pixman - pkgconfig utilmacros xorgserver + pkg-config utilmacros xorgserver ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix index 440a797a72326..02ce560d8a94f 100644 --- a/pkgs/os-specific/linux/xsensors/default.nix +++ b/pkgs/os-specific/linux/xsensors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk2, pkgconfig, lm_sensors }: +{ stdenv, lib, fetchurl, gtk2, pkg-config, lm_sensors }: stdenv.mkDerivation rec { pname = "xsensors"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz"; sha256 = "1siplsfgvcxamyqf44h71jx6jdfmvhfm7mh0y1q8ps4zs6pj2zwh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 lm_sensors ]; diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/os-specific/linux/zenmonitor/default.nix index 4fc2a11a65fbe..43cfd87cba533 100644 --- a/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/pkgs/os-specific/linux/zenmonitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "zenmonitor"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gtk3 ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 85990a6989d0e..61313f08f31fe 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -9,7 +9,7 @@ , nfs-utils , gawk, gnugrep, gnused, systemd , smartmontools, sysstat, sudo -, pkgconfig +, pkg-config # Kernel dependencies , kernel ? null @@ -91,7 +91,7 @@ let nativeBuildInputs = [ autoreconfHook269 nukeReferences ] ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]) - ++ optional buildUser pkgconfig; + ++ optional buildUser pkg-config; buildInputs = optionals buildUser [ zlib libuuid attr libtirpc ] ++ optional buildUser openssl ++ optional (buildUser && enablePython) python3; diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index 283cceb12405c..828b55fbba2fc 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, pkgconfig, libseccomp }: +{ lib, stdenv, fetchurl, pkg-config, libseccomp }: let version = "0.6.7"; in stdenv.mkDerivation { pname = "solo5"; inherit version; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux) libseccomp; src = fetchurl { diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index aec605111b588..c51cafa9aceff 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkgconfig +{ lib, stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config , zlib, bzip2, lzma, libgcrypt }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "024wxaaxkf7p1i78bh5xrsqmfz7ss2amigbfl2r5w9h87zqn9aq3"; }; - nativeBuildInputs = [ autoconf automake libtool flex bison pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool flex bison pkg-config ]; buildInputs = let mkStatic = flip overrideDerivation (o: { diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 0d3ab81135c6b..a2fbdde95aa93 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qt48, qmake4Hook, flex }: +{ lib, stdenv, fetchgit, qt48, qmake4Hook, flex }: # At the time of committing this, the expression fails for me to cross-build in # both mingw32 and mingw64. diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index eb4ae8dad008f..85a3c463a289b 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "2.5.1"; diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 838c39fc3c13d..0a342997530f5 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,4 +1,4 @@ -{ stdenv, windows, fetchurl }: +{ lib, stdenv, windows, fetchurl }: let version = "6.0.0"; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index f57df3192ccf5..c4fb79933432e 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }: +{ lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }: stdenv.mkDerivation { name = "wxMSW-2.8.11"; diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 3759a3d2f069c..f2193d67ff5a1 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, systemd, util-linux, coreutils, wall, hostname, man +{ lib, stdenv, fetchurl, pkg-config, systemd, util-linux, coreutils, wall, hostname, man , enableCgiScripts ? true, gd }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ util-linux man ] ++ lib.optional enableCgiScripts gd; prePatch = '' diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 26d361e97c20a..86017314ae775 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -2,7 +2,7 @@ jansson, libedit, libxml2, libxslt, ncurses, openssl, sqlite, util-linux, dmidecode, libuuid, newt, lua, speex, - srtp, wget, curl, iksemel, pkgconfig + srtp, wget, curl, iksemel, pkg-config }: let @@ -14,7 +14,7 @@ let dmidecode libuuid newt lua speex srtp wget curl iksemel ]; - nativeBuildInputs = [ util-linux pkgconfig ]; + nativeBuildInputs = [ util-linux pkg-config ]; patches = [ # We want the Makefile to install the default /var skeleton diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index a3a5990643760..a7c9464fcaec3 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.9.0"; + version = "7.10.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "0y21ivvzzs6mq2p96csmhbvz1jzwp1x4zrw26qrwavf84l2v7nlh"; + sha256 = "sha256-ScE0UXmoxHb7HOJhSfOLXj3Wb3/XitFuOR36Iktmgxk="; }; buildPhase = '' diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index b1997cf76f07e..b29f9ca9e8e0a 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libusb1, pkgconfig, pmutils, udev} : +{ lib, stdenv, fetchgit, libusb1, pkg-config, pmutils, udev} : let @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "0m2q01sbgf8z4559jpr6k3jivb8x98vxv1fhgx8nfcjbwz1q83gb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 pmutils udev ]; # shell thing didn't work so i replaced it using nix diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 433f08525dc18..939237f513ce9 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand -, moreutils, jq, git, zip, rsync, pkgconfig, yarn, python2 +, moreutils, jq, git, zip, rsync, pkg-config, yarn, python2 , nodejs-12_x, libsecret, xorg, ripgrep, nettools }: let @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - nodejs yarn' python pkgconfig zip makeWrapper git rsync jq moreutils + nodejs yarn' python pkg-config zip makeWrapper git rsync jq moreutils ]; buildInputs = [ libsecret xorg.libX11 xorg.libxkbfile ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 2b4c250a966c6..5e2bf5a97553d 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, curl +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool, curl , python3, munge, perl, pam, zlib, shadow, coreutils , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , readline, freeipmi, xorg, lz4, rdma-core, nixosTests @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # this doesn't fix tests completely at least makes slurmd to launch hardeningDisable = [ "bindnow" ]; - nativeBuildInputs = [ pkgconfig libtool python3 ]; + nativeBuildInputs = [ pkg-config libtool python3 ]; buildInputs = [ curl python3 munge perl pam zlib libmysqlclient ncurses gtk2 lz4 rdma-core diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 28651752dd194..ccb57f55bb24d 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, util-linux +{ lib, stdenv, fetchFromGitHub, openssl, flex, bison, pkg-config, groff, libxml2, util-linux , coreutils, file, libtool, which, boost, autoreconfHook }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ autoreconfHook pkgconfig flex bison libxml2 ]; + nativeBuildInputs = [ autoreconfHook pkg-config flex bison libxml2 ]; buildInputs = [ openssl groff libxml2 util-linux libtool which boost diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 08ded357488eb..5b4270a0a1c58 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, nss, nspr, libqb , dbus, rdma-core, libstatgrab, net-snmp , enableDbus ? false , enableInfiniBandRdma ? false @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0pxs18vci9kq3qnqsg5i1h35jrxxiccwbm0mzja3g8j3izdsyvmb"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ nss nspr libqb diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 4bb012d729747..a6a365c13da09 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, systemd +{ lib, stdenv, fetchurl, pkg-config, systemd , boost, libsodium, libedit, re2 , net-snmp, lua, protobuf, openssl, zlib, h2o }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1wgv19b6y4fp5x1z54psaaialji2rckl5vdh156kyw47k9r5krya"; }; - nativeBuildInputs = [ pkgconfig protobuf ]; + nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o ]; configureFlags = [ diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 9c4b04cc6e6e9..2a9e00b266bd1 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring +{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2 , autoreconfHook }: @@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "fbc51897ef0ed0639ebad59b988a91382b9544288a2db8254f0b1de433140e38"; + sha256 = "451d8913a769b7e4bcb3e250a3181b448e28a82cfc58cea6f2509475d7327983"; }; outputs = [ "bin" "out" "dev" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ./runtime-deps.patch ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls liburcu libidn2 libunistring nettle libedit diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 3277d694a4bc4..8954c9fcd89e7 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch # native deps. -, runCommand, pkgconfig, meson, ninja, makeWrapper +, runCommand, pkg-config, meson, ninja, makeWrapper # build+runtime deps. , knot-dns, luajitPackages, libuv, gnutls, lmdb , systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle @@ -50,7 +50,7 @@ unwrapped = stdenv.mkDerivation rec { patchShebangs scripts/ ''; - nativeBuildInputs = [ pkgconfig meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja ]; # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index d91a77ac372be..972b92e7de9b1 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, boost, nixosTests +{ lib, stdenv, fetchurl, pkg-config, boost, nixosTests , openssl, systemd, lua, luajit, protobuf , enableProtoBuf ? false }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1kzmliim2pwh04y3y6bpai9fm0qmdicrmff09fv5h5wahi4pzfdh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost openssl systemd lua luajit diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 990386f06ce91..cc7bb3317fd4e 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, nixosTests +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, nixosTests , boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd , mysql57, postgresql, lua, openldap, geoip, curl, unixODBC }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl unixODBC openssl systemd diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 54b699e8a6deb..ee3f02d0425ea 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }: +{ lib, stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "fcgiwrap"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ systemd fcgi ]; # systemd 230 no longer has libsystemd-daemon as a separate entity from libsystemd diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix index e626019f09b5c..88c14a220d984 100644 --- a/pkgs/servers/fileshare/default.nix +++ b/pkgs/servers/fileshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, pkgconfig, git, libmicrohttpd_0_9_70 }: +{ stdenv, lib, fetchgit, pkg-config, git, libmicrohttpd_0_9_70 }: stdenv.mkDerivation rec { pname = "fileshare"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -i 's,$(shell git rev-parse --short HEAD),/${version},g' Makefile ''; - nativeBuildInputs = [ pkgconfig git ]; + nativeBuildInputs = [ pkg-config git ]; buildInputs = [ libmicrohttpd_0_9_70 ]; makeFlags = [ "BUILD=release" ]; diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix index 6468f6a9fcc3c..db3bcb47ecc7a 100644 --- a/pkgs/servers/gopher/gofish/default.nix +++ b/pkgs/servers/gopher/gofish/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/gofish/gofish/${version}/${pname}-${version}.tar.gz"; sha256 = "0br5nvlna86k4ya4q13gz0i7nlmk225lqmpfiqlkldxkr473kf0s"; }; - + meta = with lib; { description = "A lightweight Gopher server"; homepage = "http://gofish.sourceforge.net/"; diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index 497cdb4fcf428..91b4e1d283ef8 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, docutils, libev, openssl, pkgconfig, nixosTests }: +{ lib, stdenv, fetchurl, docutils, libev, openssl, pkg-config, nixosTests }: stdenv.mkDerivation rec { version = "1.7.0"; pname = "hitch"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1i75giwyr66ip8xsvk3gg5xdbxnmcabgxz8dqi06c58mw7qzhzn9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ docutils libev openssl ]; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e02c64f6883a2..97cd133ade938 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -164,7 +164,7 @@ "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ]; "device_tracker" = ps: with ps; [ ]; - "devolo_home_control" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: devolo-home-control-api + "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api zeroconf ]; "dexcom" = ps: with ps; [ pydexcom ]; "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT "dialogflow" = ps: with ps; [ aiohttp-cors ]; @@ -253,14 +253,14 @@ "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "fints" = ps: with ps; [ fints ]; "fireservicerota" = ps: with ps; [ ]; # missing inputs: pyfireservicerota - "firmata" = ps: with ps; [ ]; # missing inputs: pymata-express + "firmata" = ps: with ps; [ pymata-express ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ fixerio ]; "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit "flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick - "flo" = ps: with ps; [ ]; # missing inputs: aioflo + "flo" = ps: with ps; [ aioflo ]; "flock" = ps: with ps; [ ]; "flume" = ps: with ps; [ ]; # missing inputs: pyflume "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou @@ -361,7 +361,7 @@ "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "http" = ps: with ps; [ aiohttp-cors ]; "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense - "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize + "huawei_lte" = ps: with ps; [ getmac stringcase url-normalize ]; # missing inputs: huawei-lte-api "huawei_router" = ps: with ps; [ ]; "hue" = ps: with ps; [ aiohue ]; "humidifier" = ps: with ps; [ ]; @@ -801,7 +801,7 @@ "switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot "switcher_kis" = ps: with ps; [ aioswitcher ]; "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate - "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru url-normalize + "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru "synology" = ps: with ps; [ ]; # missing inputs: py-synology "synology_chat" = ps: with ps; [ ]; "synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api @@ -913,7 +913,7 @@ "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 "wake_on_lan" = ps: with ps; [ wakeonlan ]; - "waqi" = ps: with ps; [ ]; # missing inputs: waqiasync + "waqi" = ps: with ps; [ waqiasync ]; "water_heater" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ waterfurnace ]; "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 498d3bc0424a4..23a8d34a63297 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkgconfig, xmlsec }: +{ lib, stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkg-config, xmlsec }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./fixdeps.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ]; configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs" "--exec-prefix=$out"]; diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix index 04440666f291f..3f2792f6498d3 100644 --- a/pkgs/servers/http/apache-modules/mod_ca/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, apacheHttpd, openssl, openldap, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_ca"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gs66br3aig749rzifxn6j1rz2kps4hc4jppscly48lypgyygy8s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ apacheHttpd openssl openldap apr aprutil ]; # Note that configureFlags and installFlags are inherited by diff --git a/pkgs/servers/http/apache-modules/mod_crl/default.nix b/pkgs/servers/http/apache-modules/mod_crl/default.nix index a5f06a58ad568..a8025c153e059 100644 --- a/pkgs/servers/http/apache-modules/mod_crl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_crl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1x186kp6fr8nwg0jlv5phagxndvw4rjqfga9mkibmn6dx252p61d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_csr/default.nix b/pkgs/servers/http/apache-modules/mod_csr/default.nix index e83ef99a2f099..c334939a1c53d 100644 --- a/pkgs/servers/http/apache-modules/mod_csr/default.nix +++ b/pkgs/servers/http/apache-modules/mod_csr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1p4jc0q40453wpvwqgnr1n007b4jxpkizzy3r4jygsxxgg4x9w7x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 783f7bfb4b21a..da1b4e456b76a 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, apacheHttpd, apr, avahi }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, apacheHttpd, apr, avahi }: stdenv.mkDerivation rec { name = "mod_dnssd-0.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ apacheHttpd avahi apr ]; patches = [ (fetchpatch { diff --git a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix index fa9309fc47200..116a9822291f5 100644 --- a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_ocsp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0wy5363m4gq1w08iny2b3sh925bnznlln88pr9lgj9vgbn8pqnrn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix index 711443230e694..1632ed381b0e4 100644 --- a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix +++ b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_pkcs12"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jfyax3qrw9rpf2n0pn6iw4dpn2nl4j0i2a998n5p1mdmjx9ch73"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_scep/default.nix b/pkgs/servers/http/apache-modules/mod_scep/default.nix index e56fa6987e153..68aeded93d004 100644 --- a/pkgs/servers/http/apache-modules/mod_scep/default.nix +++ b/pkgs/servers/http/apache-modules/mod_scep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_scep"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1imddqyi81l90valvndx9r0ywn32ggijrdfrjmbx8j1abaccagrc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix index dba56765538f9..01ecae55b2ed9 100644 --- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix +++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_spkac"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0hpr58yazbi21m0sjn22a8ns4h81s4jlab9szcdw7j9w9jdc7j0h"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix index 5e315fe956fca..d1d254c30b4bb 100644 --- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: +{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_timestamp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1p18mgxx2ainfrc2wm27rl3lh6yl0ihx6snib60jnp694587bfwg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 1f5e861e60c95..de3f58fc06f34 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -7,7 +7,7 @@ , libevent , lzma , openssl -, pkgconfig +, pkg-config , systemd , tcp_wrappers , zlib @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2"; }; - nativeBuildInputs = [ cmake doxygen pkgconfig ]; + nativeBuildInputs = [ cmake doxygen pkg-config ]; buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ]; meta = with lib; { diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 91b636cfdde25..45023e800afb8 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man -, sphinx, which, file, pkgconfig, getopt }: +, sphinx, which, file, pkg-config, getopt }: stdenv.mkDerivation rec { pname = "couchdb"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i"; }; - nativeBuildInputs = [ help2man which file pkgconfig sphinx ]; + nativeBuildInputs = [ help2man which file pkg-config sphinx ]; buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ]; postInstall = '' diff --git a/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch b/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch new file mode 100644 index 0000000000000..4bf0a0d0e95da --- /dev/null +++ b/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch @@ -0,0 +1,2980 @@ +From 97d7c456e03d4a11157fac17c7b8cbcee1d8a657 Mon Sep 17 00:00:00 2001 +From: danzh <danzh2010@users.noreply.github.com> +Date: Mon, 16 Nov 2020 14:27:13 -0500 +Subject: [PATCH] quiche: update QUICHE tar (#13949) + +Signed-off-by: Dan Zhang <danzh@google.com> +--- + bazel/envoy_internal.bzl | 2 + + bazel/external/quiche.BUILD | 85 +-- + bazel/repository_locations.bzl | 6 +- + source/extensions/quic_listeners/quiche/BUILD | 1 + + .../quiche/active_quic_listener.cc | 2 +- + .../quiche/envoy_quic_client_connection.cc | 2 +- + .../quiche/envoy_quic_client_stream.cc | 1 + + .../quiche/envoy_quic_connection.cc | 6 +- + .../quiche/envoy_quic_connection.h | 1 + + .../quiche/envoy_quic_dispatcher.cc | 6 +- + .../quiche/envoy_quic_dispatcher.h | 2 +- + .../quiche/envoy_quic_proof_source.cc | 2 +- + .../quiche/envoy_quic_proof_source.h | 2 +- + .../quiche/envoy_quic_proof_source_base.cc | 7 +- + .../quiche/envoy_quic_proof_source_base.h | 6 +- + .../quiche/envoy_quic_proof_verifier_base.cc | 4 +- + .../quiche/envoy_quic_server_connection.cc | 10 +- + .../quiche/envoy_quic_server_connection.h | 1 + + .../quic_listeners/quiche/platform/BUILD | 42 +- + .../quiche/platform/flags_impl.cc | 108 +++- + .../quiche/platform/flags_impl.h | 46 +- + .../quiche/platform/flags_list.h | 502 ------------------ + .../quiche/platform/http2_flags_impl.h | 4 +- + .../quiche/platform/quic_aligned_impl.h | 18 - + .../quiche/platform/quic_cert_utils_impl.cc | 38 +- + .../quiche/platform/quic_cert_utils_impl.h | 9 +- + .../quiche/platform/quic_fallthrough_impl.h | 11 - + .../quiche/platform/quic_file_utils_impl.cc | 4 +- + .../quiche/platform/quic_file_utils_impl.h | 6 +- + .../quiche/platform/quic_flags_impl.h | 6 +- + .../platform/quic_hostname_utils_impl.cc | 6 +- + .../platform/quic_hostname_utils_impl.h | 8 +- + .../quiche/platform/quic_macros_impl.h | 13 - + .../platform/quic_mem_slice_span_impl.cc | 3 +- + .../platform/quic_mem_slice_span_impl.h | 9 +- + ..._ptr_util_impl.h => quic_testvalue_impl.h} | 11 +- + .../platform/quic_udp_socket_platform_impl.h | 3 + + .../quiche/platform/quiche_arraysize_impl.h | 11 - + .../quiche/platform/quiche_optional_impl.h | 17 - + .../quiche/platform/quiche_text_utils_impl.h | 63 +-- + .../quiche/platform/quiche_time_utils_impl.cc | 4 +- + .../quiche/platform/quiche_time_utils_impl.h | 4 +- + .../platform/spdy_endianness_util_impl.h | 29 - + .../quiche/platform/spdy_flags_impl.h | 4 +- + .../quiche/platform/spdy_string_utils_impl.h | 2 +- + .../spdy_server_push_utils_for_envoy.cc | 10 +- + .../quiche/envoy_quic_client_session_test.cc | 2 +- + .../quiche/envoy_quic_client_stream_test.cc | 44 +- + .../quiche/envoy_quic_proof_source_test.cc | 6 +- + .../quiche/envoy_quic_proof_verifier_test.cc | 8 +- + .../quiche/envoy_quic_server_session_test.cc | 3 +- + .../quiche/envoy_quic_server_stream_test.cc | 53 +- + .../quic_listeners/quiche/platform/BUILD | 22 - + .../quiche/platform/http2_platform_test.cc | 22 +- + .../quiche/platform/quic_platform_test.cc | 61 +-- + .../quiche/platform/quic_test_output_impl.cc | 15 +- + .../quiche/platform/quic_test_output_impl.h | 12 +- + .../quiche/platform/quiche_platform_test.cc | 39 -- + .../quiche/platform/spdy_platform_test.cc | 20 +- + .../quic_listeners/quiche/test_proof_source.h | 2 +- + .../quic_listeners/quiche/test_utils.h | 4 +- + 61 files changed, 396 insertions(+), 1054 deletions(-) + delete mode 100644 source/extensions/quic_listeners/quiche/platform/flags_list.h + delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h + delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h + delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h + rename source/extensions/quic_listeners/quiche/platform/{quiche_ptr_util_impl.h => quic_testvalue_impl.h} (52%) + delete mode 100644 source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h + delete mode 100644 source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h + delete mode 100644 source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h + delete mode 100644 test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc + +diff --git a/bazel/envoy_internal.bzl b/bazel/envoy_internal.bzl +index 5ad86609a..3f9ddfd23 100644 +--- a/bazel/envoy_internal.bzl ++++ b/bazel/envoy_internal.bzl +@@ -54,6 +54,8 @@ def envoy_copts(repository, test = False): + }) + select({ + repository + "//bazel:clang_build": ["-fno-limit-debug-info", "-Wgnu-conditional-omitted-operand", "-Wc++2a-extensions", "-Wrange-loop-analysis"], + repository + "//bazel:gcc_build": ["-Wno-maybe-uninitialized"], ++ # TODO: Replace with /Zc:preprocessor for cl.exe versions >= 16.5 ++ repository + "//bazel:windows_x86_64": ["-experimental:preprocessor", "-Wv:19.4"], + "//conditions:default": [], + }) + select({ + repository + "//bazel:no_debug_info": ["-g0"], +diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD +index 7541909aa..b6b208fc5 100644 +--- a/bazel/external/quiche.BUILD ++++ b/bazel/external/quiche.BUILD +@@ -57,16 +57,12 @@ quiche_common_copts = [ + "-Wno-unused-function", + # quic_inlined_frame.h uses offsetof() to optimize memory usage in frames. + "-Wno-invalid-offsetof", +- "-Wno-range-loop-analysis", + ] + + quiche_copts = select({ + # Ignore unguarded #pragma GCC statements in QUICHE sources + "@envoy//bazel:windows_x86_64": ["-wd4068"], + # Remove these after upstream fix. +- "@envoy//bazel:gcc_build": [ +- "-Wno-sign-compare", +- ] + quiche_common_copts, + "//conditions:default": quiche_common_copts, + }) + +@@ -737,7 +733,6 @@ envoy_cc_library( + hdrs = [ + "quiche/spdy/platform/api/spdy_bug_tracker.h", + "quiche/spdy/platform/api/spdy_containers.h", +- "quiche/spdy/platform/api/spdy_endianness_util.h", + "quiche/spdy/platform/api/spdy_estimate_memory_usage.h", + "quiche/spdy/platform/api/spdy_flags.h", + "quiche/spdy/platform/api/spdy_logging.h", +@@ -935,6 +930,7 @@ envoy_cc_library( + copts = quiche_copts, + repository = "@envoy", + deps = [ ++ ":http2_hpack_huffman_hpack_huffman_encoder_lib", + ":spdy_core_protocol_lib", + ":spdy_platform", + ], +@@ -1049,19 +1045,16 @@ envoy_cc_library( + envoy_cc_library( + name = "quic_platform_base", + hdrs = [ +- "quiche/quic/platform/api/quic_aligned.h", + "quiche/quic/platform/api/quic_bug_tracker.h", + "quiche/quic/platform/api/quic_client_stats.h", + "quiche/quic/platform/api/quic_containers.h", + "quiche/quic/platform/api/quic_error_code_wrappers.h", + "quiche/quic/platform/api/quic_estimate_memory_usage.h", + "quiche/quic/platform/api/quic_exported_stats.h", +- "quiche/quic/platform/api/quic_fallthrough.h", + "quiche/quic/platform/api/quic_flag_utils.h", + "quiche/quic/platform/api/quic_flags.h", + "quiche/quic/platform/api/quic_iovec.h", + "quiche/quic/platform/api/quic_logging.h", +- "quiche/quic/platform/api/quic_macros.h", + "quiche/quic/platform/api/quic_map_util.h", + "quiche/quic/platform/api/quic_mem_slice.h", + "quiche/quic/platform/api/quic_prefetch.h", +@@ -1072,6 +1065,7 @@ envoy_cc_library( + "quiche/quic/platform/api/quic_stream_buffer_allocator.h", + "quiche/quic/platform/api/quic_string_utils.h", + "quiche/quic/platform/api/quic_uint128.h", ++ "quiche/quic/platform/api/quic_testvalue.h", + # TODO: uncomment the following files as implementations are added. + # "quiche/quic/platform/api/quic_fuzzed_data_provider.h", + # "quiche/quic/platform/api/quic_test_loopback.h", +@@ -1147,7 +1141,6 @@ envoy_cc_test_library( + hdrs = ["quiche/quic/platform/api/quic_port_utils.h"], + repository = "@envoy", + tags = ["nofips"], +- deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:quic_platform_port_utils_impl_lib"], + ) + + envoy_cc_library( +@@ -1216,15 +1209,14 @@ envoy_cc_test_library( + ) + + envoy_cc_library( +- name = "quiche_common_platform_endian", +- hdrs = ["quiche/common/platform/api/quiche_endian.h"], ++ name = "quiche_common_endian_lib", ++ hdrs = ["quiche/common/quiche_endian.h"], + repository = "@envoy", + tags = ["nofips"], + visibility = ["//visibility:public"], + deps = + [ + ":quiche_common_platform_export", +- "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_endian_impl_lib", + ], + ) + +@@ -1932,6 +1924,7 @@ envoy_cc_library( + visibility = ["//visibility:public"], + deps = [ + ":quic_core_clock_lib", ++ ":quic_core_crypto_certificate_view_lib", + ":quic_core_crypto_encryption_lib", + ":quic_core_crypto_hkdf_lib", + ":quic_core_crypto_proof_source_interface_lib", +@@ -2167,6 +2160,15 @@ envoy_cc_library( + ], + ) + ++envoy_cc_library( ++ name = "quic_core_flags_list_lib", ++ hdrs = ["quiche/quic/core/quic_flags_list.h"], ++ copts = quiche_copts, ++ repository = "@envoy", ++ tags = ["nofips"], ++ visibility = ["//visibility:public"], ++) ++ + envoy_cc_library( + name = "quic_core_framer_lib", + srcs = ["quiche/quic/core/quic_framer.cc"], +@@ -2339,6 +2341,7 @@ envoy_cc_library( + repository = "@envoy", + tags = ["nofips"], + deps = [ ++ ":http2_constants_lib", + ":quic_core_data_lib", + ":quic_core_error_codes_lib", + ":quic_core_http_http_frames_lib", +@@ -2723,6 +2726,27 @@ envoy_cc_library( + ], + ) + ++envoy_cc_library( ++ name = "quic_core_path_validator_lib", ++ srcs = ["quiche/quic/core/quic_path_validator.cc"], ++ hdrs = ["quiche/quic/core/quic_path_validator.h"], ++ copts = quiche_copts, ++ repository = "@envoy", ++ tags = ["nofips"], ++ deps = [ ++ ":quic_core_alarm_factory_interface_lib", ++ ":quic_core_alarm_interface_lib", ++ ":quic_core_arena_scoped_ptr_lib", ++ ":quic_core_clock_lib", ++ ":quic_core_constants_lib", ++ ":quic_core_crypto_random_lib", ++ ":quic_core_one_block_arena_lib", ++ ":quic_core_packet_writer_interface_lib", ++ ":quic_core_types_lib", ++ ":quic_platform", ++ ], ++) ++ + envoy_cc_library( + name = "quic_core_process_packet_interface_lib", + hdrs = ["quiche/quic/core/quic_process_packet_interface.h"], +@@ -2735,6 +2759,15 @@ envoy_cc_library( + ], + ) + ++envoy_cc_library( ++ name = "quic_core_protocol_flags_list_lib", ++ hdrs = ["quiche/quic/core/quic_protocol_flags_list.h"], ++ copts = quiche_copts, ++ repository = "@envoy", ++ tags = ["nofips"], ++ visibility = ["//visibility:public"], ++) ++ + envoy_cc_library( + name = "quic_core_qpack_blocking_manager_lib", + srcs = ["quiche/quic/core/qpack/qpack_blocking_manager.cc"], +@@ -2896,6 +2929,7 @@ envoy_cc_library( + deps = [ + ":http2_decoder_decode_buffer_lib", + ":http2_decoder_decode_status_lib", ++ ":quic_core_error_codes_lib", + ":quic_core_qpack_qpack_instruction_decoder_lib", + ":quic_core_qpack_qpack_instructions_lib", + ":quic_core_qpack_qpack_stream_receiver_lib", +@@ -3368,7 +3402,7 @@ envoy_cc_library( + ":quic_core_error_codes_lib", + ":quic_core_time_lib", + ":quic_platform_base", +- ":quiche_common_platform_endian", ++ ":quiche_common_endian_lib", + ], + ) + +@@ -3420,6 +3454,7 @@ envoy_cc_library( + repository = "@envoy", + tags = ["nofips"], + deps = [ ++ ":quic_core_circular_deque_lib", + ":quic_core_connection_stats_lib", + ":quic_core_packets_lib", + ":quic_core_session_notifier_interface_lib", +@@ -3459,6 +3494,7 @@ envoy_cc_library( + deps = [ + ":quic_core_versions_lib", + ":quic_platform_base", ++ ":quiche_common_endian_lib", + ], + ) + +@@ -3475,7 +3511,6 @@ envoy_cc_library( + ":quic_core_tag_lib", + ":quic_core_types_lib", + ":quic_platform_base", +- ":quiche_common_platform_endian", + ], + ) + +@@ -3746,6 +3781,7 @@ envoy_cc_test_library( + ":quic_core_packet_creator_lib", + ":quic_core_packet_writer_interface_lib", + ":quic_core_packets_lib", ++ ":quic_core_path_validator_lib", + ":quic_core_received_packet_manager_lib", + ":quic_core_sent_packet_manager_lib", + ":quic_core_server_id_lib", +@@ -3836,25 +3872,10 @@ envoy_cc_test_library( + deps = [":epoll_server_platform"], + ) + +-envoy_cc_library( +- name = "quiche_common_platform_optional", +- hdrs = ["quiche/common/platform/api/quiche_optional.h"], +- repository = "@envoy", +- tags = ["nofips"], +- visibility = ["//visibility:public"], +- deps = [ +- ":quiche_common_platform_export", +- "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_optional_impl_lib", +- ], +-) +- + envoy_cc_library( + name = "quiche_common_platform", + hdrs = [ +- "quiche/common/platform/api/quiche_arraysize.h", + "quiche/common/platform/api/quiche_logging.h", +- "quiche/common/platform/api/quiche_optional.h", +- "quiche/common/platform/api/quiche_ptr_util.h", + "quiche/common/platform/api/quiche_str_cat.h", + "quiche/common/platform/api/quiche_string_piece.h", + "quiche/common/platform/api/quiche_text_utils.h", +@@ -3866,7 +3887,6 @@ envoy_cc_library( + visibility = ["//visibility:public"], + deps = [ + ":quiche_common_platform_export", +- ":quiche_common_platform_optional", + "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_impl_lib", + ], + ) +@@ -3874,7 +3894,6 @@ envoy_cc_library( + envoy_cc_test_library( + name = "quiche_common_platform_test", + srcs = [ +- "quiche/common/platform/api/quiche_endian_test.cc", + "quiche/common/platform/api/quiche_str_cat_test.cc", + "quiche/common/platform/api/quiche_text_utils_test.cc", + "quiche/common/platform/api/quiche_time_utils_test.cc", +@@ -3884,7 +3903,6 @@ envoy_cc_test_library( + tags = ["nofips"], + deps = [ + ":quiche_common_platform", +- ":quiche_common_platform_endian", + "@envoy//test/extensions/quic_listeners/quiche/platform:quiche_common_platform_test_impl_lib", + ], + ) +@@ -3904,8 +3922,8 @@ envoy_cc_library( + tags = ["nofips"], + visibility = ["//visibility:public"], + deps = [ ++ ":quiche_common_endian_lib", + ":quiche_common_platform", +- ":quiche_common_platform_endian", + ], + ) + +@@ -3944,6 +3962,7 @@ envoy_cc_test( + deps = [ + ":http2_platform", + ":http2_test_tools_random", ++ ":quiche_common_test_tools_test_utils_lib", + ], + ) + +diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl +index 6eba5a821..19ddc76e8 100644 +--- a/bazel/repository_locations.bzl ++++ b/bazel/repository_locations.bzl +@@ -671,9 +671,9 @@ DEPENDENCY_REPOSITORIES_SPEC = dict( + project_name = "QUICHE", + project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols", + project_url = "https://quiche.googlesource.com/quiche", +- # Static snapshot of https://quiche.googlesource.com/quiche/+archive/f555d99a084cdd086a349548c70fb558ac5847cf.tar.gz +- version = "f555d99a084cdd086a349548c70fb558ac5847cf", +- sha256 = "1833f08e7b0f18b49d7498b029b7f3e6559a82113ec82a98a9e945553756e351", ++ # Static snapshot of https://quiche.googlesource.com/quiche/+archive/ecc28c0d7428f3323ea26eb1ddb98a5e06b23dea.tar.gz ++ version = "ecc28c0d7428f3323ea26eb1ddb98a5e06b23dea", ++ sha256 = "52680dea984dbe899c27176155578b97276e1f1516b7c3a63fb16ba593061859", + urls = ["https://storage.googleapis.com/quiche-envoy-integration/{version}.tar.gz"], + use_category = ["dataplane_ext"], + extensions = ["envoy.transport_sockets.quic"], +diff --git a/source/extensions/quic_listeners/quiche/BUILD b/source/extensions/quic_listeners/quiche/BUILD +index 29eb78d15..a90cfde6d 100644 +--- a/source/extensions/quic_listeners/quiche/BUILD ++++ b/source/extensions/quic_listeners/quiche/BUILD +@@ -212,6 +212,7 @@ envoy_cc_library( + "//source/common/buffer:buffer_lib", + "//source/common/common:assert_lib", + "//source/common/http:header_map_lib", ++ "//source/common/http:header_utility_lib", + "//source/extensions/quic_listeners/quiche/platform:quic_platform_mem_slice_storage_impl_lib", + "@com_googlesource_quiche//:quic_core_http_client_lib", + ], +diff --git a/source/extensions/quic_listeners/quiche/active_quic_listener.cc b/source/extensions/quic_listeners/quiche/active_quic_listener.cc +index f4808adc5..86912292a 100644 +--- a/source/extensions/quic_listeners/quiche/active_quic_listener.cc ++++ b/source/extensions/quic_listeners/quiche/active_quic_listener.cc +@@ -55,7 +55,7 @@ ActiveQuicListener::ActiveQuicListener( + quic::QuicRandom* const random = quic::QuicRandom::GetInstance(); + random->RandBytes(random_seed_, sizeof(random_seed_)); + crypto_config_ = std::make_unique<quic::QuicCryptoServerConfig>( +- quiche::QuicheStringPiece(reinterpret_cast<char*>(random_seed_), sizeof(random_seed_)), ++ absl::string_view(reinterpret_cast<char*>(random_seed_), sizeof(random_seed_)), + quic::QuicRandom::GetInstance(), + std::make_unique<EnvoyQuicProofSource>(listen_socket_, listener_config.filterChainManager(), + stats_), +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc +index e79b08ad9..95d63729d 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc +@@ -43,7 +43,7 @@ EnvoyQuicClientConnection::EnvoyQuicClientConnection( + const quic::ParsedQuicVersionVector& supported_versions, Event::Dispatcher& dispatcher, + Network::ConnectionSocketPtr&& connection_socket) + : EnvoyQuicConnection( +- server_connection_id, ++ server_connection_id, quic::QuicSocketAddress(), + envoyIpAddressToQuicSocketAddress(connection_socket->remoteAddress()->ip()), helper, + alarm_factory, writer, owns_writer, quic::Perspective::IS_CLIENT, supported_versions, + std::move(connection_socket)), +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc +index 866e35416..a759b26b1 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc +@@ -20,6 +20,7 @@ + + #include "common/buffer/buffer_impl.h" + #include "common/http/header_map_impl.h" ++#include "common/http/header_utility.h" + #include "common/common/assert.h" + + namespace Envoy { +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc +index dcc311a6e..d813dfe4b 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc +@@ -6,6 +6,7 @@ namespace Envoy { + namespace Quic { + + EnvoyQuicConnection::EnvoyQuicConnection(const quic::QuicConnectionId& server_connection_id, ++ quic::QuicSocketAddress initial_self_address, + quic::QuicSocketAddress initial_peer_address, + quic::QuicConnectionHelperInterface& helper, + quic::QuicAlarmFactory& alarm_factory, +@@ -13,8 +14,9 @@ EnvoyQuicConnection::EnvoyQuicConnection(const quic::QuicConnectionId& server_co + quic::Perspective perspective, + const quic::ParsedQuicVersionVector& supported_versions, + Network::ConnectionSocketPtr&& connection_socket) +- : quic::QuicConnection(server_connection_id, initial_peer_address, &helper, &alarm_factory, +- writer, owns_writer, perspective, supported_versions), ++ : quic::QuicConnection(server_connection_id, initial_self_address, initial_peer_address, ++ &helper, &alarm_factory, writer, owns_writer, perspective, ++ supported_versions), + connection_socket_(std::move(connection_socket)) {} + + EnvoyQuicConnection::~EnvoyQuicConnection() { connection_socket_->close(); } +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_connection.h b/source/extensions/quic_listeners/quiche/envoy_quic_connection.h +index f4c8589d7..f8543bc93 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_connection.h ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_connection.h +@@ -26,6 +26,7 @@ class EnvoyQuicConnection : public quic::QuicConnection, + protected Logger::Loggable<Logger::Id::connection> { + public: + EnvoyQuicConnection(const quic::QuicConnectionId& server_connection_id, ++ quic::QuicSocketAddress initial_self_address, + quic::QuicSocketAddress initial_peer_address, + quic::QuicConnectionHelperInterface& helper, + quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc +index ba8f7f3a8..e6351f643 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc +@@ -48,11 +48,11 @@ void EnvoyQuicDispatcher::OnConnectionClosed(quic::QuicConnectionId connection_i + } + + std::unique_ptr<quic::QuicSession> EnvoyQuicDispatcher::CreateQuicSession( +- quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& /*self_address*/, +- const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece /*alpn*/, ++ quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& self_address, ++ const quic::QuicSocketAddress& peer_address, absl::string_view /*alpn*/, + const quic::ParsedQuicVersion& version) { + auto quic_connection = std::make_unique<EnvoyQuicServerConnection>( +- server_connection_id, peer_address, *helper(), *alarm_factory(), writer(), ++ server_connection_id, self_address, peer_address, *helper(), *alarm_factory(), writer(), + /*owns_writer=*/false, quic::ParsedQuicVersionVector{version}, listen_socket_); + auto quic_session = std::make_unique<EnvoyQuicServerSession>( + config(), quic::ParsedQuicVersionVector{version}, std::move(quic_connection), this, +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h +index 589ff5327..d59307f41 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h +@@ -62,7 +62,7 @@ protected: + std::unique_ptr<quic::QuicSession> + CreateQuicSession(quic::QuicConnectionId server_connection_id, + const quic::QuicSocketAddress& self_address, +- const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece alpn, ++ const quic::QuicSocketAddress& peer_address, absl::string_view alpn, + const quic::ParsedQuicVersion& version) override; + + private: +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc +index 1f65e4e7e..967765829 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc +@@ -36,7 +36,7 @@ EnvoyQuicProofSource::GetCertChain(const quic::QuicSocketAddress& server_address + + void EnvoyQuicProofSource::signPayload( + const quic::QuicSocketAddress& server_address, const quic::QuicSocketAddress& client_address, +- const std::string& hostname, uint16_t signature_algorithm, quiche::QuicheStringPiece in, ++ const std::string& hostname, uint16_t signature_algorithm, absl::string_view in, + std::unique_ptr<quic::ProofSource::SignatureCallback> callback) { + CertConfigWithFilterChain res = + getTlsCertConfigAndFilterChain(server_address, client_address, hostname); +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h +index 6e1c74c92..e22bf3465 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h +@@ -28,7 +28,7 @@ protected: + // quic::ProofSource + void signPayload(const quic::QuicSocketAddress& server_address, + const quic::QuicSocketAddress& client_address, const std::string& hostname, +- uint16_t signature_algorithm, quiche::QuicheStringPiece in, ++ uint16_t signature_algorithm, absl::string_view in, + std::unique_ptr<quic::ProofSource::SignatureCallback> callback) override; + + private: +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc +index 2c82c04d9..9ad3cb07f 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc +@@ -21,7 +21,7 @@ void EnvoyQuicProofSourceBase::GetProof(const quic::QuicSocketAddress& server_ad + const std::string& hostname, + const std::string& server_config, + quic::QuicTransportVersion /*transport_version*/, +- quiche::QuicheStringPiece chlo_hash, ++ absl::string_view chlo_hash, + std::unique_ptr<quic::ProofSource::Callback> callback) { + quic::QuicReferenceCountedPointer<quic::ProofSource::Chain> chain = + GetCertChain(server_address, client_address, hostname); +@@ -68,13 +68,12 @@ void EnvoyQuicProofSourceBase::GetProof(const quic::QuicSocketAddress& server_ad + auto signature_callback = std::make_unique<SignatureCallback>(std::move(callback), chain); + + signPayload(server_address, client_address, hostname, sign_alg, +- quiche::QuicheStringPiece(payload.get(), payload_size), +- std::move(signature_callback)); ++ absl::string_view(payload.get(), payload_size), std::move(signature_callback)); + } + + void EnvoyQuicProofSourceBase::ComputeTlsSignature( + const quic::QuicSocketAddress& server_address, const quic::QuicSocketAddress& client_address, +- const std::string& hostname, uint16_t signature_algorithm, quiche::QuicheStringPiece in, ++ const std::string& hostname, uint16_t signature_algorithm, absl::string_view in, + std::unique_ptr<quic::ProofSource::SignatureCallback> callback) { + signPayload(server_address, client_address, hostname, signature_algorithm, in, + std::move(callback)); +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h +index b7d76981e..a9e7e8c3f 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h +@@ -57,7 +57,7 @@ public: + void GetProof(const quic::QuicSocketAddress& server_address, + const quic::QuicSocketAddress& client_address, const std::string& hostname, + const std::string& server_config, quic::QuicTransportVersion /*transport_version*/, +- quiche::QuicheStringPiece chlo_hash, ++ absl::string_view chlo_hash, + std::unique_ptr<quic::ProofSource::Callback> callback) override; + + TicketCrypter* GetTicketCrypter() override { return nullptr; } +@@ -65,14 +65,14 @@ public: + void ComputeTlsSignature(const quic::QuicSocketAddress& server_address, + const quic::QuicSocketAddress& client_address, + const std::string& hostname, uint16_t signature_algorithm, +- quiche::QuicheStringPiece in, ++ absl::string_view in, + std::unique_ptr<quic::ProofSource::SignatureCallback> callback) override; + + protected: + virtual void signPayload(const quic::QuicSocketAddress& server_address, + const quic::QuicSocketAddress& client_address, + const std::string& hostname, uint16_t signature_algorithm, +- quiche::QuicheStringPiece in, ++ absl::string_view in, + std::unique_ptr<quic::ProofSource::SignatureCallback> callback) PURE; + + private: +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc +index 229b3ab36..e37590529 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc +@@ -58,8 +58,8 @@ bool EnvoyQuicProofVerifierBase::verifySignature(const std::string& server_confi + *error_details = "QuicPacketWriter error."; + return false; + } +- bool valid = cert_view->VerifySignature(quiche::QuicheStringPiece(payload.get(), payload_size), +- signature, sign_alg); ++ bool valid = cert_view->VerifySignature(absl::string_view(payload.get(), payload_size), signature, ++ sign_alg); + if (!valid) { + *error_details = "Signature is not valid."; + } +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc +index b8fa94221..974c6c8eb 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc +@@ -11,11 +11,13 @@ namespace Quic { + + EnvoyQuicServerConnection::EnvoyQuicServerConnection( + const quic::QuicConnectionId& server_connection_id, +- quic::QuicSocketAddress initial_peer_address, quic::QuicConnectionHelperInterface& helper, +- quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, bool owns_writer, ++ quic::QuicSocketAddress initial_self_address, quic::QuicSocketAddress initial_peer_address, ++ quic::QuicConnectionHelperInterface& helper, quic::QuicAlarmFactory& alarm_factory, ++ quic::QuicPacketWriter* writer, bool owns_writer, + const quic::ParsedQuicVersionVector& supported_versions, Network::Socket& listen_socket) +- : EnvoyQuicConnection(server_connection_id, initial_peer_address, helper, alarm_factory, writer, +- owns_writer, quic::Perspective::IS_SERVER, supported_versions, ++ : EnvoyQuicConnection(server_connection_id, initial_self_address, initial_peer_address, helper, ++ alarm_factory, writer, owns_writer, quic::Perspective::IS_SERVER, ++ supported_versions, + std::make_unique<Network::ConnectionSocketImpl>( + // Wraps the real IoHandle instance so that if the connection socket + // gets closed, the real IoHandle won't be affected. +diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h +index 7b7fac05e..7625fad02 100644 +--- a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h ++++ b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h +@@ -10,6 +10,7 @@ namespace Quic { + class EnvoyQuicServerConnection : public EnvoyQuicConnection { + public: + EnvoyQuicServerConnection(const quic::QuicConnectionId& server_connection_id, ++ quic::QuicSocketAddress initial_self_address, + quic::QuicSocketAddress initial_peer_address, + quic::QuicConnectionHelperInterface& helper, + quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, +diff --git a/source/extensions/quic_listeners/quiche/platform/BUILD b/source/extensions/quic_listeners/quiche/platform/BUILD +index f53e07b58..839664d52 100644 +--- a/source/extensions/quic_listeners/quiche/platform/BUILD ++++ b/source/extensions/quic_listeners/quiche/platform/BUILD +@@ -36,15 +36,16 @@ envoy_extension_package() + envoy_cc_library( + name = "flags_impl_lib", + srcs = ["flags_impl.cc"], +- hdrs = [ +- "flags_impl.h", +- "flags_list.h", +- ], ++ hdrs = ["flags_impl.h"], + external_deps = [ + "abseil_base", + "abseil_synchronization", + ], + visibility = ["//visibility:public"], ++ deps = [ ++ "@com_googlesource_quiche//:quic_core_flags_list_lib", ++ "@com_googlesource_quiche//:quic_core_protocol_flags_list_lib", ++ ], + ) + + envoy_cc_library( +@@ -62,7 +63,6 @@ envoy_cc_library( + envoy_cc_library( + name = "http2_platform_impl_lib", + hdrs = [ +- "http2_arraysize_impl.h", + "http2_bug_tracker_impl.h", + "http2_containers_impl.h", + "http2_estimate_memory_usage_impl.h", +@@ -74,7 +74,6 @@ envoy_cc_library( + ], + external_deps = [ + "abseil_base", +- "abseil_optional", + "abseil_str_format", + ], + visibility = ["//visibility:public"], +@@ -114,16 +113,13 @@ envoy_cc_library( + "quic_mem_slice_impl.cc", + ], + hdrs = [ +- "quic_aligned_impl.h", + "quic_client_stats_impl.h", + "quic_containers_impl.h", + "quic_error_code_wrappers_impl.h", + "quic_estimate_memory_usage_impl.h", +- "quic_fallthrough_impl.h", + "quic_flag_utils_impl.h", + "quic_flags_impl.h", + "quic_iovec_impl.h", +- "quic_macros_impl.h", + "quic_map_util_impl.h", + "quic_mem_slice_impl.h", + "quic_prefetch_impl.h", +@@ -132,6 +128,7 @@ envoy_cc_library( + "quic_server_stats_impl.h", + "quic_stack_trace_impl.h", + "quic_stream_buffer_allocator_impl.h", ++ "quic_testvalue_impl.h", + "quic_uint128_impl.h", + ], + external_deps = [ +@@ -141,7 +138,6 @@ envoy_cc_library( + "abseil_memory", + "abseil_node_hash_map", + "abseil_node_hash_set", +- "abseil_optional", + ], + tags = ["nofips"], + visibility = ["//visibility:public"], +@@ -236,6 +232,7 @@ envoy_cc_library( + }), + repository = "@envoy", + tags = ["nofips"], ++ visibility = ["//visibility:public"], + ) + + envoy_cc_library( +@@ -250,23 +247,12 @@ envoy_cc_library( + ], + ) + +-envoy_cc_library( +- name = "quiche_common_platform_optional_impl_lib", +- hdrs = ["quiche_optional_impl.h"], +- external_deps = [ +- "abseil_node_hash_map", +- ], +- visibility = ["//visibility:public"], +-) +- + envoy_cc_library( + name = "quiche_common_platform_impl_lib", + srcs = ["quiche_time_utils_impl.cc"], + hdrs = [ +- "quiche_arraysize_impl.h", + "quiche_logging_impl.h", + "quiche_map_util_impl.h", +- "quiche_ptr_util_impl.h", + "quiche_str_cat_impl.h", + "quiche_string_piece_impl.h", + "quiche_text_utils_impl.h", +@@ -281,17 +267,14 @@ envoy_cc_library( + deps = [ + ":quic_platform_logging_impl_lib", + ":string_utils_lib", +- "@com_googlesource_quiche//:quiche_common_platform_optional", + ], + ) + + envoy_cc_library( + name = "spdy_platform_impl_lib", + hdrs = [ +- "spdy_arraysize_impl.h", + "spdy_bug_tracker_impl.h", + "spdy_containers_impl.h", +- "spdy_endianness_util_impl.h", + "spdy_estimate_memory_usage_impl.h", + "spdy_flags_impl.h", + "spdy_logging_impl.h", +@@ -331,14 +314,3 @@ envoy_cc_library( + tags = ["nofips"], + visibility = ["//visibility:public"], + ) +- +-envoy_cc_library( +- name = "quiche_common_platform_endian_impl_lib", +- hdrs = ["quiche_endian_impl.h"], +- tags = ["nofips"], +- visibility = ["//visibility:public"], +- deps = [ +- "quiche_common_platform_export_impl_lib", +- "//source/common/common:byte_order_lib", +- ], +-) +diff --git a/source/extensions/quic_listeners/quiche/platform/flags_impl.cc b/source/extensions/quic_listeners/quiche/platform/flags_impl.cc +index 70fb182d6..9d4ea89ce 100644 +--- a/source/extensions/quic_listeners/quiche/platform/flags_impl.cc ++++ b/source/extensions/quic_listeners/quiche/platform/flags_impl.cc +@@ -15,12 +15,24 @@ namespace quiche { + + namespace { + +-absl::flat_hash_map<std::string, Flag*> MakeFlagMap() { ++absl::flat_hash_map<std::string, Flag*> makeFlagMap() { + absl::flat_hash_map<std::string, Flag*> flags; + +-#define QUICHE_FLAG(type, flag, value, help) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag); +-#include "extensions/quic_listeners/quiche/platform/flags_list.h" +-#undef QUICHE_FLAG ++#define QUIC_FLAG(flag, ...) flags.emplace(flag->name(), flag); ++#include "quiche/quic/core/quic_flags_list.h" ++ QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) ++ QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) ++ QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) ++ QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) ++ QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) ++ QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) ++ QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) ++ QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) ++#undef QUIC_FLAG ++ ++#define QUIC_PROTOCOL_FLAG(type, flag, ...) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag); ++#include "quiche/quic/core/quic_protocol_flags_list.h" ++#undef QUIC_PROTOCOL_FLAG + + return flags; + } +@@ -28,75 +40,123 @@ absl::flat_hash_map<std::string, Flag*> MakeFlagMap() { + } // namespace + + // static +-FlagRegistry& FlagRegistry::GetInstance() { ++FlagRegistry& FlagRegistry::getInstance() { + static auto* instance = new FlagRegistry(); + return *instance; + } + +-FlagRegistry::FlagRegistry() : flags_(MakeFlagMap()) {} ++FlagRegistry::FlagRegistry() : flags_(makeFlagMap()) {} + +-void FlagRegistry::ResetFlags() const { ++void FlagRegistry::resetFlags() const { + for (auto& kv : flags_) { +- kv.second->ResetValue(); ++ kv.second->resetValue(); + } + } + +-Flag* FlagRegistry::FindFlag(const std::string& name) const { ++Flag* FlagRegistry::findFlag(const std::string& name) const { + auto it = flags_.find(name); + return (it != flags_.end()) ? it->second : nullptr; + } + +-template <> bool TypedFlag<bool>::SetValueFromString(const std::string& value_str) { ++template <> bool TypedFlag<bool>::setValueFromString(const std::string& value_str) { + static const auto* kTrueValues = new std::set<std::string>({"1", "t", "true", "y", "yes"}); + static const auto* kFalseValues = new std::set<std::string>({"0", "f", "false", "n", "no"}); + auto lower = absl::AsciiStrToLower(value_str); + if (kTrueValues->find(lower) != kTrueValues->end()) { +- SetValue(true); ++ setValue(true); + return true; + } + if (kFalseValues->find(lower) != kFalseValues->end()) { +- SetValue(false); ++ setValue(false); + return true; + } + return false; + } + +-template <> bool TypedFlag<int32_t>::SetValueFromString(const std::string& value_str) { ++template <> bool TypedFlag<int32_t>::setValueFromString(const std::string& value_str) { + int32_t value; + if (absl::SimpleAtoi(value_str, &value)) { +- SetValue(value); ++ setValue(value); + return true; + } + return false; + } + +-template <> bool TypedFlag<int64_t>::SetValueFromString(const std::string& value_str) { ++template <> bool TypedFlag<int64_t>::setValueFromString(const std::string& value_str) { + int64_t value; + if (absl::SimpleAtoi(value_str, &value)) { +- SetValue(value); ++ setValue(value); + return true; + } + return false; + } + +-template <> bool TypedFlag<double>::SetValueFromString(const std::string& value_str) { ++template <> bool TypedFlag<double>::setValueFromString(const std::string& value_str) { + double value; + if (absl::SimpleAtod(value_str, &value)) { +- SetValue(value); ++ setValue(value); + return true; + } + return false; + } + +-template <> bool TypedFlag<std::string>::SetValueFromString(const std::string& value_str) { +- SetValue(value_str); ++template <> bool TypedFlag<std::string>::setValueFromString(const std::string& value_str) { ++ setValue(value_str); + return true; + } + ++template <> bool TypedFlag<unsigned long>::setValueFromString(const std::string& value_str) { ++ unsigned long value; ++ if (absl::SimpleAtoi(value_str, &value)) { ++ setValue(value); ++ return true; ++ } ++ return false; ++} ++ ++template <> bool TypedFlag<unsigned long long>::setValueFromString(const std::string& value_str) { ++ unsigned long long value; ++ if (absl::SimpleAtoi(value_str, &value)) { ++ setValue(value); ++ return true; ++ } ++ return false; ++} ++ + // Flag definitions +-#define QUICHE_FLAG(type, flag, value, help) \ +- TypedFlag<type>* FLAGS_##flag = new TypedFlag<type>(#flag, value, help); +-#include "extensions/quic_listeners/quiche/platform/flags_list.h" +-#undef QUICHE_FLAG ++#define QUIC_FLAG(flag, value) TypedFlag<bool>* flag = new TypedFlag<bool>(#flag, value, ""); ++#include "quiche/quic/core/quic_flags_list.h" ++QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) ++QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) ++QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) ++QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) ++ ++#undef QUIC_FLAG ++ ++#define STRINGIFY(X) #X ++ ++#define DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, value, help) \ ++ TypedFlag<type>* FLAGS_##flag = new TypedFlag<type>(STRINGIFY(FLAGS_##flag), value, help); ++ ++#define DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE(type, flag, value, doc) \ ++ DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, value, doc) ++ ++#define DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES(type, flag, internal_value, external_value, doc) \ ++ DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, external_value, doc) ++ ++// Select the right macro based on the number of arguments. ++#define GET_6TH_ARG(arg1, arg2, arg3, arg4, arg5, arg6, ...) arg6 ++ ++#define QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(...) \ ++ GET_6TH_ARG(__VA_ARGS__, DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES, \ ++ DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE) ++ ++#define QUIC_PROTOCOL_FLAG(...) QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__) ++#include "quiche/quic/core/quic_protocol_flags_list.h" ++#undef QUIC_PROTOCOL_FLAG + + } // namespace quiche +diff --git a/source/extensions/quic_listeners/quiche/platform/flags_impl.h b/source/extensions/quic_listeners/quiche/platform/flags_impl.h +index 5db939925..83ed8430c 100644 +--- a/source/extensions/quic_listeners/quiche/platform/flags_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/flags_impl.h +@@ -26,13 +26,13 @@ public: + ~FlagRegistry() = default; + + // Return singleton instance. +- static FlagRegistry& GetInstance(); ++ static FlagRegistry& getInstance(); + + // Reset all registered flags to their default values. +- void ResetFlags() const; ++ void resetFlags() const; + + // Look up a flag by name. +- Flag* FindFlag(const std::string& name) const; ++ Flag* findFlag(const std::string& name) const; + + private: + FlagRegistry(); +@@ -48,10 +48,10 @@ public: + virtual ~Flag() = default; + + // Set flag value from given string, returning true iff successful. +- virtual bool SetValueFromString(const std::string& value_str) = 0; ++ virtual bool setValueFromString(const std::string& value_str) = 0; + + // Reset flag to default value. +- virtual void ResetValue() = 0; ++ virtual void resetValue() = 0; + + // Return flag name. + std::string name() const { return name_; } +@@ -70,15 +70,15 @@ public: + TypedFlag(const char* name, T default_value, const char* help) + : Flag(name, help), value_(default_value), default_value_(default_value) {} + +- bool SetValueFromString(const std::string& value_str) override; ++ bool setValueFromString(const std::string& value_str) override; + +- void ResetValue() override { ++ void resetValue() override { + absl::MutexLock lock(&mutex_); + value_ = default_value_; + } + + // Set flag value. +- void SetValue(T value) { ++ void setValue(T value) { + absl::MutexLock lock(&mutex_); + value_ = value; + } +@@ -96,15 +96,29 @@ private: + }; + + // SetValueFromString specializations +-template <> bool TypedFlag<bool>::SetValueFromString(const std::string& value_str); +-template <> bool TypedFlag<int32_t>::SetValueFromString(const std::string& value_str); +-template <> bool TypedFlag<int64_t>::SetValueFromString(const std::string& value_str); +-template <> bool TypedFlag<double>::SetValueFromString(const std::string& value_str); +-template <> bool TypedFlag<std::string>::SetValueFromString(const std::string& value_str); ++template <> bool TypedFlag<bool>::setValueFromString(const std::string& value_str); ++template <> bool TypedFlag<int32_t>::setValueFromString(const std::string& value_str); ++template <> bool TypedFlag<int64_t>::setValueFromString(const std::string& value_str); ++template <> bool TypedFlag<double>::setValueFromString(const std::string& value_str); ++template <> bool TypedFlag<std::string>::setValueFromString(const std::string& value_str); ++template <> bool TypedFlag<unsigned long>::setValueFromString(const std::string& value_str); ++template <> bool TypedFlag<unsigned long long>::setValueFromString(const std::string& value_str); + + // Flag declarations +-#define QUICHE_FLAG(type, flag, value, help) extern TypedFlag<type>* FLAGS_##flag; +-#include "extensions/quic_listeners/quiche/platform/flags_list.h" +-#undef QUICHE_FLAG ++#define QUIC_FLAG(flag, ...) extern TypedFlag<bool>* flag; ++#include "quiche/quic/core/quic_flags_list.h" ++QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) ++QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) ++QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) ++QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) ++QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) ++#undef QUIC_FLAG ++ ++#define QUIC_PROTOCOL_FLAG(type, flag, ...) extern TypedFlag<type>* FLAGS_##flag; ++#include "quiche/quic/core/quic_protocol_flags_list.h" ++#undef QUIC_PROTOCOL_FLAG + + } // namespace quiche +diff --git a/source/extensions/quic_listeners/quiche/platform/flags_list.h b/source/extensions/quic_listeners/quiche/platform/flags_list.h +deleted file mode 100644 +index 7e9e20a7c..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/flags_list.h ++++ /dev/null +@@ -1,502 +0,0 @@ +-// This file intentionally does not have header guards. It is intended to be +-// included multiple times, each time with a different definition of +-// QUICHE_FLAG. +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-// This file is generated by //third_party/quic/tools:quic_flags_list in +-// Google3. +- +-#if defined(QUICHE_FLAG) +- +-QUICHE_FLAG( +- bool, http2_reloadable_flag_http2_backend_alpn_failure_error_code, false, +- "If true, the GFE will return a new ResponseCodeDetails error when ALPN to the backend fails.") +- +-QUICHE_FLAG(bool, http2_reloadable_flag_http2_ip_based_cwnd_exp, true, +- "If true, enable IP address based CWND bootstrapping experiment with different " +- "bandwidth models and priorities in HTTP2.") +- +-QUICHE_FLAG( +- bool, http2_reloadable_flag_http2_load_based_goaway_warning, false, +- "If true, load-based connection closures will send a warning GOAWAY before the actual GOAWAY.") +- +-QUICHE_FLAG(bool, http2_reloadable_flag_http2_security_requirement_for_client3, false, +- "If true, check whether client meets security requirements during SSL handshake. If " +- "flag is true and client does not meet security requirements, do not negotiate HTTP/2 " +- "with client or terminate the session with SPDY_INADEQUATE_SECURITY if HTTP/2 is " +- "already negotiated. The spec contains both cipher and TLS version requirements.") +- +-QUICHE_FLAG(bool, http2_reloadable_flag_http2_websocket_detection, false, +- "If true, uses a HTTP/2-specific method of detecting websocket upgrade requests.") +- +-QUICHE_FLAG(bool, http2_reloadable_flag_permissive_http2_switch, false, +- "If true, the GFE allows both HTTP/1.0 and HTTP/1.1 versions in HTTP/2 upgrade " +- "requests/responses.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_advertise_quic_for_https_for_debugips, false, "") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_advertise_quic_for_https_for_external_users, false, "") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_gclb_quic_allow_alia, true, +- "If gfe2_reloadable_flag_gclb_use_alia is also true, use Alia for GCLB QUIC " +- "handshakes. To be used as a big red button if there's a problem with Alia/QUIC.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_abort_qpack_on_stream_close, false, +- "If true, abort async QPACK header decompression in QuicSpdyStream::OnClose().") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_ack_delay_alarm_granularity, false, +- "When true, ensure the ACK delay is never less than the alarm granularity when ACK " +- "decimation is enabled.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_missing_connected_checks, false, +- "If true, add missing connected checks.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_silent_idle_timeout, true, +- "If true, when server is silently closing connections due to idle timeout, serialize " +- "the connection close packets which will be added to time wait list.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, false, +- "If true, include stream information in idle timeout connection close detail.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_allow_backend_set_stream_ttl, false, +- "If true, check backend response header for X-Response-Ttl. If it is provided, the " +- "stream TTL is set. A QUIC stream will be immediately canceled when tries to write " +- "data if this TTL expired.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_allow_client_enabled_bbr_v2, true, +- "If true, allow client to enable BBRv2 on server via connection option 'B2ON'.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_alpn_dispatch, false, +- "Support different QUIC sessions, as indicated by ALPN. Used for QBONE.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_avoid_too_low_probe_bw_cwnd, false, +- "If true, QUIC BBRv2's PROBE_BW mode will not reduce cwnd below BDP+ack_height.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_fewer_startup_round_trips, false, +- "When true, the 1RTT and 2RTT connection options decrease the number of round trips in " +- "BBRv2 STARTUP without a 25% bandwidth increase to 1 or 2 round trips respectively.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_bbr2_limit_inflight_hi, false, +- "When true, the B2HI connection option limits reduction of inflight_hi to (1-Beta)*CWND.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_use_post_inflight_to_detect_queuing, false, +- "If true, QUIC BBRv2 will use inflight byte after congestion event to detect queuing " +- "during PROBE_UP.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr_no_bytes_acked_in_startup_recovery, false, +- "When in STARTUP and recovery, do not add bytes_acked to QUIC BBR's CWND in " +- "CalculateCongestionWindow()") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_bootstrap_cwnd_by_spdy_priority, true, +- "If true, bootstrap initial QUIC cwnd by SPDY priorities.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_cap_large_client_initial_rtt, true, +- "If true, cap client suggested initial RTT to 1s if it is longer than 1s.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_clean_up_spdy_session_destructor, false, +- "If true, QuicSpdySession's destructor won't need to do cleanup.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_close_connection_in_on_can_write_with_blocked_writer, +- false, +- "If true, close connection if writer is still blocked while OnCanWrite is called.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_close_connection_on_serialization_failure, false, +- "If true, close connection on packet serialization failures.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_conservative_bursts, false, +- "If true, set burst token to 2 in cwnd bootstrapping experiment.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_conservative_cwnd_and_pacing_gains, false, +- "If true, uses conservative cwnd gain and pacing gain when cwnd gets bootstrapped.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_copy_bbr_cwnd_to_bbr2, false, +- "If true, when switching from BBR to BBRv2, BBRv2 will use BBR's cwnd as its initial cwnd.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_enable_5rto_blackhole_detection2, true, +- "If true, default-enable 5RTO blachole detection.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_on_pto, false, +- "If true, default on PTO which unifies TLP + RTO loss recovery.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_to_bbr, true, +- "When true, defaults to BBR congestion control instead of Cubic.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_to_bbr_v2, false, +- "If true, use BBRv2 as the default congestion controller. Takes precedence over " +- "--quic_default_to_bbr.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_server_blackhole_detection, false, +- "If true, disable blackhole detection on server side.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_draft_27, false, +- "If true, disable QUIC version h3-27.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_draft_29, false, +- "If true, disable QUIC version h3-29.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q043, false, +- "If true, disable QUIC version Q043.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q046, false, +- "If true, disable QUIC version Q046.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q050, false, +- "If true, disable QUIC version Q050.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_t050, false, +- "If true, disable QUIC version h3-T050.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_t051, false, +- "If true, disable QUIC version h3-T051.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_discard_initial_packet_with_key_dropped, false, +- "If true, discard INITIAL packet if the key has been dropped.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_do_not_accept_stop_waiting, false, +- "In v44 and above, where STOP_WAITING is never sent, close the connection if it's received.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_donot_reset_ideal_next_packet_send_time, false, +- "If true, stop resetting ideal_next_packet_send_time_ in pacing sender.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_enable_loss_detection_experiment_at_gfe, false, +- "If ture, enable GFE-picked loss detection experiment.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_enable_loss_detection_tuner, false, +- "If true, allow QUIC loss detection tuning to be enabled by connection option ELDT.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_enable_mtu_discovery_at_server, false, +- "If true, QUIC will default enable MTU discovery at server, with a target of 1450 bytes.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_enabled, false, "") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_arm_pto_for_application_data, false, +- "If true, do not arm PTO for application data until handshake confirmed.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_bytes_left_for_batch_write, false, +- "If true, convert bytes_left_for_batch_write_ to unsigned int.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_fix_http3_goaway_stream_id, false, +- "If true, send the lowest stream ID that can be retried by the client in a GOAWAY frame. If " +- "false, send the highest received stream ID, which actually should not be retried.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_out_of_order_sending, false, +- "If true, fix a potential out of order sending caused by handshake gets confirmed " +- "while the coalescer is not empty.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_fix_pto_pending_timer_count, false, +- "If true, make sure there is pending timer credit when trying to PTO retransmit any packets.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_undecryptable_packets2, false, +- "If true, remove processed undecryptable packets.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_get_stream_information_from_stream_map, true, +- "If true, gQUIC will only consult stream_map in QuicSession::GetNumActiveStreams().") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_give_sent_packet_to_debug_visitor_after_sent, false, +- "If true, QUIC connection will pass sent packet information to the debug visitor after " +- "a packet is recorded as sent in sent packet manager.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_http3_new_default_urgency_value, false, +- "If true, QuicStream::kDefaultUrgency is 3, otherwise 1.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_ip_based_cwnd_exp, true, +- "If true, enable IP address based CWND bootstrapping experiment with different " +- "bandwidth models and priorities. ") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_listener_never_fake_epollout, false, +- "If true, QuicListener::OnSocketIsWritable will always return false, which means there " +- "will never be a fake EPOLLOUT event in the next epoll iteration.") +- +-QUICHE_FLAG(bool, +- quic_reloadable_flag_quic_neuter_initial_packet_in_coalescer_with_initial_key_discarded, +- false, "If true, neuter initial packet in the coalescer when discarding initial keys.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_no_dup_experiment_id_2, false, +- "If true, transport connection stats doesn't report duplicated experiments for same " +- "connection.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_no_silent_close_for_idle_timeout, true, +- "If true, always send connection close for idle timeout if NSLC is received.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_only_set_uaid_in_tcs_visitor, false, +- "If true, QuicTransportConnectionStatsVisitor::PopulateTransportConnectionStats will " +- "be the only place where TCS's uaid field is set.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_only_truncate_long_cids, true, +- "In IETF QUIC, only truncate long CIDs from the client's Initial, don't modify them.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_preferred_altsvc_version, false, +- "When true, we will send a preferred QUIC version at the start of our Alt-Svc list.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_proxy_write_packed_strings, false, +- "If true, QuicProxyDispatcher will write packed_client_address and packed_server_vip " +- "in TcpProxyHeaderProto.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_record_frontend_service_vip_mapping, true, +- "If true, for L1 GFE, as requests come in, record frontend service to VIP mapping " +- "which is used to announce VIP in SHLO for proxied sessions. ") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_record_received_min_ack_delay, false, +- "If true, record the received min_ack_delay in transport parameters to QUIC config.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_reject_all_traffic, false, "") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_remove_zombie_streams, true, +- "If true, QuicSession doesn't keep a separate zombie_streams. Instead, all streams are " +- "stored in stream_map_.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_require_handshake_confirmation, false, +- "If true, require handshake confirmation for QUIC connections, functionally disabling " +- "0-rtt handshakes.") +- +-QUICHE_FLAG( +- bool, quic_reloadable_flag_quic_send_key_update_not_yet_supported, false, +- "When true, QUIC+TLS versions will send the key_update_not_yet_supported transport parameter.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_send_path_response, false, +- "If true, send PATH_RESPONSE upon receiving PATH_CHALLENGE regardless of perspective. " +- "--gfe2_reloadable_flag_quic_start_peer_migration_earlier has to be true before turn " +- "on this flag.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_send_timestamps, false, +- "When the STMP connection option is sent by the client, timestamps in the QUIC ACK " +- "frame are sent and processed.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_server_push, false, +- "If true, enable server push feature on QUIC.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_set_resumed_ssl_session_early, false, +- "If true, set resumed_ssl_session if this is a 0-RTT connection.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_start_peer_migration_earlier, false, +- "If true, while reading an IETF quic packet, start peer migration immediately when " +- "detecting the existence of any non-probing frame instead of at the end of the packet.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_stop_sending_uses_ietf_error_code, false, +- "If true, use IETF QUIC application error codes in STOP_SENDING frames. If false, use " +- "QuicRstStreamErrorCodes.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_testonly_default_false, false, +- "A testonly reloadable flag that will always default to false.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_testonly_default_true, true, +- "A testonly reloadable flag that will always default to true.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_unified_iw_options, false, +- "When true, set the initial congestion control window from connection options in " +- "QuicSentPacketManager rather than TcpCubicSenderBytes.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_use_header_stage_idle_list2, false, +- "If true, use header stage idle list for QUIC connections in GFE.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_quic_use_leto_key_exchange, false, +- "If true, QUIC will attempt to use the Leto key exchange service and only fall back to " +- "local key exchange if that fails.") +- +-QUICHE_FLAG(bool, quic_reloadable_flag_send_quic_fallback_server_config_on_leto_error, false, +- "If true and using Leto for QUIC shared-key calculations, GFE will react to a failure " +- "to contact Leto by sending a REJ containing a fallback ServerConfig, allowing the " +- "client to continue the handshake.") +- +-QUICHE_FLAG( +- bool, quic_restart_flag_dont_fetch_quic_private_keys_from_leto, false, +- "If true, GFE will not request private keys when fetching QUIC ServerConfigs from Leto.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_adjust_initial_cwnd_by_gws, true, +- "If true, GFE informs backend that a client request is the first one on the connection " +- "via frontline header \"first_request=1\". Also, adjust initial cwnd based on " +- "X-Google-Gws-Initial-Cwnd-Mode sent by GWS.") +- +-QUICHE_FLAG( +- bool, quic_restart_flag_quic_allow_loas_multipacket_chlo, false, +- "If true, inspects QUIC CHLOs for kLOAS and early creates sessions to allow multi-packet CHLOs") +- +-QUICHE_FLAG( +- bool, quic_restart_flag_quic_disable_gws_cwnd_experiment, false, +- "If true, X-Google-Gws-Initial-Cwnd-Mode related header sent by GWS becomes no-op for QUIC.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_enable_tls_resumption_v4, true, +- "If true, enables support for TLS resumption in QUIC.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_enable_zero_rtt_for_tls_v2, true, +- "If true, support for IETF QUIC 0-rtt is enabled.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_offload_pacing_to_usps2, false, +- "If true, QUIC offload pacing when using USPS as egress method.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_rx_ring_use_tpacket_v3, false, +- "If true, use TPACKET_V3 for QuicRxRing instead of TPACKET_V2.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_should_accept_new_connection, false, +- "If true, reject QUIC CHLO packets when dispatcher is asked to do so.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_support_release_time_for_gso, false, +- "If true, QuicGsoBatchWriter will support release time if it is available and the " +- "process has the permission to do so.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_testonly_default_false, false, +- "A testonly restart flag that will always default to false.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_testonly_default_true, true, +- "A testonly restart flag that will always default to true.") +- +-QUICHE_FLAG( +- bool, quic_restart_flag_quic_use_leto_for_quic_configs, false, +- "If true, use Leto to fetch QUIC server configs instead of using the seeds from Memento.") +- +-QUICHE_FLAG(bool, quic_restart_flag_quic_use_pigeon_socket_to_backend, false, +- "If true, create a shared pigeon socket for all quic to backend connections and switch " +- "to use it after successful handshake.") +- +-QUICHE_FLAG(bool, spdy_reloadable_flag_quic_bootstrap_cwnd_by_spdy_priority, true, +- "If true, bootstrap initial QUIC cwnd by SPDY priorities.") +- +-QUICHE_FLAG(bool, spdy_reloadable_flag_quic_clean_up_spdy_session_destructor, false, +- "If true, QuicSpdySession's destructor won't need to do cleanup.") +- +-QUICHE_FLAG( +- bool, spdy_reloadable_flag_spdy_discard_response_body_if_disallowed, false, +- "If true, SPDY will discard all response body bytes when response code indicates no response " +- "body should exist. Previously, we only discard partial bytes on the first response processing " +- "and the rest of the response bytes would still be delivered even though the response code " +- "said there should not be any body associated with the response code.") +- +-QUICHE_FLAG(bool, quic_allow_chlo_buffering, true, +- "If true, allows packets to be buffered in anticipation of a " +- "future CHLO, and allow CHLO packets to be buffered until next " +- "iteration of the event loop.") +- +-QUICHE_FLAG(bool, quic_disable_pacing_for_perf_tests, false, "If true, disable pacing in QUIC") +- +-QUICHE_FLAG(bool, quic_enforce_single_packet_chlo, true, +- "If true, enforce that QUIC CHLOs fit in one packet") +- +-QUICHE_FLAG(int64_t, quic_time_wait_list_max_connections, 600000, +- "Maximum number of connections on the time-wait list. " +- "A negative value implies no configured limit.") +- +-QUICHE_FLAG(int64_t, quic_time_wait_list_seconds, 200, +- "Time period for which a given connection_id should live in " +- "the time-wait state.") +- +-QUICHE_FLAG(double, quic_bbr_cwnd_gain, 2.0f, +- "Congestion window gain for QUIC BBR during PROBE_BW phase.") +- +-QUICHE_FLAG(int32_t, quic_buffered_data_threshold, 8 * 1024, +- "If buffered data in QUIC stream is less than this " +- "threshold, buffers all provided data or asks upper layer for more data") +- +-QUICHE_FLAG(int32_t, quic_send_buffer_max_data_slice_size, 4 * 1024, +- "Max size of data slice in bytes for QUIC stream send buffer.") +- +-QUICHE_FLAG(int32_t, quic_lumpy_pacing_size, 2, +- "Number of packets that the pacing sender allows in bursts during " +- "pacing. This flag is ignored if a flow's estimated bandwidth is " +- "lower than 1200 kbps.") +- +-QUICHE_FLAG(double, quic_lumpy_pacing_cwnd_fraction, 0.25f, +- "Congestion window fraction that the pacing sender allows in bursts " +- "during pacing.") +- +-QUICHE_FLAG(int32_t, quic_max_pace_time_into_future_ms, 10, +- "Max time that QUIC can pace packets into the future in ms.") +- +-QUICHE_FLAG(double, quic_pace_time_into_future_srtt_fraction, 0.125f, +- "Smoothed RTT fraction that a connection can pace packets into the future.") +- +-QUICHE_FLAG(bool, quic_export_server_num_packets_per_write_histogram, false, +- "If true, export number of packets written per write operation histogram.") +- +-QUICHE_FLAG(bool, quic_disable_version_negotiation_grease_randomness, false, +- "If true, use predictable version negotiation versions.") +- +-QUICHE_FLAG(bool, quic_enable_http3_grease_randomness, true, +- "If true, use random greased settings and frames.") +- +-QUICHE_FLAG(int64_t, quic_max_tracked_packet_count, 10000, "Maximum number of tracked packets.") +- +-QUICHE_FLAG(bool, quic_prober_uses_length_prefixed_connection_ids, false, +- "If true, QuicFramer::WriteClientVersionNegotiationProbePacket uses " +- "length-prefixed connection IDs.") +- +-QUICHE_FLAG(bool, quic_client_convert_http_header_name_to_lowercase, true, +- "If true, HTTP request header names sent from QuicSpdyClientBase(and " +- "descendents) will be automatically converted to lower case.") +- +-QUICHE_FLAG(bool, quic_enable_http3_server_push, false, +- "If true, server push will be allowed in QUIC versions that use HTTP/3.") +- +-QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_base_duration_ms, 2000, +- "The default minimum duration for BBRv2-native probes, in milliseconds.") +- +-QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_max_rand_duration_ms, 1000, +- "The default upper bound of the random amount of BBRv2-native " +- "probes, in milliseconds.") +- +-QUICHE_FLAG(int32_t, quic_bbr2_default_probe_rtt_period_ms, 10000, +- "The default period for entering PROBE_RTT, in milliseconds.") +- +-QUICHE_FLAG(double, quic_bbr2_default_loss_threshold, 0.02, +- "The default loss threshold for QUIC BBRv2, should be a value " +- "between 0 and 1.") +- +-QUICHE_FLAG(int32_t, quic_bbr2_default_startup_full_loss_count, 8, +- "The default minimum number of loss marking events to exit STARTUP.") +- +-QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_full_loss_count, 2, +- "The default minimum number of loss marking events to exit PROBE_UP phase.") +- +-QUICHE_FLAG(double, quic_bbr2_default_inflight_hi_headroom, 0.01, +- "The default fraction of unutilized headroom to try to leave in path " +- "upon high loss.") +- +-QUICHE_FLAG(int32_t, quic_bbr2_default_initial_ack_height_filter_window, 10, +- "The default initial value of the max ack height filter's window length.") +- +-QUICHE_FLAG(double, quic_ack_aggregation_bandwidth_threshold, 1.0, +- "If the bandwidth during ack aggregation is smaller than (estimated " +- "bandwidth * this flag), consider the current aggregation completed " +- "and starts a new one.") +- +-QUICHE_FLAG(int32_t, quic_anti_amplification_factor, 5, +- "Anti-amplification factor. Before address validation, server will " +- "send no more than factor times bytes received.") +- +-QUICHE_FLAG(int32_t, quic_max_buffered_crypto_bytes, 16 * 1024, +- "The maximum amount of CRYPTO frame data that can be buffered.") +- +-QUICHE_FLAG(int32_t, quic_max_aggressive_retransmittable_on_wire_ping_count, 0, +- "If set to non-zero, the maximum number of consecutive pings that " +- "can be sent with aggressive initial retransmittable on wire timeout " +- "if there is no new data received. After which, the timeout will be " +- "exponentially back off until exceeds the default ping timeout.") +- +-QUICHE_FLAG(int32_t, quic_max_congestion_window, 2000, "The maximum congestion window in packets.") +- +-QUICHE_FLAG(int32_t, quic_max_streams_window_divisor, 2, +- "The divisor that controls how often MAX_STREAMS frame is sent.") +- +-QUICHE_FLAG(bool, http2_reloadable_flag_http2_testonly_default_false, false, +- "A testonly reloadable flag that will always default to false.") +- +-QUICHE_FLAG(bool, http2_restart_flag_http2_testonly_default_false, false, +- "A testonly restart flag that will always default to false.") +- +-QUICHE_FLAG(bool, spdy_reloadable_flag_spdy_testonly_default_false, false, +- "A testonly reloadable flag that will always default to false.") +- +-QUICHE_FLAG(bool, spdy_restart_flag_spdy_testonly_default_false, false, +- "A testonly restart flag that will always default to false.") +- +-#endif +diff --git a/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h +index 7d2561469..dc6fe5429 100644 +--- a/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h +@@ -8,10 +8,10 @@ + + #include "extensions/quic_listeners/quiche/platform/flags_impl.h" + +-#define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_http2_reloadable_flag_##flag->value() ++#define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() + + #define SetHttp2ReloadableFlagImpl(flag, value) \ +- quiche::FLAGS_http2_reloadable_flag_##flag->SetValue(value) ++ quiche::FLAGS_quic_reloadable_flag_##flag->setValue(value) + + #define HTTP2_CODE_COUNT_N_IMPL(flag, instance, total) \ + do { \ +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h +deleted file mode 100644 +index 3f595380b..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h ++++ /dev/null +@@ -1,18 +0,0 @@ +-#pragma once +- +-#include "absl/base/optimization.h" +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-#define QUIC_ALIGN_OF_IMPL alignof +-#ifdef _MSC_VER +-#define QUIC_ALIGNED_IMPL(X) __declspec(align(X)) +-#else +-#define QUIC_ALIGNED_IMPL(X) __attribute__((aligned(X))) +-#endif +-#define QUIC_CACHELINE_ALIGNED_IMPL ABSL_CACHELINE_ALIGNED +-#define QUIC_CACHELINE_SIZE_IMPL ABSL_CACHELINE_SIZE +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc +index 2a886a12c..27b977908 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc ++++ b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc +@@ -10,25 +10,7 @@ + + namespace quic { + +-// static +-bool QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(quiche::QuicheStringPiece cert, +- quiche::QuicheStringPiece* subject_out) { +- CBS tbs_certificate; +- if (!SeekToSubject(cert, &tbs_certificate)) { +- return false; +- } +- +- CBS subject; +- if (!CBS_get_asn1_element(&tbs_certificate, &subject, CBS_ASN1_SEQUENCE)) { +- return false; +- } +- *subject_out = +- absl::string_view(reinterpret_cast<const char*>(CBS_data(&subject)), CBS_len(&subject)); +- return true; +-} +- +-// static +-bool QuicCertUtilsImpl::SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_certificate) { ++bool seekToSubject(absl::string_view cert, CBS* tbs_certificate) { + CBS der; + CBS_init(&der, reinterpret_cast<const uint8_t*>(cert.data()), cert.size()); + CBS certificate; +@@ -65,4 +47,22 @@ bool QuicCertUtilsImpl::SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_c + return true; + } + ++// static ++// NOLINTNEXTLINE(readability-identifier-naming) ++bool QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(absl::string_view cert, ++ absl::string_view* subject_out) { ++ CBS tbs_certificate; ++ if (!seekToSubject(cert, &tbs_certificate)) { ++ return false; ++ } ++ ++ CBS subject; ++ if (!CBS_get_asn1_element(&tbs_certificate, &subject, CBS_ASN1_SEQUENCE)) { ++ return false; ++ } ++ *subject_out = ++ absl::string_view(reinterpret_cast<const char*>(CBS_data(&subject)), CBS_len(&subject)); ++ return true; ++} ++ + } // namespace quic +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h +index 0c41b9dbc..29b882b7d 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h +@@ -6,18 +6,15 @@ + // consumed or referenced directly by other Envoy code. It serves purely as a + // porting layer for QUICHE. + ++#include "absl/strings/string_view.h" + #include "openssl/base.h" +-#include "quiche/common/platform/api/quiche_string_piece.h" + + namespace quic { + + class QuicCertUtilsImpl { + public: +- static bool ExtractSubjectNameFromDERCert(quiche::QuicheStringPiece cert, +- quiche::QuicheStringPiece* subject_out); +- +-private: +- static bool SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_certificate); ++ // NOLINTNEXTLINE(readability-identifier-naming) ++ static bool ExtractSubjectNameFromDERCert(absl::string_view cert, absl::string_view* subject_out); + }; + + } // namespace quic +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h +deleted file mode 100644 +index aa9d6bc36..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h ++++ /dev/null +@@ -1,11 +0,0 @@ +-#pragma once +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-#include "absl/base/macros.h" +- +-#define QUIC_FALLTHROUGH_INTENDED_IMPL ABSL_FALLTHROUGH_INTENDED +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc +index 91d52c44a..b2e396fab 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc ++++ b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc +@@ -36,6 +36,7 @@ void depthFirstTraverseDirectory(const std::string& dirname, std::vector<std::st + } // namespace + + // Traverses the directory |dirname| and returns all of the files it contains. ++// NOLINTNEXTLINE(readability-identifier-naming) + std::vector<std::string> ReadFileContentsImpl(const std::string& dirname) { + std::vector<std::string> files; + depthFirstTraverseDirectory(dirname, files); +@@ -43,7 +44,8 @@ std::vector<std::string> ReadFileContentsImpl(const std::string& dirname) { + } + + // Reads the contents of |filename| as a string into |contents|. +-void ReadFileContentsImpl(quiche::QuicheStringPiece filename, std::string* contents) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++void ReadFileContentsImpl(absl::string_view filename, std::string* contents) { + #ifdef WIN32 + Envoy::Filesystem::InstanceImplWin32 fs; + #else +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h +index 654c1ad18..25c31e9de 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h +@@ -8,7 +8,7 @@ + + #include <vector> + +-#include "quiche/common/platform/api/quiche_string_piece.h" ++#include "absl/strings/string_view.h" + + namespace quic { + +@@ -16,6 +16,7 @@ namespace quic { + * Traverses the directory |dirname| and returns all of the files it contains. + * @param dirname full path without trailing '/'. + */ ++// NOLINTNEXTLINE(readability-identifier-naming)` + std::vector<std::string> ReadFileContentsImpl(const std::string& dirname); + + /** +@@ -23,6 +24,7 @@ std::vector<std::string> ReadFileContentsImpl(const std::string& dirname); + * @param filename the full path to the file. + * @param contents output location of the file content. + */ +-void ReadFileContentsImpl(quiche::QuicheStringPiece filename, std::string* contents); ++// NOLINTNEXTLINE(readability-identifier-naming) ++void ReadFileContentsImpl(absl::string_view filename, std::string* contents); + + } // namespace quic +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h +index 872495f2d..d562bb1a4 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h +@@ -15,16 +15,16 @@ + #define GetQuicFlagImpl(flag) (quiche::flag)->value() + + // |flag| is the global flag variable, which is a pointer to TypedFlag<type>. +-#define SetQuicFlagImpl(flag, value) (quiche::flag)->SetValue(value) ++#define SetQuicFlagImpl(flag, value) (quiche::flag)->setValue(value) + + #define GetQuicReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() + + #define SetQuicReloadableFlagImpl(flag, value) \ +- quiche::FLAGS_quic_reloadable_flag_##flag->SetValue(value) ++ quiche::FLAGS_quic_reloadable_flag_##flag->setValue(value) + + #define GetQuicRestartFlagImpl(flag) quiche::FLAGS_quic_restart_flag_##flag->value() + +-#define SetQuicRestartFlagImpl(flag, value) quiche::FLAGS_quic_restart_flag_##flag->SetValue(value) ++#define SetQuicRestartFlagImpl(flag, value) quiche::FLAGS_quic_restart_flag_##flag->setValue(value) + + // Not wired into command-line parsing. + #define DEFINE_QUIC_COMMAND_LINE_FLAG_IMPL(type, flag, value, help) \ +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc +index bcbafb566..75849611d 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc ++++ b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc +@@ -19,7 +19,8 @@ + namespace quic { + + // static +-bool QuicHostnameUtilsImpl::IsValidSNI(quiche::QuicheStringPiece sni) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++bool QuicHostnameUtilsImpl::IsValidSNI(absl::string_view sni) { + // TODO(wub): Implement it on top of GoogleUrl, once it is available. + + return sni.find_last_of('.') != std::string::npos && +@@ -27,7 +28,8 @@ bool QuicHostnameUtilsImpl::IsValidSNI(quiche::QuicheStringPiece sni) { + } + + // static +-std::string QuicHostnameUtilsImpl::NormalizeHostname(quiche::QuicheStringPiece hostname) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++std::string QuicHostnameUtilsImpl::NormalizeHostname(absl::string_view hostname) { + // TODO(wub): Implement it on top of GoogleUrl, once it is available. + std::string host = absl::AsciiStrToLower(hostname); + +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h +index 2b7ed4357..67cd787d0 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h +@@ -6,7 +6,7 @@ + // consumed or referenced directly by other Envoy code. It serves purely as a + // porting layer for QUICHE. + +-#include "quiche/common/platform/api/quiche_string_piece.h" ++#include "absl/strings/string_view.h" + #include "quiche/quic/platform/api/quic_export.h" + + namespace quic { +@@ -18,7 +18,8 @@ public: + // (2) check that the hostname contains valid characters only; and + // (3) contains at least one dot. + // NOTE(wub): Only (3) is implemented for now. +- static bool IsValidSNI(quiche::QuicheStringPiece sni); ++ // NOLINTNEXTLINE(readability-identifier-naming) ++ static bool IsValidSNI(absl::string_view sni); + + // Normalize a hostname: + // (1) Canonicalize it, similar to what Chromium does in +@@ -27,7 +28,8 @@ public: + // (3) Remove the trailing '.'. + // WARNING: May mutate |hostname| in place. + // NOTE(wub): Only (2) and (3) are implemented for now. +- static std::string NormalizeHostname(quiche::QuicheStringPiece hostname); ++ // NOLINTNEXTLINE(readability-identifier-naming) ++ static std::string NormalizeHostname(absl::string_view hostname); + + private: + QuicHostnameUtilsImpl() = delete; +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h +deleted file mode 100644 +index b8b70a042..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h ++++ /dev/null +@@ -1,13 +0,0 @@ +-#pragma once +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-#include "absl/base/attributes.h" +- +-#define QUIC_MUST_USE_RESULT_IMPL ABSL_MUST_USE_RESULT +-#define QUIC_UNUSED_IMPL ABSL_ATTRIBUTE_UNUSED +-#define QUIC_CONST_INIT_IMPL ABSL_CONST_INIT +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc +index c2eb527d6..9e46c37df 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc ++++ b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc +@@ -10,7 +10,8 @@ + + namespace quic { + +-quiche::QuicheStringPiece QuicMemSliceSpanImpl::GetData(size_t index) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++absl::string_view QuicMemSliceSpanImpl::GetData(size_t index) { + Envoy::Buffer::RawSliceVector slices = buffer_->getRawSlices(/*max_slices=*/index + 1); + ASSERT(slices.size() > index); + return {reinterpret_cast<char*>(slices[index].mem_), slices[index].len_}; +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h +index 1824fb8d1..ef40e6387 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h +@@ -9,7 +9,7 @@ + #include "envoy/buffer/buffer.h" + + #include "absl/container/fixed_array.h" +-#include "quiche/common/platform/api/quiche_string_piece.h" ++#include "absl/strings/string_view.h" + #include "quiche/quic/core/quic_types.h" + #include "quiche/quic/platform/api/quic_mem_slice.h" + +@@ -43,9 +43,13 @@ public: + } + + // QuicMemSliceSpan +- quiche::QuicheStringPiece GetData(size_t index); ++ // NOLINTNEXTLINE(readability-identifier-naming) ++ absl::string_view GetData(size_t index); ++ // NOLINTNEXTLINE(readability-identifier-naming) + QuicByteCount total_length() { return buffer_->length(); }; ++ // NOLINTNEXTLINE(readability-identifier-naming) + size_t NumSlices() { return buffer_->getRawSlices().size(); } ++ // NOLINTNEXTLINE(readability-identifier-naming) + template <typename ConsumeFunction> QuicByteCount ConsumeAll(ConsumeFunction consume); + bool empty() const { return buffer_->length() == 0; } + +@@ -54,6 +58,7 @@ private: + }; + + template <typename ConsumeFunction> ++// NOLINTNEXTLINE(readability-identifier-naming) + QuicByteCount QuicMemSliceSpanImpl::ConsumeAll(ConsumeFunction consume) { + size_t saved_length = 0; + for (auto& slice : buffer_->getRawSlices()) { +diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h +similarity index 52% +rename from source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h +rename to source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h +index aaebe5d5c..4b0201c35 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h +@@ -6,12 +6,11 @@ + // consumed or referenced directly by other Envoy code. It serves purely as a + // porting layer for QUICHE. + +-#include "absl/memory/memory.h" ++#include "absl/strings/string_view.h" + +-namespace quiche { ++namespace quic { + +-template <typename T> std::unique_ptr<T> QuicheWrapUniqueImpl(T* ptr) { +- return absl::WrapUnique<T>(ptr); +-} ++// NOLINTNEXTLINE(readability-identifier-naming) ++template <class T> void AdjustTestValueImpl(absl::string_view /*label*/, T* /*var*/) {} + +-} // namespace quiche ++} // namespace quic +diff --git a/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h +index 248cfc193..1e88abe46 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h +@@ -19,4 +19,7 @@ inline bool GetGooglePacketHeadersFromControlMessageImpl(struct ::cmsghdr* /*cms + return false; + } + ++// NOLINTNEXTLINE(readability-identifier-naming) ++inline void SetGoogleSocketOptionsImpl(int /*fd*/) {} ++ + } // namespace quic +diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h +deleted file mode 100644 +index 7a23b53da..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h ++++ /dev/null +@@ -1,11 +0,0 @@ +-#pragma once +- +-#include "absl/base/macros.h" +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-#define QUICHE_ARRAYSIZE_IMPL(array) ABSL_ARRAYSIZE(array) +diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h +deleted file mode 100644 +index f8b2b6c08..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h ++++ /dev/null +@@ -1,17 +0,0 @@ +-#pragma once +- +-#include "absl/types/optional.h" +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-namespace quiche { +- +-template <typename T> using QuicheOptionalImpl = absl::optional<T>; +- +-#define QUICHE_NULLOPT_IMPL absl::nullopt +- +-} // namespace quiche +diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h +index 3a6d1a393..7b87c1cd6 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h +@@ -2,7 +2,6 @@ + + #include "common/common/base64.h" + +-#include "extensions/quic_listeners/quiche/platform/quiche_optional_impl.h" + #include "extensions/quic_listeners/quiche/platform/quiche_string_piece_impl.h" + #include "extensions/quic_listeners/quiche/platform/string_utils.h" + +@@ -13,6 +12,7 @@ + #include "absl/strings/str_cat.h" + #include "absl/strings/str_format.h" + #include "absl/strings/str_split.h" ++#include "absl/types/optional.h" + + // NOLINT(namespace-envoy) + +@@ -25,58 +25,16 @@ namespace quiche { + class QuicheTextUtilsImpl { + public: + // NOLINTNEXTLINE(readability-identifier-naming) +- static bool StartsWith(QuicheStringPieceImpl data, QuicheStringPieceImpl prefix) { +- return absl::StartsWith(data, prefix); +- } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static bool EndsWith(QuicheStringPieceImpl data, QuicheStringPieceImpl suffix) { +- return absl::EndsWith(data, suffix); +- } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static bool EndsWithIgnoreCase(QuicheStringPieceImpl data, QuicheStringPieceImpl suffix) { +- return absl::EndsWithIgnoreCase(data, suffix); +- } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static std::string ToLower(QuicheStringPieceImpl data) { return absl::AsciiStrToLower(data); } ++ static std::string ToLower(absl::string_view data) { return absl::AsciiStrToLower(data); } + + // NOLINTNEXTLINE(readability-identifier-naming) +- static void RemoveLeadingAndTrailingWhitespace(QuicheStringPieceImpl* data) { ++ static void RemoveLeadingAndTrailingWhitespace(absl::string_view* data) { + *data = absl::StripAsciiWhitespace(*data); + } + +- // NOLINTNEXTLINE(readability-identifier-naming) +- static bool StringToUint64(QuicheStringPieceImpl in, uint64_t* out) { +- return absl::SimpleAtoi(in, out); +- } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static bool StringToInt(QuicheStringPieceImpl in, int* out) { return absl::SimpleAtoi(in, out); } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static bool StringToUint32(QuicheStringPieceImpl in, uint32_t* out) { +- return absl::SimpleAtoi(in, out); +- } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static bool StringToSizeT(QuicheStringPieceImpl in, size_t* out) { +- return absl::SimpleAtoi(in, out); +- } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static std::string Uint64ToString(uint64_t in) { return absl::StrCat(in); } +- +- // NOLINTNEXTLINE(readability-identifier-naming) +- static std::string HexEncode(QuicheStringPieceImpl data) { return absl::BytesToHexString(data); } +- + // NOLINTNEXTLINE(readability-identifier-naming) + static std::string Hex(uint32_t v) { return absl::StrCat(absl::Hex(v)); } + +- // NOLINTNEXTLINE(readability-identifier-naming) +- static std::string HexDecode(QuicheStringPieceImpl data) { return absl::HexStringToBytes(data); } +- + // NOLINTNEXTLINE(readability-identifier-naming) + static void Base64Encode(const uint8_t* data, size_t data_len, std::string* output) { + *output = +@@ -84,27 +42,28 @@ public: + } + + // NOLINTNEXTLINE(readability-identifier-naming) +- static QuicheOptionalImpl<std::string> Base64Decode(QuicheStringPieceImpl input) { ++ static absl::optional<std::string> Base64Decode(absl::string_view input) { + return Envoy::Base64::decodeWithoutPadding(input); + } + + // NOLINTNEXTLINE(readability-identifier-naming) +- static std::string HexDump(QuicheStringPieceImpl binary_data) { +- return quiche::HexDump(binary_data); +- } ++ static std::string Uint64ToString(uint64_t in) { return absl::StrCat(in); } ++ ++ // NOLINTNEXTLINE(readability-identifier-naming) ++ static std::string HexDump(absl::string_view binary_data) { return quiche::HexDump(binary_data); } + + // NOLINTNEXTLINE(readability-identifier-naming) +- static bool ContainsUpperCase(QuicheStringPieceImpl data) { ++ static bool ContainsUpperCase(absl::string_view data) { + return std::any_of(data.begin(), data.end(), absl::ascii_isupper); + } + + // NOLINTNEXTLINE(readability-identifier-naming) +- static bool IsAllDigits(QuicheStringPieceImpl data) { ++ static bool IsAllDigits(absl::string_view data) { + return std::all_of(data.begin(), data.end(), absl::ascii_isdigit); + } + + // NOLINTNEXTLINE(readability-identifier-naming) +- static std::vector<QuicheStringPieceImpl> Split(QuicheStringPieceImpl data, char delim) { ++ static std::vector<absl::string_view> Split(absl::string_view data, char delim) { + return absl::StrSplit(data, delim); + } + }; +diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc +index 3260eafee..5387e0598 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc ++++ b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc +@@ -9,7 +9,7 @@ + namespace quiche { + + namespace { +-QuicheOptional<int64_t> quicheUtcDateTimeToUnixSecondsInner(int year, int month, int day, int hour, ++absl::optional<int64_t> quicheUtcDateTimeToUnixSecondsInner(int year, int month, int day, int hour, + int minute, int second) { + const absl::CivilSecond civil_time(year, month, day, hour, minute, second); + if (second != 60 && (civil_time.year() != year || civil_time.month() != month || +@@ -24,7 +24,7 @@ QuicheOptional<int64_t> quicheUtcDateTimeToUnixSecondsInner(int year, int month, + } // namespace + + // NOLINTNEXTLINE(readability-identifier-naming) +-QuicheOptional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, ++absl::optional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, + int minute, int second) { + // Handle leap seconds without letting any other irregularities happen. + if (second == 60) { +diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h +index a1b70b70a..5e2ef7956 100644 +--- a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h +@@ -10,12 +10,12 @@ + + #include "absl/time/civil_time.h" + #include "absl/time/time.h" +-#include "quiche/common/platform/api/quiche_optional.h" ++#include "absl/types/optional.h" + + namespace quiche { + + // NOLINTNEXTLINE(readability-identifier-naming) +-QuicheOptional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, ++absl::optional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, + int minute, int second); + + } // namespace quiche +diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h +deleted file mode 100644 +index 737b81ee2..000000000 +--- a/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h ++++ /dev/null +@@ -1,29 +0,0 @@ +-#pragma once +- +-#include <cstdint> +- +-#include "envoy/common/platform.h" +- +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-namespace spdy { +- +-inline uint16_t SpdyNetToHost16Impl(uint16_t x) { return ntohs(x); } +- +-inline uint32_t SpdyNetToHost32Impl(uint32_t x) { return ntohl(x); } +- +-// TODO: implement +-inline uint64_t SpdyNetToHost64Impl(uint64_t /*x*/) { return 0; } +- +-inline uint16_t SpdyHostToNet16Impl(uint16_t x) { return htons(x); } +- +-inline uint32_t SpdyHostToNet32Impl(uint32_t x) { return htonl(x); } +- +-// TODO: implement +-inline uint64_t SpdyHostToNet64Impl(uint64_t /*x*/) { return 0; } +- +-} // namespace spdy +diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h +index a3cbd680f..833562fab 100644 +--- a/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h +@@ -8,9 +8,9 @@ + + #include "extensions/quic_listeners/quiche/platform/flags_impl.h" + +-#define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_spdy_reloadable_flag_##flag->value() ++#define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() + +-#define GetSpdyRestartFlagImpl(flag) quiche::FLAGS_spdy_restart_flag_##flag->value() ++#define GetSpdyRestartFlagImpl(flag) quiche::FLAGS_quic_restart_flag_##flag->value() + + #define SPDY_CODE_COUNT_N_IMPL(flag, instance, total) \ + do { \ +diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h +index 41fa3cad8..4b01b2dbd 100644 +--- a/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h ++++ b/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h +@@ -50,7 +50,7 @@ inline std::string SpdyHexEncodeUInt32AndTrimImpl(uint32_t data) { + inline std::string SpdyHexDumpImpl(absl::string_view data) { return quiche::HexDump(data); } + + struct SpdyStringPieceCaseHashImpl { +- size_t operator()(quiche::QuicheStringPiece data) const { ++ size_t operator()(absl::string_view data) const { + std::string lower = absl::AsciiStrToLower(data); + return absl::Hash<std::string>()(lower); + } +diff --git a/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc b/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc +index 3bd0bc295..5ac5738c4 100644 +--- a/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc ++++ b/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc +@@ -12,25 +12,29 @@ using spdy::SpdyHeaderBlock; + namespace quic { + + // static ++// NOLINTNEXTLINE(readability-identifier-naming) + std::string SpdyServerPushUtils::GetPromisedUrlFromHeaders(const SpdyHeaderBlock& /*headers*/) { + NOT_IMPLEMENTED_GCOVR_EXCL_LINE; + } + + // static + std::string ++// NOLINTNEXTLINE(readability-identifier-naming) + SpdyServerPushUtils::GetPromisedHostNameFromHeaders(const SpdyHeaderBlock& /*headers*/) { + NOT_IMPLEMENTED_GCOVR_EXCL_LINE; + } + + // static ++// NOLINTNEXTLINE(readability-identifier-naming) + bool SpdyServerPushUtils::PromisedUrlIsValid(const SpdyHeaderBlock& /*headers*/) { + NOT_IMPLEMENTED_GCOVR_EXCL_LINE; + } + + // static +-std::string SpdyServerPushUtils::GetPushPromiseUrl(quiche::QuicheStringPiece /*scheme*/, +- quiche::QuicheStringPiece /*authority*/, +- quiche::QuicheStringPiece /*path*/) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++std::string SpdyServerPushUtils::GetPushPromiseUrl(absl::string_view /*scheme*/, ++ absl::string_view /*authority*/, ++ absl::string_view /*path*/) { + NOT_IMPLEMENTED_GCOVR_EXCL_LINE; + } + +diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc +index e2d90d916..8fa7d9fe9 100644 +--- a/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc ++++ b/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc +@@ -49,9 +49,9 @@ public: + Network::ConnectionSocketPtr&& connection_socket) + : EnvoyQuicClientConnection(server_connection_id, helper, alarm_factory, &writer, false, + supported_versions, dispatcher, std::move(connection_socket)) { +- SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); + SetEncrypter(quic::ENCRYPTION_FORWARD_SECURE, + std::make_unique<quic::NullEncrypter>(quic::Perspective::IS_CLIENT)); ++ SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); + } + + MOCK_METHOD(void, SendConnectionClosePacket, (quic::QuicErrorCode, const std::string&)); +diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc +index 98359c618..f3b02f4cc 100644 +--- a/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc ++++ b/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc +@@ -48,11 +48,11 @@ public: + quic_session_.ActivateStream(std::unique_ptr<EnvoyQuicClientStream>(quic_stream_)); + EXPECT_CALL(quic_session_, ShouldYield(_)).WillRepeatedly(testing::Return(false)); + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; +- })); ++ .WillRepeatedly( ++ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; ++ })); + EXPECT_CALL(writer_, WritePacket(_, _, _, _, _)) + .WillRepeatedly(Invoke([](const char*, size_t buf_len, const quic::QuicIpAddress&, + const quic::QuicSocketAddress&, quic::PerPacketOptions*) { +@@ -146,7 +146,7 @@ TEST_P(EnvoyQuicClientStreamTest, PostRequestAndResponse) { + std::unique_ptr<char[]> data_buffer; + quic::QuicByteCount data_frame_header_length = + quic::HttpEncoder::SerializeDataFrameHeader(response_body_.length(), &data_buffer); +- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); ++ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); + data = absl::StrCat(data_frame_header, response_body_); + } + quic::QuicStreamFrame frame(stream_id_, false, 0, data); +@@ -184,7 +184,7 @@ TEST_P(EnvoyQuicClientStreamTest, OutOfOrderTrailers) { + std::unique_ptr<char[]> data_buffer; + quic::QuicByteCount data_frame_header_length = + quic::HttpEncoder::SerializeDataFrameHeader(response_body_.length(), &data_buffer); +- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); ++ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); + data = absl::StrCat(data_frame_header, response_body_); + } + quic::QuicStreamFrame frame(stream_id_, false, 0, data); +@@ -301,11 +301,11 @@ TEST_P(EnvoyQuicClientStreamTest, HeadersContributeToWatermarkIquic) { + // Unblock writing now, and this will write out 16kB data and cause stream to + // be blocked by the flow control limit. + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; +- })); ++ .WillOnce( ++ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; ++ })); + EXPECT_CALL(stream_callbacks_, onBelowWriteBufferLowWatermark()); + quic_session_.OnCanWrite(); + EXPECT_TRUE(quic_stream_->IsFlowControlBlocked()); +@@ -315,20 +315,20 @@ TEST_P(EnvoyQuicClientStreamTest, HeadersContributeToWatermarkIquic) { + 32 * 1024); + quic_stream_->OnWindowUpdateFrame(window_update1); + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; +- })); ++ .WillOnce( ++ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; ++ })); + quic_session_.OnCanWrite(); + // No data should be buffered at this point. + + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillOnce(Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; +- })); ++ .WillOnce( ++ Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; ++ })); + // Send more data. If watermark bytes counting were not cleared in previous + // OnCanWrite, this write would have caused the stream to exceed its high watermark. + std::string request1(16 * 1024 - 3, 'a'); +diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc +index cbf66f511..8a493a8e8 100644 +--- a/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc ++++ b/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc +@@ -25,7 +25,7 @@ namespace Quic { + class TestGetProofCallback : public quic::ProofSource::Callback { + public: + TestGetProofCallback(bool& called, bool should_succeed, const std::string& server_config, +- quic::QuicTransportVersion& version, quiche::QuicheStringPiece chlo_hash, ++ quic::QuicTransportVersion& version, absl::string_view chlo_hash, + Network::FilterChain& filter_chain) + : called_(called), should_succeed_(should_succeed), server_config_(server_config), + version_(version), chlo_hash_(chlo_hash), expected_filter_chain_(filter_chain) { +@@ -100,7 +100,7 @@ private: + bool should_succeed_; + const std::string& server_config_; + const quic::QuicTransportVersion& version_; +- quiche::QuicheStringPiece chlo_hash_; ++ absl::string_view chlo_hash_; + Network::FilterChain& expected_filter_chain_; + NiceMock<Stats::MockStore> store_; + Event::GlobalTimeSystem time_system_; +@@ -178,7 +178,7 @@ protected: + quic::QuicSocketAddress server_address_; + quic::QuicSocketAddress client_address_; + quic::QuicTransportVersion version_{quic::QUIC_VERSION_UNSUPPORTED}; +- quiche::QuicheStringPiece chlo_hash_{"aaaaa"}; ++ absl::string_view chlo_hash_{"aaaaa"}; + std::string server_config_{"Server Config"}; + std::string expected_certs_{quic::test::kTestCertificateChainPem}; + std::string pkey_{quic::test::kTestCertificatePrivateKeyPem}; +diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc +index 4a1dfe144..9cdc169cd 100644 +--- a/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc ++++ b/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc +@@ -163,7 +163,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureEmptyCertChain) { + std::unique_ptr<quic::CertificateView> cert_view = + quic::CertificateView::ParseSingleCertificate(leaf_cert_); + quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; +- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; ++ absl::string_view chlo_hash{"aaaaa"}; + std::string server_config{"Server Config"}; + const std::string ocsp_response; + const std::string cert_sct; +@@ -181,7 +181,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidLeafCert) { + std::unique_ptr<quic::CertificateView> cert_view = + quic::CertificateView::ParseSingleCertificate(leaf_cert_); + quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; +- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; ++ absl::string_view chlo_hash{"aaaaa"}; + std::string server_config{"Server Config"}; + const std::string ocsp_response; + const std::string cert_sct; +@@ -197,7 +197,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidLeafCert) { + TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureUnsupportedECKey) { + configCertVerificationDetails(true); + quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; +- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; ++ absl::string_view chlo_hash{"aaaaa"}; + std::string server_config{"Server Config"}; + const std::string ocsp_response; + const std::string cert_sct; +@@ -236,7 +236,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidSignature) { + std::unique_ptr<quic::CertificateView> cert_view = + quic::CertificateView::ParseSingleCertificate(leaf_cert_); + quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; +- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; ++ absl::string_view chlo_hash{"aaaaa"}; + std::string server_config{"Server Config"}; + const std::string ocsp_response; + const std::string cert_sct; +diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc +index 05307c6b9..4fc376857 100644 +--- a/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc ++++ b/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc +@@ -61,6 +61,7 @@ public: + const quic::ParsedQuicVersionVector& supported_versions, + Network::Socket& listen_socket) + : EnvoyQuicServerConnection(quic::test::TestConnectionId(), ++ quic::QuicSocketAddress(quic::QuicIpAddress::Any4(), 12345), + quic::QuicSocketAddress(quic::QuicIpAddress::Loopback4(), 12345), + helper, alarm_factory, &writer, /*owns_writer=*/false, + supported_versions, listen_socket) {} +@@ -201,10 +202,10 @@ public: + crypto_stream_ = test_crypto_stream; + } + quic::test::QuicServerSessionBasePeer::SetCryptoStream(&envoy_quic_session_, crypto_stream); +- quic_connection_->SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); + quic_connection_->SetEncrypter( + quic::ENCRYPTION_FORWARD_SECURE, + std::make_unique<quic::NullEncrypter>(quic::Perspective::IS_SERVER)); ++ quic_connection_->SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); + } + + bool installReadFilter() { +diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc +index c2fd31c6f..f602e2c9a 100644 +--- a/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc ++++ b/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc +@@ -51,6 +51,7 @@ public: + POOL_GAUGE(listener_config_.listenerScope()), + POOL_HISTOGRAM(listener_config_.listenerScope()))}), + quic_connection_(quic::test::TestConnectionId(), ++ quic::QuicSocketAddress(quic::QuicIpAddress::Any6(), 123), + quic::QuicSocketAddress(quic::QuicIpAddress::Any6(), 12345), + connection_helper_, alarm_factory_, &writer_, + /*owns_writer=*/false, {quic_version_}, *listener_config_.socket_), +@@ -66,11 +67,11 @@ public: + quic_session_.ActivateStream(std::unique_ptr<EnvoyQuicServerStream>(quic_stream_)); + EXPECT_CALL(quic_session_, ShouldYield(_)).WillRepeatedly(testing::Return(false)); + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; +- })); ++ .WillRepeatedly( ++ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; ++ })); + EXPECT_CALL(writer_, WritePacket(_, _, _, _, _)) + .WillRepeatedly(Invoke([](const char*, size_t buf_len, const quic::QuicIpAddress&, + const quic::QuicSocketAddress&, quic::PerPacketOptions*) { +@@ -110,7 +111,7 @@ public: + std::unique_ptr<char[]> data_buffer; + quic::QuicByteCount data_frame_header_length = + quic::HttpEncoder::SerializeDataFrameHeader(body.length(), &data_buffer); +- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); ++ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); + data = absl::StrCat(data_frame_header, body); + } + return data; +@@ -397,11 +398,11 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { + + // Make the stream blocked by congestion control. + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillOnce(Invoke([](quic::QuicStreamId, size_t /*write_length*/, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; +- })); ++ .WillOnce( ++ Invoke([](quic::QuicStreamId, size_t /*write_length*/, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; ++ })); + quic_stream_->encodeHeaders(response_headers_, /*end_stream=*/false); + + // Encode 16kB -10 bytes request body. Because the high watermark is 16KB, with previously +@@ -415,11 +416,11 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { + // Unblock writing now, and this will write out 16kB data and cause stream to + // be blocked by the flow control limit. + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; +- })); ++ .WillOnce( ++ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; ++ })); + EXPECT_CALL(stream_callbacks_, onBelowWriteBufferLowWatermark()); + quic_session_.OnCanWrite(); + EXPECT_TRUE(quic_stream_->IsFlowControlBlocked()); +@@ -429,20 +430,20 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { + 32 * 1024); + quic_stream_->OnWindowUpdateFrame(window_update1); + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; +- })); ++ .WillOnce( ++ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; ++ })); + quic_session_.OnCanWrite(); + // No data should be buffered at this point. + + EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) +- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, +- quic::StreamSendingState state, bool, +- quiche::QuicheOptional<quic::EncryptionLevel>) { +- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; +- })); ++ .WillRepeatedly( ++ Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, ++ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { ++ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; ++ })); + // Send more data. If watermark bytes counting were not cleared in previous + // OnCanWrite, this write would have caused the stream to exceed its high watermark. + std::string response1(16 * 1024 - 3, 'a'); +diff --git a/test/extensions/quic_listeners/quiche/platform/BUILD b/test/extensions/quic_listeners/quiche/platform/BUILD +index 420e812b8..7dbb08d82 100644 +--- a/test/extensions/quic_listeners/quiche/platform/BUILD ++++ b/test/extensions/quic_listeners/quiche/platform/BUILD +@@ -9,16 +9,6 @@ licenses(["notice"]) # Apache 2 + + envoy_package() + +-envoy_cc_test( +- name = "quiche_platform_test", +- srcs = ["quiche_platform_test.cc"], +- external_deps = ["quiche_common_platform"], +- deps = [ +- "@com_googlesource_quiche//:quiche_common_platform", +- "@com_googlesource_quiche//:quiche_common_platform_endian", +- ], +-) +- + envoy_cc_test( + name = "http2_platform_test", + srcs = ["http2_platform_test.cc"], +@@ -63,7 +53,6 @@ envoy_cc_test( + "@com_googlesource_quiche//:quic_platform_mem_slice_span", + "@com_googlesource_quiche//:quic_platform_mem_slice_storage", + "@com_googlesource_quiche//:quic_platform_mock_log", +- "@com_googlesource_quiche//:quic_platform_port_utils", + "@com_googlesource_quiche//:quic_platform_sleep", + "@com_googlesource_quiche//:quic_platform_system_event_loop", + "@com_googlesource_quiche//:quic_platform_test", +@@ -150,17 +139,6 @@ envoy_cc_test_library( + deps = ["@com_googlesource_quiche//:quic_platform_base"], + ) + +-envoy_cc_test_library( +- name = "quic_platform_port_utils_impl_lib", +- srcs = ["quic_port_utils_impl.cc"], +- hdrs = ["quic_port_utils_impl.h"], +- tags = ["nofips"], +- deps = [ +- "//source/common/network:utility_lib", +- "//test/test_common:environment_lib", +- ], +-) +- + envoy_cc_test_library( + name = "quic_platform_test_mem_slice_vector_impl_lib", + hdrs = ["quic_test_mem_slice_vector_impl.h"], +diff --git a/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc +index 069a79eab..35aee5d27 100644 +--- a/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc ++++ b/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc +@@ -72,20 +72,14 @@ TEST(Http2PlatformTest, Http2Log) { + HTTP2_DLOG_EVERY_N(ERROR, 2) << "DLOG_EVERY_N(ERROR, 2)"; + } + +-TEST(Http2PlatformTest, Http2StringPiece) { +- std::string s = "bar"; +- quiche::QuicheStringPiece sp(s); +- EXPECT_EQ('b', sp[0]); +-} +- + TEST(Http2PlatformTest, Http2Macro) { + EXPECT_DEBUG_DEATH(HTTP2_UNREACHABLE(), ""); + EXPECT_DEATH(HTTP2_DIE_IF_NULL(nullptr), ""); + } + + TEST(Http2PlatformTest, Http2Flags) { +- auto& flag_registry = quiche::FlagRegistry::GetInstance(); +- flag_registry.ResetFlags(); ++ auto& flag_registry = quiche::FlagRegistry::getInstance(); ++ flag_registry.resetFlags(); + EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); + SetHttp2ReloadableFlag(http2_testonly_default_false, true); + EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); +@@ -93,22 +87,22 @@ TEST(Http2PlatformTest, Http2Flags) { + for (std::string s : {"1", "t", "true", "TRUE", "y", "yes", "Yes"}) { + SetHttp2ReloadableFlag(http2_testonly_default_false, false); + EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); +- EXPECT_TRUE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") +- ->SetValueFromString(s)); ++ EXPECT_TRUE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") ++ ->setValueFromString(s)); + EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); + } + for (std::string s : {"0", "f", "false", "FALSE", "n", "no", "No"}) { + SetHttp2ReloadableFlag(http2_testonly_default_false, true); + EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); +- EXPECT_TRUE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") +- ->SetValueFromString(s)); ++ EXPECT_TRUE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") ++ ->setValueFromString(s)); + EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); + } + for (std::string s : {"some", "invalid", "values", ""}) { + SetHttp2ReloadableFlag(http2_testonly_default_false, false); + EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); +- EXPECT_FALSE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") +- ->SetValueFromString(s)); ++ EXPECT_FALSE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") ++ ->setValueFromString(s)); + EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); + } + } +diff --git a/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc +index 68141aa94..902ad1a9e 100644 +--- a/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc ++++ b/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc +@@ -30,7 +30,6 @@ + #include "gtest/gtest.h" + #include "quiche/common/platform/api/quiche_string_piece.h" + #include "quiche/epoll_server/fake_simple_epoll_server.h" +-#include "quiche/quic/platform/api/quic_aligned.h" + #include "quiche/quic/platform/api/quic_bug_tracker.h" + #include "quiche/quic/platform/api/quic_cert_utils.h" + #include "quiche/quic/platform/api/quic_client_stats.h" +@@ -42,7 +41,6 @@ + #include "quiche/quic/platform/api/quic_flags.h" + #include "quiche/quic/platform/api/quic_hostname_utils.h" + #include "quiche/quic/platform/api/quic_logging.h" +-#include "quiche/quic/platform/api/quic_macros.h" + #include "quiche/quic/platform/api/quic_map_util.h" + #include "quiche/quic/platform/api/quic_mem_slice.h" + #include "quiche/quic/platform/api/quic_mem_slice_span.h" +@@ -50,7 +48,6 @@ + #include "quiche/quic/platform/api/quic_mock_log.h" + #include "quiche/quic/platform/api/quic_mutex.h" + #include "quiche/quic/platform/api/quic_pcc_sender.h" +-#include "quiche/quic/platform/api/quic_port_utils.h" + #include "quiche/quic/platform/api/quic_ptr_util.h" + #include "quiche/quic/platform/api/quic_server_stats.h" + #include "quiche/quic/platform/api/quic_sleep.h" +@@ -92,8 +89,6 @@ protected: + const int verbosity_log_threshold_; + }; + +-TEST_F(QuicPlatformTest, QuicAlignOf) { EXPECT_LT(0, QUIC_ALIGN_OF(int)); } +- + enum class TestEnum { ZERO = 0, ONE, TWO, COUNT }; + + TEST_F(QuicPlatformTest, QuicBugTracker) { +@@ -468,9 +463,9 @@ TEST_F(QuicPlatformTest, QuicCertUtils) { + unsigned char* der = nullptr; + int len = i2d_X509(x509_cert.get(), &der); + ASSERT_GT(len, 0); +- quiche::QuicheStringPiece out; ++ absl::string_view out; + QuicCertUtils::ExtractSubjectNameFromDERCert( +- quiche::QuicheStringPiece(reinterpret_cast<const char*>(der), len), &out); ++ absl::string_view(reinterpret_cast<const char*>(der), len), &out); + EXPECT_EQ("0z1\v0\t\x6\x3U\x4\x6\x13\x2US1\x13" + "0\x11\x6\x3U\x4\b\f\nCalifornia1\x16" + "0\x14\x6\x3U\x4\a\f\rSan Francisco1\r" +@@ -566,8 +561,8 @@ TEST_F(QuicPlatformTest, MonotonicityWithFakeEpollClock) { + } + + TEST_F(QuicPlatformTest, QuicFlags) { +- auto& flag_registry = quiche::FlagRegistry::GetInstance(); +- flag_registry.ResetFlags(); ++ auto& flag_registry = quiche::FlagRegistry::getInstance(); ++ flag_registry.resetFlags(); + + EXPECT_FALSE(GetQuicReloadableFlag(quic_testonly_default_false)); + EXPECT_TRUE(GetQuicReloadableFlag(quic_testonly_default_true)); +@@ -583,14 +578,15 @@ TEST_F(QuicPlatformTest, QuicFlags) { + SetQuicFlag(FLAGS_quic_time_wait_list_seconds, 100); + EXPECT_EQ(100, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); + +- flag_registry.ResetFlags(); ++ flag_registry.resetFlags(); + EXPECT_FALSE(GetQuicReloadableFlag(quic_testonly_default_false)); + EXPECT_TRUE(GetQuicRestartFlag(quic_testonly_default_true)); + EXPECT_EQ(200, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); +- flag_registry.FindFlag("quic_reloadable_flag_quic_testonly_default_false") +- ->SetValueFromString("true"); +- flag_registry.FindFlag("quic_restart_flag_quic_testonly_default_true")->SetValueFromString("0"); +- flag_registry.FindFlag("quic_time_wait_list_seconds")->SetValueFromString("100"); ++ flag_registry.findFlag("FLAGS_quic_reloadable_flag_quic_testonly_default_false") ++ ->setValueFromString("true"); ++ flag_registry.findFlag("FLAGS_quic_restart_flag_quic_testonly_default_true") ++ ->setValueFromString("0"); ++ flag_registry.findFlag("FLAGS_quic_time_wait_list_seconds")->setValueFromString("100"); + EXPECT_TRUE(GetQuicReloadableFlag(quic_testonly_default_false)); + EXPECT_FALSE(GetQuicRestartFlag(quic_testonly_default_true)); + EXPECT_EQ(100, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); +@@ -661,35 +657,6 @@ TEST_F(FileUtilsTest, ReadFileContents) { + EXPECT_EQ(data, output); + } + +-TEST_F(QuicPlatformTest, PickUnsedPort) { +- int port = QuicPickServerPortForTestsOrDie(); +- std::vector<Envoy::Network::Address::IpVersion> supported_versions = +- Envoy::TestEnvironment::getIpVersionsForTest(); +- for (auto ip_version : supported_versions) { +- Envoy::Network::Address::InstanceConstSharedPtr addr = +- Envoy::Network::Test::getCanonicalLoopbackAddress(ip_version); +- Envoy::Network::Address::InstanceConstSharedPtr addr_with_port = +- Envoy::Network::Utility::getAddressWithPort(*addr, port); +- Envoy::Network::SocketImpl sock(Envoy::Network::Socket::Type::Datagram, addr_with_port); +- // binding of given port should success. +- EXPECT_EQ(0, sock.bind(addr_with_port).rc_); +- } +-} +- +-TEST_F(QuicPlatformTest, FailToPickUnsedPort) { +- Envoy::Api::MockOsSysCalls os_sys_calls; +- Envoy::TestThreadsafeSingletonInjector<Envoy::Api::OsSysCallsImpl> os_calls(&os_sys_calls); +- // Actually create sockets. +- EXPECT_CALL(os_sys_calls, socket(_, _, _)).WillRepeatedly([](int domain, int type, int protocol) { +- os_fd_t fd = ::socket(domain, type, protocol); +- return Envoy::Api::SysCallSocketResult{fd, errno}; +- }); +- // Fail bind call's to mimic port exhaustion. +- EXPECT_CALL(os_sys_calls, bind(_, _, _)) +- .WillRepeatedly(Return(Envoy::Api::SysCallIntResult{-1, SOCKET_ERROR_ADDR_IN_USE})); +- EXPECT_DEATH(QuicPickServerPortForTestsOrDie(), "Failed to pick a port for test."); +-} +- + TEST_F(QuicPlatformTest, TestEnvoyQuicBufferAllocator) { + QuicStreamBufferAllocator allocator; + Envoy::Stats::TestUtil::MemoryTest memory_test; +@@ -711,14 +678,6 @@ TEST_F(QuicPlatformTest, TestSystemEventLoop) { + QuicSystemEventLoop("dummy"); + } + +-QUIC_MUST_USE_RESULT bool dummyTestFunction() { return false; } +- +-TEST_F(QuicPlatformTest, TestQuicMacros) { +- // Just make sure it compiles. +- EXPECT_FALSE(dummyTestFunction()); +- int a QUIC_UNUSED; +-} +- + TEST(EnvoyQuicMemSliceTest, ConstructMemSliceFromBuffer) { + std::string str(512, 'b'); + // Fragment needs to out-live buffer. +diff --git a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc +index 556f6cd3e..9eaf8532a 100644 +--- a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc ++++ b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc +@@ -19,7 +19,7 @@ + namespace quic { + namespace { + +-void QuicRecordTestOutputToFile(const std::string& filename, quiche::QuicheStringPiece data) { ++void quicRecordTestOutputToFile(const std::string& filename, absl::string_view data) { + const char* output_dir_env = std::getenv("QUIC_TEST_OUTPUT_DIR"); + if (output_dir_env == nullptr) { + QUIC_LOG(WARNING) << "Could not save test output since QUIC_TEST_OUTPUT_DIR is not set"; +@@ -64,11 +64,13 @@ void QuicRecordTestOutputToFile(const std::string& filename, quiche::QuicheStrin + } + } // namespace + +-void QuicSaveTestOutputImpl(quiche::QuicheStringPiece filename, quiche::QuicheStringPiece data) { +- QuicRecordTestOutputToFile(filename.data(), data); ++// NOLINTNEXTLINE(readability-identifier-naming) ++void QuicSaveTestOutputImpl(absl::string_view filename, absl::string_view data) { ++ quicRecordTestOutputToFile(filename.data(), data); + } + +-bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* data) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++bool QuicLoadTestOutputImpl(absl::string_view filename, std::string* data) { + const char* read_dir_env = std::getenv("QUIC_TEST_OUTPUT_DIR"); + if (read_dir_env == nullptr) { + QUIC_LOG(WARNING) << "Could not load test output since QUIC_TEST_OUTPUT_DIR is not set"; +@@ -96,7 +98,8 @@ bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* dat + return true; + } + +-void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStringPiece data) { ++// NOLINTNEXTLINE(readability-identifier-naming) ++void QuicRecordTraceImpl(absl::string_view identifier, absl::string_view data) { + const testing::TestInfo* test_info = testing::UnitTest::GetInstance()->current_test_info(); + + std::string timestamp = absl::FormatTime("%Y%m%d%H%M%S", absl::Now(), absl::LocalTimeZone()); +@@ -104,7 +107,7 @@ void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStr + std::string filename = fmt::sprintf("%s.%s.%s.%s.qtr", test_info->name(), + test_info->test_case_name(), identifier.data(), timestamp); + +- QuicRecordTestOutputToFile(filename, data); ++ quicRecordTestOutputToFile(filename, data); + } + + } // namespace quic +diff --git a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h +index a1c6c7305..fcf0c47b3 100644 +--- a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h ++++ b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h +@@ -6,14 +6,16 @@ + // consumed or referenced directly by other Envoy code. It serves purely as a + // porting layer for QUICHE. + +-#include "quiche/common/platform/api/quiche_string_piece.h" ++#include "absl/strings/string_view.h" + + namespace quic { ++// NOLINTNEXTLINE(readability-identifier-naming) ++void QuicSaveTestOutputImpl(absl::string_view filename, absl::string_view data); + +-void QuicSaveTestOutputImpl(quiche::QuicheStringPiece filename, quiche::QuicheStringPiece data); ++// NOLINTNEXTLINE(readability-identifier-naming) ++bool QuicLoadTestOutputImpl(absl::string_view filename, std::string* data); + +-bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* data); +- +-void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStringPiece data); ++// NOLINTNEXTLINE(readability-identifier-naming) ++void QuicRecordTraceImpl(absl::string_view identifier, absl::string_view data); + + } // namespace quic +diff --git a/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc +deleted file mode 100644 +index a733894b5..000000000 +--- a/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc ++++ /dev/null +@@ -1,39 +0,0 @@ +-// NOLINT(namespace-envoy) +- +-// This file is part of the QUICHE platform implementation, and is not to be +-// consumed or referenced directly by other Envoy code. It serves purely as a +-// porting layer for QUICHE. +- +-#include "gtest/gtest.h" +-#include "quiche/common/platform/api/quiche_arraysize.h" +-#include "quiche/common/platform/api/quiche_endian.h" +-#include "quiche/common/platform/api/quiche_optional.h" +-#include "quiche/common/platform/api/quiche_ptr_util.h" +-#include "quiche/common/platform/api/quiche_string_piece.h" +- +-namespace quiche { +- +-TEST(QuichePlatformTest, Arraysize) { +- int array[] = {0, 1, 2, 3, 4}; +- EXPECT_EQ(5, QUICHE_ARRAYSIZE(array)); +-} +- +-TEST(QuichePlatformTest, StringPiece) { +- std::string s = "bar"; +- QuicheStringPiece sp(s); +- EXPECT_EQ('b', sp[0]); +-} +- +-TEST(QuichePlatformTest, WrapUnique) { +- auto p = QuicheWrapUnique(new int(6)); +- EXPECT_EQ(6, *p); +-} +- +-TEST(QuichePlatformTest, TestQuicheOptional) { +- QuicheOptional<int32_t> maybe_a; +- EXPECT_FALSE(maybe_a.has_value()); +- maybe_a = 1; +- EXPECT_EQ(1, *maybe_a); +-} +- +-} // namespace quiche +diff --git a/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc +index 56453e232..eeae58c0a 100644 +--- a/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc ++++ b/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc +@@ -8,7 +8,6 @@ + #include "gtest/gtest.h" + #include "quiche/spdy/platform/api/spdy_bug_tracker.h" + #include "quiche/spdy/platform/api/spdy_containers.h" +-#include "quiche/spdy/platform/api/spdy_endianness_util.h" + #include "quiche/spdy/platform/api/spdy_estimate_memory_usage.h" + #include "quiche/spdy/platform/api/spdy_flags.h" + #include "quiche/spdy/platform/api/spdy_logging.h" +@@ -47,11 +46,6 @@ TEST(SpdyPlatformTest, SpdyHashSet) { + EXPECT_EQ(0, hset.count("qux")); + } + +-TEST(SpdyPlatformTest, SpdyEndianness) { +- EXPECT_EQ(0x1234, spdy::SpdyNetToHost16(spdy::SpdyHostToNet16(0x1234))); +- EXPECT_EQ(0x12345678, spdy::SpdyNetToHost32(spdy::SpdyHostToNet32(0x12345678))); +-} +- + TEST(SpdyPlatformTest, SpdyEstimateMemoryUsage) { + std::string s = "foo"; + // Stubbed out to always return 0. +@@ -92,19 +86,19 @@ TEST(SpdyPlatformTest, SpdyTestHelpers) { + } + + TEST(SpdyPlatformTest, SpdyFlags) { +- auto& flag_registry = quiche::FlagRegistry::GetInstance(); +- flag_registry.ResetFlags(); ++ auto& flag_registry = quiche::FlagRegistry::getInstance(); ++ flag_registry.resetFlags(); + EXPECT_FALSE(GetSpdyReloadableFlag(spdy_testonly_default_false)); + EXPECT_FALSE(GetSpdyRestartFlag(spdy_testonly_default_false)); + +- flag_registry.FindFlag("spdy_reloadable_flag_spdy_testonly_default_false") +- ->SetValueFromString("true"); ++ flag_registry.findFlag("FLAGS_quic_reloadable_flag_spdy_testonly_default_false") ++ ->setValueFromString("true"); + EXPECT_TRUE(GetSpdyReloadableFlag(spdy_testonly_default_false)); + EXPECT_FALSE(GetSpdyRestartFlag(spdy_testonly_default_false)); + +- flag_registry.ResetFlags(); +- flag_registry.FindFlag("spdy_restart_flag_spdy_testonly_default_false") +- ->SetValueFromString("yes"); ++ flag_registry.resetFlags(); ++ flag_registry.findFlag("FLAGS_quic_restart_flag_spdy_testonly_default_false") ++ ->setValueFromString("yes"); + EXPECT_FALSE(GetSpdyReloadableFlag(spdy_testonly_default_false)); + EXPECT_TRUE(GetSpdyRestartFlag(spdy_testonly_default_false)); + } +diff --git a/test/extensions/quic_listeners/quiche/test_proof_source.h b/test/extensions/quic_listeners/quiche/test_proof_source.h +index a249b4314..bbedfd6c7 100644 +--- a/test/extensions/quic_listeners/quiche/test_proof_source.h ++++ b/test/extensions/quic_listeners/quiche/test_proof_source.h +@@ -36,7 +36,7 @@ protected: + void signPayload(const quic::QuicSocketAddress& /*server_address*/, + const quic::QuicSocketAddress& /*client_address*/, + const std::string& /*hostname*/, uint16_t /*signature_algorithm*/, +- quiche::QuicheStringPiece in, ++ absl::string_view in, + std::unique_ptr<quic::ProofSource::SignatureCallback> callback) override { + callback->Run(true, absl::StrCat("Fake signature for { ", in, " }"), + std::make_unique<EnvoyQuicProofSourceDetails>(filter_chain_)); +diff --git a/test/extensions/quic_listeners/quiche/test_utils.h b/test/extensions/quic_listeners/quiche/test_utils.h +index 102f7608e..7f0ea78e8 100644 +--- a/test/extensions/quic_listeners/quiche/test_utils.h ++++ b/test/extensions/quic_listeners/quiche/test_utils.h +@@ -46,7 +46,7 @@ public: + MOCK_METHOD(quic::QuicConsumedData, WritevData, + (quic::QuicStreamId id, size_t write_length, quic::QuicStreamOffset offset, + quic::StreamSendingState state, quic::TransmissionType type, +- quiche::QuicheOptional<quic::EncryptionLevel> level)); ++ absl::optional<quic::EncryptionLevel> level)); + MOCK_METHOD(bool, ShouldYield, (quic::QuicStreamId id)); + + absl::string_view requestedServerName() const override { +@@ -90,7 +90,7 @@ public: + MOCK_METHOD(quic::QuicConsumedData, WritevData, + (quic::QuicStreamId id, size_t write_length, quic::QuicStreamOffset offset, + quic::StreamSendingState state, quic::TransmissionType type, +- quiche::QuicheOptional<quic::EncryptionLevel> level)); ++ absl::optional<quic::EncryptionLevel> level)); + MOCK_METHOD(bool, ShouldYield, (quic::QuicStreamId id)); + + absl::string_view requestedServerName() const override { +-- +2.29.2 + diff --git a/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch b/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch new file mode 100644 index 0000000000000..370682efaa39d --- /dev/null +++ b/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch @@ -0,0 +1,91 @@ +From 8b531c41f956b27e4be32b430db2e7a44e0cdd3e Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown <git@lukegb.com> +Date: Thu, 7 Jan 2021 11:09:18 +0000 +Subject: [PATCH] Add upb patch to make it compile under GCC10 + +--- + bazel/repositories.bzl | 5 +++- + bazel/upb2.patch | 55 ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 59 insertions(+), 1 deletion(-) + create mode 100644 bazel/upb2.patch + +diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl +index 64d61ea49..c6cadc9df 100644 +--- a/bazel/repositories.bzl ++++ b/bazel/repositories.bzl +@@ -811,7 +811,10 @@ def _com_github_grpc_grpc(): + def _upb(): + _repository_impl( + name = "upb", +- patches = ["@envoy//bazel:upb.patch"], ++ patches = [ ++ "@envoy//bazel:upb.patch", ++ "@envoy//bazel:upb2.patch", ++ ], + patch_args = ["-p1"], + ) + +diff --git a/bazel/upb2.patch b/bazel/upb2.patch +new file mode 100644 +index 000000000..6e436c61b +--- /dev/null ++++ b/bazel/upb2.patch +@@ -0,0 +1,55 @@ ++From 9bd23dab4240b015321a53c45b3c9e4847fbf020 Mon Sep 17 00:00:00 2001 ++From: Joshua Haberman <jhaberman@gmail.com> ++Date: Tue, 7 Apr 2020 15:22:11 -0700 ++Subject: [PATCH] Changed upb status to suit GCC10's warning about strncpy(). ++ (#268) ++ ++Added tests for all cases. Also removed ellipses from truncated ++messages, they were more trouble than they are worth. ++--- ++ tests/test_generated_code.c | 33 +++++++++++++++++++++++++++++++++ ++ upb/upb.c | 17 +++-------------- ++ 2 files changed, 36 insertions(+), 14 deletions(-) ++ ++diff --git a/upb/upb.c b/upb/upb.c ++index cb2cdfd9d..258192d79 100644 ++--- a/upb/upb.c +++++ b/upb/upb.c ++@@ -11,17 +11,6 @@ ++ ++ #include "upb/port_def.inc" ++ ++-/* Guarantee null-termination and provide ellipsis truncation. ++- * It may be tempting to "optimize" this by initializing these final ++- * four bytes up-front and then being careful never to overwrite them, ++- * this is safer and simpler. */ ++-static void nullz(upb_status *status) { ++- const char *ellipsis = "..."; ++- size_t len = strlen(ellipsis); ++- UPB_ASSERT(sizeof(status->msg) > len); ++- memcpy(status->msg + sizeof(status->msg) - len, ellipsis, len); ++-} ++- ++ /* upb_status *****************************************************************/ ++ ++ void upb_status_clear(upb_status *status) { ++@@ -37,8 +26,8 @@ const char *upb_status_errmsg(const upb_status *status) { return status->msg; } ++ void upb_status_seterrmsg(upb_status *status, const char *msg) { ++ if (!status) return; ++ status->ok = false; ++- strncpy(status->msg, msg, sizeof(status->msg)); ++- nullz(status); +++ strncpy(status->msg, msg, UPB_STATUS_MAX_MESSAGE - 1); +++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0'; ++ } ++ ++ void upb_status_seterrf(upb_status *status, const char *fmt, ...) { ++@@ -52,7 +41,7 @@ void upb_status_vseterrf(upb_status *status, const char *fmt, va_list args) { ++ if (!status) return; ++ status->ok = false; ++ _upb_vsnprintf(status->msg, sizeof(status->msg), fmt, args); ++- nullz(status); +++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0'; ++ } ++ ++ /* upb_alloc ******************************************************************/ +-- +2.29.2 + diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix new file mode 100644 index 0000000000000..0da0cb23d7694 --- /dev/null +++ b/pkgs/servers/http/envoy/default.nix @@ -0,0 +1,119 @@ +{ buildBazelPackage +, fetchFromGitHub +, stdenv +, cmake +, go +, ninja +, python3 +}: + +let + srcVer = { + # We need the commit hash, since Bazel stamps the build with it. + # However, the version string is more useful for end-users. + # These are contained in a attrset of their own to make it obvious that + # people should update both. + version = "1.16.2"; + commit = "e98e41a8e168af7acae8079fc0cd68155f699aa3"; + }; +in +buildBazelPackage rec { + pname = "envoy"; + version = srcVer.version; + src = fetchFromGitHub { + owner = "envoyproxy"; + repo = "envoy"; + rev = srcVer.commit; + hash = "sha256-aWVMRKFCZzf9/96NRPCP4jiW38DJhXyi0gEqW7uIpnQ="; + + extraPostFetch = '' + chmod -R +w $out + rm $out/.bazelversion + echo ${srcVer.commit} > $out/SOURCE_VERSION + sed -i 's/GO_VERSION = ".*"/GO_VERSION = "host"/g' $out/bazel/dependency_imports.bzl + ''; + }; + + patches = [ + # Quiche needs to be updated to compile under newer GCC. + # This is a manual backport of http://github.com/envoyproxy/envoy/pull/13949. + ./0001-quiche-update-QUICHE-tar-13949.patch + + # upb needs to be updated to compile under newer GCC. + # This is a manual backport of https://github.com/protocolbuffers/upb/commit/9bd23dab4240b015321a53c45b3c9e4847fbf020. + ./0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch + ]; + postPatch = '' + sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch + ''; + + nativeBuildInputs = [ + cmake + python3 + go + ninja + ]; + + fetchAttrs = { + sha256 = "sha256-mct7anzErY9eSujZyGORfRJqzAO9XuFAv04DS8VRZKM="; + dontUseCmakeConfigure = true; + preInstall = '' + # Strip out the path to the build location (by deleting the comment line). + find $bazelOut/external -name requirements.bzl | while read requirements; do + sed -i '/# Generated from /d' "$requirements" + done + + # Remove references to paths in the Nix store. + sed -i \ + -e 's,${python3},__NIXPYTHON__,' \ + -e 's,${stdenv.shellPackage},__NIXSHELL__,' \ + $bazelOut/external/com_github_luajit_luajit/build.py \ + $bazelOut/external/local_config_sh/BUILD + rm -r $bazelOut/external/go_sdk + + # Replace some wheels which are only used for tests with empty files; + # they're nondeterministically built and packed. + >$bazelOut/external/config_validation_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl + >$bazelOut/external/protodoc_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl + >$bazelOut/external/thrift_pip3/thrift-0.13.0-cp38-cp38-linux_x86_64.whl + ''; + }; + buildAttrs = { + dontUseCmakeConfigure = true; + dontUseNinjaInstall = true; + preConfigure = '' + sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/tools/build_defs/framework.bzl + + # Add paths to Nix store back. + sed -i \ + -e 's,__NIXPYTHON__,${python3},' \ + -e 's,__NIXSHELL__,${stdenv.shellPackage},' \ + $bazelOut/external/com_github_luajit_luajit/build.py \ + $bazelOut/external/local_config_sh/BUILD + ''; + installPhase = '' + install -Dm0755 bazel-bin/source/exe/envoy-static $out/bin/envoy + ''; + }; + + fetchConfigured = true; + removeRulesCC = false; + removeLocalConfigCc = true; + removeLocal = false; + bazelTarget = "//source/exe:envoy-static"; + bazelBuildFlags = [ + "-c opt" + "--spawn_strategy=standalone" + "--noexperimental_strict_action_env" + "--cxxopt=-Wno-maybe-uninitialized" + "--cxxopt=-Wno-uninitialized" + ]; + + meta = with stdenv.lib; { + homepage = "https://envoyproxy.io"; + description = "Cloud-native edge and service proxy"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = [ "x86_64-linux" ]; # Other platforms will generate different fetch hashes. + }; +} diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index a53be3e2aa6e7..b533a908ef988 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, cmake, ninja +, pkg-config, cmake, ninja , openssl, libuv, zlib }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "dev" "lib" ]; - nativeBuildInputs = [ pkgconfig cmake ninja ]; + nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ openssl libuv zlib ]; meta = with lib; { diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 34da8750befef..d4a2c91d60b06 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file +{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, libxml2, zlib, bzip2, which, file , openssl, enableMagnet ? false, lua5_1 ? null , enableMysql ? false, libmysqlclient ? null , enableLdap ? false, openldap ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ] ++ lib.optional enableMagnet lua5_1 ++ lib.optional enableMysql libmysqlclient diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index b1764b553694e..11b580ed8a0ca 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, zlib, cmake, jemalloc }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, cmake, jemalloc }: stdenv.mkDerivation rec { pname = "lwan"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1znkcsbxw3r10prqvf2x27w1wmm9kd485pj59c364wlvqdhidwqr"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ jemalloc zlib ]; diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index 456c58e45a2f6..bbac8b843b15d 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, file, qrencode, miniupnpc }: stdenv.mkDerivation rec { pname = "pshs"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1j8j4r0vsmp6226q6jdgf9bzhx3qk7vdliwaw7f8kcsrkndkg6p4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libevent file qrencode miniupnpc ]; # SSL requires libevent at 2.1 with ssl support diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index 5f24c66ce64a5..d4e92bc3f6c2f 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, redland, pkgconfig, gmp, zlib, librdf_raptor2 +{ lib, stdenv, fetchurl, redland, pkg-config, gmp, zlib, librdf_raptor2 , librdf_rasqal }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp redland zlib librdf_raptor2 librdf_rasqal ]; preConfigure = '' diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/servers/irc/atheme/default.nix index 95019fb939f4b..a95a2ad27c365 100644 --- a/pkgs/servers/irc/atheme/default.nix +++ b/pkgs/servers/irc/atheme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libmowgli, pkgconfig, git, gettext, pcre, libidn, cracklib, openssl }: +{ lib, stdenv, fetchgit, libmowgli, pkg-config, git, gettext, pcre, libidn, cracklib, openssl }: stdenv.mkDerivation rec { pname = "atheme"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { leaveDotGit = true; }; - nativeBuildInputs = [ pkgconfig git gettext ]; + nativeBuildInputs = [ pkg-config git gettext ]; buildInputs = [ libmowgli pcre libidn cracklib openssl ]; configureFlags = [ diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index 8f6f31bba35dd..7bb0900d7d308 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python, pkgconfig +{ lib, stdenv, fetchFromGitLab, python, pkg-config , xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1hslwqa0gqsnl3l6hd5hxpn0wlachxd51infifhlwhyhd6iwgx8p"; }; - nativeBuildInputs = [ pkgconfig xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ pkg-config xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ python diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/servers/kapowbang/default.nix index a0096eab026c7..b52018b64f4ce 100644 --- a/pkgs/servers/kapowbang/default.nix +++ b/pkgs/servers/kapowbang/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kapowbang"; - version = "0.5.4"; + version = "0.6.0"; subPackages = [ "." ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "BBVA"; repo = "kapow"; rev = "v${version}"; - sha256 = "09qr631vzlgibz6q64f35lqzz9h1g3gxqfbapkrci5i0n3h04yr4"; + sha256 = "sha256-+GZarnG+SlxynoXYTvI1f9eki3DobiDt7vUdWlC0ECk="; }; - vendorSha256 = "159s46rhg67mgglaxgddx3k8kssl0cqiq8yjdqgjhhxppf16r7dy"; + vendorSha256 = "sha256-vXu64o/MTmw9oZL4MIHB+PEfYLcKVh5A5iGZ1RW1Xd4="; doCheck = false; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index dd513d8a44777..bfa372ed0692f 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, doxygen, perl, pam, nspr, nss, openldap +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap , db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "141iv1phgk1lw74sfjj3v7wy6qs0q56lvclwv2p0hqn1wg8ic4q6"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ]; + nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ perl pam nspr nss openldap db cyrus_sasl svrcore icu net-snmp kerberos pcre libevent openssl python diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 046176fea2ea1..2c44094d0f702 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl +{ stdenv, lib, fetchurl, perl, pkg-config, systemd, openssl , bzip2, zlib, lz4, inotify-tools, pam, libcap , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl , nixosTests @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; version = "2.3.13"; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ] ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index de3daf8e4c0ef..9d69b0d73c2f7 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,4 +1,4 @@ -{ coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, lib, stdenv +{ coreutils, db, fetchurl, openssl, pcre, perl, pkg-config, lib, stdenv , enableLDAP ? false, openldap , enableMySQL ? false, libmysqlclient, zlib , enableAuthDovecot ? false, dovecot @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1nsb2i5mqxfz1sl1bmbxmpb2qiaf3wffhfiw4j9vfpagy3xfhzpp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ coreutils db openssl perl pcre ] ++ lib.optional enableLDAP openldap ++ lib.optionals enableMySQL [ libmysqlclient zlib ] diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 39a3a645ce68b..65ff08b453963 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, libevent, libasr, - python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, + python2, pkg-config, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, enablePython ? true, enableLua ? true, enablePerl ? true, @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libevent libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "--with-scheduler-python" ] ++ lib.optionals enableLua [ - "--with-lua=${pkgconfig}" + "--with-lua=${pkg-config}" "--with-filter-lua" ] ++ lib.optionals enablePerl [ diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index d1bee8cc049a7..df04ade5b452d 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, git, gperf, pcre, unbound, libev, tokyocabinet, pkgconfig, bash, libsrs2 }: +{ stdenv, lib, fetchFromGitHub, git, gperf, pcre, unbound, libev, tokyocabinet, pkg-config, bash, libsrs2 }: let version = "0.9"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { patches = [ ./0001-Fix-build-with-unbound-1.6.1.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [git gperf pcre unbound libev tokyocabinet bash libsrs2]; postUnpack = '' diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index ba69e99cc8b9a..0740613bad7a0 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, perl -, glib, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu +, glib, luajit, openssl, pcre, pkg-config, sqlite, ragel, icu , hyperscan, jemalloc, blas, lapack, lua, libsodium , withBlas ? true , withHyperscan ? stdenv.isx86_64 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "0vwa7k2s2bkfb8w78z5izkd6ywjbzqysb0grls898y549hm8ii70"; }; - nativeBuildInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkg-config perl ]; buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ] ++ lib.optional withHyperscan hyperscan ++ lib.optionals withBlas [ blas lapack ] diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index f4b89981d6947..389b724a134fb 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -19,7 +19,7 @@ nodePackages."${packageName}".override { meta = with lib; { description = "A Matrix <--> Slack bridge"; - maintainers = with maintainers; [ kampka ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index c310e17608e80..d84aa954a00fd 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg_3, file -, pkgconfig, autoreconfHook }: +, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "mediatomb"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg_3 file mp4v2 flac - pkgconfig autoreconfHook ]; + pkg-config autoreconfHook ]; meta = with lib; { homepage = "http://mediatomb.cc"; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index b63428ba7d9d9..0e1b207a755af 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jdk11 }: stdenv.mkDerivation rec { pname = "metabase"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { dontUnpack = true; installPhase = '' - makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $src" + makeWrapper ${jdk11}/bin/java $out/bin/metabase --add-flags "-jar $src" ''; meta = with lib; { diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 653ca399fcffc..759ac94e568ca 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -1,5 +1,5 @@ { lib, buildGoPackage, fetchFromGitHub, fetchpatch -, pkgconfig, zlib, geoip }: +, pkg-config, zlib, geoip }: buildGoPackage rec { pname = "mirrorbits"; @@ -33,7 +33,7 @@ buildGoPackage rec { deleteVendor = true; goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib geoip ]; meta = { diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index f7c97abf104e6..6a63292301b50 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -4,7 +4,7 @@ , srt , ffmpeg_3_4 , bc -, pkgconfig +, pkg-config , perl , openssl , zlib @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}"; enableParallelBuilding = true; - nativeBuildInputs = [ bc pkgconfig perl ]; + nativeBuildInputs = [ bc pkg-config perl ]; buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 ]; preBuild = '' diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 80f3d2c14ab1d..551fa028811fe 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkg-config , doxygen, freetype, libX11, libftdi, libusb-compat-0_1, libusb1, ncurses, perl }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ freetype libX11 libftdi libusb-compat-0_1 libusb1 ncurses ]; - nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkg-config ]; # In 0.5.9: gcc: error: libbignum.a: No such file or directory enableParallelBuilding = false; diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index d6c69a6089bf8..2784dae63aff0 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.3.0"; + version = "0.4.0"; vendorSha256 = null; src = fetchFromGitHub { owner = "justwatchcom"; - repo = "sql_exporter"; + repo = pname; rev = "v${version}"; - sha256 = "125brlxgwhkn3z5v0522gpm0sk6v905ghh05c4c3wf1hlm7bhnrc"; + sha256 = "0dxzcd3b430xby741fdc85k4d2380jrh34xxskmdzxbf2kqdc5k8"; }; meta = with lib; { diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index ef4a3cb4d387c..e4516f652b9a8 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libiconv, openssl, pcre }: +{ lib, stdenv, fetchurl, pkg-config, libiconv, openssl, pcre }: import ./versions.nix ({ version, sha256 }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ import ./versions.nix ({ version, sha256 }: inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libiconv openssl diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 18c1ac52fc153..067d888332415 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libevent, libiconv, openssl, pcre, zlib +{ lib, stdenv, fetchurl, pkg-config, libevent, libiconv, openssl, pcre, zlib , odbcSupport ? true, unixODBC , snmpSupport ? true, net-snmp , sshSupport ? true, libssh2 @@ -25,7 +25,7 @@ in inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevent libiconv diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 2e6275921a453..03e9c1a867b81 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, curl, libevent, libiconv, libxml2, openssl, pcre, zlib +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, curl, libevent, libiconv, libxml2, openssl, pcre, zlib , jabberSupport ? true, iksemel , ldapSupport ? true, openldap , odbcSupport ? true, unixODBC @@ -25,7 +25,7 @@ in inherit sha256; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ curl libevent diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix index 3cc3f338f2f6d..b4d1fda40901c 100644 --- a/pkgs/servers/mumsi/default.nix +++ b/pkgs/servers/mumsi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, boost +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, boost , log4cpp, pjsip, openssl, alsaLib, mumlib }: with lib; stdenv.mkDerivation { pname = "mumsi"; @@ -11,8 +11,8 @@ with lib; stdenv.mkDerivation { sha256 = "0vrivl1fiiwjsz4v26nrn8ra3k9v0mcz7zjm2z319fw8hv6n1nrk"; }; - buildInputs = [ boost log4cpp pkgconfig pjsip mumlib openssl alsaLib ]; - nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost log4cpp pkg-config pjsip mumlib openssl alsaLib ]; + nativeBuildInputs = [ cmake pkg-config ]; installPhase = '' install -Dm555 mumsi $out/bin/mumsi ''; diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index ad3a68b46eb33..a638c06385285 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl, pythonPackages }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, pythonPackages }: stdenv.mkDerivation rec { name = "neard-0.16"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; pythonPath = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 3118a0128df35..799c26e82fdb5 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests +{ lib, stdenv, fetchurl, lua, pkg-config, systemd, jemalloc, nixosTests , tlsSupport ? true, openssl }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''} ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua ] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 49b998ecbf04c..b76210dd9058d 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}: +{lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}: stdenv.mkDerivation rec { pname = "osrm-backend"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=pessimizing-move" "-Wno-error=redundant-move" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 77ce52db91f3c..b040c86c9fa20 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.1.3842-b0c7a97d9"; + version = "1.21.1.3876-3c3adfcb4"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0wq8q9dvdwciazidvh9plxjzngjr6ibg077yksxhy41dv14vkw7s"; + sha256 = "1xpsmk5l0f0blqp5ba9n1w0npsk692p07hp4ipkq7yz3mfag50p0"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "14pa50kvgi4m5hbw4a0q7y3s4xn9ghvnm4vdim9g18p1khfmwmwp"; + sha256 = "0dyw84x9h295428l7r8iqfb2vxkv0f1d68z1j2ka3wsw7cj1yq78"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 625e2e0e8ca50..32aa421ebf039 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook , libsndfile, libtool, makeWrapper, perlPackages , xorg, libcap, alsaLib, glib, dconf , avahi, libjack2, libasyncns, lirc, dbus @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper perlPackages.perl perlPackages.XMLParser ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper perlPackages.perl perlPackages.XMLParser ]; propagatedBuildInputs = lib.optionals stdenv.isLinux [ libcap ]; diff --git a/pkgs/servers/pulseaudio/pali.nix b/pkgs/servers/pulseaudio/pali.nix index d5ae80b5e7986..cc11f98a82903 100644 --- a/pkgs/servers/pulseaudio/pali.nix +++ b/pkgs/servers/pulseaudio/pali.nix @@ -4,7 +4,7 @@ , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config , libsndfile , libtool , makeWrapper @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { makeWrapper meson ninja - pkgconfig + pkg-config perlPackages.perl perlPackages.XMLParser ]; diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index 1d44561806a40..c3c69fa79b6af 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libcap, libnl, readline, net-snmp, less, perl, texinfo, - pkgconfig, c-ares }: + pkg-config, c-ares }: stdenv.mkDerivation rec { pname = "quagga"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { [ readline net-snmp c-ares ] ++ lib.optionals stdenv.isLinux [ libcap libnl ]; - nativeBuildInputs = [ pkgconfig perl texinfo ]; + nativeBuildInputs = [ pkg-config perl texinfo ]; configureFlags = [ "--sysconfdir=/etc/quagga" diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 9755d42ce01fc..ec3ed346cad7f 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, lib, stdenv, pkgconfig, libnsl, libtirpc, autoreconfHook +{ fetchgit, lib, stdenv, pkg-config, libnsl, libtirpc, autoreconfHook , useSystemd ? true, systemd }: stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { "--with-rpcuser=rpc" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { description = "ONC RPC portmapper"; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 0df084230b650..c125732cafcd5 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , python -, pkgconfig +, pkg-config , bison , flex , perl @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config bison flex perl diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index d48df47f0c560..b0793d5e42a8f 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchgit, python3Packages, - pkgconfig, + pkg-config, gcc8Stdenv, boost, git, @@ -44,7 +44,7 @@ gcc8Stdenv.mkDerivation { patches = [ ./seastar-configure-script-paths.patch ./configure-etc-osrelease.patch ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake makeWrapper ninja diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index d05c2e527e2d1..b3a14f5f2c7eb 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mecab, kytea, libedit, pkgconfig +{ lib, stdenv, fetchurl, mecab, kytea, libedit, pkg-config , suggestSupport ? false, zeromq, libevent, msgpack , lz4Support ? false, lz4 , zlibSupport ? false, zlib @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = with lib; - [ pkgconfig mecab kytea libedit ] + [ pkg-config mecab kytea libedit ] ++ optional lz4Support lz4 ++ optional zlibSupport zlib ++ optionals suggestSupport [ zeromq libevent msgpack ]; diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index 3eea64e6ab2dc..90db957d3c011 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , avahi, libao }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "02xkd9al79pbqh8rhzz5w99vv43jg5vqkqg7kxsw8c8sz9di9wsa"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ avahi libao ]; diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 108721fceb0e2..bae2f3aad79de 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsaLib -, libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: +, libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { version = "3.3.7"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "mikebrady"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 94a32a6e78b9d..c81c7f30b31f9 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , libgcrypt, libgpgerror, libtasn1 # Optional Dependencies @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Fixes support for gcrypt 1.6+ patches = [ ./gcrypt-fix.patch ./freebsd-unistd.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgcrypt libgpgerror libtasn1 optPam optLibidn optGnutls ]; configureFlags = [ diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index 6b7d3e7b1ca4a..7bd971e86e755 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -7,7 +7,7 @@ python2.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "SickRage"; repo = "SickRage"; - rev = version; + rev = version; sha256 = "0lzklpsxqrb73inbv8almnhbnb681pmi44gzc8i4sjwmdksiiif9"; }; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index e89a599ebec5b..d7611baad14e4 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook +{ fetchFromGitHub, fetchpatch, stdenv, lib, pkg-config, autoreconfHook , ncurses, gnutls, readline , openssl, perl, sqlite, libjpeg, speex, pcre, libuuid , ldns, libedit, yasm, which, libsndfile, libtiff @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ncurses gnutls readline perl libjpeg sqlite pcre speex ldns libedit yasm which diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index f8995063a0c19..3e69602170f02 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: +{ fetchurl, lib, stdenv, pkg-config, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { name = "sipwitch-1.9.15"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ucommon libosip libexosip gnutls zlib ]; preConfigure = '' diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 3a332876ffd1a..0ef8a5799e2e1 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libcap }: stdenv.mkDerivation rec { pname = "smcroute"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mjq9cx093b0825rqbcq3z0lzy81pd8h0fz6rda6npg3604rxj81"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libcap ]; configureFlags = [ diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 90fdbd09b6e81..e70d43a1505e0 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config, makeWrapper, ncurses, nixosTests , libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd @@ -33,7 +33,7 @@ common = rec { # attributes common to both builds name = "mariadb-${version}.tar.gz"; }; - nativeBuildInputs = [ cmake pkgconfig ] + nativeBuildInputs = [ cmake pkg-config ] ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index cc9852d57e3c0..98166d0b38a81 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, bison, pkgconfig +{ lib, stdenv, fetchurl, cmake, bison, pkg-config , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , cctools, CoreServices, developer_cmds , libtirpc, rpcsvc-proto @@ -21,7 +21,7 @@ self = stdenv.mkDerivation rec { export PATH=$PATH:$TMPDIR ''; - nativeBuildInputs = [ cmake bison pkgconfig rpcsvc-proto ]; + nativeBuildInputs = [ cmake bison pkg-config rpcsvc-proto ]; buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib libtirpc ] ++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 519ef64bca80d..3dbd84c2a9841 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bison, cmake, pkgconfig +{ lib, stdenv, fetchurl, bison, cmake, pkg-config , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto }: @@ -17,7 +17,7 @@ self = stdenv.mkDerivation rec { ./abi-check.patch ]; - nativeBuildInputs = [ bison cmake pkgconfig rpcsvc-proto ]; + nativeBuildInputs = [ bison cmake pkg-config rpcsvc-proto ]; ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. postPatch = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 20e3637f40c60..27345616f8951 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -4,7 +4,7 @@ let # dependencies { stdenv, lib, fetchurl, makeWrapper , glibc, zlib, readline, openssl, icu, systemd, libossp_uuid - , pkgconfig, libxml2, tzdata + , pkg-config, libxml2, tzdata # This is important to obtain a version of `libpq` that does not depend on systemd. , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin) @@ -40,7 +40,7 @@ let ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; - nativeBuildInputs = lib.optionals icuEnabled [ pkgconfig ]; + nativeBuildInputs = lib.optionals icuEnabled [ pkg-config ]; enableParallelBuilding = !stdenv.isDarwin; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 50fb383dabb82..be2843871740a 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }: +{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack, groonga }: stdenv.mkDerivation rec { pname = "pgroonga"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rd3cxap9rqpg5y8y48r5bd7rki3lck6qsrb0bqdqm9xffnibw8j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ postgresql msgpack groonga ]; makeFlags = [ "HAVE_MSGPACK=1" ]; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 4cc7423ab2c1d..590aa6f2b6b90 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -7,7 +7,7 @@ , proj , gdal , json_c -, pkgconfig +, pkg-config , file , protobufc , libiconv @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] ++ lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index f94bb69871cb2..3f3b2aa4f143f 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, postgresql }: +{ lib, stdenv, fetchFromGitHub, pkg-config, postgresql }: stdenv.mkDerivation { pname = "tsearch-extras"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba"; }; - nativenativeBuildInputs = [ pkgconfig ]; + nativenativeBuildInputs = [ pkg-config ]; buildInputs = [ postgresql ]; installPhase = '' diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 238a298f85f47..59da5a80a37d9 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap -, expat, libxml2, openssl, pkgconfig +, expat, libxml2, openssl, pkg-config }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1q1ywpic6s7dfjj3cwzcfgscc4zq0aih462gyas7j1z683ss14b8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl ] ++ lib.optionals stdenv.isLinux [ libcap pam ]; diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix index caeb969f23b40..8c5a64f22955f 100644 --- a/pkgs/servers/tang/default.nix +++ b/pkgs/servers/tang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, asciidoc , jansson, jose, http-parser, systemd }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ]; + nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ]; buildInputs = [ jansson jose http-parser systemd ]; outputs = [ "out" "man" ]; diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/servers/tmate-ssh-server/default.nix index 6fe5bc201f9b7..ea564e6791daa 100644 --- a/pkgs/servers/tmate-ssh-server/default.nix +++ b/pkgs/servers/tmate-ssh-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkg-config , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; - nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; meta = with lib; { homepage = "https://tmate.io/"; diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index bd055e6568740..3ef571bc82a4f 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, cmake, xxd +, pkg-config, cmake, xxd , openssl, libwebsockets, json_c, libuv, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1ifgw93g8jaaa6fgfqjnn83n5ccr6l72ynwwwa97hfwjk90r14fg"; }; - nativeBuildInputs = [ pkgconfig cmake xxd ]; + nativeBuildInputs = [ pkg-config cmake xxd ]; buildInputs = [ openssl libwebsockets json_c libuv zlib ]; outputs = [ "out" "man" ]; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 716e8e1c1aad2..98a40766d7e74 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config , avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_3, libiconv, openssl, python , v4l-utils, which, zlib }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation { which zlib ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 14876e47df3fa..bd74a62887745 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixosTests, lib, fetchurl, pkgconfig, jansson, pcre +{ stdenv, nixosTests, lib, fetchurl, pkg-config, jansson, pcre # plugins: list of strings, eg. [ "python2" "python3" ] , plugins ? [] , pam, withPAM ? stdenv.isLinux @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ./additional-php-ldflags.patch ]; - nativeBuildInputs = [ python3 pkgconfig ]; + nativeBuildInputs = [ python3 pkg-config ]; buildInputs = [ jansson pcre ] ++ lib.optional withPAM pam diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 433cc44415c35..db426f399f83f 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit +{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit , python3, makeWrapper }: let @@ -14,7 +14,7 @@ let passthru.python = python3; - nativeBuildInputs = with python3.pkgs; [ pkgconfig docutils sphinx ]; + nativeBuildInputs = with python3.pkgs; [ pkg-config docutils sphinx ]; buildInputs = [ pcre libxslt groff ncurses readline libedit makeWrapper python3 ]; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index b6ec11e4e8df8..55d13ffae31f9 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils }: stdenv.mkDerivation rec { version = "1.0.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig docutils ]; + nativeBuildInputs = [ autoreconfHook pkg-config docutils ]; buildInputs = [ varnish libmhash ]; postPatch = '' diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index a9900424b966f..20f8aa91ab656 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, docutils }: stdenv.mkDerivation rec { version = "0.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; - nativeBuildInputs = [ pkgconfig docutils autoreconfHook varnish.python ]; + nativeBuildInputs = [ pkg-config docutils autoreconfHook varnish.python ]; buildInputs = [ varnish ]; postPatch = '' substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal" diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index f39afd9c87ca9..0a8e97df61ee8 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, docutils, removeReferencesTo }: stdenv.mkDerivation rec { version = "0.15.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docutils - pkgconfig + pkg-config removeReferencesTo varnish.python # use same python version as varnish server ]; diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix index 76b468d35d778..b6abc423eb858 100644 --- a/pkgs/servers/web-apps/fileshelter/default.nix +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt4, libconfig, pkgconfig } : +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt4, libconfig, pkg-config } : stdenv.mkDerivation rec { pname = "fileshelter"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzip boost wt4 libconfig ]; NIX_LDFLAGS = "-lpthread"; diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 6b22c29c128c9..af565e6292d27 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "3.10"; + version = "3.10.1"; stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version)); in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "4aYKZmXym1Tq/462PIgJb4sHGUclEkU0Ok1iQJ6u0aw="; + sha256 = "sha256-VHlz8twsp7mSwZPatJkciHaDOP0r0EudeG5i3gjPUT8="; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index aa2a9fc925881..b3fedf9bc5d65 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -1,5 +1,5 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir -, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkgconfig }: +, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config }: with lib; gnustep.stdenv.mkDerivation rec { pname = "SOGo"; version = "5.0.1"; @@ -12,7 +12,7 @@ with lib; gnustep.stdenv.mkDerivation rec { }; nativeBuildInputs = [ gnustep.make makeWrapper python2 ]; - buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkgconfig ] + buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkg-config ] ++ optional (openldap != null) openldap; patches = [ diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix index 69270afb76bb7..05741e0ac21af 100644 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, autoPatchelfHook +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, autoPatchelfHook , qtbase, libvirt, cutelyst, grantlee }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1vgjai34hqppkpl0ryxkyhpm9dsx1chs3bii3wc3h40hl80n6dgy"; }; - nativeBuildInputs = [ cmake pkgconfig autoPatchelfHook ]; + nativeBuildInputs = [ cmake pkg-config autoPatchelfHook ]; buildInputs = [ qtbase libvirt cutelyst grantlee ]; installPhase = '' diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index 8fdd9a93a2395..f1a385c6809df 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/pkgs/servers/wsdd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ]; patches = [ - (fetchpatch { + (fetchpatch { # https://github.com/christgau/wsdd/issues/72 - name = "fix_send_messages_using_correct_socket.patch"; - url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch"; - sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg"; + name = "fix_send_messages_using_correct_socket.patch"; + url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch"; + sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg"; }) ]; diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 0d7d6df87bc0d..9beb0553395ef 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, xorg, pixman, pkgconfig, AppKit, Foundation, Xplugin }: +{ lib, stdenv, fetchurl, xorg, pixman, pkg-config, AppKit, Foundation, Xplugin }: let version = "1.3.1"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ in stdenv.mkDerivation { xorg.libXrandr xorg.libXext pixman - pkgconfig + pkg-config AppKit Xplugin Foundation ]; meta = with lib; { diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 88bdaeb67ae64..065216da3cc60 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -5,7 +5,7 @@ lib.makeScope newScope (self: with self; { inherit pixman; - appres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { + appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { name = "appres-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -13,12 +13,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0a2r4sxky3k7b3kdb5pbv709q9b5zi3gxjz336wl66f828vqkbgz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - bdftopcf = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "bdftopcf-1.1"; builder = ./builder.sh; src = fetchurl { @@ -26,12 +26,12 @@ lib.makeScope newScope (self: with self; { sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "bitmap-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -39,12 +39,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - editres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "editres-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -52,12 +52,12 @@ lib.makeScope newScope (self: with self; { sha256 = "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - encodings = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + encodings = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "encodings-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -65,12 +65,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobe100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -78,13 +78,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobe75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -92,13 +92,13 @@ lib.makeScope newScope (self: with self; { sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -106,13 +106,13 @@ lib.makeScope newScope (self: with self; { sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -120,13 +120,13 @@ lib.makeScope newScope (self: with self; { sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontadobeutopiatype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -134,13 +134,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontalias = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + fontalias = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "font-alias-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -148,12 +148,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontarabicmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -161,13 +161,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbh100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -175,13 +175,13 @@ lib.makeScope newScope (self: with self; { sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbh75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -189,13 +189,13 @@ lib.makeScope newScope (self: with self; { sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -203,13 +203,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -217,13 +217,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontbhttf = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -231,13 +231,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontbhtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -245,13 +245,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbitstream100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -259,13 +259,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbitstream75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -273,13 +273,13 @@ lib.makeScope newScope (self: with self; { sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontbitstreamtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -287,13 +287,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontcronyxcyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -301,13 +301,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontcursormisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -315,13 +315,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontdaewoomisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -329,13 +329,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontdecmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -343,13 +343,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontibmtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -357,13 +357,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontisasmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -371,13 +371,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontjismisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -385,13 +385,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmicromisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -399,13 +399,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmisccyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -413,13 +413,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontmiscethiopic = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -427,13 +427,13 @@ lib.makeScope newScope (self: with self; { sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontmiscmeltho = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -441,13 +441,13 @@ lib.makeScope newScope (self: with self; { sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontmiscmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -455,13 +455,13 @@ lib.makeScope newScope (self: with self; { sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmuttmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -469,13 +469,13 @@ lib.makeScope newScope (self: with self; { sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontschumachermisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -483,13 +483,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontscreencyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -497,13 +497,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontsonymisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -511,13 +511,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontsunmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -525,13 +525,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fonttosfnt = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { + fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { name = "fonttosfnt-1.2.1"; builder = ./builder.sh; src = fetchurl { @@ -539,12 +539,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16r51h5wfy85wnbq3q8v8a184hb25c3ksjgix0mlcywdz7qkbj07"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc freetype xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - fontutil = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + fontutil = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "font-util-1.3.1"; builder = ./builder.sh; src = fetchurl { @@ -552,12 +552,12 @@ lib.makeScope newScope (self: with self; { sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontwinitzkicyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -565,13 +565,13 @@ lib.makeScope newScope (self: with self; { sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontxfree86type1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -579,13 +579,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig mkfontscale ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; - gccmakedep = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + gccmakedep = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "gccmakedep-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -593,12 +593,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - iceauth = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { + iceauth = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { name = "iceauth-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -606,12 +606,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - ico = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + ico = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "ico-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -619,12 +619,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0gvpwfk9kvlfn631dgizc45qc2qqjn9pavdp2q7qb3drkvr64fyp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - imake = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + imake = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "imake-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -632,12 +632,12 @@ lib.makeScope newScope (self: with self; { sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libAppleWM = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libAppleWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libAppleWM-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -645,12 +645,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libFS = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { + libFS = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { name = "libFS-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -658,12 +658,12 @@ lib.makeScope newScope (self: with self; { sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - libICE = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { + libICE = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { name = "libICE-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -671,12 +671,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - libSM = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { + libSM = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { name = "libSM-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -684,12 +684,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libuuid xorgproto xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - libWindowsWM = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libWindowsWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { @@ -697,12 +697,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { + libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { name = "libX11-1.7.0"; builder = ./builder.sh; src = fetchurl { @@ -710,12 +710,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0m6bfwllr3pq2c00l51y62yiq15kphc8dw69zf67qhwmclxzkj1n"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libxcb xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - libXScrnSaver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libXScrnSaver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libXScrnSaver-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -723,12 +723,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libXTrap = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { + libXTrap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { name = "libXTrap-1.0.1"; builder = ./builder.sh; src = fetchurl { @@ -736,12 +736,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + libXau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libXau-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -749,12 +749,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXaw = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { + libXaw = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { name = "libXaw-1.0.13"; builder = ./builder.sh; src = fetchurl { @@ -762,12 +762,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto libXmu libXpm libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXaw3d = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { + libXaw3d = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { name = "libXaw3d-1.6.3"; builder = ./builder.sh; src = fetchurl { @@ -775,12 +775,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXmu libXpm xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { + libXcomposite = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { name = "libXcomposite-0.4.5"; builder = ./builder.sh; src = fetchurl { @@ -788,12 +788,12 @@ lib.makeScope newScope (self: with self; { sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes ]; meta.platforms = lib.platforms.unix; }) {}; - libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { + libXcursor = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { name = "libXcursor-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -801,12 +801,12 @@ lib.makeScope newScope (self: with self; { sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { + libXdamage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { name = "libXdamage-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -814,12 +814,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes ]; meta.platforms = lib.platforms.unix; }) {}; - libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + libXdmcp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libXdmcp-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -827,12 +827,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + libXext = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "libXext-1.3.4"; builder = ./builder.sh; src = fetchurl { @@ -840,12 +840,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXfixes = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libXfixes = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libXfixes-5.0.3"; builder = ./builder.sh; src = fetchurl { @@ -853,12 +853,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libXfont = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { + libXfont = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont-1.5.4"; builder = ./builder.sh; src = fetchurl { @@ -866,12 +866,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; meta.platforms = lib.platforms.unix; }) {}; - libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { + libXfont2 = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont2-2.0.4"; builder = ./builder.sh; src = fetchurl { @@ -879,12 +879,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; meta.platforms = lib.platforms.unix; }) {}; - libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { + libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { name = "libXft-2.3.3"; builder = ./builder.sh; src = fetchurl { @@ -892,12 +892,12 @@ lib.makeScope newScope (self: with self; { sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fontconfig freetype libX11 xorgproto libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - libXi = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { + libXi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { name = "libXi-1.7.10"; builder = ./builder.sh; src = fetchurl { @@ -905,12 +905,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXfixes ]; meta.platforms = lib.platforms.unix; }) {}; - libXinerama = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXinerama = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXinerama-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -918,12 +918,12 @@ lib.makeScope newScope (self: with self; { sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { + libXmu = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { name = "libXmu-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -931,12 +931,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { + libXp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { name = "libXp-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -944,12 +944,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXau libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { + libXpm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { name = "libXpm-3.5.13"; builder = ./builder.sh; src = fetchurl { @@ -957,12 +957,12 @@ lib.makeScope newScope (self: with self; { sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libX11 libXext xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - libXpresent = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libXpresent = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libXpresent-1.0.0"; builder = ./builder.sh; src = fetchurl { @@ -970,12 +970,12 @@ lib.makeScope newScope (self: with self; { sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { + libXrandr = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { name = "libXrandr-1.5.2"; builder = ./builder.sh; src = fetchurl { @@ -983,12 +983,12 @@ lib.makeScope newScope (self: with self; { sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - libXrender = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libXrender = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libXrender-0.9.10"; builder = ./builder.sh; src = fetchurl { @@ -996,12 +996,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libXres = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libXres = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libXres-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -1009,12 +1009,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libXt = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { + libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { name = "libXt-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -1022,12 +1022,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE xorgproto libSM libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libXtst = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { + libXtst = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { name = "libXtst-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -1035,12 +1035,12 @@ lib.makeScope newScope (self: with self; { sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXi ]; meta.platforms = lib.platforms.unix; }) {}; - libXv = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libXv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libXv-1.0.11"; builder = ./builder.sh; src = fetchurl { @@ -1048,12 +1048,12 @@ lib.makeScope newScope (self: with self; { sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { + libXvMC = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { name = "libXvMC-1.0.12"; builder = ./builder.sh; src = fetchurl { @@ -1061,12 +1061,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXv ]; meta.platforms = lib.platforms.unix; }) {}; - libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXxf86dga = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXxf86dga-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -1074,12 +1074,12 @@ lib.makeScope newScope (self: with self; { sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXxf86misc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXxf86misc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXxf86misc-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1087,12 +1087,12 @@ lib.makeScope newScope (self: with self; { sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libXxf86vm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXxf86vm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { name = "libXxf86vm-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1100,12 +1100,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - libdmx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libdmx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { name = "libdmx-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1113,12 +1113,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; }) {}; - libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { + libfontenc = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { name = "libfontenc-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1126,12 +1126,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto zlib ]; meta.platforms = lib.platforms.unix; }) {}; - libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation { + libpciaccess = callPackage ({ stdenv, pkg-config, fetchurl, zlib }: stdenv.mkDerivation { name = "libpciaccess-0.16"; builder = ./builder.sh; src = fetchurl { @@ -1139,12 +1139,12 @@ lib.makeScope newScope (self: with self; { sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ]; meta.platforms = lib.platforms.unix; }) {}; - libpthreadstubs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + libpthreadstubs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "libpthread-stubs-0.4"; builder = ./builder.sh; src = fetchurl { @@ -1152,12 +1152,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { + libxcb = callPackage ({ stdenv, pkg-config, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { name = "libxcb-1.14"; builder = ./builder.sh; src = fetchurl { @@ -1165,12 +1165,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; meta.platforms = lib.platforms.unix; }) {}; - libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libxkbfile = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { name = "libxkbfile-1.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1178,12 +1178,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - libxshmfence = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + libxshmfence = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libxshmfence-1.3"; builder = ./builder.sh; src = fetchurl { @@ -1191,12 +1191,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - listres = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + listres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "listres-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1204,12 +1204,12 @@ lib.makeScope newScope (self: with self; { sha256 = "041bxkvv6f92sm3hhm977c4gdqdv5r1jyxjqcqfi8vkrg3s2j4ka"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - lndir = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + lndir = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "lndir-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -1217,12 +1217,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - luit = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + luit = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "luit-20190106"; builder = ./builder.sh; src = fetchurl { @@ -1230,12 +1230,12 @@ lib.makeScope newScope (self: with self; { sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + makedepend = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "makedepend-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1243,12 +1243,12 @@ lib.makeScope newScope (self: with self; { sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { + mkfontscale = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { name = "mkfontscale-1.2.1"; builder = ./builder.sh; src = fetchurl { @@ -1256,12 +1256,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc freetype xorgproto zlib ]; meta.platforms = lib.platforms.unix; }) {}; - oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { + oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { name = "oclock-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1269,12 +1269,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1zmfzfmdp42nvapf0qz1bc3i3waq5sjrpkgfw64qs4nmq30wy86c"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - sessreg = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { + sessreg = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { name = "sessreg-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1282,12 +1282,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - setxkbmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { + setxkbmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { name = "setxkbmap-1.3.2"; builder = ./builder.sh; src = fetchurl { @@ -1295,12 +1295,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = lib.platforms.unix; }) {}; - smproxy = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { + smproxy = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { name = "smproxy-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1308,12 +1308,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - transset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + transset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "transset-1.0.2"; builder = ./builder.sh; src = fetchurl { @@ -1321,12 +1321,12 @@ lib.makeScope newScope (self: with self; { sha256 = "088v8p0yfn4r3azabp6662hqikfs2gjb9xmjjd45gnngwwp19b2b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - twm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + twm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "twm-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -1334,12 +1334,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libX11 libXext libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - utilmacros = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + utilmacros = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "util-macros-1.19.2"; builder = ./builder.sh; src = fetchurl { @@ -1347,12 +1347,12 @@ lib.makeScope newScope (self: with self; { sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - viewres = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { + viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "viewres-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -1360,12 +1360,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1mz319kfmvcrdpi22dmdr91mif1j0j3ck1f8mmnz5g1r9kl1in2y"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { + x11perf = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { name = "x11perf-1.6.1"; builder = ./builder.sh; src = fetchurl { @@ -1373,12 +1373,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXft libXmu xorgproto libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - xauth = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { + xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { name = "xauth-1.1"; builder = ./builder.sh; src = fetchurl { @@ -1386,12 +1386,12 @@ lib.makeScope newScope (self: with self; { sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXext libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xbacklight = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { + xbacklight = callPackage ({ stdenv, pkg-config, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { name = "xbacklight-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -1399,12 +1399,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb xcbutil ]; meta.platforms = lib.platforms.unix; }) {}; - xbitmaps = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xbitmaps = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xbitmaps-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1412,12 +1412,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { + xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { name = "xcalc-1.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1425,12 +1425,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python3 }: stdenv.mkDerivation { + xcbproto = callPackage ({ stdenv, pkg-config, fetchurl, python3 }: stdenv.mkDerivation { name = "xcb-proto-1.14.1"; builder = ./builder.sh; src = fetchurl { @@ -1438,12 +1438,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1451,12 +1451,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilcursor = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1464,12 +1464,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbutilimage xcbutilrenderutil xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilerrors = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { @@ -1477,12 +1477,12 @@ lib.makeScope newScope (self: with self; { sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbproto xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilimage = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1490,12 +1490,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbutil xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilkeysyms = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1503,12 +1503,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilrenderutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { @@ -1516,12 +1516,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilwm = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1529,12 +1529,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { name = "xclock-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -1542,12 +1542,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xcmsdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11 }: stdenv.mkDerivation { + xcmsdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11 }: stdenv.mkDerivation { name = "xcmsdb-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -1555,12 +1555,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - xcompmgr = callPackage ({ stdenv, pkgconfig, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { + xcompmgr = callPackage ({ stdenv, pkg-config, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { name = "xcompmgr-1.1.8"; builder = ./builder.sh; src = fetchurl { @@ -1568,12 +1568,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - xconsole = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { name = "xconsole-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -1581,12 +1581,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1q2ib1626i5da0nda09sp3vzppjrcn82fff83cw7hwr0vy14h56i"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { + xcursorgen = callPackage ({ stdenv, pkg-config, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { name = "xcursorgen-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -1594,12 +1594,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng libX11 libXcursor ]; meta.platforms = lib.platforms.unix; }) {}; - xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation { + xcursorthemes = callPackage ({ stdenv, pkg-config, fetchurl, libXcursor }: stdenv.mkDerivation { name = "xcursor-themes-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1607,12 +1607,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXcursor ]; meta.platforms = lib.platforms.unix; }) {}; - xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { name = "xdm-1.1.12"; builder = ./builder.sh; src = fetchurl { @@ -1620,12 +1620,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xdpyinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { + xdpyinfo = callPackage ({ stdenv, pkg-config, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { name = "xdpyinfo-1.3.2"; builder = ./builder.sh; src = fetchurl { @@ -1633,12 +1633,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xorgproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; meta.platforms = lib.platforms.unix; }) {}; - xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { + xdriinfo = callPackage ({ stdenv, pkg-config, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { name = "xdriinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1646,12 +1646,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGL xorgproto libX11 ]; meta.platforms = lib.platforms.unix; }) {}; - xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { + xev = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { name = "xev-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -1659,12 +1659,12 @@ lib.makeScope newScope (self: with self; { sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXrandr ]; meta.platforms = lib.platforms.unix; }) {}; - xeyes = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xeyes = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { name = "xeyes-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1672,12 +1672,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { + xf86inputevdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { name = "xf86-input-evdev-2.10.6"; builder = ./builder.sh; src = fetchurl { @@ -1685,12 +1685,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libevdev udev mtdev xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputjoystick = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputjoystick = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-joystick-1.6.3"; builder = ./builder.sh; src = fetchurl { @@ -1698,12 +1698,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputkeyboard = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputkeyboard = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-keyboard-1.9.0"; builder = ./builder.sh; src = fetchurl { @@ -1711,12 +1711,12 @@ lib.makeScope newScope (self: with self; { sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { + xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { name = "xf86-input-libinput-0.30.0"; builder = ./builder.sh; src = fetchurl { @@ -1724,12 +1724,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libinput xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputmouse = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-input-mouse-1.9.3"; builder = ./builder.sh; src = fetchurl { @@ -1737,12 +1737,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1iawr1wyl2qch1mqszcs0s84i92mh4xxprflnycbw1adc18b7v4k"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { + xf86inputsynaptics = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { name = "xf86-input-synaptics-1.9.1"; builder = ./builder.sh; src = fetchurl { @@ -1750,12 +1750,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0xhm03qywwfgkpfl904d08lx00y28m1b6lqmks5nxizixwk3by3s"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputvmmouse = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { + xf86inputvmmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { name = "xf86-input-vmmouse-13.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1763,12 +1763,12 @@ lib.makeScope newScope (self: with self; { sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto udev xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86inputvoid = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { + xf86inputvoid = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { name = "xf86-input-void-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1776,12 +1776,12 @@ lib.makeScope newScope (self: with self; { sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { + xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { name = "xf86-video-amdgpu-19.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1789,12 +1789,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0pgy4ihnja0vm8504qw7qxh3pdpa3p9k6967nz15m6b1mvha83jg"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoapm = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoapm = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-apm-1.3.0"; builder = ./builder.sh; src = fetchurl { @@ -1802,12 +1802,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoark = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; src = fetchurl { @@ -1815,12 +1815,12 @@ lib.makeScope newScope (self: with self; { sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoast = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoast = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ast-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -1828,12 +1828,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ati-19.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1841,12 +1841,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0j9w4axsqlycv4v14g53xyhkm9h7d27b2fcv9lrzb9gf54b5m7v5"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videochips = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-chips-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1854,12 +1854,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videocirrus = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videocirrus = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-cirrus-1.5.3"; builder = ./builder.sh; src = fetchurl { @@ -1867,12 +1867,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videodummy = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videodummy = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-dummy-0.3.8"; builder = ./builder.sh; src = fetchurl { @@ -1880,12 +1880,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videofbdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videofbdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-fbdev-0.5.0"; builder = ./builder.sh; src = fetchurl { @@ -1893,12 +1893,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16a66zr0l1lmssa07i3rzy07djxnb45c17ks8c71h8l06xgxihyw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videogeode = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videogeode = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-geode-2.11.19"; builder = ./builder.sh; src = fetchurl { @@ -1906,12 +1906,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0zn9gb49grds5mcs1dlrx241k2w1sgqmx4i5x7v6159xxqhlqsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoglide = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videoglide = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-glide-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -1919,12 +1919,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoglint = callPackage ({ stdenv, pkgconfig, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videoglint = callPackage ({ stdenv, pkg-config, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-glint-1.2.9"; builder = ./builder.sh; src = fetchurl { @@ -1932,12 +1932,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpciaccess xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoi128 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoi128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-i128-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1945,12 +1945,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoi740 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoi740 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-i740-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1958,12 +1958,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { + xf86videointel = callPackage ({ stdenv, pkg-config, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { @@ -1971,12 +1971,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videomach64 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videomach64 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-mach64-6.9.6"; builder = ./builder.sh; src = fetchurl { @@ -1984,12 +1984,12 @@ lib.makeScope newScope (self: with self; { sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videomga = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-mga-2.0.0"; builder = ./builder.sh; src = fetchurl { @@ -1997,12 +1997,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoneomagic = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoneomagic = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-neomagic-1.3.0"; builder = ./builder.sh; src = fetchurl { @@ -2010,12 +2010,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0r4h673kw8fl7afc30anwbjlbhp82mg15fvaxf470xg7z983k0wk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videonewport = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videonewport = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-newport-0.2.4"; builder = ./builder.sh; src = fetchurl { @@ -2023,12 +2023,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videonouveau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videonouveau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-nouveau-1.0.16"; builder = ./builder.sh; src = fetchurl { @@ -2036,12 +2036,12 @@ lib.makeScope newScope (self: with self; { sha256 = "01mz8gnq7j6bvrqb2ljm3d1wpjhi9p2z2w8zbkdrqmqmcj060h1h"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videonv = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videonv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-nv-2.1.21"; builder = ./builder.sh; src = fetchurl { @@ -2049,12 +2049,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoomap = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { + xf86videoomap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { name = "xf86-video-omap-0.4.5"; builder = ./builder.sh; src = fetchurl { @@ -2062,12 +2062,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoopenchrome = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { + xf86videoopenchrome = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; src = fetchurl { @@ -2075,12 +2075,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver libXvMC ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoqxl = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoqxl = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-qxl-0.1.5"; builder = ./builder.sh; src = fetchurl { @@ -2088,12 +2088,12 @@ lib.makeScope newScope (self: with self; { sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videor128 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-r128-6.11.0"; builder = ./builder.sh; src = fetchurl { @@ -2101,12 +2101,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videorendition = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videorendition = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-rendition-4.2.7"; builder = ./builder.sh; src = fetchurl { @@ -2114,12 +2114,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0yzqcdfrnnyaaaa76d4hpwycpq4x2j8qvg9m4q19lj4xbicwc4cm"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videos3virge = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-s3virge-1.11.0"; builder = ./builder.sh; src = fetchurl { @@ -2127,12 +2127,12 @@ lib.makeScope newScope (self: with self; { sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosavage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosavage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-savage-2.3.9"; builder = ./builder.sh; src = fetchurl { @@ -2140,12 +2140,12 @@ lib.makeScope newScope (self: with self; { sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosiliconmotion = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosiliconmotion = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-siliconmotion-1.7.9"; builder = ./builder.sh; src = fetchurl { @@ -2153,12 +2153,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosis = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sis-0.11.0"; builder = ./builder.sh; src = fetchurl { @@ -2166,12 +2166,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosisusb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosisusb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sisusb-0.9.7"; builder = ./builder.sh; src = fetchurl { @@ -2179,12 +2179,12 @@ lib.makeScope newScope (self: with self; { sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosuncg6 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videosuncg6 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-suncg6-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -2192,12 +2192,12 @@ lib.makeScope newScope (self: with self; { sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosunffb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videosunffb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sunffb-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2205,12 +2205,12 @@ lib.makeScope newScope (self: with self; { sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videosunleo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videosunleo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-sunleo-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2218,12 +2218,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videotdfx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-tdfx-1.5.0"; builder = ./builder.sh; src = fetchurl { @@ -2231,12 +2231,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videotga = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videotga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-tga-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2244,12 +2244,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videotrident = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videotrident = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-trident-1.3.8"; builder = ./builder.sh; src = fetchurl { @@ -2257,12 +2257,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videov4l = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videov4l = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { name = "xf86-video-v4l-0.3.0"; builder = ./builder.sh; src = fetchurl { @@ -2270,12 +2270,12 @@ lib.makeScope newScope (self: with self; { sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videovboxvideo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videovboxvideo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-vboxvideo-1.0.0"; builder = ./builder.sh; src = fetchurl { @@ -2283,12 +2283,12 @@ lib.makeScope newScope (self: with self; { sha256 = "195z1js3i51qgxvhfw4bxb4dw3jcrrx2ynpm2y3475dypjzs7dkz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videovesa = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-vesa-2.5.0"; builder = ./builder.sh; src = fetchurl { @@ -2296,12 +2296,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0nf6ai74c60xk96kgr8q9mx6lrxm5id3765ws4d801irqzrj85hz"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videovmware = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { + xf86videovmware = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { name = "xf86-video-vmware-13.3.0"; builder = ./builder.sh; src = fetchurl { @@ -2309,12 +2309,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0v06qhm059klq40m2yx4wypzb7h53aaassbjfmm6clcyclj1k5s7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videovoodoo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videovoodoo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-voodoo-1.2.5"; builder = ./builder.sh; src = fetchurl { @@ -2322,12 +2322,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videowsfb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { + xf86videowsfb = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2335,12 +2335,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xf86videoxgi = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoxgi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-xgi-1.6.1"; builder = ./builder.sh; src = fetchurl { @@ -2348,12 +2348,12 @@ lib.makeScope newScope (self: with self; { sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; }) {}; - xfd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { + xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { name = "xfd-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2361,12 +2361,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xfontsel = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "xfontsel-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2374,12 +2374,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { + xfs = callPackage ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { name = "xfs-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -2387,12 +2387,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXfont2 xorgproto xtrans ]; meta.platforms = lib.platforms.unix; }) {}; - xfsinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { + xfsinfo = callPackage ({ stdenv, pkg-config, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { name = "xfsinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2400,12 +2400,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libFS xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { + xgamma = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { name = "xgamma-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2413,12 +2413,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXxf86vm ]; meta.platforms = lib.platforms.unix; }) {}; - xgc = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { name = "xgc-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2426,12 +2426,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { + xhost = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { name = "xhost-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -2439,12 +2439,12 @@ lib.makeScope newScope (self: with self; { sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xinit = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xinit = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xinit-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -2452,12 +2452,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { + xinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { name = "xinput-1.6.3"; builder = ./builder.sh; src = fetchurl { @@ -2465,12 +2465,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXi libXinerama libXrandr ]; meta.platforms = lib.platforms.unix; }) {}; - xkbcomp = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { + xkbcomp = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { name = "xkbcomp-1.4.4"; builder = ./builder.sh; src = fetchurl { @@ -2478,12 +2478,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0zpjkbap9160pdd6jpgb5f0yg5281w0rkkx1l0i7g887lq1ydk2r"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xkbevd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { + xkbevd = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { name = "xkbevd-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2491,12 +2491,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = lib.platforms.unix; }) {}; - xkbprint = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { + xkbprint = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { name = "xkbprint-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2504,12 +2504,12 @@ lib.makeScope newScope (self: with self; { sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xkbutils = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { + xkbutils = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { name = "xkbutils-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2517,12 +2517,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation { + xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation { name = "xkeyboard-config-2.31"; builder = ./builder.sh; src = fetchurl { @@ -2530,12 +2530,12 @@ lib.makeScope newScope (self: with self; { sha256 = "18xddaxh83zm698syh50w983jg6b7b8zgv0dfaf7ha485hgihi6s"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xkill = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xkill = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xkill-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2543,12 +2543,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { + xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { name = "xload-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2556,12 +2556,12 @@ lib.makeScope newScope (self: with self; { sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { + xlsatoms = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { name = "xlsatoms-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2569,12 +2569,12 @@ lib.makeScope newScope (self: with self; { sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb ]; meta.platforms = lib.platforms.unix; }) {}; - xlsclients = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { + xlsclients = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { name = "xlsclients-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2582,12 +2582,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb ]; meta.platforms = lib.platforms.unix; }) {}; - xlsfonts = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xlsfonts = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xlsfonts-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2595,12 +2595,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xmag = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "xmag-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2608,12 +2608,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xmessage = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { name = "xmessage-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2621,12 +2621,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0a90kfm0qz8cn2pbpqfyqrc5s9bfvvy14nj848ynvw56wy0zng9p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xmodmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xmodmap-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -2634,12 +2634,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xmore = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { name = "xmore-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -2647,12 +2647,12 @@ lib.makeScope newScope (self: with self; { sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xorgcffiles = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xorgcffiles = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xorg-cf-files-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2660,12 +2660,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xorgdocs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xorgdocs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xorg-docs-1.7.1"; builder = ./builder.sh; src = fetchurl { @@ -2673,12 +2673,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation { + xorgproto = callPackage ({ stdenv, pkg-config, fetchurl, libXt }: stdenv.mkDerivation { name = "xorgproto-2020.1"; builder = ./builder.sh; src = fetchurl { @@ -2686,12 +2686,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1llrnrkq6iprgiqakmwlv89745s9h02xsiaq0xn3fnh377qm78al"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { + xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { name = "xorg-server-1.20.10"; builder = ./builder.sh; src = fetchurl { @@ -2699,12 +2699,12 @@ lib.makeScope newScope (self: with self; { sha256 = "16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xorgsgmldoctools = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xorgsgmldoctools = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; src = fetchurl { @@ -2712,12 +2712,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xpr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xpr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xpr-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2725,12 +2725,12 @@ lib.makeScope newScope (self: with self; { sha256 = "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xprop = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xprop-1.2.5"; builder = ./builder.sh; src = fetchurl { @@ -2738,12 +2738,12 @@ lib.makeScope newScope (self: with self; { sha256 = "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xrandr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { + xrandr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { name = "xrandr-1.5.1"; builder = ./builder.sh; src = fetchurl { @@ -2751,12 +2751,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXrandr libXrender ]; meta.platforms = lib.platforms.unix; }) {}; - xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xrdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xrdb-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -2764,12 +2764,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xrefresh = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xrefresh = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xrefresh-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2777,12 +2777,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { + xset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { name = "xset-1.2.4"; builder = ./builder.sh; src = fetchurl { @@ -2790,12 +2790,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXmu xorgproto libXxf86misc ]; meta.platforms = lib.platforms.unix; }) {}; - xsetroot = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { + xsetroot = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { name = "xsetroot-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -2803,12 +2803,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xbitmaps libXcursor libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xsm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { + xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { name = "xsm-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2816,12 +2816,12 @@ lib.makeScope newScope (self: with self; { sha256 = "09a4ss1fnrh1sgm21r4n5pivawf34paci3rn6mscyljf7a4vcd4r"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libX11 libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; - xstdcmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xstdcmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { name = "xstdcmap-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2829,12 +2829,12 @@ lib.makeScope newScope (self: with self; { sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { + xtrans = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { name = "xtrans-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2842,12 +2842,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; - xtrap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { + xtrap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { name = "xtrap-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -2855,12 +2855,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0sqm4j1zflk1s94iq4waa70hna1xcys88v9a70w0vdw66czhvj2j"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXt libXTrap ]; meta.platforms = lib.platforms.unix; }) {}; - xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { + xvinfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { name = "xvinfo-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2868,12 +2868,12 @@ lib.makeScope newScope (self: with self; { sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXv ]; meta.platforms = lib.platforms.unix; }) {}; - xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { + xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { name = "xwd-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -2881,12 +2881,12 @@ lib.makeScope newScope (self: with self; { sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxkbfile libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xwininfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { + xwininfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { name = "xwininfo-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2894,12 +2894,12 @@ lib.makeScope newScope (self: with self; { sha256 = "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - xwud = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xwud = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { name = "xwud-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2907,7 +2907,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index a6cd8032ba700..b50f3f33a3107 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -292,7 +292,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { my @arguments = @buildInputs; push @arguments, @nativeBuildInputs; - unshift @arguments, "stdenv", "pkgconfig", "fetchurl"; + unshift @arguments, "stdenv", "pkg-config", "fetchurl"; my $argumentsStr = join ", ", @arguments; my $extraAttrsStr = ""; @@ -309,7 +309,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { sha256 = "$pkgHashes{$pkg}"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig $nativeBuildInputsStr]; + nativeBuildInputs = [ pkg-config $nativeBuildInputsStr]; buildInputs = [ $buildInputsStr];$extraAttrsStr meta.platforms = lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1379b3b19c5d2..458bc7ea84599 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -4,7 +4,7 @@ freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkgconfig, llvm_6, libxslt, + mcpp, epoxy, openssl, pkg-config, llvm_6, libxslt, ApplicationServices, Carbon, Cocoa, Xplugin }: @@ -467,7 +467,7 @@ self: super: configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; # 1: compatibility for X11/xkb location - # 2: I think pkgconfig/ is supposed to be in /lib/ + # 2: I think pkg-config/ is supposed to be in /lib/ postInstall = '' ln -s share "$out/etc" mkdir -p "$out/lib" && ln -s ../share/pkgconfig "$out/lib/" @@ -589,7 +589,7 @@ self: super: url = "mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2"; sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = lib.platforms.unix; } else if (abiCompat == "1.18") then { @@ -599,7 +599,7 @@ self: super: url = "mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2"; sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; postPatch = lib.optionalString stdenv.isLinux "sed '1i#include <malloc.h>' -i include/os.h"; meta.platforms = lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index cc8bf7dfa106d..ee870f071256f 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }: +{ lib, stdenv, fetchurl, pkg-config, m4, libxcb, xcbutil, libX11 }: stdenv.mkDerivation rec { version = "1.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h"; }; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; doCheck = true; buildInputs = [ libxcb xcbutil ]; checkInputs = [ libX11 ]; diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index deaa7ca18f074..762154f018c87 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, - libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } : + libiconv, botan2, systemd, pkg-config, udns, pandoc, coreutils } : stdenv.mkDerivation rec { pname = "biboumi"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = [ ./catch.patch ]; - nativeBuildInputs = [ cmake pkgconfig pandoc ]; + nativeBuildInputs = [ cmake pkg-config pandoc ]; buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd udns ]; diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index 68349214359e8..03ded7a5d5cde 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { version = "20090101"; src = fetchcvs { - cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy"; - module = "xmpppy/mail-transport"; - date = "2009-01-01"; - sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e"; - }; + cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy"; + module = "xmpppy/mail-transport"; + date = "2009-01-01"; + sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e"; + }; pythonPath = [ xmpppy ]; buildInputs = [ pythonPackages.wrapPython ]; diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index babcd8e6374bc..0ae93ed1469ae 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkgconfig +{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config , curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, util-linuxMinimal, x264, zlib , coreutils, procps, psmisc, nixosTests }: @@ -157,7 +157,7 @@ in stdenv.mkDerivation rec { CryptEksblowfish DataEntropy # zmupdate.pl ]); - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; cmakeFlags = [ "-DWITH_SYSTEMD=ON" diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index 06ca242079875..8b2ac36295984 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -3,7 +3,7 @@ buildDotnetPackage { baseName = "pash"; version = "git-2016-07-06"; - + src = fetchFromGitHub { owner = "Pash-Project"; repo = "Pash"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 683c58d8406f0..d481ae99b8914 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-01-16"; + version = "2021-01-20"; pname = "oh-my-zsh"; - rev = "efcbd9f3480a28ec69c607c46adcbfd8d230ac9f"; + rev = "cd4918c2cdb6613cf77ea8f6f29e1930bd7f4bf5"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1zngxqkhm49m2qczvyp5mws7d4bwxbb3fq20xqbbdpgk35smwnxc"; + sha256 = "1b8zipghawa2rl3l6vylmhbwcwz9yq52xmbfpkz0bxhifisq74kn"; }; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 3d48467a24653..333da40adbb06 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { license = licenses.mit; homepage = "https://github.com/b4b4r07/history"; platforms = platforms.unix; - maintainers = with maintainers; [ kampka ]; + maintainers = with maintainers; [ ]; }; passthru.tests = { diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 0bc46849df278..c18a863c636e0 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.14.4"; + version = "1.14.6"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1072ikklvpvx6qf0q8ydbi1qc1dxjjfs4031b4zzgjw766xnpcbk"; + sha256 = "1z6xipd7bgq7fc03x9j2dmg3yv59xyjf4ic5f1l6l6pw7w3q4sq7"; }; patches = [ diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index ecec2903b5f76..30c38168fd1e9 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,7 +1,5 @@ { lib , localSystem, crossSystem, config, overlays, crossOverlays ? [] -# The version of darwin.apple_sdk used for sources provided by apple. -, appleSdkVersion ? "10.12" # Minimum required macOS version, used both for compatibility as well as reproducability. , macosVersionMin ? "10.12" # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools @@ -150,7 +148,7 @@ in rec { __extraImpureHostDeps = commonImpureHostDeps; extraAttrs = { - inherit macosVersionMin appleSdkVersion platform; + inherit macosVersionMin platform; }; overrides = self: super: (overrides self super) // { inherit ccNoLibcxx; @@ -524,7 +522,7 @@ in rec { extraAttrs = { libc = pkgs.darwin.Libsystem; shellPackage = pkgs.bash; - inherit macosVersionMin appleSdkVersion platform bootstrapTools; + inherit macosVersionMin platform bootstrapTools; }; allowedRequisites = (with pkgs; [ diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix index 4bddee68f826d..1a4f1daad51e0 100644 --- a/pkgs/tools/X11/alttab/default.nix +++ b/pkgs/tools/X11/alttab/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "026xd1bkg10fj2q1n6xx797xk1grpby25qj1pnw2lp4f3vc19qn6"; }; - nativeBuildInputs = [ + nativeBuildInputs = [ autoconf automake pkg-config diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index dc527f47dd340..6955f36b8f1c5 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { pname = "OpenTabletDriver"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "InfinityGhost"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "048y7gjlk2yw4vh62px1d9w0va6ap1a0cndcpbirlyj9q6b8jxax"; + sha256 = "1xi97nn5zb4fs3pyyqznvxnz07j30j3p967s7jigjmlm9321vkqp"; }; debPkg = fetchurl { url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; - sha256 = "13gg0dhvjy88h9lhcrp30fjiwgb9dzjsgk1k760pi1ki71a5vz2r"; + sha256 = "06m2g5qvc02ga9f98f2ssa7wr2b7b2qm90qwaf17fz5z8rr0qmp0"; }; nativeBuildInputs = [ @@ -134,8 +134,8 @@ stdenv.mkDerivation rec { install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead - dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/30-opentabletdriver.rules - install -Dm644 ./usr/lib/udev/rules.d/30-opentabletdriver.rules -t $out/lib/udev/rules.d + dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/99-opentabletdriver.rules + install -Dm644 ./usr/lib/udev/rules.d/99-opentabletdriver.rules -t $out/lib/udev/rules.d runHook postInstall ''; @@ -155,8 +155,11 @@ stdenv.mkDerivation rec { dontWrapGApps = true; dontStrip = true; - passthru.tests = { - otd-runs = nixosTests.opentabletdriver; + passthru = { + updateScript = ./update.sh; + tests = { + otd-runs = nixosTests.opentabletdriver; + }; }; meta = with lib; { diff --git a/pkgs/tools/X11/opentabletdriver/deps.nix b/pkgs/tools/X11/opentabletdriver/deps.nix index 34d2981cff548..ccb7097153bd8 100644 --- a/pkgs/tools/X11/opentabletdriver/deps.nix +++ b/pkgs/tools/X11/opentabletdriver/deps.nix @@ -11,13 +11,13 @@ }) (fetchNuGet { name = "Eto.Forms"; - version = "2.5.6"; - sha256 = "035ny8jlanchwq16gcq0xb6ywabjl71c7qbpv26sjwg96na8vz51"; + version = "2.5.10"; + sha256 = "1d71wglk4ixfqfbm6sxmj753x5iwbar8i9zzjy3bh64fy1dn8lz7"; }) (fetchNuGet { name = "Eto.Platform.Gtk"; - version = "2.5.6"; - sha256 = "1ijkjd3lc7x59yk369kxipzgk1zhyr9g6k319wc0n033vij26mwl"; + version = "2.5.10"; + sha256 = "1pkqvlfx7bzracnw19bl50i9jg4ym376vihmy9qq7m5z5nfdqn4g"; }) (fetchNuGet { name = "GdkSharp"; @@ -41,8 +41,8 @@ }) (fetchNuGet { name = "HidSharpCore"; - version = "1.1.0"; - sha256 = "122s5j3wrv8hcgnbxrnjqydvcfz7gdm8xq0wlwzrgwdjk44lr45a"; + version = "1.2.1"; + sha256 = "0vcw38skr9g691gxbzv3cf6y9rk11vh5pvcyjshdgii2z1z8a4g2"; }) (fetchNuGet { name = "MessagePack.Annotations"; @@ -120,9 +120,9 @@ sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) (fetchNuGet { - name = "Newtonsoft.Json"; - version = "12.0.3"; - sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + name = "Octokit"; + version = "0.48.0"; + sha256 = "17ria1shx04rb6knbaswpqndmwam6v3r3lsfsd486q584798ccn8"; }) (fetchNuGet { name = "PangoSharp"; @@ -205,6 +205,11 @@ sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) (fetchNuGet { + name = "SharpZipLib"; + version = "1.3.1"; + sha256 = "09zypjfils38143da507s5fi4hzvdlz32wfav219hksnpl35y8x0"; + }) + (fetchNuGet { name = "StreamJsonRpc"; version = "2.6.121"; sha256 = "0xzvpk17w2skndzdg47j7gkrrvw6521db4mv8lc3v8hm97vs9m76"; @@ -230,11 +235,6 @@ sha256 = "16saf1fm9q80bb624fkqz0ksrwpnbw9617d7xg3jib7a2wgagm2r"; }) (fetchNuGet { - name = "System.CommandLine"; - version = "2.0.0-beta1.20303.1"; - sha256 = "0isnz8ipqlqim06hf56zlaq2vnsy5facvf5nvq6kzm5h1dm3l2vn"; - }) - (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.7.0"; sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; @@ -320,11 +320,6 @@ sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) (fetchNuGet { - name = "System.Numerics.Vectors"; - version = "4.5.0"; - sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; - }) - (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; diff --git a/pkgs/tools/X11/opentabletdriver/update.sh b/pkgs/tools/X11/opentabletdriver/update.sh index 04fae30c05a5d..715857cf8f46b 100755 --- a/pkgs/tools/X11/opentabletdriver/update.sh +++ b/pkgs/tools/X11/opentabletdriver/update.sh @@ -14,6 +14,14 @@ if [[ "$new_version" == "$old_version" ]]; then [[ "${1}" != "--force" ]] && exit 0 fi +# Updating the hash of deb package manually since there seems to be no way to do it automatically +oldDebPkgUrl="https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${old_version}/OpenTabletDriver.deb"; +newDebPkgUrl="https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${new_version}/OpenTabletDriver.deb"; +oldDebSha256=$(nix-prefetch-url "$oldDebPkgUrl") +newDebSha256=$(nix-prefetch-url "$newDebPkgUrl") +echo "oldDebSha256: $oldDebSha256 newDebSha256: $newDebSha256" +sed -i ./default.nix -re "s|\"$oldDebSha256\"|\"$newDebSha256\"|" + cd ../../../.. update-source-version opentabletdriver "$new_version" store_src="$(nix-build . -A opentabletdriver.src --no-out-link)" diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index a321ead366653..f10510051edb7 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub +{ lib, stdenv, fetchgit, fetchFromGitHub , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , w3m, gnugrep, gnused, coreutils, xset, perlPackages , mimiSupport ? false, gawk ? null }: @@ -22,11 +22,12 @@ in stdenv.mkDerivation rec { pname = "xdg-utils"; - version = "1.1.3"; + version = "unstable-2020-10-21"; - src = fetchurl { - url = "https://portland.freedesktop.org/download/${pname}-${version}.tar.gz"; - sha256 = "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"; + src = fetchgit { + url = "https://gitlab.freedesktop.org/xdg/${pname}.git"; + rev = "d11b33ec7f24cfb1546f6b459611d440013bdc72"; + sha256 = "sha256-8PtXfI8hRneEpnUvIV3M+6ACjlkx0w/NEiJFdGbbHnQ="; }; # just needed when built from git diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index 0bb1e5172ff40..7572e19fbf913 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildPhase = '' scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; - + installPhase = '' install -D -t "$out"/bin xsettingsd dump_xsettings install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1 diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 4fda82839a8bf..0cf02b2540ef8 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.216"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.217"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-6kJ+PmFVHf8rGvp7X7t7e1+RVoRL/OEQHP9gqSHughY="; + sha256 = "sha256-bRrEFDRccklM3f6K/HAptKYrPnnCPM3Jo4vNsDt3Fuo="; }; postPatch = '' diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 54d78d8fab7ae..2c5dca4a2fac0 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0l4wlg6x074slndkihvwdvw4frsyzwxfqm1pkzqwc3x8awa9nlbv"; + sha256 = "sha256-wjYO/tu+QrztGPvtz3YBZJ7/e+9TDEwJ542xIBuNaQo="; }; - vendorSha256 = "0sfx8x1iwdqwbyiid5hc9wiwjc16aig8vplpjlqxkmcvig8qlwff"; + vendorSha256 = "sha256-woEa/h6TKQD32BslmPBuILvBAObhWjT8XqnQmuweUx0="; doCheck = false; diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index d4bbbe77a2d8a..db768a5d14a22 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { buildCommand = '' install -Dm755 $script $out/bin/rpmextract ''; - + script = substituteAll { src = ./rpmextract.sh; isExecutable = true; diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 3cd68e6ef459a..3b81295ccf2ab 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -5,7 +5,7 @@ assert par2Support -> par2cmdline != null; -let version = "0.31"; in +let version = "0.32"; in with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation { repo = "bup"; owner = "bup"; rev = version; - sha256 = "03kmmdlgg0p5z39bhckkf91mmq55wghb93ghqvv9f9gaby1diw4z"; + sha256 = "sha256-SWnEJ5jwu/Jr2NLsTS8ajWay0WX/gYbOc3J6w00DndI="; }; buildInputs = [ diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/tools/backup/hpe-ltfs/default.nix index e7ee67802c255..ec8e6392e9cfc 100644 --- a/pkgs/tools/backup/hpe-ltfs/default.nix +++ b/pkgs/tools/backup/hpe-ltfs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ + buildInputs = [ fuse icu libxml2 libuuid ]; diff --git a/pkgs/tools/backup/iceshelf/default.nix b/pkgs/tools/backup/iceshelf/default.nix index 546339ca002a4..eb5e883bdacf1 100644 --- a/pkgs/tools/backup/iceshelf/default.nix +++ b/pkgs/tools/backup/iceshelf/default.nix @@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec { format = "other"; - src = fetchFromGitHub { - owner = "mrworf"; - repo = pname; - rev = "26768dde3fc54fa412e523eb8f8552e866b4853b"; - sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm"; + src = fetchFromGitHub { + owner = "mrworf"; + repo = pname; + rev = "26768dde3fc54fa412e523eb8f8552e866b4853b"; + sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm"; }; propagatedBuildInputs = [ @@ -19,12 +19,12 @@ python3.pkgs.buildPythonApplication rec { python3.pkgs.python-gnupg ]; - installPhase = '' - mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages} + installPhase = '' + mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages} cp -v iceshelf iceshelf-restore $out/bin cp -v iceshelf.sample.conf $out/share/doc/${pname}/ cp -rv modules $out/${python3.sitePackages} - ''; + ''; meta = with lib; { description = "A simple tool to allow storage of signed, encrypted, incremental backups using Amazon's Glacier storage"; diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index 0f9a171e979d0..708cd85bb2982 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "16k5mp64a5l063rdj65hbpx414xv0bqdvhvz49k8018f2a2jj5xl"; + sha256 = "sha256-kCyfVeGTXBzdwmTTDJM1eaR6ANoIXAydj1ePmrZehqE="; }; - cargoSha256 = "0s5mv8mymycz4ga4zh9kbrhwmhgl4j01pw1sdzxy49l9waryk9p3"; + cargoSha256 = "sha256-juxaL/zjfqzFMqZe9tpevdjjVU7fPK8zalksAARWHC8="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix index 26a0ba29189a8..5e6e6a95ae72a 100644 --- a/pkgs/tools/backup/ori/default.nix +++ b/pkgs/tools/backup/ori/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "8ce1a3dfbb6d1538885e993616bdfe71be44711d48f7f6798ff6bc0a39b3deca"; }; - buildInputs = [ + buildInputs = [ boost pkg-config scons util-linux fuse libevent openssl zlib ]; diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index e954163b9e847..71ce9060b255c 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "blueberry"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "19kmjp686h7lwmw5n7fc9giqbqm757pkbn42nfwlmasvzqsqlnz6"; + sha256 = "sha256-YwJQryIK92/Tc1s49jM3pCs7dmO3l+RbbFBtuXvhYbQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix index 24a93ee686cdf..fc2ff6128f75b 100644 --- a/pkgs/tools/bluetooth/obexftp/default.nix +++ b/pkgs/tools/bluetooth/obexftp/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, openobex, bluez, cmake }: - + stdenv.mkDerivation rec { name = "obexftp-0.24.2"; - + src = fetchurl { url = "mirror://sourceforge/openobex/${name}-Source.tar.gz"; sha256 = "18w9r78z78ri5qc8fjym4nk1jfbrkyr789sq7rxrkshf1a7b83yl"; diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index 03828c51c01a2..1079623cf2afd 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, bluez, libusb-compat-0_1, cmake }: - + stdenv.mkDerivation rec { name = "openobex-1.7.2"; - + src = fetchurl { url = "mirror://sourceforge/openobex/${name}-Source.tar.gz"; sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m"; diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index ea424865919ee..ba6cb79fbd578 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { Bcache is a Linux kernel block layer cache. It allows one or more fast disk drives such as flash-based solid state drives (SSDs) to act as a cache for one or more slower hard disk drives. - + This package contains the required user-space tools. User documentation is in Documentation/bcache.txt in the Linux kernel diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix index a5f15c5fb2ea2..9917bf8d965e0 100644 --- a/pkgs/tools/filesystems/ext4magic/default.nix +++ b/pkgs/tools/filesystems/ext4magic/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { If the information in the journal are sufficient, ext4magic can recover the most file types, with original filename, owner and group, - file mode bits and also the old atime/mtime stamps. + file mode bits and also the old atime/mtime stamps. It's much more effective and works much better than extundelete. ''; diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix index b4980e83bee5b..ccc048f757231 100644 --- a/pkgs/tools/filesystems/genext2fs/default.nix +++ b/pkgs/tools/filesystems/genext2fs/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "genext2fs-1.4.1"; - + src = fetchurl { url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz"; sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0"; diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 0c9a6af9a6e0d..368f62f219693 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.32.0"; + version = "2.32.2"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "1qmhwkl2ws0hwd7s1mzrdiw4h7jpilzcr0w8dgx465mdzb5d2jad"; + sha256 = "sha256-ybDVBcPkjsW2OxNxUmn5hG/qLEjxF9vqR8pZdb9tIBs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/cfdg/src-for-default.nix b/pkgs/tools/graphics/cfdg/src-for-default.nix index 6d98ea240de61..7ff076a5b0ae1 100644 --- a/pkgs/tools/graphics/cfdg/src-for-default.nix +++ b/pkgs/tools/graphics/cfdg/src-for-default.nix @@ -4,6 +4,6 @@ hash="1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p"; url="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz"; advertisedUrl="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz"; - - + + } diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index c0dc7661715dc..fa6880f6f910d 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dpic"; - version = "2020.09.15"; + version = "2021.01.01"; src = fetchurl { url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz"; - sha256 = "0gmmp4dlir3bn892nm55a3q8cfsj8yg7fp1dixmhsdhsrgmg1b83"; + sha256 = "sha256-vrBiTQqdaIslDd/WWMbdgornRkZmC2m+RF2J78F5Pm8="; }; # The prefix passed to configure is not used. diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 94756ee945622..0ce24482164e4 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "0mr4ni75klmzfjivfv5xmcdw03y1gjvkz1d297gwh46zq1q7blf3"; + sha256 = "sha256-pnaNBjMKWfnCHG4MTLS2tJ2lrKxH6tcnvbOFZSDtPJY="; }; - cargoSha256 = "0wm139lik6w2hwg72j8hcphp0z89bbabfxjmfyqrih6akyzb0l01"; + cargoSha256 = "sha256-M5LEoEaWKT6nfQsnuqfyRBtDILewAxzMs7d6DvhkvFg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/graphics/graph-cli/default.nix b/pkgs/tools/graphics/graph-cli/default.nix new file mode 100644 index 0000000000000..4da4f50cef82d --- /dev/null +++ b/pkgs/tools/graphics/graph-cli/default.nix @@ -0,0 +1,31 @@ +{ lib +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "graph-cli"; + version = "0.1.7"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "graph_cli"; + sha256 = "sha256-/v9COgAjuunJ06HHl55J0moV1p4uO+N+w2QwE8tgebQ="; + }; + + propagatedBuildInputs = with python3Packages; [ + numpy + pandas + matplotlib + ]; + + # does not contain tests despite reference in Makefile + doCheck = false; + pythonImportsCheck = [ "graph_cli" ]; + + meta = with lib; { + description = "CLI to create graphs from CSV files"; + homepage = "https://github.com/mcastorina/graph-cli/"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ leungbk ]; + }; +} diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index 2aec9be214e7e..2f2d0523469e8 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -35,18 +35,18 @@ stdenv.mkDerivation rec { scanbd polls a scanner's buttons, looking for button presses, function knob changes, or other scanner events such as paper inserts and removals, while at the same time allowing scan-applications to access the scanner. - + Various actions can be submitted (scan, copy, email, ...) via action scripts. The function knob values are passed to the action scripts as well. Scan actions are also signaled via dbus. This can be useful for foreign applications. Scans can also be triggered via dbus from foreign applications. - + On platforms which support signaling of dynamic device insertion/removal (libudev, dbus, hal), scanbd supports this as well. scanbd can use all sane-backends or some special backends from the (old) - scanbuttond project. + scanbuttond project. ''; homepage = "http://scanbd.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/scanbd/"; diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index 69e4425d8c3b6..fc28a08b4b79f 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -1,11 +1,11 @@ { callPackage, plugins ? [] }: -let +let unwrapped = callPackage ./unwrapped.nix { }; wrapped = callPackage ./wrapper.nix { plugins = plugins; fcitx = unwrapped; }; -in if plugins == [] +in if plugins == [] then unwrapped else wrapped diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index e049930488993..30b08a13ade48 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -7,6 +7,7 @@ , qtx11extras , libxcb , libXdmcp +, qtbase }: mkDerivation rec { @@ -20,8 +21,14 @@ mkDerivation rec { sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM="; }; + preConfigure = '' + substituteInPlace qt5/platforminputcontext/CMakeLists.txt \ + --replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix} + ''; + cmakeFlags = [ "-DENABLE_QT4=0" + "-DENABLE_QT6=0" ]; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix index 854020effeaa8..17501d5f36220 100644 --- a/pkgs/tools/inputmethods/fcitx5/with-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix @@ -12,6 +12,14 @@ symlinkJoin { --prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \ --suffix XDG_DATA_DIRS : "$out/share" \ --suffix PATH : "$out/bin" + + desktop=share/applications/org.fcitx.Fcitx5.desktop + autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop + rm $out/$desktop + rm $out/$autostart + cp ${fcitx5}/$desktop $out/$desktop + sed -i $out/$desktop -e "s|^Exec=.*|Exec=$out/bin/fcitx5|g" + ln -s $out/$desktop $out/$autostart ''; meta = fcitx5.meta; diff --git a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix new file mode 100644 index 0000000000000..730135e4a7d98 --- /dev/null +++ b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitLab, pkg-config, libyamlcpp, libevdev }: + +stdenv.mkDerivation rec { + pname = "dual-function-keys"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "interception/linux/plugins"; + repo = pname; + rev = version; + sha256 = "07hksca4g7v4zsvhmhc9j725j3n63fzrkx9sb4a0wrd7rwgr25rz"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libevdev libyamlcpp ]; + + prePatch = '' + substituteInPlace config.mk --replace \ + '/usr/include/libevdev-1.0' \ + "$(pkg-config --cflags libevdev | cut -c 3-)" + ''; + + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + meta = with lib; { + homepage = "https://gitlab.com/interception/linux/plugins/dual-function-keys"; + description = "Tap for one key, hold for another."; + license = licenses.mit; + maintainers = with maintainers; [ svend ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index 554700dad93fc..d0beb7d40d75f 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -2,6 +2,8 @@ , fetchurl , fetchzip , autoPatchelfHook +, makeWrapper +, jdk , libsecret }: @@ -29,17 +31,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook + makeWrapper ]; installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then '' - mkdir -p $out/bin - for f in configuration features p2 plugins Archi.ini Archi; do - cp $f $out/bin/ + mkdir -p $out/bin $out/libexec + for f in configuration features p2 plugins Archi.ini; do + cp -r $f $out/libexec done - install -D -m755 Archi $out/bin/Archi + install -D -m755 Archi $out/libexec/Archi + makeWrapper $out/libexec/Archi $out/bin/Archi \ + --prefix PATH : ${jdk}/bin '' else '' diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index 30d4d79488e10..afce1429e69b1 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "llathasa-veleth"; repo = "disfetch"; rev = version; - sha256 = "14vccp1z0g2hr9alx2ydz29hfa4xfv9irdjsvqm94fbyi5fa87k0"; + sha256 = "0p5pj8d761gz95ar35s8q6lrybrg9jik33kwnsxvb14n990kya0p"; }; dontBuild = true; diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix index 73dac5280bf4d..12232c414fd35 100644 --- a/pkgs/tools/misc/dumptorrent/default.nix +++ b/pkgs/tools/misc/dumptorrent/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "dumptorrent"; version = "1.2"; - + src = fetchurl { url = "mirror://sourceforge/dumptorrent/dumptorrent-${version}.tar.gz"; sha256 = "073h03bmpfdy15qh37lvppayld2747i4acpyk0pm5nf2raiak0zm"; diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index bedfebd968125..695187b3e840e 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -16,4 +16,4 @@ callPackage ./dvtm.nix rec { }) ]; } - + diff --git a/pkgs/tools/misc/gammy/default.nix b/pkgs/tools/misc/gammy/default.nix index cb8f491069a85..9f9a73a989e1b 100644 --- a/pkgs/tools/misc/gammy/default.nix +++ b/pkgs/tools/misc/gammy/default.nix @@ -2,7 +2,7 @@ let pname = "gammy"; - version = "0.9.59"; + version = "0.9.62"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "Fushko"; repo = pname; rev = "v${version}"; - sha256 = "1iz41larqr6ss5kar1pds6zgcrch6ch34cr0ngd71gcaxal0rb72"; + sha256 = "sha256-fyr+khLgaX5xbKCW3pqt6fFvZBHGEVs1BsMireZDxP0="; }; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 58a7ce619c5ae..6611b3e9210a2 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.149.0"; + version = "0.155.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "14yvxnl2ap1hizpk3pfzlh36399df1z2zgsc63qdh1h4ixyav6cy"; + sha256 = "sha256-wVHBcxbrU6WvBAegQYDRDvLbuoU49/Cm19ujghNyi2A="; }; - vendorSha256 = "17l15z2wyxzh7h7hvb1fysdnyg8wr8ww827vvmki73s1plfgr80d"; + vendorSha256 = "sha256-k4TphR8z3DtoqJm6o6QILvQ1rHIldi1BpQJbEyWKv9U="; buildFlagsArray = [ "-ldflags=" diff --git a/pkgs/tools/misc/haste-client/Gemfile b/pkgs/tools/misc/haste-client/Gemfile index 851fabc21ddb7..06dd69c0179ed 100644 --- a/pkgs/tools/misc/haste-client/Gemfile +++ b/pkgs/tools/misc/haste-client/Gemfile @@ -1,2 +1,2 @@ source 'https://rubygems.org' -gemspec +gem 'haste' diff --git a/pkgs/tools/misc/haste-client/Gemfile.lock b/pkgs/tools/misc/haste-client/Gemfile.lock index 430407946604e..3f395ed9ef822 100644 --- a/pkgs/tools/misc/haste-client/Gemfile.lock +++ b/pkgs/tools/misc/haste-client/Gemfile.lock @@ -1,38 +1,19 @@ -PATH - remote: . - specs: - haste (0.2.3) - faraday (~> 0.9) - json - GEM remote: https://rubygems.org/ specs: - diff-lcs (1.4.4) faraday (0.17.3) multipart-post (>= 1.2, < 3) - json (2.3.1) + haste (0.2.3) + faraday (~> 0.9) + json + json (2.5.1) multipart-post (2.1.1) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.3) PLATFORMS ruby DEPENDENCIES - haste! - rspec + haste BUNDLED WITH 2.1.4 diff --git a/pkgs/tools/misc/haste-client/default.nix b/pkgs/tools/misc/haste-client/default.nix index 477ba5820aa31..0005e94fe05c4 100644 --- a/pkgs/tools/misc/haste-client/default.nix +++ b/pkgs/tools/misc/haste-client/default.nix @@ -1,25 +1,13 @@ { lib -, bundlerEnv +, bundlerApp , buildRubyGem , ruby }: -let - version = "0.2.3"; - deps = bundlerEnv rec { - name = "haste-client-${version}"; - inherit ruby; - gemdir = ./.; - }; -in -buildRubyGem rec { - name = "haste-client-${version}"; - inherit version; - gemName = "haste"; - - source.sha256 = "0jaq0kvlxwvd0jq9pl707saqnaaal3dis13mqwfjbj121gr4hq4q"; - - propagatedBuildInputs = [ deps ]; +bundlerApp rec { + pname = "haste"; + gemdir = ./.; + exes = [ "haste" ]; meta = with lib; { description = "Command line interface to the AnyStyle Parser and Finder"; diff --git a/pkgs/tools/misc/haste-client/gemset.nix b/pkgs/tools/misc/haste-client/gemset.nix index 336df25081bd1..49959531ae934 100644 --- a/pkgs/tools/misc/haste-client/gemset.nix +++ b/pkgs/tools/misc/haste-client/gemset.nix @@ -1,14 +1,4 @@ { - diff-lcs = { - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; - type = "gem"; - }; - version = "1.4.4"; - }; faraday = { dependencies = ["multipart-post"]; groups = ["default"]; @@ -172,159 +162,11 @@ haste = { dependencies = ["faraday" "json"]; groups = ["default"]; - platforms = [{ - engine = "maglev"; - } { - engine = "maglev"; - } { - engine = "maglev"; - version = "1.8"; - } { - engine = "maglev"; - version = "1.8"; - } { - engine = "maglev"; - version = "1.9"; - } { - engine = "maglev"; - version = "1.9"; - } { - engine = "maglev"; - version = "2.0"; - } { - engine = "maglev"; - version = "2.0"; - } { - engine = "maglev"; - version = "2.1"; - } { - engine = "maglev"; - version = "2.1"; - } { - engine = "maglev"; - version = "2.2"; - } { - engine = "maglev"; - version = "2.2"; - } { - engine = "maglev"; - version = "2.3"; - } { - engine = "maglev"; - version = "2.3"; - } { - engine = "maglev"; - version = "2.4"; - } { - engine = "maglev"; - version = "2.4"; - } { - engine = "maglev"; - version = "2.5"; - } { - engine = "maglev"; - version = "2.5"; - } { - engine = "maglev"; - version = "2.6"; - } { - engine = "maglev"; - version = "2.6"; - } { - engine = "rbx"; - } { - engine = "rbx"; - } { - engine = "rbx"; - version = "1.8"; - } { - engine = "rbx"; - version = "1.9"; - } { - engine = "rbx"; - version = "2.0"; - } { - engine = "rbx"; - version = "2.1"; - } { - engine = "rbx"; - version = "2.2"; - } { - engine = "rbx"; - version = "2.3"; - } { - engine = "rbx"; - version = "2.4"; - } { - engine = "rbx"; - version = "2.5"; - } { - engine = "rbx"; - version = "2.6"; - } { - engine = "ruby"; - } { - engine = "ruby"; - } { - engine = "ruby"; - } { - engine = "ruby"; - version = "1.8"; - } { - engine = "ruby"; - version = "1.8"; - } { - engine = "ruby"; - version = "1.9"; - } { - engine = "ruby"; - version = "1.9"; - } { - engine = "ruby"; - version = "2.0"; - } { - engine = "ruby"; - version = "2.0"; - } { - engine = "ruby"; - version = "2.1"; - } { - engine = "ruby"; - version = "2.1"; - } { - engine = "ruby"; - version = "2.2"; - } { - engine = "ruby"; - version = "2.2"; - } { - engine = "ruby"; - version = "2.3"; - } { - engine = "ruby"; - version = "2.3"; - } { - engine = "ruby"; - version = "2.4"; - } { - engine = "ruby"; - version = "2.4"; - } { - engine = "ruby"; - version = "2.5"; - } { - engine = "ruby"; - version = "2.5"; - } { - engine = "ruby"; - version = "2.6"; - } { - engine = "ruby"; - version = "2.6"; - }]; + platforms = []; source = { - path = ./.; - type = "path"; + remotes = ["https://rubygems.org"]; + sha256 = "0jaq0kvlxwvd0jq9pl707saqnaaal3dis13mqwfjbj121gr4hq4q"; + type = "gem"; }; version = "0.2.3"; }; @@ -482,10 +324,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; multipart-post = { groups = ["default"]; @@ -646,58 +488,4 @@ }; version = "2.1.1"; }; - rspec = { - dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; - type = "gem"; - }; - version = "3.9.0"; - }; - rspec-core = { - dependencies = ["rspec-support"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xndkv5cz763wh30x7hdqw6k7zs8xfh0f86amra9agwn44pcqs0y"; - type = "gem"; - }; - version = "3.9.2"; - }; - rspec-expectations = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bxkv25qmy39jqrdx35bfgw00g24qkssail9jlljm7hywbqvr9bb"; - type = "gem"; - }; - version = "3.9.2"; - }; - rspec-mocks = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; - type = "gem"; - }; - version = "3.9.1"; - }; - rspec-support = { - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dandh2fy1dfkjk8jf9v4azbbma6968bhh06hddv0yqqm8108jir"; - type = "gem"; - }; - version = "3.9.3"; - }; } \ No newline at end of file diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index e7a9ccd6358e0..050cc63f6a5d5 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "4.22"; + version = "4.24"; pname = "hebcal"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; rev = "v${version}"; - sha256 = "0bm29n51qi9q4vx4qsz3l9l1wvpvsk138zixfl5f5yz4kngzbx24"; + sha256 = "sha256-iWp2S3s8z/y4dZ66Ogqu7Yf4gTUvSS1J5F7d0ifRbcY="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/kcollectd/default.nix b/pkgs/tools/misc/kcollectd/default.nix index ffc64b1455aa8..e38cb6f5a7911 100644 --- a/pkgs/tools/misc/kcollectd/default.nix +++ b/pkgs/tools/misc/kcollectd/default.nix @@ -18,12 +18,12 @@ mkDerivation rec { pname = "kcollectd"; - version = "0.11.99.0"; + version = "0.12.0"; src = fetchFromGitLab { owner = "aerusso"; repo = pname; rev = "v${version}"; - sha256 = "0h4ymvzihzbmyv3z0bp28g94wxc6c7lgi3my0xbka3advxr811gn"; + sha256 = "sha256-Ihd4Ps4t9+sNB3joO3vTxDR/25t7Ecl6yvHQ15QiUdY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 6f532533f99d0..5bb4f41a5de85 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "latex2html"; - version = "2020.2"; + version = "2021"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1icyl6kl60wh7cavprgbd8q6lpjwr7wn24m34kpiif7ahknhcbcm"; + sha256 = "sha256-n7VbK/S9EkWxb4fbIXp3tIfX7N+9bvZ/odBylqTuzUU="; }; buildInputs = [ ghostscript netpbm perl ]; diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 4fee29216fd9d..616ee822eba20 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "0a2jff72l5my00pg9lhjdmnwkqfv4hmnl0a9cfbnzsqh39lbklqy"; + sha256 = "1p51wdv47cyg6dmb81fm0d92x1kp7bwwpgax6vlh669nkddiwvmm"; }; postInstall = '' @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { install -Dm644 -t $out/share/mcfly mcfly.fish ''; - cargoSha256 = "1c8qjkpc8wi095zzmgd05721kdf1knh9la91l081mvwa3inwk6ax"; + cargoSha256 = "0gcdgca8w8i978b067rwm5zrc81rxb704006k9pbcwizkq2281yy"; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 7a010eb5e68af..12cd9990779d1 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.7.3"; + version = "2.9.1"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "0c56na9s3g7rdb4cc6ccsnfby2ihf5zrfs3lg9qxiqsfr7mcn4w9"; + sha256 = "sha256-owa+HmzMXpLR7H1FssW4gQiVAQGJRXhcitgJj6pxJRc="; }; - cargoSha256 = "05rrww53g3k2c8mpxvyc067qsgs7w9sxnzdlvmca1idbqa0k9060"; + cargoSha256 = "sha256-TqWe4eARQmmWcwnvb6BIZrzGeKMpiIObPv0cW1JvWj4="; buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index a5d1baf1fd185..f5d42431e4f23 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A 'top' like tool for PostgreSQL"; - longDescription = '' - pg_top allows you to: + longDescription = '' + pg_top allows you to: * View currently running SQL statement of a process. * View query plan of a currently running SQL statement. * View locks held by a process. diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 24367189ff072..82e7659d15248 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six + argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six beautifulsoup4 ]; checkInputs = with python3Packages; [ pyfakefs mock ddt ]; # Disabling git tests because they expect git to be preconfigured - # with the user's details. See + # with the user's details. See # https://github.com/NixOS/nixpkgs/issues/94663 preCheck = '' rm tests/test_git.py diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/tools/misc/rargs/default.nix index c8eea974750c2..834a62803f670 100644 --- a/pkgs/tools/misc/rargs/default.nix +++ b/pkgs/tools/misc/rargs/default.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { description = "xargs + awk with pattern matching support"; homepage = "https://github.com/lolabout/rargs"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ pblkt ]; + maintainers = with maintainers; [ pblkt ]; }; } diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix new file mode 100644 index 0000000000000..c5f84601a6dc6 --- /dev/null +++ b/pkgs/tools/misc/rauc/default.nix @@ -0,0 +1,50 @@ +{ autoreconfHook +, curl +, dbus +, fetchFromGitHub +, glib +, json-glib +, lib +, nix-update-script +, openssl +, pkg-config +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "rauc"; + version = "1.5"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "10v9nllfw5y53797p00hk6645zkaa6cacsim1rh6y2jngnqfkmw0"; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + buildInputs = [ curl dbus glib json-glib openssl ]; + + configureFlags = [ + "--with-dbusinterfacesdir=${placeholder "out"}/share/dbus-1/interfaces" + "--with-dbuspolicydir=${placeholder "out"}/share/dbus-1/systemd.d" + "--with-dbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" + ]; + + meta = with lib; { + description = "Safe and secure software updates for embedded Linux"; + homepage = "https://rauc.io"; + license = licenses.lgpl21; + maintainers = with maintainers; [ emantor ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix new file mode 100644 index 0000000000000..a18a8d6d38d0e --- /dev/null +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -0,0 +1,55 @@ +{ mkDerivation, + stdenv, + lib, + fetchFromGitHub, + cmake, + curl, + libarchive, + util-linux, + qtbase, + qtdeclarative, + qtsvg, + qttools, + qtquickcontrols2, + qtgraphicaleffects +}: + +mkDerivation rec { + pname = "rpi-imager"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = pname; + rev = "v${version}"; + sha256 = "0596c7rpkykmjr3gsz9yczqsj7fzq04kc97s0rqkygjnwiqh2rwz"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + curl + libarchive + util-linux + qtbase + qtdeclarative + qtsvg + qttools + qtquickcontrols2 + qtgraphicaleffects + ]; + + /* By default, the builder checks for JSON support in lsblk by running "lsblk --json", + but that throws an error, as /sys/dev doesn't exist in the sandbox. + This patch removes the check. */ + patches = [ ./lsblkCheckFix.patch ]; + + meta = with lib; { + description = "Raspberry Pi Imaging Utility"; + homepage = "https://www.raspberrypi.org/software/"; + license = licenses.asl20; + maintainers = with maintainers; [ ymarkus ]; + platforms = platforms.all; + # does not build on darwin + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch b/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch new file mode 100644 index 0000000000000..98fd2a659dc8f --- /dev/null +++ b/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d7fc79..8ce72b9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -229,11 +229,6 @@ else() + if (NOT LSBLK) + message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)") + endif() +- +- execute_process(COMMAND "${LSBLK}" "--json" RESULT_VARIABLE ret) +- if (ret EQUAL "1") +- message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)") +- endif() + endif() + + configure_file( diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix index b1f6c7cdcab59..5218453d15e3b 100644 --- a/pkgs/tools/misc/teamocil/default.nix +++ b/pkgs/tools/misc/teamocil/default.nix @@ -13,7 +13,7 @@ bundlerEnv { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ - zachcoyle + zachcoyle nicknovitski ]; }; diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index 4d78e7f3f931d..b6cca5fe5c339 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp"; }; - + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index 962a46cb27ff5..7d9a07badbb32 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cassowary"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; rev = "v${version}"; - sha256 = "161wzcdq7kpny6fzxsqk2ivnah0xwmh2knv37jn0x18lclga1k9s"; + sha256 = "sha256-HRshuMnRPMzatOYYI//yEtjC46kORGXaAWJJjLHW2+k="; }; - vendorSha256 = "1qgilmkai9isbbg4pzqic6i8v5z8cay0ilw1gb69z4a6f2q4zhkp"; + vendorSha256 = "sha256-d8JPsHBGkZ/MeoHTCLxi6JeNomER/0veWjqmqGal8eE="; doCheck = false; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 95a81bba210a5..89f44e8bb7b35 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl +{ stdenv, lib, fetchurl, pkg-config, perl , http2Support ? true, nghttp2 , idnSupport ? false, libidn ? null , ldapSupport ? false, openldap ? null @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; # Zlib and OpenSSL must be propagated because `libcurl.la' contains # "-lz -lssl", which aren't necessary direct build inputs of diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index e66d5b7c2a5ba..d7394ac94d881 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -1,26 +1,38 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: - -with python3Packages; +{ lib +, buildPythonApplication +, click +, fetchFromGitHub +, ipy +, pyyaml +, requests +}: buildPythonApplication rec { pname = "gandi-cli"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "Gandi"; repo = "gandi.cli"; rev = version; - sha256 = "1jcabpphlm6qajw8dz0h4gynm03g1mxi0cn900i3v7wdfww1gfab"; + sha256 = "sha256-KLeEbbzgqpmBjeTc5RYsFScym8xtMqVjU+H0lyDM0+o="; }; - propagatedBuildInputs = [ click ipy pyyaml requests ]; + propagatedBuildInputs = [ + click + ipy + pyyaml + requests + ]; - doCheck = false; # Tests try to contact the actual remote API + # Tests try to contact the actual remote API + doCheck = false; + pythonImportsCheck = [ "gandi" ]; meta = with lib; { description = "Command-line interface to the public Gandi.net API"; homepage = "https://cli.gandi.net/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kampka ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index fccd4b8dace55..3f9d31b508b0c 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "grpcurl"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "fullstorydev"; repo = "grpcurl"; rev = "v${version}"; - sha256 = "11wjyg5008mkpzdp6q6k6yxwxx5byas8kbp57kdi1r38pya38hna"; + sha256 = "sha256-ZrL23eqA56BApwUtBwL5nSAd2LZbQxthyiFBnkJ5+Zg="; }; subPackages = [ "cmd/grpcurl" ]; - vendorSha256 = "0pc62dndca13jyk3bq6mp53w1ay7sfzf487m0cswvkijcsw8wk9q"; + vendorSha256 = "sha256-Tx00zRlzxCgyYdcYjzCxnFe8HyiitaKLcXJjYWhYSic="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/tools/networking/igmpproxy/default.nix b/pkgs/tools/networking/igmpproxy/default.nix index 0c4279b6f6492..9f92496490783 100644 --- a/pkgs/tools/networking/igmpproxy/default.nix +++ b/pkgs/tools/networking/igmpproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "igmpproxy"; - version = "0.2.1"; + version = "0.3"; src = fetchFromGitHub { owner = "pali"; repo = "igmpproxy"; rev = version; - sha256 = "13zn4q24drbhpqmcmqh1jg7ind5iqn11wj3xvczlc8w35vyqssyf"; + sha256 = "sha256-B7mq+5pKWMO4dJeFPB7tiyjDQjj90g/kmYB2ApBE3Ic="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 4294e9a77784d..b03678858ad01 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./ssh_path.patch + ./mosh-client_path.patch ./utempter_path.patch # Fix w/c++17, ::bind vs std::bind (fetchpatch { @@ -32,6 +33,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace scripts/mosh.pl \ --subst-var-by ssh "${openssh}/bin/ssh" + substituteInPlace scripts/mosh.pl \ + --subst-var-by mosh-client "$out/bin/mosh-client" ''; configureFlags = [ "--enable-completion" ] ++ lib.optional withUtempter "--with-utempter"; diff --git a/pkgs/tools/networking/mosh/mosh-client_path.patch b/pkgs/tools/networking/mosh/mosh-client_path.patch new file mode 100644 index 0000000000000..327fb7af92604 --- /dev/null +++ b/pkgs/tools/networking/mosh/mosh-client_path.patch @@ -0,0 +1,22 @@ +diff --git a/scripts/mosh.pl b/scripts/mosh.pl +index 56e96d7..2a2177e 100755 +--- a/scripts/mosh.pl ++++ b/scripts/mosh.pl +@@ -61,7 +61,7 @@ my $have_ipv6 = eval { + + $|=1; + +-my $client = 'mosh-client'; ++my $client = '@mosh-client@'; + my $server = 'mosh-server'; + + my $predict = undef; +@@ -91,7 +91,7 @@ my @cmdline = @ARGV; + my $usage = + qq{Usage: $0 [options] [--] [user@]host [command...] + --client=PATH mosh client on local machine +- (default: "mosh-client") ++ (default: "@mosh-client@") + --server=COMMAND mosh server on remote machine + (default: "mosh-server") + diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index c136328d031ae..6478a15aa1a42 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, which }: stdenv.mkDerivation rec { - name = "nbd-3.20"; + name = "nbd-3.21"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "1kfnyx52nna2mnw264njk1dl2zc8m78sz031yp65mbmpi99v7qg0"; + sha256 = "sha256-52iK852Rczu80tsIBixE/lA9AE5RUodAE5xEr/amvvk="; }; buildInputs = [ glib ] diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index a5271bf410f1a..787067881a2fe 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "4.3.1"; + version = "5.0.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "1h9infspwbij9ahb376vc4ijakrqb7xww573ccrqvchxphbcsf7l"; + sha256 = "13kgc84kyrypr0xy4xifrzqcy4qlvcxc7f0jy3n1xkjl3vhav7w3"; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix index a0af97b2ea9a8..1384f35a3f201 100644 --- a/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "5.0.0-2020-02-04"; + version = "6.0.0-2021-01-18"; # Also update the fetchurl link pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/openapi-generator-cli-5.0.0-20200204.091421-37.jar"; - sha256 = "0swv976fcr2z8g53avr0r706c31xacb2dlnl8b4c8mzmi49byy7k"; + url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/openapi-generator-cli-6.0.0-20210118.082537-4.jar"; + sha256 = "1ji3yw9dp4srlgqxvb21vrcp2bzj4himxsmp8l8zid9nxsc1m71x"; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix index 3ca47897618fb..0f7a37e8831e3 100644 --- a/pkgs/tools/networking/openconnect_pa/default.nix +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -5,14 +5,14 @@ assert (openssl != null) == (gnutls == null); stdenv.mkDerivation { version = "unstable-2018-10-08"; pname = "openconnect_pa"; - + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "dlenski"; repo = "openconnect"; rev = "e5fe063a087385c5b157ad7a9a3fa874181f6e3b"; - sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax"; + sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax"; }; preConfigure = '' @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ]; - + meta = with lib; { description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN"; homepage = "https://github.com/dlenski/openconnect/"; diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix index c64a8ba945c03..1822eda26278d 100644 --- a/pkgs/tools/networking/ssh-ident/default.nix +++ b/pkgs/tools/networking/ssh-ident/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, python3, makeWrapper, openssh }: +{ stdenvNoCC, lib, fetchFromGitHub, python3, openssh}: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "ssh-ident"; version = "2016-04-21"; src = fetchFromGitHub { @@ -10,19 +10,22 @@ stdenv.mkDerivation { sha256 = "1jf19lz1gwn7cyp57j8d4zs5bq13iw3kw31m8nvr8h6sib2pf815"; }; - buildInputs = [ python3 makeWrapper ]; + postPatch = '' + substituteInPlace ssh-ident \ + --replace 'ssh-agent >' '${openssh}/bin/ssh-agent >' + ''; + buildInputs = [ python3 ]; + installPhase = '' mkdir -p $out/bin install -m 755 ssh-ident $out/bin/ssh-ident - wrapProgram $out/bin/ssh-ident \ - --prefix PATH : ${lib.makeBinPath [ openssh ]} ''; - meta = { + meta = with lib; { homepage = "https://github.com/ccontavalli/ssh-ident"; description = "Start and use ssh-agent and load identities as necessary"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ telotortium ]; - platforms = with lib.platforms; unix; + license = licenses.bsd2; + maintainers = with maintainers; [ telotortium ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/networking/sshoogr/default.nix b/pkgs/tools/networking/sshoogr/default.nix index 9539c15f5ed90..f3c9c1a31fb89 100644 --- a/pkgs/tools/networking/sshoogr/default.nix +++ b/pkgs/tools/networking/sshoogr/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { ''; longDescription = '' The sshoogr (pronounced [ʃʊgə]) is a Groovy-based DSL library for working - with remote servers through SSH. The DSL allows: connecting, executing - remote commands, copying files and directories, creating tunnels in a + with remote servers through SSH. The DSL allows: connecting, executing + remote commands, copying files and directories, creating tunnels in a simple and concise way. ''; homepage = "https://github.com/aestasit/sshoogr"; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; }; -} +} diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix index f89b168b84cc0..2d069ea07f02c 100644 --- a/pkgs/tools/networking/uget-integrator/default.nix +++ b/pkgs/tools/networking/uget-integrator/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { substituteInPlace $f --replace "/usr" "$out" done - install -D -t $out/bin bin/uget-integrator - install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json - install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json - install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json - install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json + install -D -t $out/bin bin/uget-integrator + install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json wrapPythonPrograms ''; diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix index 23458f2a39642..2a07ada114d7c 100644 --- a/pkgs/tools/networking/wolfebin/default.nix +++ b/pkgs/tools/networking/wolfebin/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "5.4"; pname = "wolfebin"; - + src = fetchFromGitHub { owner = "thejoshwolfe"; repo = "wolfebin"; diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index d2a133052920d..7a900860110bc 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.13.8"; + version = "0.13.10"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "16v93k8d1aq0as4ab1i972bjw410k07gb3s6xdzb1r019gxg2i2h"; + sha256 = "sha256-WWU+aNMNOOstHiGRE5nj2biWCL3uwyqJKgt0xCAfS0s="; }; - cargoSha256 = "1jbp8jbpxnchzinjzv36crszdipxp1myknmrxn7r0ijfjdpigk9r"; + cargoSha256 = "sha256-G3UgcFW0WxvCYRvHCTuRpSCOT3XdvdZCN53HhpWQxS4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index b001550286517..eb6b2b88354d0 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.3.9"; + version = "0.4.2"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "173nj6fx2l15shy7s4dngnfqsa10m7qwhi2ia2rr421l7b24ixqq"; + sha256 = "sha256-74jv5GvBSErU5qjd4QmAK4JZhqFoqBf3cNxOGLIqt9U="; }; - cargoSha256 = "0bjw3fvc430b1jxla25clr75c94p2ms7d94j72d8mirxsiklgsp9"; + cargoSha256 = "sha256-SPHXkvtUL6hdYOE1fUIQLEqWzn68RVBiu6zJQJ/3BxQ="; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index b8b4de36eb424..8897a313e8db3 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2020-09-06"; + version = "2021-01-16"; src = fetchFromGitHub { owner = "nix-community"; repo = "home-manager"; - rev = "249650a07ee2d949fa599f3177a8c234adbd1bee"; - sha256 = "0x858b7i15kx74aqwgi2n5ls7zjhcky95z9vbxfdlawmaz371dma"; + rev = "8127799f79ee96129b295d78294f40a54078131f"; + sha256 = "0iji8nxa66s409pvjwi370ycsw4m74w6b3ywnjpfkl2filpapjns"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix index ceb919ecb8205..3cce599c052ad 100644 --- a/pkgs/tools/package-management/python2nix/default.nix +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication { name = "python2nix-20140927"; - + src = fetchFromGitHub { owner = "proger"; repo = "python2nix"; diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix index 41e4439eeb372..c8518ef0a9fbe 100644 --- a/pkgs/tools/security/2fa/default.nix +++ b/pkgs/tools/security/2fa/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - version = "1.1.0"; + version = "1.2.0"; pname = "2fa"; goPackagePath = "rsc.io/2fa"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "rsc"; repo = "2fa"; rev = "v${version}"; - sha256 = "0827vl2bxd6m2rbj00x7857cs7cic3mlg5nlhqzd0n73dm5vk2za"; + sha256 = "sha256-cB5iADZwvJQwwK1GockE2uicFlqFMEAY6xyeXF5lnUY="; }; meta = with lib; { diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index a6e238f9085b7..bef7fc8d6be4e 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.16.1"; + version = "2.17.1"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1c4fcf8jzgd6636wv903r5msc9z5l56l2i4k93kvb2zvg7qj014w"; + sha256 = "1kd21higniszk1na5ag7q4g0l7h6ddl91gpbjbwym28hsbjvxla7"; }; buildCommand = '' diff --git a/pkgs/tools/security/bypass403/default.nix b/pkgs/tools/security/bypass403/default.nix new file mode 100644 index 0000000000000..5bf40766883a9 --- /dev/null +++ b/pkgs/tools/security/bypass403/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "bypass403"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "drsigned"; + repo = pname; + rev = "v${version}"; + sha256 = "1x3a4lnxjxbv80kaydy57809n9r7vzci9ki4f98smf3w04s86rcl"; + }; + + vendorSha256 = "1bp6bf99rxlyg91pn1y228q18lawpykmvkl22cydmclms0q0n238"; + + meta = with lib; { + description = "Tool to bypass 403 Forbidden responses"; + homepage = "https://github.com/drsigned/bypass403"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 5753784542dad..f9f0dd96a11ba 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "chkrootkit-0.53"; + name = "chkrootkit-0.54"; src = fetchurl { url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${name}.tar.gz"; - sha256 = "1da5ry3p7jb6xs6xlfml1ly09q2rs5q6n5axif17d29k7gixlqkj"; + sha256 = "sha256-FUySaSH1PbYHKKfLyXyohli2lMFLfSiO/jg+CEmRVgc="; }; # TODO: a lazy work-around for linux build failure ... diff --git a/pkgs/tools/security/corsmisc/default.nix b/pkgs/tools/security/corsmisc/default.nix new file mode 100644 index 0000000000000..4c64677f3240c --- /dev/null +++ b/pkgs/tools/security/corsmisc/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "corsmisc"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "drsigned"; + repo = pname; + rev = "v${version}"; + sha256 = "18a70v093jl85vnih80i50wvac8hsg3f2gmcws9jyhj2brndq2qj"; + }; + + vendorSha256 = "1bp6bf99rxlyg91pn1y228q18lawpykmvkl22cydmclms0q0n238"; + + meta = with lib; { + description = "Tool to discover CORS misconfigurations vulnerabilities"; + homepage = "https://github.com/drsigned/corsmisc"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/enum4linux-ng/default.nix b/pkgs/tools/security/enum4linux-ng/default.nix new file mode 100644 index 0000000000000..33694ad79ae3f --- /dev/null +++ b/pkgs/tools/security/enum4linux-ng/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, impacket +, ldap3 +, pyyaml +, samba +}: + +buildPythonApplication rec { + pname = "enum4linux-ng"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "cddmp"; + repo = pname; + rev = "v${version}"; + sha256 = "0dhg8cwbdn0vlnchhscx31ay4mgj5p6rf73wzgs8nvqg0shsawmy"; + }; + + propagatedBuildInputs = [ + impacket + ldap3 + pyyaml + samba + ]; + + # It's only a script and not a Python module. Project has no tests + doCheck = false; + + meta = with lib; { + description = "Windows/Samba enumeration tool"; + longDescription = '' + enum4linux-ng.py is a rewrite of Mark Lowe's enum4linux.pl, a tool for + enumerating information from Windows and Samba systems. + ''; + homepage = "https://github.com/cddmp/enum4linux-ng"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/git-hound/default.nix b/pkgs/tools/security/git-hound/default.nix new file mode 100644 index 0000000000000..56fa2ce476364 --- /dev/null +++ b/pkgs/tools/security/git-hound/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "git-hound"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "tillson"; + repo = pname; + rev = "v${version}"; + sha256 = "1l2bif7qpc1yl93ih01g9jci7ba47rsnpq9js88rz216q93dzmsf"; + }; + + vendorSha256 = "055hpfjbqng513c9rscb8jhnlxj7p82sr8cbsvwnzk569n71qwma"; + + meta = with lib; { + description = "Reconnaissance tool for GitHub code search"; + longDescription = '' + GitHound pinpoints exposed API keys and other sensitive information + across all of GitHub using pattern matching, commit history searching, + and a unique result scoring system. + ''; + homepage = "https://github.com/tillson/git-hound"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix new file mode 100644 index 0000000000000..982774612759b --- /dev/null +++ b/pkgs/tools/security/gitleaks/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "gitleaks"; + version = "7.2.0"; + + src = fetchFromGitHub { + owner = "zricethezav"; + repo = pname; + rev = "v${version}"; + sha256 = "1pdbkjx8h6ijypsxyv34lykymaqf8wnfyjk3ldp49apbx01bl34y"; + }; + + vendorSha256 = "0kk8ci7vprqw4v7cigspshfd13k2wyy4pdkxf11pqc2fz8j07kh9"; + + meta = with lib; { + description = "Scan git repos (or files) for secrets"; + longDescription = '' + Gitleaks is a SAST tool for detecting hardcoded secrets like passwords, + API keys, and tokens in git repos. + ''; + homepage = "https://github.com/zricethezav/gitleaks"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/gospider/default.nix b/pkgs/tools/security/gospider/default.nix index ef3184a0422f2..f32ecdc94e65f 100644 --- a/pkgs/tools/security/gospider/default.nix +++ b/pkgs/tools/security/gospider/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gospider"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "jaeles-project"; repo = pname; rev = version; - sha256 = "03gl8y2047iwa6bhmayyds3li21wy3sw1x4hpp9zgqgi95039q86"; + sha256 = "sha256-yfW94sQzT1u6O0s1sqpeANlukC5y8fNvHNL2c77+dxU="; }; - vendorSha256 = "0dc4ddi26i38c5rvy9zbal27a7qvn17h64w1yhbig4iyb79b18ym"; + vendorSha256 = "sha256-1aOw0lk+khcX9IETA0+wGx91BFXrJ79zYWhEI2JrhDU="; # tests require internet access and API keys doCheck = false; diff --git a/pkgs/tools/security/hashcash/default.nix b/pkgs/tools/security/hashcash/default.nix index b13425b720551..f86684178fcb2 100644 --- a/pkgs/tools/security/hashcash/default.nix +++ b/pkgs/tools/security/hashcash/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "hashcash"; version = "1.22"; - + buildInputs = [ openssl ]; src = fetchurl { url = "http://www.hashcash.org/source/hashcash-${version}.tgz"; sha256 = "15kqaimwb2y8wvzpn73021bvay9mz1gqqfc40gk4hj6f84nz34h1"; }; - + makeFlags = [ "generic-openssl" "LIBCRYPTO=-lcrypto" @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "MAN_INSTALL_PATH=${placeholder "out"}/share/man/man1" "DOC_INSTALL_PATH=${placeholder "out"}/share/doc/hashcash-$(version)" ]; - + meta = with lib; { description = "Proof-of-work algorithm used as spam and denial-of-service counter measure"; homepage = "http://hashcash.org"; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index a2fe22dd2bdda..314abba853dfc 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -38,4 +38,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ berce ]; platforms = with platforms; unix; }; -} +} diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4df0d2235a058..83db469db6e75 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.12" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.26" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 8ef6d3b3148a6..8660d72e5d997 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 8ba313ed85b03ef54bec32086c2a8708a7e1df58 - ref: refs/tags/6.0.12 + revision: 0cdd01a0c4432348b45e1a0f5b5b9983b6ce6c48 + ref: refs/tags/6.0.26 specs: - metasploit-framework (6.0.12) + metasploit-framework (6.0.26) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -31,9 +31,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.22) + metasploit-payloads (= 2.0.27) metasploit_data_models - metasploit_payloads-mettle (= 1.0.2) + metasploit_payloads-mettle (= 1.0.5) mqtt msgpack nessus_rest @@ -50,6 +50,7 @@ GIT pcaprub pdf-reader pg + puma railties rb-readline recog @@ -86,6 +87,7 @@ GIT windows_error xdr xmlrpc + zeitwerk GEM remote: https://rubygems.org/ @@ -119,41 +121,41 @@ GEM public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) arel (9.0.0) - arel-helpers (2.11.0) + arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.0) - aws-partitions (1.385.0) - aws-sdk-core (3.109.1) + aws-partitions (1.417.0) + aws-sdk-core (3.111.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.202.0) + aws-sdk-ec2 (1.220.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.46.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.39.0) + aws-sdk-kms (1.41.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.1) + aws-sdk-s3 (1.87.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.16) - bcrypt_pbkdf (1.0.1) + bcrypt_pbkdf (1.1.0) bindata (2.4.8) bit-struct (0.16) - bson (4.11.0) + bson (4.11.1) builder (3.2.4) concurrent-ruby (1.0.5) cookiejar (0.3.3) crass (1.0.6) daemons (1.3.1) - dnsruby (1.61.4) + dnsruby (1.61.5) simpleidn (~> 0.1) ed25519 (1.2.4) em-http-request (1.1.7) @@ -164,13 +166,15 @@ GEM http_parser.rb (>= 0.6.0) em-socksify (0.3.2) eventmachine (>= 1.0.0.beta.4) - erubi (1.9.0) + erubi (1.10.0) eventmachine (1.2.7) - faker (2.14.0) + faker (2.15.1) i18n (>= 1.6, < 2) - faraday (1.1.0) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords + faraday-net_http (1.0.1) faye-websocket (0.11.0) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) @@ -179,24 +183,24 @@ GEM hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) http_parser.rb (0.6.0) - i18n (1.8.5) + i18n (1.8.7) concurrent-ruby (~> 1.0) - io-console (0.5.6) - irb (1.2.7) + io-console (0.5.7) + irb (1.3.2) reline (>= 0.1.5) jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix - json (2.3.1) - loofah (2.7.0) + json (2.5.1) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.4) - metasploit-concern (3.0.0) + metasploit-concern (3.0.1) activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-credential (4.0.2) + metasploit-credential (4.0.3) metasploit-concern metasploit-model metasploit_data_models (>= 3.0.0) @@ -206,12 +210,12 @@ GEM rex-socket rubyntlm rubyzip - metasploit-model (3.1.2) + metasploit-model (3.1.3) activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.22) - metasploit_data_models (4.1.0) + metasploit-payloads (2.0.27) + metasploit_data_models (4.1.1) activerecord (~> 5.2.2) activesupport (~> 5.2.2) arel-helpers @@ -220,23 +224,25 @@ GEM pg railties (~> 5.2.2) recog (~> 2.0) - metasploit_payloads-mettle (1.0.2) + metasploit_payloads-mettle (1.0.5) method_source (1.0.0) - mini_portile2 (2.4.0) - minitest (5.14.2) + mini_portile2 (2.5.0) + minitest (5.14.3) mqtt (0.5.0) msgpack (1.3.3) multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) - net-ldap (0.16.3) + net-ldap (0.17.0) net-ssh (6.1.0) network_interface (0.0.2) nexpose (7.2.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - octokit (4.19.0) + nio4r (2.5.4) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) openssl-ccm (1.2.2) @@ -254,6 +260,9 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) + puma (5.1.1) + nio4r (~> 2.0) + racc (1.5.2) rack (2.2.3) rack-protection (2.1.0) rack @@ -270,65 +279,65 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.1) + rake (13.0.3) rb-readline (0.5.5) - recog (2.3.15) + recog (2.3.18) nokogiri - redcarpet (3.5.0) - reline (0.1.6) + redcarpet (3.5.1) + reline (0.2.2) io-console (~> 0.5) - rex-arch (0.1.13) + rex-arch (0.1.14) rex-text - rex-bin_tools (0.1.6) + rex-bin_tools (0.1.7) metasm rex-arch rex-core rex-struct2 rex-text - rex-core (0.1.13) - rex-encoder (0.1.4) + rex-core (0.1.14) + rex-encoder (0.1.5) metasm rex-arch rex-text - rex-exploitation (0.1.24) + rex-exploitation (0.1.26) jsobfu metasm rex-arch rex-encoder rex-text - rex-java (0.1.5) - rex-mime (0.1.5) + rex-java (0.1.6) + rex-mime (0.1.6) rex-text - rex-nop (0.1.1) + rex-nop (0.1.2) rex-arch - rex-ole (0.1.6) + rex-ole (0.1.7) rex-text - rex-powershell (0.1.87) + rex-powershell (0.1.89) rex-random_identifier rex-text ruby-rc4 - rex-random_identifier (0.1.4) + rex-random_identifier (0.1.5) rex-text - rex-registry (0.1.3) - rex-rop_builder (0.1.3) + rex-registry (0.1.4) + rex-rop_builder (0.1.4) metasm rex-core rex-text - rex-socket (0.1.24) + rex-socket (0.1.25) rex-core rex-sslscan (0.1.5) rex-core rex-socket rex-text - rex-struct2 (0.1.2) - rex-text (0.2.28) - rex-zip (0.1.3) + rex-struct2 (0.1.3) + rex-text (0.2.31) + rex-zip (0.1.4) rex-text rkelly-remix (0.0.7) - ruby-macho (2.3.0) + ruby-macho (2.5.0) ruby-rc4 (0.1.5) - ruby2_keywords (0.0.2) - ruby_smb (2.0.6) + ruby2_keywords (0.0.4) + ruby_smb (2.0.7) bindata openssl-ccm openssl-cmac @@ -339,7 +348,7 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - simpleidn (0.1.1) + simpleidn (0.2.1) unf (~> 0.1.4) sinatra (2.1.0) mustermann (~> 1.0) @@ -348,17 +357,17 @@ GEM tilt (~> 2.0) sqlite3 (1.4.2) sshkey (2.0.0) - thin (1.7.2) + thin (1.8.0) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (1.0.1) thread_safe (0.3.6) tilt (2.0.10) - ttfunk (1.6.2.1) - tzinfo (1.2.7) + ttfunk (1.7.0) + tzinfo (1.2.9) thread_safe (~> 0.1) - tzinfo-data (1.2020.4) + tzinfo-data (1.2020.6) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext @@ -372,7 +381,8 @@ GEM xdr (3.0.2) activemodel (>= 4.2, < 7.0) activesupport (>= 4.2, < 7.0) - xmlrpc (0.3.0) + xmlrpc (0.3.1) + zeitwerk (2.4.2) PLATFORMS ruby diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 1260584a3a7aa..0d9475ddfa0c0 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.12"; + version = "6.0.26"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs"; + sha256 = "sha256-ayW0MsV3TQnta+bP9kNL6m3hFPrn6lbsiAbXw7WOmBA="; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 4879eb9228463..18ad75c0d5ec4 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -84,10 +84,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16irs6rai9pasv36yy31glijs3p2pvgry5g1lh03vnzg8xpb1msp"; + sha256 = "12wgkhajfsm3fgk43zf7xyxrx7q2kc4ggq459p1az6p0b9jscarx"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; Ascii85 = { groups = ["default"]; @@ -114,30 +114,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04i4bry59c3g1anbjpsz9g1pz7yy23kh4vvhg7z611amlcr48zvb"; + sha256 = "1difs2ynpizrq0jdww075camiagkkxncyfb1qi4s19hfsn8xp3j0"; type = "gem"; }; - version = "1.385.0"; + version = "1.417.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmppcxq7jm8lffqibkhq257hfwfbv82zm2y1fbhwm3icgxzwlfx"; + sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4"; type = "gem"; }; - version = "3.109.1"; + version = "3.111.2"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fsf9qhlxczz8cz755xlcdpfqn384d4kr3ybx2p54n377wamdq08"; + sha256 = "1x3hw3ld27gxj0mmbaj4dw6aw90kr06mkjfx5wxxb807krp5giza"; type = "gem"; }; - version = "1.202.0"; + version = "1.220.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -154,20 +154,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ly1m631qm2ciif7sysbzrgczjvz95ga3g6w6vrzvfdv31jjnl9a"; + sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm"; type = "gem"; }; - version = "1.39.0"; + version = "1.41.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "021yqghdb1i980vn249hv44jajr0v3hq4ik4r6fqh9kwp04fsbqv"; + sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; type = "gem"; }; - version = "1.83.1"; + version = "1.87.0"; }; aws-sigv4 = { groups = ["default"]; @@ -194,10 +194,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35"; + sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; bindata = { groups = ["default"]; @@ -224,10 +224,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bm64q413wrrm3pda6ha2kn1yipyl0qp5240fwsdw1hkqhbjdnjm"; + sha256 = "12v95l3v7n7lh3mk8k1jdrkpn2vjnkb8k636hcygaczzv4jdsdfp"; type = "gem"; }; - version = "4.11.0"; + version = "4.11.1"; }; builder = { groups = ["default"]; @@ -284,10 +284,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i4mq4zm8bqd0ik908gnn8nm3kph268af7q173wlq4krg3nw562x"; + sha256 = "0q7k7wn8flcdr0kzgknq40cjddd0zn3g3n4gwwwdz0kq30pinzxx"; type = "gem"; }; - version = "1.61.4"; + version = "1.61.5"; }; ed25519 = { groups = ["default"]; @@ -324,10 +324,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; eventmachine = { groups = ["default"]; @@ -344,20 +344,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06sh8492k03p9lsfzv5zifzn51ilb4734vrvwl30vzmzg1apzml6"; + sha256 = "1l0dvswigzxaz9558wmfix3v8cmwwkgdvrx1fmpd3qnr5hky1qrk"; type = "gem"; }; - version = "2.14.0"; + version = "2.15.1"; }; faraday = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35"; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; type = "gem"; }; - version = "1.1.0"; + version = "1.3.0"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; }; faye-websocket = { groups = ["default"]; @@ -414,30 +424,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.7"; }; io-console = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vbn4nvnr1pcmjsn0gghc3bz2md89njxq4801zi5dv5niypdxlsp"; + sha256 = "1gp1xx2g1x81wsh929x7rzsm0c8qgkhr2mkjn79fbdwyfnk4s04l"; type = "gem"; }; - version = "0.5.6"; + version = "0.5.7"; }; irb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10d9xr1hdpkqhljxhvdm44c2qbxdjfqm5x00d4v6aw0fym1w7r2g"; + sha256 = "166xravh6r82w46d8hcjrg55gnyjdf0501g16lb48i2h06k363l2"; type = "gem"; }; - version = "1.2.7"; + version = "1.3.2"; }; jmespath = { groups = ["default"]; @@ -464,20 +474,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; loofah = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; + sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck"; type = "gem"; }; - version = "2.7.0"; + version = "2.9.0"; }; metasm = { groups = ["default"]; @@ -494,72 +504,72 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10a9dr0pi25vsnk7x1bavx2ja62lqswdkym0hvhjsds6awvx1cf2"; + sha256 = "19cz0g463wl35gpdy1630n88a9m7fhhlcylspvvwc0m01sipc33g"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; metasploit-credential = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03339i3v6lgz0cymn2i7y0sylpw2nihsc8h75c4yn3bq9p6wk6sx"; + sha256 = "1f6cjvk68yypciycp8vdvhc5hrwmc8qi4y06s1cd77zj4m2skkmn"; type = "gem"; }; - version = "4.0.2"; + version = "4.0.3"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "8ba313ed85b03ef54bec32086c2a8708a7e1df58"; - sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs"; + rev = "0cdd01a0c4432348b45e1a0f5b5b9983b6ce6c48"; + sha256 = "044qissw7mq6i3n5dsp7z8af2vga9d1zdkz6dgnhjkbpqlrb89bb"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.12"; + version = "6.0.26"; }; metasploit-model = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0szwqs6djh882alpnmnnkx46s548jg3vb0ya61hibw3kqcw3i1ig"; + sha256 = "0gmh23c3hc4my244m5lpd4kiysrsprag4rn6kvnnphxiflxvi4f7"; type = "gem"; }; - version = "3.1.2"; + version = "3.1.3"; }; metasploit-payloads = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yiwwyc12f9jln58l4j26yjbixij1v5h3spp4ci3ik4dxyk2r4zb"; + sha256 = "1c3jn9gjy1bknyd7wrwwfbcjwlmijd6nnsjzyqc7yszjjy0yqca2"; type = "gem"; }; - version = "2.0.22"; + version = "2.0.27"; }; metasploit_data_models = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7vb6pg446jadjsgrc29kxnc9b6ga29hw8pg52dnrzhp7rwhiyl"; + sha256 = "1czqg49b7n9n2iqp6r4f1cxh8kd39gbjvydq09hzmzdmkwxh3x1f"; type = "gem"; }; - version = "4.1.0"; + version = "4.1.1"; }; metasploit_payloads-mettle = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "147s4jd2hckls76binsskb6rvnh1crd2agmf1lk7fsj1n55dhkvk"; + sha256 = "0z6gnidpcpdm80vvl0yw1h10kchkaw9whcsv2kwy7ih6247l7nbq"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.5"; }; method_source = { groups = ["default"]; @@ -576,20 +586,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.3"; }; mqtt = { groups = ["default"]; @@ -646,10 +656,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; + sha256 = "1j19yxrz7h3hj7kiiln13c7bz7hvpdqr31bwi88dj64zifr7896n"; type = "gem"; }; - version = "0.16.3"; + version = "0.17.0"; }; net-ssh = { groups = ["default"]; @@ -681,25 +691,35 @@ }; version = "7.2.1"; }; + nio4r = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk"; + type = "gem"; + }; + version = "2.5.4"; + }; nokogiri = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; octokit = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24"; + sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; type = "gem"; }; - version = "4.19.0"; + version = "4.20.0"; }; openssl-ccm = { groups = ["default"]; @@ -791,6 +811,26 @@ }; version = "4.0.6"; }; + puma = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b"; + type = "gem"; + }; + version = "5.1.1"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rack = { groups = ["default"]; platforms = []; @@ -856,10 +896,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.3"; }; rb-readline = { groups = ["default"]; @@ -876,170 +916,170 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vxnm9ld3rn8xxccq9jyhzz6558bqfxdb3sd4na20frg9f5pflb7"; + sha256 = "0inz904fbsjscjs71lxxj4070lm1klm27m9prmrhqybc0hr95l69"; type = "gem"; }; - version = "2.3.15"; + version = "2.3.18"; }; redcarpet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; + sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; type = "gem"; }; - version = "3.5.0"; + version = "3.5.1"; }; reline = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sspfd5x8aq80pmkdj0dzd20iclhrdjan1ibkrivgk7j8af23hbk"; + sha256 = "0zinl7l63gzy6y477j8w1azfm5655h2026hxl49w4c73qcfdjj3x"; type = "gem"; }; - version = "0.1.6"; + version = "0.2.2"; }; rex-arch = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cvdy2ysiphdig258lkicbxqq2y47bkl69kgj4kkj8w338rb5kwa"; + sha256 = "1gi9641869pg30ij7ba3r2z89flvdqsma4spbpww6c8ph62iy4bp"; type = "gem"; }; - version = "0.1.13"; + version = "0.1.14"; }; rex-bin_tools = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19q4cj7cis29k3zx9j2gp4h3ib0zig2fa4rs56c1gjr32f192zzk"; + sha256 = "16w219ashxrgrgb5via9k45h7whrib77rmwy0f7akqf409pzjdp7"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; rex-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b9pf7f8m2zjck65dpp8h8v4n0a05kfas6cn9adv0w8d9z58aqvv"; + sha256 = "0mmsckkrds6jvg1b4sdq4cv9s1q0idjiy1k8kjfvgylz96ap0vlw"; type = "gem"; }; - version = "0.1.13"; + version = "0.1.14"; }; rex-encoder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zm5jdxgyyp8pkfqwin34izpxdrmglx6vmk20ifnvcsm55c9m70z"; + sha256 = "0lnrlii8d3r35927wp42bpdzh37dx3jqgdxk6lk5d6xvz6h14kp7"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rex-exploitation = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inrf2vahmpxhjf84i8ak2b7gcirsrjrmb1rnvvqqr9kl0xw5xm3"; + sha256 = "0z4dn579mxl22qdxcnbmxp0diia6kr7c20giv0bn4r0viavz49gc"; type = "gem"; }; - version = "0.1.24"; + version = "0.1.26"; }; rex-java = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j58k02p5g9snkpak64sb4aymkrvrh9xpqh8wsnya4w7b86w2y6i"; + sha256 = "0g8xdj7ij4y51wgh6l29al6i107bqn6pwql6za7ahms75m8s9dys"; type = "gem"; }; - version = "0.1.5"; + version = "0.1.6"; }; rex-mime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15a14kz429h7pn81ysa6av3qijxjmxagjff6dyss5v394fxzxf4a"; + sha256 = "0wzw1qcdgbn3iyskppy5038mcdrzplyai45pilm5qjj4fwvjdl6m"; type = "gem"; }; - version = "0.1.5"; + version = "0.1.6"; }; rex-nop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aigf9qsqsmiraa6zvfy1a7cyvf7zc3iyhzxi6fjv5sb8f64d6ny"; + sha256 = "0yjlmgmaaa65lkd6jrm71g8yfn8xy91jl07nd1v90xp9jrzrrl92"; type = "gem"; }; - version = "0.1.1"; + version = "0.1.2"; }; rex-ole = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnzbqfnvbs0vc0z0ryszk3fxhgxrjd6gzwqa937rhlphwp5jpww"; + sha256 = "0rlsy1a4lig7iqvb4zn60fpf125v8k4bjrjzakks74prjb2qmqnp"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; rex-powershell = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11wi8dpb2s8bvkqhbf80g16nyj2hscs3vz31ffzl1g0g6imcs0dl"; + sha256 = "1wza4g3kkscc17kaw44hnq8qs2nmvppb9awaf27lp4v1c1kdxixs"; type = "gem"; }; - version = "0.1.87"; + version = "0.1.89"; }; rex-random_identifier = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fg94sczff5c2rlvqqgw2dndlqyzjil5rjk3p9f46ss2hc8zxlbk"; + sha256 = "0pqd8pfcxqd44ql8dawk59k9s5jnhx7inc8wnpjhkbx0y0sldq8q"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rex-registry = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wv812ghnz143vx10ixmv32ypj1xrzr4rh4kgam8d8wwjwxsgw1q"; + sha256 = "09b6jhcih4srrh0j52v49vbffqz8ngki6qpmq9b2wdabqnw63d1v"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; rex-rop_builder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjd3d6wnbq4ym0d0m268md8fb16f2hbwrahvxnl14q63fj9i3wy"; + sha256 = "0ssynxq3kc86v3xnc6jx8pg5zh13q61wl2klqbi9hzn2n8lhdgvj"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; rex-socket = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y6p1sw0wiw4x4dk89lwhf7vzsb0cjgpbr8hf7m119lg2kzm5g8y"; + sha256 = "1601b7vhp56sif21lk7mqcn3bbkhdrp6zz0vag8yzma3ji707pqg"; type = "gem"; }; - version = "0.1.24"; + version = "0.1.25"; }; rex-sslscan = { groups = ["default"]; @@ -1056,30 +1096,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nbdn53264a20cr2m2nq2v4mg0n33dvrd1jj1sixl37qjzw2k452"; + sha256 = "1hp8yv55j995dl587hismwa7ydyprs03c75gia6rwp7v5bhshy4n"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; rex-text = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wx8pncrk7yb2zxxqaycm4ikvb577zj7rma8jdfi74a0c5119c44"; + sha256 = "078bdybz7cw3zd0mr59qgr1x6pifnn352636s74i1ncqzrzni46b"; type = "gem"; }; - version = "0.2.28"; + version = "0.2.31"; }; rex-zip = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mbfryyhcw47i7jb8cs8vilbyqgyiyjkfl1ngl6wdbf7d87dwdw7"; + sha256 = "0azm4g4dm9k6vrav769vn0gffrv7pgxknlj4dr9yav632920cvqj"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; rkelly-remix = { groups = ["default"]; @@ -1096,10 +1136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12khgv5hx90a4dxqca2hzbksalx9czb51bsz0bhq0czsql9pwby8"; + sha256 = "05nfdv5isk3g13qhzm6axg70bghg1z5nbsl04dwqqhaifjys0dhf"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.0"; }; ruby-rc4 = { groups = ["default"]; @@ -1116,20 +1156,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; type = "gem"; }; - version = "0.0.2"; + version = "0.0.4"; }; ruby_smb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fsdnvisswchk27knii6ijq8sjsc7qm9jiffdsf71q195ga2qi66"; + sha256 = "0px84i3d9kqb40ff7nk3k7hb3w3kk80w5zsgi61svgddp1dbzh1n"; type = "gem"; }; - version = "2.0.6"; + version = "2.0.7"; }; rubyntlm = { groups = ["default"]; @@ -1166,10 +1206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b9v0xs4ksd68zckamv6rbrrqllpa9am0p29bycq9fxvlkqd7w2w"; + sha256 = "06f7w6ph3bzzqk212yylfp4jfx275shgp9zg3xszbpv1ny2skp9m"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.1"; }; sinatra = { groups = ["default"]; @@ -1206,10 +1246,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; + sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5"; type = "gem"; }; - version = "1.7.2"; + version = "1.8.0"; }; thor = { groups = ["default"]; @@ -1246,30 +1286,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w0bjn6k38xv46mr02p3038gwk5jj5hl398bv5kr625msxkdhqzn"; + sha256 = "15iaxz9iak5643bq2bc0jkbjv8w2zn649lxgvh5wg48q9d4blw13"; type = "gem"; }; - version = "1.6.2.1"; + version = "1.7.0"; }; tzinfo = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; tzinfo-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02anabncgfjwsqn07ra9jdqvmi0a4yngzp6dfiz2yxb1m9qpdm4a"; + sha256 = "131dgg2sz3j15vp71xaijlb72nlii9fn8v5dc4vr6q7hrdq4kjf4"; type = "gem"; }; - version = "1.2020.4"; + version = "1.2020.6"; }; unf = { groups = ["default"]; @@ -1346,9 +1386,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s744iwblw262gj357pky3d9fcx9hisvla7rnw29ysn5zsb6i683"; + sha256 = "0yihlrbipgiivgpkbx06qx8wgbic0jm26by6jymdwxb01zsd0yj1"; + type = "gem"; + }; + version = "0.3.1"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "0.3.0"; + version = "2.4.2"; }; } \ No newline at end of file diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index c3aebc782d8a5..bc7731a0a7aa8 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -3,21 +3,16 @@ stdenv.mkDerivation rec { pname = "nitrokey-app"; - version = "1.3.2"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Nitrokey"; repo = "nitrokey-app"; rev = "v${version}"; - sha256 = "193kzlz3qn9il56h78faiqkgv749hdils1nn1iw6g3wphgx5fjs2"; + sha256 = "1k0w921hfrya4q2r7bqn7kgmwvwb7c15k9ymlbnksmfc9yyjyfcv"; fetchSubmodules = true; }; - postPatch = '' - substituteInPlace libnitrokey/CMakeLists.txt \ - --replace '/data/41-nitrokey.rules' '/libnitrokey/data/41-nitrokey.rules' - ''; - buildInputs = [ bash-completion hidapi diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix index a8143ae6925ca..11dcd63d77616 100644 --- a/pkgs/tools/security/nitrokey-app/udev-rules.nix +++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix @@ -1,6 +1,5 @@ -{ lib, stdenv, nitrokey-app -, group ? "nitrokey" -}: +{ lib, stdenv, nitrokey-app }: + stdenv.mkDerivation { name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}"; @@ -9,10 +8,6 @@ stdenv.mkDerivation { dontBuild = true; - patchPhase = '' - substituteInPlace libnitrokey/data/41-nitrokey.rules --replace plugdev "${group}" - ''; - installPhase = '' mkdir -p $out/etc/udev/rules.d cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d diff --git a/pkgs/tools/security/pwdsafety/default.nix b/pkgs/tools/security/pwdsafety/default.nix new file mode 100644 index 0000000000000..2a6ed328e49e1 --- /dev/null +++ b/pkgs/tools/security/pwdsafety/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "pwdsafety"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "edoardottt"; + repo = pname; + rev = "v${version}"; + sha256 = "1qnkabgc2924qg9x1ij51jq7lnxzcj1ygdp3x4mzi9gl532i191w"; + }; + + vendorSha256 = "0avm4zwwqv476yrraaf5xkc1lac0mwnmzav5wckifws6r4x3xrsb"; + + meta = with lib; { + description = "Command line tool checking password safety"; + homepage = "https://github.com/edoardottt/pwdsafety"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/sigurlx/default.nix b/pkgs/tools/security/sigurlx/default.nix new file mode 100644 index 0000000000000..b6908c2742282 --- /dev/null +++ b/pkgs/tools/security/sigurlx/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "sigurlx"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "drsigned"; + repo = pname; + rev = "v${version}"; + sha256 = "1q5vy05387qx7h4xcccvn2z2ks1kiff3mfbd2w3w0l0a4qgz74xs"; + }; + + vendorSha256 = "1bp6bf99rxlyg91pn1y228q18lawpykmvkl22cydmclms0q0n238"; + + meta = with lib; { + description = "Tool to map the attack surface of web applications"; + homepage = "https://github.com/drsigned/sigurlx"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/sshchecker/default.nix b/pkgs/tools/security/sshchecker/default.nix new file mode 100644 index 0000000000000..5dfc37dcf6cfc --- /dev/null +++ b/pkgs/tools/security/sshchecker/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "sshchecker"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "lazytools"; + repo = pname; + rev = "v${version}"; + sha256 = "139b850h1w0392k8jcgj22jscsl2l60b5kk0n8378b6g57ikmis0"; + }; + + vendorSha256 = "19hdaf7d6lvwrl5rc1srrjsjx57g25cy4lvw0vvs6j52impdk6ak"; + + meta = with lib; { + description = "Dedicated SSH brute-forcing tool"; + longDescription = '' + sshchecker is a fast dedicated SSH brute-forcing tool to check + SSH login on the giving IP list. + ''; + homepage = "https://github.com/lazytools/sshchecker"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index 4153ddafbf480..7a03649859e41 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -1,8 +1,11 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib +, fetchFromGitHub +, python3 +}: python3.pkgs.buildPythonApplication rec { pname = "theHarvester"; - version = "3.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "laramies"; @@ -11,9 +14,27 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0lxzxfa9wbzim50d2jmd27i57szd0grm1dfayhnym86jn01qpvn3"; }; - propagatedBuildInputs = with python3.pkgs; [ - aiodns beautifulsoup4 dns grequests netaddr - plotly pyyaml requests retrying shodan texttable + propagatedBuildInputs = with python3.pkgs; [ + aiodns + aiohttp + aiomultiprocess + aiosqlite + beautifulsoup4 + censys + certifi + dns + gevent + grequests + lxml + netaddr + plotly + pyppeteer + pyyaml + requests + retrying + shodan + texttable + uvloop ]; checkInputs = [ python3.pkgs.pytest ]; @@ -31,6 +52,6 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/laramies/theHarvester"; maintainers = with maintainers; [ c0bw3b treemo ]; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index abcc159398846..b59222200c128 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.50"; + version = "1.0.59"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "10j2g19sh2hl5lzbcllr862hkzr0mc1z8n24afzaycn1sphri8fc"; + sha256 = "sha256-RlrUUIbZRNTvxU8LVW0/ZcARlKDVvSMlkN0+6BgAink="; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 02a3c7991d20f..5f3cc2f6fcf26 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "htop"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9"; + sha256 = "sha256-9zecDd3oZ24RyOLnKdJmR29Chx6S24Kvuf/F7RYzl4I="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 8c87f64d7454f..4d1417b4b831f 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.43"; + version = "3.5.45"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "19cx3854rk7b2056z8pvxnf4simsg5js7czsy2bys7jl6vh2x02b"; + sha256 = "sha256-rnlloa0DicWT1RlP2szDvBINvT5/RZ17GOarUzvX1AI="; }; buildInputs = [ jdk ]; diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index 502579bb931c9..cb48a48ff49c7 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "0j6w4rg2gybcy1cv812qixravy0z0xpp33snrng11q802zq3mkmq"; + sha256 = "sha256-2cP3kZnjlMmN3nWRPh1M+hk+dyssGNpJjlluDsm702g="; }; - cargoSha256 = "0x5s3yi5bv3h1k54lrgcvkpdkmfphvwhnrmk5lmk6xd9pxfh218p"; + cargoSha256 = "sha256-JFDtmi10iCK66/2ovg8tGAgGDW8Y4b5IYkSbDqu0PmQ="; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 29536a595463d..3460020618fda 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "monit-5.27.1"; + name = "monit-5.27.2"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "0lgdhif6x11fcpli0qn138rpdvrfnwmkzsy4lc9pas45c78hhx7m"; + sha256 = "sha256-2ICceNXcHtenujKlpVxRFIVRMsxNpIBfjTqvjPRuqkw="; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix index 2b9923eb571bd..33fbd15c5e63d 100644 --- a/pkgs/tools/system/stress/default.nix +++ b/pkgs/tools/system/stress/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "stress-1.0.4"; - + src = fetchurl { url = "https://people.seas.harvard.edu/~apw/stress/${name}.tar.gz"; sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5"; diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/tools/text/angle-grinder/default.nix index e04530b8110b9..82ca3ff0f603c 100644 --- a/pkgs/tools/text/angle-grinder/default.nix +++ b/pkgs/tools/text/angle-grinder/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "angle-grinder"; - version = "0.15.0"; + version = "0.16"; src = fetchFromGitHub { owner = "rcoh"; repo = pname; rev = "v${version}"; - sha256 = "1m5yj9412kjlnqi1nwh44i627ip0kqcbhvwgh87gl5vgd2a0m091"; + sha256 = "sha256-cGYhGcNalmc/Gr7mY1Fycs8cZYaIy622DFIL64LT+gE="; }; - cargoSha256 = "0y4c1gja0i3h2whjpm74yf3z1y85pkwmpmrl2fjsyy0mn493hzv8"; + cargoSha256 = "sha256-NkghuZHNT3Rq2wqiyKzjP+u9ZpeHU5H6oBLS0oQ7LcU="; meta = with lib; { description = "Slice and dice logs on the command line"; diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix index de16854927b4f..9c5796c0b1d84 100644 --- a/pkgs/tools/text/cconv/default.nix +++ b/pkgs/tools/text/cconv/default.nix @@ -3,14 +3,14 @@ let version = "0.6.3"; in stdenv.mkDerivation { pname = "cconv"; inherit version; - + src = fetchurl { url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz"; sha256 = "82f46a94829f5a8157d6f686e302ff5710108931973e133d6e19593061b81d84"; }; nativeBuildInputs = [ autoreconfHook ]; - + meta = with lib; { description = "A iconv based simplified-traditional chinese conversion tool"; homepage = "https://github.com/xiaoyjy/cconv"; diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index b558386536e40..c8ff1e973a506 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -1,14 +1,14 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "diffstat-1.63"; + name = "diffstat-1.64"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/diffstat/${name}.tgz" "https://invisible-mirror.net/archives/diffstat/${name}.tgz" ]; - sha256 = "0vyw200s5dv1257pmrh6c6fdkmw3slyz5szpqfx916xr04sdbpby"; + sha256 = "sha256-uK7jjZ0uHQWSbmtVgQqdLC3UB/JNaiZzh1Y6RDbj9/w="; }; meta = with lib; { diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 6c23acb86b4b9..7015bd4453cbd 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; - + }; } diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index d3ecc519a5fc9..b5cfdcbfc0c9c 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, python3, sqlite, libedit, zlib }: +{ lib, stdenv, fetchurl, pkg-config, python3, sqlite, libedit, zlib, runCommand, dieHook }: -stdenv.mkDerivation rec { - version = "5.8.0"; +let + +link-grammar = stdenv.mkDerivation rec { + version = "5.8.1"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "1v8ngx77nachxln68xpvyw2lh7z59pzsi99h8j0mnrm0gjsacrdd"; + sha256 = "sha256-EcT/VR+lFpJX2sxXUIDGOwdceQ7awpmEqUZBoJk7UFs="; }; nativeBuildInputs = [ pkg-config python3 ]; @@ -18,11 +20,30 @@ stdenv.mkDerivation rec { "--disable-java-bindings" ]; + doCheck = true; + + passthru.tests = { + quick = runCommand "link-grammar-quick-test" { + buildInputs = [ + link-grammar + dieHook + ]; + } '' + echo "Furiously sleep ideas green colorless." | link-parser en | grep "No complete linkages found." || die "Grammaticaly invalid sentence was parsed." + echo "Colorless green ideas sleep furiously." | link-parser en | grep "Found .* linkages." || die "Grammaticaly valid sentence was not parsed." + touch $out + ''; + }; + meta = with lib; { description = "A Grammar Checking library"; homepage = "https://www.abisource.com/projects/link-grammar/"; - license = licenses.lgpl21; + changelog = "https://github.com/opencog/link-grammar/blob/link-grammar-${version}/ChangeLog"; + license = licenses.lgpl21Only; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; -} +}; + +in + link-grammar diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index 632f8c41463db..4b950fd0f220a 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp"; }; - + buildInputs = [ ffmpeg libui ]; postBuild = '' diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 30cf09d2942af..bfe11127a92f7 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "govc"; - version = "0.23.1"; + version = "0.24.0"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "05f6i7v8v9g3w3cmz8c952djl652mj6qcwjx9iyl23h6knd1d9b1"; + sha256 = "sha256-Urfrkeqbl0+GB2Vr2IfekiilRvGcG0vGO5MGeZcP4C8="; }; meta = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 22dd825b1fe84..7d3332c3a7c7a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -258,6 +258,8 @@ mapAliases ({ inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; + i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 + jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities"; jbuilder = dune; # added 2018-09-09 jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; @@ -471,6 +473,8 @@ mapAliases ({ pidginsipe = pidgin-sipe; # added 2018-01-08 pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 piwik = matomo; # added 2018-01-16 + pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18 + pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 pltScheme = racket; # just to be sure plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 pmtools = acpica-tools; # added 2018-11-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebf981208e058..604cb5312e01a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -242,6 +242,8 @@ in enum4linux = callPackage ../tools/security/enum4linux {}; + enum4linux-ng = python3Packages.callPackage ../tools/security/enum4linux-ng { }; + onesixtyone = callPackage ../tools/security/onesixtyone {}; creddump = callPackage ../tools/security/creddump {}; @@ -398,7 +400,7 @@ in # break dependency cycles fetchurl = stdenv.fetchurlBoot; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; - pkgconfig = buildPackages.pkgconfig.override (old: { + pkg-config = buildPackages.pkg-config.override (old: { pkg-config = old.pkg-config.override { fetchurl = stdenv.fetchurlBoot; }; @@ -431,12 +433,12 @@ in else old.gssSupport or true; # `? true` is the default libkrb5 = buildPackages.libkrb5.override { fetchurl = stdenv.fetchurlBoot; - inherit pkgconfig perl openssl; + inherit pkg-config perl openssl; keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; }; }; nghttp2 = buildPackages.nghttp2.override { fetchurl = stdenv.fetchurlBoot; - inherit zlib pkgconfig openssl; + inherit zlib pkg-config openssl; c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; }; @@ -580,7 +582,7 @@ in iconConvTools = callPackage ../build-support/icon-conv-tools {}; validatePkgConfig = makeSetupHook - { name = "validate-pkg-config"; deps = [ findutils pkgconfig ]; } + { name = "validate-pkg-config"; deps = [ findutils pkg-config ]; } ../build-support/setup-hooks/validate-pkg-config.sh; #package writers @@ -1144,6 +1146,8 @@ in coolreader = libsForQt5.callPackage ../applications/misc/coolreader {}; + corsmisc = callPackage ../tools/security/corsmisc { }; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; cpuid = callPackage ../os-specific/linux/cpuid { }; @@ -1395,6 +1399,8 @@ in ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { }; + sshchecker = callPackage ../tools/security/sshchecker { }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg {}; @@ -1710,6 +1716,8 @@ in textual-window-manager = tmux; }; + bypass403 = callPackage ../tools/security/bypass403 { }; + bsh = fetchurl { url = "http://www.beanshell.org/bsh-2.0b5.jar"; sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; @@ -2199,6 +2207,8 @@ in fast-cli = nodePackages.fast-cli; + fast-cpp-csv-parser = callPackage ../development/libraries/fast-cpp-csv-parser { }; + faudio = callPackage ../development/libraries/faudio { }; fd = callPackage ../tools/misc/fd { }; @@ -2424,6 +2434,8 @@ in klipper = callPackage ../servers/klipper { }; + klog = qt5.callPackage ../applications/radio/klog { }; + lcdproc = callPackage ../servers/monitoring/lcdproc { }; languagetool = callPackage ../tools/text/languagetool { }; @@ -3205,6 +3217,7 @@ in interception-tools = callPackage ../tools/inputmethods/interception-tools { }; interception-tools-plugins = { caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; + dual-function-keys = callPackage ../tools/inputmethods/interception-tools/dual-function-keys.nix { }; }; age = callPackage ../tools/security/age { }; @@ -3213,6 +3226,8 @@ in biosdevname = callPackage ../tools/networking/biosdevname { }; + bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { }; + code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; }; code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk = true; @@ -4268,7 +4283,7 @@ in gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; - gandi-cli = callPackage ../tools/networking/gandi-cli { }; + gandi-cli = python3Packages.callPackage ../tools/networking/gandi-cli { }; gandom-fonts = callPackage ../data/fonts/gandom-fonts { }; @@ -4416,6 +4431,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + git-hound = callPackage ../tools/security/git-hound { }; + git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { }; git-ignore = callPackage ../applications/version-management/git-and-tools/git-ignore { }; @@ -4528,6 +4545,8 @@ in gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { }; + gitleaks = callPackage ../tools/security/gitleaks { }; + gitaly = callPackage ../applications/version-management/gitlab/gitaly { ruby = ruby_2_7; }; @@ -5077,8 +5096,6 @@ in i2pd = callPackage ../tools/networking/i2pd { }; - i-score = libsForQt514.callPackage ../applications/audio/i-score { }; - iasl = callPackage ../development/compilers/iasl { }; iannix = libsForQt5.callPackage ../applications/audio/iannix { }; @@ -6305,6 +6322,8 @@ in netcdffortran = callPackage ../development/libraries/netcdf-fortran { }; + networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { }; + nco = callPackage ../development/libraries/nco { }; ncftp = callPackage ../tools/networking/ncftp { }; @@ -7445,6 +7464,8 @@ in rpPPPoE = callPackage ../tools/networking/rp-pppoe { }; + rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { }; + rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { }; rpm = callPackage ../tools/package-management/rpm { @@ -8055,6 +8076,8 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + tangram = callPackage ../applications/networking/instant-messengers/tangram { }; + t1utils = callPackage ../tools/misc/t1utils { }; talkfilters = callPackage ../misc/talkfilters {}; @@ -9800,7 +9823,7 @@ in langCC = false; langC = false; profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext pkgconfig perl; + inherit zip unzip zlib boehmgc gettext pkg-config perl; inherit (gnome2) libart_lgpl; }); @@ -10616,6 +10639,7 @@ in cargo-asm = callPackage ../development/tools/rust/cargo-asm { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-binutils = callPackage ../development/tools/rust/cargo-binutils { }; cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; cargo-cache = callPackage ../development/tools/rust/cargo-cache { inherit (darwin.apple_sdk.frameworks) Security; @@ -11003,6 +11027,8 @@ in lxrandr = callPackage ../desktops/lxde/core/lxrandr { }; + lxsession = callPackage ../desktops/lxde/core/lxsession { }; + kona = callPackage ../development/interpreters/kona {}; lolcode = callPackage ../development/interpreters/lolcode { }; @@ -11600,6 +11626,7 @@ in bingrep = callPackage ../development/tools/analysis/bingrep { }; binutils-unwrapped = callPackage ../development/tools/misc/binutils { + autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; @@ -12170,8 +12197,6 @@ in jam = callPackage ../development/tools/build-managers/jam { }; - jamomacore = callPackage ../development/libraries/audio/jamomacore { }; - jbake = callPackage ../development/tools/jbake { }; jbang = callPackage ../development/tools/jbang { }; @@ -12414,14 +12439,12 @@ in pkg-config = callPackage ../build-support/pkg-config-wrapper { pkg-config = pkg-config-unwrapped; }; - pkgconfig = pkg-config; # added 2018-02-02 pkg-configUpstream = lowPrio (pkg-config.override (old: { pkg-config = old.pkg-config.override { vanilla = true; }; })); - pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 inherit (nodePackages) postcss-cli; @@ -12963,6 +12986,8 @@ in bamf = callPackage ../development/libraries/bamf { }; + inherit (callPackages ../development/libraries/bashup-events { }) bashup-events32 bashup-events44; + bcg729 = callPackage ../development/libraries/bcg729 { }; bctoolbox = callPackage ../development/libraries/bctoolbox { }; @@ -17482,6 +17507,8 @@ in engelsystem = callPackage ../servers/web-apps/engelsystem { }; + envoy = callPackage ../servers/http/envoy { }; + etcd = callPackage ../servers/etcd { }; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; @@ -17555,6 +17582,8 @@ in gobetween = callPackage ../servers/gobetween { }; + graph-cli = callPackage ../tools/graphics/graph-cli { }; + h2o = callPackage ../servers/http/h2o { }; haka = callPackage ../tools/security/haka { }; @@ -18203,6 +18232,8 @@ in sickrage = callPackage ../servers/sickbeard/sickrage.nix { }; + sigurlx = callPackage ../tools/security/sigurlx { }; + sipwitch = callPackage ../servers/sip/sipwitch { }; slimserver = callPackage ../servers/slimserver { }; @@ -21567,7 +21598,7 @@ in inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; inherit - autoconf automake editorconfig-core-c git libffi libpng pkgconfig + autoconf automake editorconfig-core-c git libffi libpng pkg-config poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages libtool zeromq openssl ott; }; @@ -22372,6 +22403,10 @@ in hdhomerun-config-gui = callPackage ../applications/video/hdhomerun-config-gui { }; + hdr-plus = callPackage ../applications/graphics/hdr-plus { + stdenv = clangStdenv; + }; + heimer = libsForQt5.callPackage ../applications/misc/heimer { }; hello = callPackage ../applications/misc/hello { }; @@ -22402,6 +22437,8 @@ in hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; + hivelytracker = callPackage ../applications/audio/hivelytracker { }; + hledger = haskell.lib.justStaticExecutables haskellPackages.hledger; hledger-iadd = haskell.lib.justStaticExecutables haskellPackages.hledger-iadd; hledger-interest = haskell.lib.justStaticExecutables haskellPackages.hledger-interest; @@ -23211,6 +23248,8 @@ in mediathekview = callPackage ../applications/video/mediathekview { }; + megapixels = callPackage ../applications/graphics/megapixels { }; + meteo = callPackage ../applications/networking/weather/meteo { }; meld = callPackage ../applications/version-management/meld { }; @@ -24061,6 +24100,8 @@ in purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { }; + pikopixel = callPackage ../applications/graphics/pikopixel { }; + pithos = callPackage ../applications/audio/pithos { pythonPackages = python3Packages; }; @@ -24155,6 +24196,8 @@ in puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; + pwdsafety = callPackage ../tools/security/pwdsafety { }; + pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; @@ -25769,6 +25812,8 @@ in desktopSupport = "xfce4"; }; + xmountains = callPackage ../applications/graphics/xmountains { }; + xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { }; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; @@ -26666,6 +26711,8 @@ in quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { }; + quake3hires = callPackage ../games/quake3/content/hires.nix { }; + quakespasm = callPackage ../games/quakespasm { }; vkquake = callPackage ../games/quakespasm/vulkan.nix { }; @@ -26893,6 +26940,8 @@ in typespeed = callPackage ../games/typespeed { }; + udig = callPackage ../applications/gis/udig { }; + ufoai = callPackage ../games/ufoai { }; ultimatestunts = callPackage ../games/ultimatestunts { }; @@ -27051,6 +27100,7 @@ in zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { wxGTK = wxGTK30; + stdenv = gcc9Stdenv; }); zeroad = zeroadPackages.zeroad; @@ -28234,6 +28284,8 @@ in gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { }; + carps-cups = callPackage ../misc/cups/drivers/carps-cups { }; + cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; @@ -28840,6 +28892,8 @@ in rargs = callPackage ../tools/misc/rargs { }; + rauc = callPackage ../tools/misc/rauc { }; + redprl = callPackage ../applications/science/logic/redprl { }; renderizer = pkgs.callPackage ../development/tools/renderizer {}; @@ -29397,6 +29451,8 @@ in snowsql = callPackage ../applications/misc/snowsql {}; + snowmachine = python3Packages.callPackage ../applications/snowmachine {}; + sidequest = callPackage ../applications/misc/sidequest {}; maphosts = callPackage ../tools/networking/maphosts {}; @@ -29458,7 +29514,9 @@ in phonetisaurus = callPackage ../development/libraries/phonetisaurus {}; - duti = callPackage ../os-specific/darwin/duti {}; + duti = callPackage ../os-specific/darwin/duti { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; dnstracer = callPackage ../tools/networking/dnstracer { inherit (darwin) libresolv; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 91c1549a3b0f4..0b2b6af80383b 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -6,7 +6,7 @@ , fetchFromGitHub , fetchNuGet , glib -, pkgconfig +, pkg-config , mono , fsharp , unzip @@ -860,7 +860,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { buildInputs = [ mono - pkgconfig + pkg-config ]; postInstall = '' diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index ff6360970043f..9ae97cdf35a05 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -10,7 +10,7 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ zlib ]; buildInputs = old.buildInputs ++ [ automake autoconf ]; configurePhase = '' @@ -49,7 +49,7 @@ rec { }).overrideDerivation (old: { propagatedBuildInputs = [ zlib ]; - buildInputs = old.buildInputs ++ [ pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkg-config ]; # just override it with nothing so it does not fail autoreconfPhase = "echo autoreconfPhase not used..."; @@ -84,8 +84,8 @@ rec { pname = "xmlmirror"; version = "unstable-2016-06-05"; - buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; - nativeBuildInputs = [ pkgconfig zlib ]; + buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; + nativeBuildInputs = [ pkg-config zlib ]; src = pkgs.fetchgit { url = "https://gitlab.com/odfplugfest/xmlmirror.git"; @@ -136,7 +136,7 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - buildInputs = old.buildInputs ++ [ pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkg-config ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; configurePhase = '' diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 550c5bbd63b50..b42f827d0dfad 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,7 +5,7 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, unzip, pkgconfig +{ fetchurl, stdenv, lua, unzip, pkg-config , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat , autoreconfHook, gnum4 , mysql, postgresql, cyrus_sasl @@ -108,7 +108,7 @@ with self; { sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz"; }; - nativeBuildInputs = [ which pkgconfig ]; + nativeBuildInputs = [ which pkg-config ]; postPatch = '' patchShebangs . diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index de358159287f0..8a5b9bd6ae52b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -283,7 +283,7 @@ let url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz"; sha256 = "0jg2dmkzhj03f6b0vmv597yryfw9cclsdn9ynvvlrzzgpd5lw8jk"; }; - propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; + propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; buildInputs = [ LWPProtocolHttps ]; }; @@ -7503,8 +7503,8 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz"; sha256 = "bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e"; }; - nativeBuildInputs = [ buildPackages.pkgconfig ]; - propagatedBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ buildPackages.pkg-config ]; + propagatedBuildInputs = [ pkgs.pkg-config ]; doCheck = false; # expects test_glib-2.0.pc in PKG_CONFIG_PATH meta = { homepage = "http://gtk2-perl.sourceforge.net"; @@ -9005,7 +9005,7 @@ let url = "mirror://cpan/authors/id/O/OE/OESTERHOL/Gtk2-AppIndicator-0.15.tar.gz"; sha256 = "a25cb071e214fb89b4450aa4605031eae89b7961e149b0d6e8f491c19c14a90a"; }; - propagatedBuildInputs = [ pkgs.libappindicator-gtk2 pkgs.libdbusmenu-gtk2 pkgs.gtk2 pkgs.pkgconfig Gtk2 ]; + propagatedBuildInputs = [ pkgs.libappindicator-gtk2 pkgs.libdbusmenu-gtk2 pkgs.gtk2 pkgs.pkg-config Gtk2 ]; # Tests fail due to no display: # Gtk-WARNING **: cannot open display: at /nix/store/HASH-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 126. doCheck = false; @@ -11724,7 +11724,7 @@ let url = "mirror://cpan/authors/id/L/LK/LKUNDRAK/Log-Journald-0.30.tar.gz"; sha256 = "55992cf9a1e1fb833f428300525bfa7cf7ed46b83ec414f82a091789b37d08a3"; }; - buildInputs = [ pkgs.pkgconfig pkgs.systemd ]; + buildInputs = [ pkgs.pkg-config pkgs.systemd ]; postPatch = '' substituteInPlace Build.PL \ --replace "libsystemd-journal" "libsystemd" @@ -14674,7 +14674,7 @@ let # Makefile.PL in this package uses which to find pkg-config -- make it use path instead patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Makefile.PL''; doCheck = false; # The main test performs network access - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; propagatedBuildInputs = [ pkgs.libdiscid ]; }; @@ -14967,7 +14967,7 @@ let url = "mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.2.0.tar.gz"; sha256 = "e7a1ac9ef4a1235b3fdbd5888f86c347182306467bd79abc9b0756a64b441cbc"; }; - nativeBuildInputs = [ buildPackages.pkgconfig ]; + nativeBuildInputs = [ buildPackages.pkg-config ]; buildInputs = [ pkgs.dbus TestPod TestPodCoverage ]; propagatedBuildInputs = [ XMLTwig ]; @@ -16310,7 +16310,7 @@ let sha256 = "17f6i16jv6ci6459vh6y3sz94vgcvykjjszcl4xsykryakjvf8i7"; }; buildInputs = [ pkgs.pcsclite ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.pcsclite}/lib -lpcsclite"; # tests fail; look unfinished doCheck = false; @@ -19038,6 +19038,7 @@ let description = "lib/Safe/Hole.pm"; license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/toddr/Safe-Hole"; + broken = stdenv.isDarwin; }; }; @@ -19245,7 +19246,7 @@ let url = "mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-v6.3.0.tar.gz"; sha256 = "6333fe3c554322fec5a3e1890b08a4ea4f39b0fbb506b3592688a5785a488f39"; }; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' }; @@ -23131,7 +23132,7 @@ let url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.99.tar.gz"; sha256 = "1w7pn0wb88nma6biy4h05ak3j4ykma6vz1wbkrxy8qgvfyl1fzhj"; }; - buildInputs = [ pkgs.pkgconfig pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; + buildInputs = [ pkgs.pkg-config pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ XMLLibXML ]; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cb3cfdf7651d7..19feb36aa2713 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkgconfig, re2c +{ stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkg-config, re2c , gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng @@ -176,7 +176,7 @@ lib.makeScope pkgs.newScope (self: with self; { "--with-zmq=${pkgs.zeromq}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkg-config ]; meta.maintainers = lib.teams.php.members; meta.broken = lib.versionAtLeast php.version "7.3"; @@ -206,7 +206,7 @@ lib.makeScope pkgs.newScope (self: with self; { sourceRoot = "php-${php.version}/ext/${name}"; enableParallelBuilding = true; - nativeBuildInputs = [ php.unwrapped autoconf pkgconfig re2c ]; + nativeBuildInputs = [ php.unwrapped autoconf pkg-config re2c ]; inherit configureFlags internalDeps buildInputs zendExtension doCheck; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2076ae2ec54a0..8f2d5c92bf243 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -214,6 +214,8 @@ in { aiofiles = callPackage ../development/python-modules/aiofiles { }; + aioflo = callPackage ../development/python-modules/aioflo { }; + aioftp = callPackage ../development/python-modules/aioftp { }; aioguardian = callPackage ../development/python-modules/aioguardian { }; @@ -541,7 +543,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 { }; @@ -1157,6 +1159,8 @@ in { catalogue = callPackage ../development/python-modules/catalogue { }; + catboost = callPackage ../development/python-modules/catboost { }; + cbeams = callPackage ../misc/cbeams { }; cbor2 = callPackage ../development/python-modules/cbor2 { }; @@ -1175,6 +1179,8 @@ in { cement = callPackage ../development/python-modules/cement { }; + censys = callPackage ../development/python-modules/censys { }; + connect-box = callPackage ../development/python-modules/connect_box { }; cerberus = callPackage ../development/python-modules/cerberus { }; @@ -1611,7 +1617,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 { }; @@ -1667,6 +1673,8 @@ in { detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 + devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { }; + devpi-common = callPackage ../development/python-modules/devpi-common { }; dftfit = callPackage ../development/python-modules/dftfit { }; @@ -2411,7 +2419,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 +2706,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 +2785,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 +2933,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 +3091,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 +3462,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 +3550,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 +3658,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 +3720,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 +3907,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 +4917,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 +5129,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 +5137,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 +5183,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 { }; @@ -5272,8 +5280,6 @@ in { pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; }; - pydotplus = callPackage ../development/python-modules/pydotplus { }; - pydrive = callPackage ../development/python-modules/pydrive { }; pydsdl = callPackage ../development/python-modules/pydsdl { }; @@ -5385,19 +5391,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 +5413,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 { }; @@ -5536,6 +5542,8 @@ in { pymaging_png = callPackage ../development/python-modules/pymaging_png { }; + pymata-express = callPackage ../development/python-modules/pymata-express { }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; @@ -5708,7 +5716,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 +5857,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 { }; @@ -6025,6 +6033,8 @@ in { pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; + pytest-instafail = callPackage ../development/python-modules/pytest-instafail { }; + pytest-isort = callPackage ../development/python-modules/pytest-isort { }; pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; @@ -6165,7 +6175,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 +6198,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 +6260,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 +6276,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 +6716,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 +6950,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 +6977,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 +7466,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 { }; @@ -7924,6 +7934,8 @@ in { uritools = callPackage ../development/python-modules/uritools { }; + url-normalize = callPackage ../development/python-modules/url-normalize { }; + urlgrabber = callPackage ../development/python-modules/urlgrabber { }; urllib3 = callPackage ../development/python-modules/urllib3 { }; @@ -7998,7 +8010,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 { }; @@ -8068,6 +8080,8 @@ in { warrant = callPackage ../development/python-modules/warrant { }; + waqiasync = callPackage ../development/python-modules/waqiasync { }; + wasabi = callPackage ../development/python-modules/wasabi { }; wasm = callPackage ../development/python-modules/wasm { }; @@ -8185,11 +8199,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; @@ -8198,7 +8212,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; @@ -8454,7 +8468,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 { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 5e591ec7a8575..a394c4d8eee8f 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -126,7 +126,7 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; pciutils = linux; pdf2xml = all; perl = all; - pkgconfig = all; + pkg-config = all; pmccabe = linux; procps = linux; python = unix; # Cygwin builds fail |