diff options
Diffstat (limited to 'pkgs/servers')
117 files changed, 3980 insertions, 791 deletions
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 3759a3d2f06..f2193d67ff5 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 26d361e97c2..86017314ae7 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 a3a59906437..a7c9464fcae 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 b1997cf76f0..b29f9ca9e8e 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 433f08525dc..939237f513c 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 2b4c250a966..5e2bf5a9755 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 28651752dd1..ccb57f55bb2 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 08ded357488..5b4270a0a1c 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/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 02c19e22e74..3aa7b074848 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dgraph"; - version = "20.07.2"; + version = "20.07.3"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "0cx2qqn8b7v0qvhrwzjqghymm8r2a0v86pyfgqxmmyfghjhykax4"; + sha256 = "sha256-yuKXcxewt64T0ToDPid37WUEhwLu+yt4tjhDQobj/Ls="; }; - vendorSha256 = "111lixpqp8p2q4kg9342220i00dcp2lwp2j3hasdvwdrrf0971by"; + vendorSha256 = "sha256-2Ub0qdEaVSHHE5K0bNSXJFukGeSSXNpIBoUldF8jGpI="; doCheck = false; diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 4bb012d7297..a6a365c13da 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 9c4b04cc6e6..2a9e00b266b 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 3277d694a4b..8954c9fcd89 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 d91a77ac372..972b92e7de9 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 990386f06ce..cc7bb3317fd 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/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix deleted file mode 100644 index b27a8decb5e..00000000000 --- a/pkgs/servers/elasticmq/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper, which }: - -stdenv.mkDerivation rec { - name = "elasticmq-0.5"; - - src = fetchurl { - url = "https://github.com/downloads/adamw/elasticmq/${name}.tar.gz"; - sha256 = "1zpv3vzairprh4x9fia82qqr14kf5hpxq1r90mn4ww7ighbv9pf1"; - }; - - buildInputs = [ makeWrapper ]; - - installPhase = - '' - mkdir -p $out/bin - cp -prd lib conf $out/ - - cp bin/run.sh $out/bin/elasticmq - substituteInPlace $out/bin/elasticmq --replace '-DBASEDIR=$BASEDIR' '-DBASEDIR=''${ELASTICMQ_DATA_PREFIX:-.}' - - wrapProgram $out/bin/elasticmq --prefix PATH : "${lib.makeBinPath [ which jre ]}" - ''; - - meta = { - homepage = "https://github.com/adamw/elasticmq"; - description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; - longDescription = - '' - ElasticMQ is a message queueing system with Java, Scala and - Amazon SQS-compatible interfaces. You should set the - environment ELASTICMQ_DATA_PREFIX to a writable directory - where ElasticMQ will store its data and log files. It also - looks for its configuration file in - $ELASTICMQ_DATA_PREFIX/conf/Default.scala. You can use the - Default.scala included in the distribution as a template. - ''; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 54b699e8a6d..ee3f02d0425 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/fiche/default.nix b/pkgs/servers/fiche/default.nix new file mode 100644 index 00000000000..10ce1c30a0c --- /dev/null +++ b/pkgs/servers/fiche/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "fiche"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "solusipse"; + repo = "fiche"; + rev = version; + sha256 = "1102r39xw17kip7mjp987jy8na333gw9vxv31f7v8q05cr7d7kfb"; + }; + + installPhase = '' + install -Dm755 fiche -t $out/bin + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Command line pastebin for sharing terminal output"; + longDescription = '' + Fiche is a command line pastebin server for sharing terminal output. + It can be used without any graphical tools from a TTY and has minimal requirements. + A live instance can be found at https://termbin.com. + + Example usage: + echo just testing! | nc termbin.com 9999 + ''; + + homepage = "https://github.com/solusipse/fiche"; + changelog = "https://github.com/solusipse/fiche/releases/tag/${version}"; + license = licenses.mit; + maintainers = [ maintainers.pinpox ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix index e626019f09b..88c14a220d9 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 6468f6a9fcc..db3bcb47ecc 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 497cdb4fcf4..91b4e1d283e 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 2e9c5f99da5..97cd133ade9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -13,13 +13,13 @@ "ads" = ps: with ps; [ pyads ]; "advantage_air" = ps: with ps; [ advantage-air ]; "aftership" = ps: with ps; [ pyaftership ]; - "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py + "agent_dvr" = ps: with ps; [ agent-py ]; "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ airly ]; "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; - "alarmdecoder" = ps: with ps; [ ]; # missing inputs: adext + "alarmdecoder" = ps: with ps; [ adext ]; "alert" = ps: with ps; [ ]; "alexa" = ps: with ps; [ aiohttp-cors ]; "almond" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyalmond @@ -77,7 +77,7 @@ "binary_sensor" = ps: with ps; [ ]; "bitcoin" = ps: with ps; [ blockchain ]; "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus - "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird + "blackbird" = ps: with ps; [ pyblackbird ]; "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi "blink" = ps: with ps; [ ]; # missing inputs: blinkpy "blinksticklight" = ps: with ps; [ BlinkStick ]; @@ -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; [ ]; @@ -682,7 +682,7 @@ "rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp - "roomba" = ps: with ps; [ ]; # missing inputs: roombapy + "roomba" = ps: with ps; [ roombapy ]; "roon" = ps: with ps; [ ]; # missing inputs: roonapi "route53" = ps: with ps; [ boto3 ]; "rova" = ps: with ps; [ ]; # missing inputs: rova @@ -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 498d3bc0424..23a8d34a632 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 04440666f29..3f2792f6498 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 a5f06a58ad5..a8025c153e0 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 e83ef99a2f0..c334939a1c5 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 783f7bfb4b2..da1b4e456b7 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 fa9309fc472..116a9822291 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 711443230e6..1632ed381b0 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 e56fa6987e1..68aeded93d0 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 dba56765538..01ecae55b2e 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 5e315fe956f..d1d254c30b4 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 1f5e861e60c..de3f58fc06f 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 91b636cfdde..45023e800af 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 00000000000..4bf0a0d0e95 --- /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 00000000000..370682efaa3 --- /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 00000000000..0da0cb23d76 --- /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 a53be3e2aa6..b533a908ef9 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 34da8750bef..d4a2c91d60b 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 b1764b55369..11b580ed8a0 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 456c58e45a2..bbac8b843b1 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 5f24c66ce64..d4e92bc3f6c 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 95019fb939f..a95a2ad27c3 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/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index bf31633e41e..3b2508a7760 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace include/defaults.h --replace 'PKGLOCALSTATEDIR "' '"/var/lib/charybdis' + substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/charybdis' ''; autoreconfPhase = "sh autogen.sh"; diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index 8f6f31bba35..7bb0900d7d3 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 a0096eab026..b52018b64f4 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 dd513d8a447..bfa372ed069 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 046176fea2e..2c44094d0f7 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 de3daf8e4c0..9d69b0d73c2 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 39a3a645ce6..65ff08b4539 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 d1bee8cc049..df04ade5b45 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 ba69e99cc8b..0740613bad7 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-corporal/default.nix b/pkgs/servers/matrix-corporal/default.nix new file mode 100644 index 00000000000..d7822afffa5 --- /dev/null +++ b/pkgs/servers/matrix-corporal/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "matrix-corporal"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "devture"; + repo = pname; + rev = version; + sha256 = "1n8yjmy3j0spgwpxgc26adhpl52fm3d2xbmkf5n9dwzw29grv68r"; + }; + + buildFlagsArray = [ + "-ldflags=-s -w -X main.GitCommit=${version} -X main.GitBranch=${version} -X main.GitState=nixpkgs -X main.GitSummary=${version} -X main.Version=${version}" + ]; + + vendorSha256 = "1gi6mff6h0fkgfq5yybd1qcy2qwrvc4kzi11x7arfl9nr0d24rb2"; + + meta = with lib; { + homepage = "https://github.com/devture/matrix-corporal"; + description = "Reconciliator and gateway for a managed Matrix server"; + maintainers = with maintainers; [ dandellion ]; + license = licenses.agpl3Only; + }; +} diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index f4b89981d69..389b724a134 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 c310e17608e..d84aa954a00 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 b63428ba7d9..0e1b207a755 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 653ca399fcf..759ac94e568 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 f7c97abf104..6a63292301b 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/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix new file mode 100644 index 00000000000..71973333063 --- /dev/null +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, systemd }: + +buildGoModule rec { + pname = "grafana-agent"; + version = "0.10.0"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "grafana"; + repo = "agent"; + sha256 = "1kliq6d3hg4bx9s5crdagirf2h3ljl0ikcyz0x0wb2ack6cgjsvm"; + }; + + vendorSha256 = null; + + # uses go-systemd, which uses libsystemd headers + # https://github.com/coreos/go-systemd/issues/351 + NIX_CFLAGS_COMPILE = [ "-I${lib.getDev systemd}/include" ]; + + # tries to access /sys: https://github.com/grafana/agent/issues/333 + preBuild = '' + rm pkg/integrations/node_exporter/node_exporter_test.go + ''; + + # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at + # runtime. + # Add to RUNPATH so it can be found. + postFixup = '' + patchelf \ + --set-rpath "${lib.makeLibraryPath [ (lib.getDev systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \ + $out/bin/agent + ''; + + meta = with lib; { + description = "A lightweight subset of Prometheus and more, optimized for Grafana Cloud"; + license = licenses.asl20; + homepage = "https://grafana.com/products/cloud"; + maintainers = with maintainers; [ flokli ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 80f3d2c14ab..551fa028811 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 d6c69a6089b..2784dae63af 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 ef4a3cb4d38..e4516f652b9 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 18c1ac52fc1..067d8883324 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 2e6275921a4..03e9c1a867b 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 3cc3f338f2f..b4d1fda4090 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 ad3a68b46eb..a638c063852 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/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 75fa1ff0824..3bea50b5620 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -58,7 +58,7 @@ in { }; nextcloud20 = generic { - version = "20.0.4"; - sha256 = "sha256-Jp8WIuMm9dEeOH04YarU4rDnkzSul+7Vp7M1K6dmFCA="; + version = "20.0.5"; + sha256 = "5c70dd33024012a1651fd099133d052d129a4dadc6935f44bb9c3e2b360befe3"; }; } diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 3118a0128df..799c26e82fd 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 49b998ecbf0..b76210dd905 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/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 625e2e0e8ca..32aa421ebf0 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 d5ae80b5e79..cc11f98a829 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 1d44561806a..c3c69fa79b6 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 9755d42ce01..ec3ed346cad 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 0df084230b6..c125732cafc 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 d48df47f0c5..b0793d5e42a 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 d05c2e527e2..b3a14f5f2c7 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 3eea64e6ab2..90db957d3c0 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 108721fceb0..bae2f3aad79 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 94a32a6e78b..c81c7f30b31 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 6b7d3e7b1ca..7bd971e86e7 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 e89a599ebec..d7611baad14 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 f8995063a0c..3e69602170f 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 3a332876ffd..0ef8a5799e2 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/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index c6cf5a5ad82..b0dc7a22757 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.22.6"; + version = "0.22.11"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "1kd7kqiic6mm974cix7m3620yzdaxpdnnq4q53pyicfq2i4pk2ml"; + sha256 = "sha256-lOsPB1e3jUBbNZfVHlnNBCMo8mZFpGNhkvGU8+Rq+Kk="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "0hyp44gzmp49mv26xa9j2nc64y2v3np1x1iqc4vsryf3ajsy2720"; + vendorSha256 = "sha256-+qfgEiJbFtG1/a6RNnYsJzU1ZPYenvhdWh+wIEISRrI="; doCheck = false; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 90fdbd09b6e..e70d43a1505 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 cc9852d57e3..98166d0b38a 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 519ef64bca8..3dbd84c2a98 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 20e3637f40c..27345616f89 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 50fb383dabb..be284387174 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 4cc7423ab2c..590aa6f2b6b 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 f94bb69871c..3f3b2aa4f14 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 238a298f85f..59da5a80a37 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 caeb969f23b..8c5a64f2295 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 6fe5bc201f9..ea564e6791d 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 bd055e65687..3ef571bc82a 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 716e8e1c1aa..98a40766d7e 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 14876e47df3..bd74a628877 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 433cc44415c..db426f399f8 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 b6ec11e4e8d..55d13ffae31 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 a9900424b96..20f8aa91ab6 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 f39afd9c87c..0a8e97df61e 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 76b468d35d7..b6abc423eb8 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 6b22c29c128..af565e6292d 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 aa2a9fc9258..b3fedf9bc5d 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 69270afb76b..05741e0ac21 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/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 6417064663a..c8722fbe8f7 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,25 +2,19 @@ stdenv.mkDerivation rec { pname = "wallabag"; - version = "2.3.8"; + version = "2.4.0"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "1sr62hfk2f2rl5by48dg8yd1gchngjnc850as17wr3w287p1kwsq"; + sha256 = "11vda7aqq82kpr88v4hr7zg19zfq970n3z4qp25my8b1fvlgdjhi"; }; outputs = [ "out" ]; patches = [ ./wallabag-data.patch # exposes $WALLABAG_DATA - (fetchurl { - # Fixes "Uncaught RuntimeException: Setting "piwik_enabled" couldn't be found."; https://github.com/wallabag/wallabag/issues/3662 - # Remove >= 2.4.0 - url = "https://github.com/wallabag/wallabag/pull/3868.patch"; - sha256 = "0pfxsv8ncaxkjkybim3v3iswmfv1vbjlzmvj50nn9blvjwc9gxjg"; - }) ]; dontBuild = true; diff --git a/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/pkgs/servers/web-apps/wallabag/wallabag-data.patch index 086e9395980..f70ffce2905 100644 --- a/pkgs/servers/web-apps/wallabag/wallabag-data.patch +++ b/pkgs/servers/web-apps/wallabag/wallabag-data.patch @@ -1,9 +1,9 @@ diff --git a/app/AppKernel.php b/app/AppKernel.php -index 40726f05..7d44e600 100644 +index 347197e..902b558 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php -@@ -58,14 +58,19 @@ class AppKernel extends Kernel - return $bundles; +@@ -69,19 +69,24 @@ class AppKernel extends Kernel + return __DIR__; } + public function getProjectDir() @@ -24,3 +24,9 @@ index 40726f05..7d44e600 100644 } public function registerContainerConfiguration(LoaderInterface $loader) + { +- $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml'); ++ $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml'); + + $loader->load(function ($container) { + if ($container->getParameter('use_webpack_dev_server')) { diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index 8fdd9a93a23..f1a385c6809 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 0d7d6df87bc..9beb0553395 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 a5904629670..065216da3cc 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,26 +525,26 @@ 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 { - name = "fonttosfnt-1.0.5"; + fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { + name = "fonttosfnt-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2"; - sha256 = "00w5in1gznai141wishz8ng7spvi5274n16zj0pdl1ma2vsmy2n8"; + url = "mirror://xorg/individual/app/fonttosfnt-1.2.1.tar.bz2"; + 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/fix-uninitialised-memory.patch b/pkgs/servers/x11/xorg/fix-uninitialised-memory.patch deleted file mode 100644 index 53f22d7f39c..00000000000 --- a/pkgs/servers/x11/xorg/fix-uninitialised-memory.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 51e8117654fb092ae5412d7aa184bfc6b498c954 Mon Sep 17 00:00:00 2001 -From: rnhmjoj <rnhmjoj@inventati.org> -Date: Fri, 7 Feb 2020 17:46:54 +0100 -Subject: [PATCH 1/2] Fix incorrect error handling in macTime() - -mktime() and time() return (time_t -1) to signal an error. -Checking for negative values will incorrectly assume an error -happened for any calendar date before the unix epoch. ---- - util.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/util.c b/util.c -index bcbfa2f..4482c9a 100644 ---- a/util.c -+++ b/util.c -@@ -213,10 +213,10 @@ macTime(int *hi, unsigned *lo) - tm.tm_isdst = -1; - - macEpoch = mktime_gmt(&tm); -- if(macEpoch < 0) return -1; -+ if(macEpoch == -1) return -1; - - current = time(NULL); -- if(current < 0) -+ if(current == -1) - return -1; - - if(current < macEpoch) { --- -2.23.0 - -From 81a61c049e6de80120531f0770b22e7637c9acb9 Mon Sep 17 00:00:00 2001 -From: rnhmjoj <rnhmjoj@inventati.org> -Date: Fri, 7 Feb 2020 17:47:52 +0100 -Subject: [PATCH 2/2] Fix uninitialised memory write - -If macTime() fails write zeros instead of unitialized memory to -the date fields. ---- - write.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/write.c b/write.c -index 318adef..c8a86e4 100644 ---- a/write.c -+++ b/write.c -@@ -434,8 +434,8 @@ fixupChecksum(FILE *out, int full_length, int head_position) - static int - writehead(FILE* out, FontPtr font) - { -- int time_hi; -- unsigned time_lo; -+ int time_hi = 0; -+ unsigned time_lo = 0; - - macTime(&time_hi, &time_lo); - --- -2.23.0 - diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index a6cd8032ba7..b50f3f33a31 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 0c5156ebdfe..458bc7ea845 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 }: @@ -22,11 +22,6 @@ self: super: buildInputs = attrs.buildInputs ++ [ self.xorgproto ]; }); - fonttosfnt = super.fonttosfnt.overrideAttrs (attrs: { - # https://gitlab.freedesktop.org/xorg/app/fonttosfnt/merge_requests/6 - patches = [ ./fix-uninitialised-memory.patch ]; - }); - bitmap = super.bitmap.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ]; postInstall = '' @@ -472,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/" @@ -594,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 { @@ -604,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/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 02467ce304b..1544af4742d 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -11,7 +11,7 @@ mirror://xorg/individual/app/appres-1.0.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.9.tar.gz mirror://xorg/individual/app/editres-1.0.7.tar.bz2 -mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2 +mirror://xorg/individual/app/fonttosfnt-1.2.1.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 mirror://xorg/individual/app/ico-1.0.5.tar.bz2 mirror://xorg/individual/app/listres-1.0.4.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index cc8bf7dfa10..ee870f07125 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 deaa7ca18f0..762154f018c 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 68349214359..03ded7a5d5c 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 babcd8e6374..0ae93ed1469 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" |