diff --git a/nixos/modules/programs/mininet.nix b/nixos/modules/programs/mininet.nix index ecc924325e6..6e90e7669ac 100644 --- a/nixos/modules/programs/mininet.nix +++ b/nixos/modules/programs/mininet.nix @@ -8,7 +8,7 @@ let cfg = config.programs.mininet; generatedPath = with pkgs; makeSearchPath "bin" [ - iperf ethtool iproute socat + iperf ethtool iproute2 socat ]; pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]); diff --git a/nixos/modules/services/misc/mame.nix b/nixos/modules/services/misc/mame.nix index c5d5e9e4837..34a471ea4fe 100644 --- a/nixos/modules/services/misc/mame.nix +++ b/nixos/modules/services/misc/mame.nix @@ -53,7 +53,7 @@ in description = "MAME TUN/TAP Ethernet interface"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index d97565f15d6..b25a53435d0 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -225,7 +225,7 @@ in { }; }; config = mkIf cfg.enable { - environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps pkgs.iproute ]; + environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps pkgs.iproute2 ]; users.users.datadog = { description = "Datadog Agent User"; @@ -239,7 +239,7 @@ in { systemd.services = let makeService = attrs: recursiveUpdate { - path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.iproute ]; + path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.iproute2 ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { User = "datadog"; diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 6f13ce889cb..ef535585e9b 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -113,7 +113,7 @@ in { description = "scollector metrics collector (part of Bosun)"; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.coreutils pkgs.iproute ]; + path = [ pkgs.coreutils pkgs.iproute2 ]; serviceConfig = { User = cfg.user; diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index bfaea4e167c..ae7998913ee 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -191,7 +191,7 @@ in ExecStop = "${cfg.package}/bin/consul leave"; }); - path = with pkgs; [ iproute gnugrep gawk consul ]; + path = with pkgs; [ iproute2 gnugrep gawk consul ]; preStart = '' mkdir -m 0700 -p ${dataDir} chown -R consul ${dataDir} diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index 0781159b6ee..1f5636e4e3a 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -10,7 +10,7 @@ let name = "ircd-hybrid-service"; scripts = [ "=>/bin" ./control.in ]; substFiles = [ "=>/conf" ./ircd.conf ]; - inherit (pkgs) ircdHybrid coreutils su iproute gnugrep procps; + inherit (pkgs) ircdHybrid coreutils su iproute2 gnugrep procps; ipv6Enabled = boolToString config.networking.enableIPv6; diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix index 280158b89f6..7a25769e067 100644 --- a/nixos/modules/services/networking/libreswan.nix +++ b/nixos/modules/services/networking/libreswan.nix @@ -85,7 +85,7 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.libreswan pkgs.iproute ]; + environment.systemPackages = [ pkgs.libreswan pkgs.iproute2 ]; systemd.services.ipsec = { description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec"; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 2e680544ec2..119bd09e2fd 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -465,7 +465,7 @@ in { restartTriggers = [ configFile overrideNameserversScript ]; # useful binaries for user-specified hooks - path = [ pkgs.iproute pkgs.util-linux pkgs.coreutils ]; + path = [ pkgs.iproute2 pkgs.util-linux pkgs.coreutils ]; aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ]; }; diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 650f9c84ac7..b4c2c944b6e 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -63,7 +63,7 @@ let wantedBy = optional cfg.autoStart "multi-user.target"; after = [ "network.target" ]; - path = [ pkgs.iptables pkgs.iproute pkgs.nettools ]; + path = [ pkgs.iptables pkgs.iproute2 pkgs.nettools ]; serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}"; serviceConfig.Restart = "always"; diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix index 4c2740d2019..abe96f60f81 100644 --- a/nixos/modules/services/networking/sslh.nix +++ b/nixos/modules/services/networking/sslh.nix @@ -132,7 +132,7 @@ in { table = "mangle"; command = "OUTPUT ! -o lo -p tcp -m connmark --mark 0x02/0x0f -j CONNMARK --restore-mark --mask 0x0f"; } ]; in { - path = [ pkgs.iptables pkgs.iproute pkgs.procps ]; + path = [ pkgs.iptables pkgs.iproute2 pkgs.procps ]; preStart = '' # Cleanup old iptables entries which might be still there diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix index f67eedac296..6e619f22546 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/module.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -63,7 +63,7 @@ in { description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; - path = with pkgs; [ kmod iproute iptables util-linux ]; + path = with pkgs; [ kmod iproute2 iptables util-linux ]; environment = { STRONGSWAN_CONF = pkgs.writeTextFile { name = "strongswan.conf"; diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index f6170b81365..401f7be4028 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -152,7 +152,7 @@ in systemd.services.strongswan = { description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ kmod iproute iptables util-linux ]; # XXX Linux + path = with pkgs; [ kmod iproute2 iptables util-linux ]; # XXX Linux after = [ "network-online.target" ]; environment = { STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 9f76f7f7cd0..34c86934535 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -63,7 +63,7 @@ let preSetup = mkOption { example = literalExample '' - ${pkgs.iproute}/bin/ip netns add foo + ${pkgs.iproute2}/bin/ip netns add foo ''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; @@ -278,7 +278,7 @@ let wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ]; environment.DEVICE = interfaceName; environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity"; - path = with pkgs; [ iproute wireguard-tools ]; + path = with pkgs; [ iproute2 wireguard-tools ]; serviceConfig = { Type = "oneshot"; @@ -333,7 +333,7 @@ let after = [ "network.target" "network-online.target" ]; wantedBy = [ "multi-user.target" ]; environment.DEVICE = name; - path = with pkgs; [ kmod iproute wireguard-tools ]; + path = with pkgs; [ kmod iproute2 wireguard-tools ]; serviceConfig = { Type = "oneshot"; diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index cf0d72d5c53..b901b19cf31 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -243,7 +243,7 @@ in restartTriggers = [ fail2banConf jailConf pathsConf ]; reloadIfChanged = true; - path = [ cfg.package cfg.packageFirewall pkgs.iproute ]; + path = [ cfg.package cfg.packageFirewall pkgs.iproute2 ]; unitConfig.Documentation = "man:fail2ban(1)"; diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index 72de11a9254..033ff5ef4b5 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -108,8 +108,8 @@ in { partOf = optional config.networking.firewall.enable "firewall.service"; path = with pkgs; if config.networking.nftables.enable - then [ nftables iproute systemd ] - else [ iptables ipset iproute systemd ]; + then [ nftables iproute2 systemd ] + else [ iptables ipset iproute2 systemd ]; # The sshguard ipsets must exist before we invoke # iptables. sshguard creates the ipsets after startup if diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 9ba6ccfbe71..11bd159319a 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -101,7 +101,7 @@ let unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig = { Type = "oneshot"; @@ -185,7 +185,7 @@ let # Restart rather than stop+start this unit to prevent the # network from dying during switch-to-configuration. stopIfChanged = false; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' state="/run/nixos/network/addresses/${i.name}" @@ -258,7 +258,7 @@ let wantedBy = [ "network-setup.service" (subsystemDevice i.name) ]; partOf = [ "network-setup.service" ]; before = [ "network-setup.service" ]; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -284,7 +284,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces echo "Removing old bridge ${n}..." @@ -372,7 +372,7 @@ let wants = deps; # if one or more interface fails, the switch should continue to run serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute config.virtualisation.vswitch.package ]; + path = [ pkgs.iproute2 config.virtualisation.vswitch.package ]; preStart = '' echo "Resetting Open vSwitch ${n}..." ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \ @@ -413,7 +413,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute pkgs.gawk ]; + path = [ pkgs.iproute2 pkgs.gawk ]; script = '' echo "Destroying old bond ${n}..." ${destroyBond n} @@ -451,7 +451,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" @@ -476,7 +476,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" @@ -504,7 +504,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 23e1e611a71..1c145e8ff47 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -259,7 +259,7 @@ in wants = deps; # if one or more interface fails, the switch should continue to run serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute config.virtualisation.vswitch.package ]; + path = [ pkgs.iproute2 config.virtualisation.vswitch.package ]; preStart = '' echo "Resetting Open vSwitch ${n}..." ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \ diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index f730ec82bdf..b5d97849658 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1171,7 +1171,7 @@ in wantedBy = [ "network.target" ]; after = [ "network-pre.target" ]; unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; script = '' @@ -1249,7 +1249,7 @@ in ${optionalString (current.type == "mesh" && current.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${current.meshID}"} ${optionalString (current.type == "monitor" && current.flags!=null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${current.flags}"} ${optionalString (current.type == "managed" && current.fourAddr!=null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if current.fourAddr then "on" else "off"}"} - ${optionalString (current.mac != null) "${pkgs.iproute}/bin/ip link set dev ${device} address ${current.mac}"} + ${optionalString (current.mac != null) "${pkgs.iproute2}/bin/ip link set dev ${device} address ${current.mac}"} ''; # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface. @@ -1260,7 +1260,7 @@ in ${optionalString (new.type == "mesh" && new.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${new.meshID}"} ${optionalString (new.type == "monitor" && new.flags!=null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${new.flags}"} ${optionalString (new.type == "managed" && new.fourAddr!=null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if new.fourAddr then "on" else "off"}"} - ${optionalString (new.mac != null) "${pkgs.iproute}/bin/ip link set dev ${device} address ${new.mac}"} + ${optionalString (new.mac != null) "${pkgs.iproute2}/bin/ip link set dev ${device} address ${new.mac}"} ''; # Udev attributes for systemd to name the device and to create a .device target. diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index 4498e3a7361..9641b693f18 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -119,7 +119,7 @@ in wants = [ "network-online.target" ]; after = [ "network-online.target" ]; - path = [ pkgs.wget pkgs.iproute ]; + path = [ pkgs.wget pkgs.iproute2 ]; script = '' diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 62912535018..1b764e7e4d8 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -19,7 +19,7 @@ with lib; wantedBy = [ "multi-user.target" "sshd.service" ]; before = [ "sshd.service" ]; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix index b6b1ffa3958..cff48d20b2b 100644 --- a/nixos/modules/virtualisation/google-compute-config.nix +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -110,7 +110,7 @@ in systemd.services.google-network-daemon = { description = "Google Compute Engine Network Daemon"; after = [ "network-online.target" "network.target" "google-instance-setup.service" ]; - path = with pkgs; [ iproute ]; + path = with pkgs; [ iproute2 ]; serviceConfig = { ExecStart = "${gce}/bin/google_network_daemon"; StandardOutput="journal+console"; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index a853917a6de..f15d5875841 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -739,7 +739,7 @@ in unitConfig.RequiresMountsFor = "/var/lib/containers/%i"; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; environment = { root = "/var/lib/containers/%i"; diff --git a/nixos/modules/virtualisation/xe-guest-utilities.nix b/nixos/modules/virtualisation/xe-guest-utilities.nix index 675cf929737..25ccbaebc07 100644 --- a/nixos/modules/virtualisation/xe-guest-utilities.nix +++ b/nixos/modules/virtualisation/xe-guest-utilities.nix @@ -17,7 +17,7 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "xe-linux-distribution.service" ]; requires = [ "proc-xen.mount" ]; - path = [ pkgs.coreutils pkgs.iproute ]; + path = [ pkgs.coreutils pkgs.iproute2 ]; serviceConfig = { PIDFile = "/run/xe-daemon.pid"; ExecStart = "${pkgs.xe-guest-utilities}/bin/xe-daemon -p /run/xe-daemon.pid"; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 5b57ca860da..24df1b6ad7c 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -248,7 +248,7 @@ in # Xen provides udev rules. services.udev.packages = [ cfg.package ]; - services.udev.path = [ pkgs.bridge-utils pkgs.iproute ]; + services.udev.path = [ pkgs.bridge-utils pkgs.iproute2 ]; systemd.services.xen-store = { description = "Xen Store Daemon"; diff --git a/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixos/tests/mysql/mariadb-galera-mariabackup.nix index a4b893a9f33..0a40c010a47 100644 --- a/nixos/tests/mysql/mariadb-galera-mariabackup.nix +++ b/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -2,7 +2,7 @@ import ./../make-test-python.nix ({ pkgs, ...} : let mysqlenv-common = pkgs.buildEnv { name = "mysql-path-env-common"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ bash gawk gnutar inetutils which ]; }; - mysqlenv-mariabackup = pkgs.buildEnv { name = "mysql-path-env-mariabackup"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ gzip iproute netcat procps pv socat ]; }; + mysqlenv-mariabackup = pkgs.buildEnv { name = "mysql-path-env-mariabackup"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ gzip iproute2 netcat procps pv socat ]; }; in { name = "mariadb-galera-mariabackup"; diff --git a/nixos/tests/wireguard/basic.nix b/nixos/tests/wireguard/basic.nix index a31e92e8649..36ab226cde0 100644 --- a/nixos/tests/wireguard/basic.nix +++ b/nixos/tests/wireguard/basic.nix @@ -52,9 +52,9 @@ import ../make-test-python.nix ({ pkgs, lib, ...} : inherit (wg-snakeoil-keys.peer0) publicKey; }; - postSetup = let inherit (pkgs) iproute; in '' - ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0 - ${iproute}/bin/ip route replace fc00::1/128 dev wg0 + postSetup = let inherit (pkgs) iproute2; in '' + ${iproute2}/bin/ip route replace 10.23.42.1/32 dev wg0 + ${iproute2}/bin/ip route replace fc00::1/128 dev wg0 ''; }; }; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 636314bf1ca..418426530bf 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkg-config }: +{ lib, stdenv, fetchurl, alsaLib, jack2, minixml, pkg-config }: stdenv.mkDerivation rec { name = packageName + "-" + version ; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = false; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib minixml jack2Full ]; + buildInputs = [ alsaLib minixml jack2 ]; meta = with lib; { description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index dd4cdd29c66..ab2450f1e52 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -1,6 +1,6 @@ { faust , gtk2 -, jack2Full +, jack2 , alsaLib , opencv , libsndfile @@ -18,7 +18,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ gtk2 - jack2Full + jack2 alsaLib opencv libsndfile diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index 76e4b5ce8db..f6bc4d485fd 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -1,5 +1,5 @@ { faust -, jack2Full +, jack2 , qt4 , libsndfile , alsaLib @@ -16,7 +16,7 @@ faust.wrapWithBuildEnv { ]; propagatedBuildInputs = [ - jack2Full + jack2 qt4 libsndfile alsaLib diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index a25c522e12f..e3f92d2da74 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper -, libsndfile, jack2Full +, libsndfile, jack2 , libGLU, libGL, lv2, cairo , ladspaH, php }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config php makeWrapper ]; - buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; + buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH ]; makeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 349f4636a79..c84aa039c52 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -9,7 +9,7 @@ , pkg-config , boost , bash -, jack2Full +, jack2 , supercollider , qwt , osmid @@ -102,7 +102,7 @@ mkDerivation rec { dontWrapQtApps = true; preFixup = '' wrapQtApp "$out/bin/sonic-pi" \ - --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2Full}/bin \ + --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2}/bin \ --set AUBIO_LIB "${aubio}/lib/libaubio.so" ''; diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index 1fe56096e95..b5012029480 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper -, expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient +, expat, fftwFloat, fontconfig, freetype, libjack2, jack2, libclthreads, libclxclient , libsndfile, libxcb, xorg }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postInstall = '' # Make sure Jack is avalable in $PATH for tetraproc - wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2Full}/bin" + wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2}/bin" ''; meta = with lib; { diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index c67abe1a743..47defd44c64 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -12,7 +12,7 @@ , dxflib , curl , libiodbc -, lzma +, xz , libharu , opencv , vigra @@ -64,7 +64,7 @@ mkDerivation rec { vigra postgresql libiodbc - lzma + xz qhull giflib ] diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 365dbb66b65..df1fcc9eb66 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, lzma +, xz , qt5 , wrapQtAppsHook , miniupnpc_2 @@ -39,7 +39,7 @@ pythonPackages.buildPythonPackage rec { service-identity twisted lz4 - lzma + xz pysocks matplotlib qtpy diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index da5aa7bf6ef..14a130d7f41 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -1,5 +1,5 @@ { boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint -, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkg-config, qtbase +, libpng, libtiff, libusb1, lz4, xz, lzo, openblas, pkg-config, qtbase , qtmultimedia, qtscript, lib, stdenv, superlu, wrapQtAppsHook, }: let source = import ./source.nix { inherit fetchFromGitHub; }; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { libtiff libusb1 lz4 - lzma + xz lzo openblas qtbase diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index e0b0e2324b1..fd662d7e992 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -2,8 +2,8 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, - kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, - signond, lzma, + kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools, + signond, xz, }: mkDerivation { @@ -21,15 +21,15 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ kaccounts-integration kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin - ki18n kiconthemes kio kwindowsystem lzma accounts-qt qttools signond + ki18n kiconthemes kio kwindowsystem xz accounts-qt qttools signond ]; propagatedBuildInputs = [ boost kitemmodels ]; outputs = [ "out" "dev" ]; CXXFLAGS = [ - ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mysql}/bin/mysqld\"'' - ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mysql}/bin/mysqladmin\"'' - ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mysql}/bin/mysql_install_db\"'' - ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mysql}/bin/mysqlcheck\"'' + ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mariadb}/bin/mysqld\"'' + ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mariadb}/bin/mysqladmin\"'' + ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mariadb}/bin/mysql_install_db\"'' + ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mariadb}/bin/mysqlcheck\"'' ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"'' ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"'' ''-DNIXPKGS_POSTGRES_INITDB=\"\"'' diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 9472af7a16f..56894a29a66 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -12,7 +12,7 @@ , at-spi2-atk , gnutar , atomEnv -, kerberos +, libkrb5 }: # from justinwoo/azuredatastudio-nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { at-spi2-core at-spi2-atk stdenv.cc.cc.lib - kerberos + libkrb5 ] ) targetPath diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index 52d56d5c8f5..cec4e8dd8c9 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, curl, python3, bind, iproute, bc, gitMinimal }: +, curl, python3, bind, iproute2, bc, gitMinimal }: let version = "1.23.0"; deps = lib.makeBinPath [ curl python3 bind.dnsutils - iproute + iproute2 bc gitMinimal ]; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index fa58c2d3965..c3b9a3226a3 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, fetchpatch, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1 -, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper +, bison, flex, zlib, qmake, makeDesktopItem, makeWrapper }: let @@ -29,7 +29,7 @@ in mkDerivation rec { qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib qtconnectivity qtcharts libusb-compat-0_1 ]; - nativeBuildInputs = [ flex makeWrapper qmake yacc ]; + nativeBuildInputs = [ flex makeWrapper qmake bison ]; patches = [ # allow building with bison 3.7 diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 9084aa0dff1..9a05ac22afb 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -4,7 +4,7 @@ , makeWrapper , pkg-config , which -, yacc +, bison , gnuplot , libxls , libxml2 @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { makeWrapper pkg-config which - yacc + bison ]; buildInputs = [ diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index 8b5f4103086..3b5e00a7ffb 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -17,7 +17,7 @@ , glib , gtk3 , icu -, iproute +, iproute2 , krb5 , lib , mesa @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary done - wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute networkmanager dnsmasq ]} + wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute2 networkmanager dnsmasq ]} wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH ''; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3197e272f0e..8d0a59f2919 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -8,7 +8,7 @@ , libusb1, pciutils, nss, re2 , python2Packages, perl, pkg-config -, nspr, systemd, kerberos +, nspr, systemd, libkrb5 , util-linux, alsaLib , bison, gperf , glib, gtk3, dbus-glib @@ -135,7 +135,7 @@ let buildInputs = defaultDependencies ++ [ nspr nss systemd util-linux alsaLib - bison gperf kerberos + bison gperf libkrb5 glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index e5282d79a28..9a7551a6fff 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib -, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkg-config, libev +, brotli, zstd, xz, openssl, autoreconfHook, gettext, pkg-config, libev , gpm, libidn, tre, expat , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses xlibsWrapper bzip2 zlib brotli zstd lzma + ncurses xlibsWrapper bzip2 zlib brotli zstd xz openssl libidn tre expat libev ] ++ lib.optional stdenv.isLinux gpm diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 72e9746421b..93b89e9031e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -13,7 +13,7 @@ , glibc , gtk2 , gtk3 -, kerberos +, libkrb5 , libX11 , libXScrnSaver , libxcb @@ -106,7 +106,7 @@ stdenv.mkDerivation { glibc gtk2 gtk3 - kerberos + libkrb5 mesa libX11 libXScrnSaver diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index ad9a4618dc8..3a8fec2c6ef 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -24,7 +24,7 @@ , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , waylandSupport ? true, libxkbcommon , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages -, gssSupport ? true, kerberos +, gssSupport ? true, libkrb5 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire ## privacy-related options @@ -174,7 +174,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 - ++ lib.optional gssSupport kerberos + ++ lib.optional gssSupport libkrb5 ++ lib.optional waylandSupport libxkbcommon ++ lib.optional pipewireSupport pipewire ++ lib.optional (lib.versionAtLeast ffversion "82") gnum4 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index ed88bf587d5..26fb49ef2a3 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,7 +8,7 @@ , tridactyl-native , fx_cast_bridge , udev -, kerberos +, libkrb5 , libva , mesa # firefox wants gbm for drm+dmabuf }: @@ -65,7 +65,7 @@ let libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver ] ++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optional gssSupport kerberos + ++ lib.optional gssSupport libkrb5 ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index b208ebf2ab0..d903cb3c083 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -5,7 +5,7 @@ , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core -, kerberos, libdrm, mesa +, libkrb5, libdrm, mesa , libxkbcommon, wayland # ozone/wayland # Command line programs @@ -66,7 +66,7 @@ let liberation_ttf curl util-linux xdg-utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core - kerberos libdrm mesa coreutils + libkrb5 libdrm mesa coreutils libxkbcommon wayland ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 7c79c4896bc..285e1db536d 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -3,7 +3,7 @@ , makeWrapper , socat , iptables -, iproute +, iproute2 , bridge-utils , conntrack-tools , buildGoPackage @@ -240,7 +240,7 @@ stdenv.mkDerivation rec { kmod socat iptables - iproute + iproute2 bridge-utils ethtool util-linux diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 53209d2edd6..a1d4b146837 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux -, coreutils, kerberos, ncurses, clang, installShellFiles +, coreutils, libkrb5, ncurses, clang, installShellFiles , components ? [ "cmd/oc" "cmd/openshift" @@ -33,7 +33,7 @@ in buildGoPackage rec { goPackagePath = "github.com/openshift/origin"; - buildInputs = [ kerberos ncurses ]; + buildInputs = [ libkrb5 ncurses ]; nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index d0db8cc10b9..f4535c9120c 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,5 +1,5 @@ { autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb -, libpcap, libtins, libtool, lzma, openssl, pkg-config, lib, stdenv, tcpdump, wireshark-cli +, libpcap, libtins, libtool, xz, openssl, pkg-config, lib, stdenv, tcpdump, wireshark-cli }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { libpcap openssl libtins - lzma + xz libctemplate libmaxminddb ]; diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index ee0b561e675..424c6772104 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkgs -, autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils +, autoconf, automake, curl, iprange, iproute2, ipset, iptables, iputils , kmod, nettools, procps, tcpdump, traceroute, util-linux, whois # If true, just install FireQOS without FireHOL @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - curl iprange iproute ipset iptables iputils kmod + curl iprange iproute2 ipset iptables iputils kmod nettools procps tcpdump traceroute util-linux whois ]; diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 5ed87334c47..7b4ddb6134d 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, cmake, openssl, libedit, flex, bison, qt4, makeWrapper -, gcc, nettools, iproute, linuxHeaders }: +, gcc, nettools, iproute2, linuxHeaders }: # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; # launch with "iked -f /etc/iked.conf" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake flex bison makeWrapper ]; - buildInputs = [ openssl libedit qt4 nettools iproute ]; + buildInputs = [ openssl libedit qt4 nettools iproute2 ]; postPatch = '' # fix build with bison3 diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 676902d68ef..bfd4f28d0c0 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja , qtbase, qtimageformats, libdbusmenu, hunspell, xdg-utils, ffmpeg_3, openalSoft -, lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected +, xz, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected , range-v3 }: @@ -21,7 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config python3 cmake ninja ]; buildInputs = [ - qtbase qtimageformats ffmpeg_3 openalSoft lzma lz4 xxHash libdbusmenu + qtbase qtimageformats ffmpeg_3 openalSoft xz lz4 xxHash libdbusmenu zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3 ]; diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index 62882818d72..d169e1fdea6 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos +{lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, libkrb5 , openldap }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses tcl openssl pam kerberos openldap + ncurses tcl openssl pam libkrb5 openldap ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index eecf8f0f67e..27c06c95d99 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -4,7 +4,7 @@ , cyrus_sasl ? null , gnupg ? null , gpgme ? null -, kerberos ? null +, libkrb5 ? null , headerCache ? true , sslSupport ? true , saslSupport ? true @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { [ ncurses which perl ] ++ optional headerCache gdbm ++ optional sslSupport openssl - ++ optional gssSupport kerberos + ++ optional gssSupport libkrb5 ++ optional saslSupport cyrus_sasl ++ optional gpgmeSupport gpgme; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 0c02f512dad..b2187371f29 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which -, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl +, ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cyrus_sasl gss gpgme kerberos libidn ncurses + cyrus_sasl gss gpgme libkrb5 libidn ncurses notmuch openssl perl lmdb mailcap sqlite ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix index 5e2c74fb3f1..dda6abac8e5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix @@ -16,7 +16,7 @@ , glibc , gtk2 , gtk3 -, kerberos +, libkrb5 , libX11 , libXScrnSaver , libXcomposite @@ -94,7 +94,7 @@ stdenv.mkDerivation { glibc gtk2 gtk3 - kerberos + libkrb5 libX11 libXScrnSaver libXcomposite diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index f9027285c13..d16cbfc1bca 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -20,7 +20,7 @@ , gpgme , gtk2 , gtk3 -, kerberos +, libkrb5 , libcanberra , libGL , libGLU @@ -93,7 +93,7 @@ stdenv.mkDerivation { glibc gtk2 gtk3 - kerberos + libkrb5 libX11 libXScrnSaver libXcomposite diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/applications/networking/remote/aws-workspaces/default.nix index acfacadd55e..96c66f054e2 100644 --- a/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -1,6 +1,6 @@ { stdenv, lib , makeWrapper, dpkg, fetchurl, autoPatchelfHook -, curl, kerberos, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking +, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc.lib - kerberos + libkrb5 curl lttng-ust libpulseaudio diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/applications/networking/remote/x2goserver/default.nix index 314805a685c..0b8e858d255 100644 --- a/pkgs/applications/networking/remote/x2goserver/default.nix +++ b/pkgs/applications/networking/remote/x2goserver/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs , util-linux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg -, nettools, iproute, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash +, nettools, iproute2, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash }: let @@ -31,7 +31,7 @@ let binaryDeps = [ perlEnv which nx-libs util-linux coreutils glibc.bin gawk gnused gnugrep - findutils nettools iproute bc procps psmisc lsof pwgen openssh sshfs + findutils nettools iproute2 bc procps psmisc lsof pwgen openssh sshfs xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil xorg.xkbcomp xorg.setxkbmap ]; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index fad87d44912..b18f22b6c1d 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -23,7 +23,7 @@ , libtool , libuuid , libxml2 -, lzma +, xz , nspr , nss , openssl @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { libuuid libxcb libxml2 - lzma + xz nspr nss openssl diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 46757601867..44a8ed14c2e 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -4,7 +4,7 @@ , cmake , gmp , glog -, gmock +, gtest , openssl , gflags , gnuradio3_8 @@ -42,7 +42,7 @@ gnuradio3_8.pkgs.mkDerivation rec { armadillo gnuradio3_8.unwrapped.boost glog - gmock + gtest openssl gflags orc diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 80506bb79b6..46d39c1a7ba 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python3, bash }: +{ lib, stdenv, fetchurl, htslib, zlib, bzip2, xz, curl, perl, python3, bash }: stdenv.mkDerivation rec { pname = "bcftools"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = [ htslib zlib bzip2 lzma curl ]; + buildInputs = [ htslib zlib bzip2 xz curl ]; strictDeps = true; diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index f5aad5d0554..aac36d2af31 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, zlib, python3, bzip2, lzma}: +{lib, stdenv, fetchFromGitHub, zlib, python3, bzip2, xz}: stdenv.mkDerivation rec { pname = "bedtools"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = [ zlib bzip2 lzma ]; + buildInputs = [ zlib bzip2 xz ]; + cxx = if stdenv.cc.isClang then "clang++" else "g++"; cc = if stdenv.cc.isClang then "clang" else "gcc"; buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} -j $NIX_BUILD_CORES"; diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index efaa4403f41..fe81ff44d24 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, lzma, ncurses, boost }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, xz, ncurses, boost }: stdenv.mkDerivation rec { pname = "delly"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-DWwC35r8cQbePUzppkFQlev0YZdxk2+BSrNTW/DOY3M="; }; - buildInputs = [ zlib htslib bzip2 lzma ncurses boost ]; + buildInputs = [ zlib htslib bzip2 xz ncurses boost ]; EBROOTHTSLIB = htslib; diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix index 32ab614b968..8646b8ca54a 100644 --- a/pkgs/applications/science/biology/freebayes/default.nix +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, bzip2, lzma }: +{ lib, stdenv, fetchFromGitHub, zlib, bzip2, xz }: stdenv.mkDerivation rec { pname = "freebayes"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ zlib bzip2 lzma ]; + buildInputs = [ zlib bzip2 xz ]; installPhase = '' install -vD bin/freebayes bin/bamleftalign scripts/* -t $out/bin diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index 26c55d3dc38..12bbfa09c25 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -3,7 +3,7 @@ , libuuid , zlib , bzip2 -, lzma +, xz , openssl , curl , libmysqlclient @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0l5lmqqc6sqkf4hyk3z4825ly0vdlj5xdfad6zd0708cb1v81nbx"; }; - buildInputs = [ libpng libuuid zlib bzip2 lzma openssl curl libmysqlclient ]; + buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; patchPhase = '' substituteInPlace ./src/checkUmask.sh \ diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix index fa88e5c47b4..0ef48ec6413 100644 --- a/pkgs/applications/science/biology/octopus/default.nix +++ b/pkgs/applications/science/biology/octopus/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchpatch, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}: +{lib, stdenv, fetchpatch, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, xz, pkg-config}: stdenv.mkDerivation rec { pname = "octopus"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost gmp htslib zlib lzma ]; + buildInputs = [ boost gmp htslib zlib xz ]; postInstall = '' mkdir $out/bin diff --git a/pkgs/applications/science/biology/svaba/default.nix b/pkgs/applications/science/biology/svaba/default.nix index 87b77f6ac04..1aed501919f 100644 --- a/pkgs/applications/science/biology/svaba/default.nix +++ b/pkgs/applications/science/biology/svaba/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, zlib, bzip2, lzma, fetchFromGitHub } : +{ lib, stdenv, zlib, bzip2, xz, fetchFromGitHub } : stdenv.mkDerivation rec { version = "1.1.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ zlib bzip2 lzma ]; + buildInputs = [ zlib bzip2 xz ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 9bb04a3189e..5a46e8f6384 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xorgproto, gccmakedep }: +{ lib, stdenv, fetchurl, tcl, tk, libX11, glibc, which, bison, flex, imake, xorgproto, gccmakedep }: let libiconvInc = lib.optionalString stdenv.isLinux "${glibc.dev}/include"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs"; }; - nativeBuildInputs = [ which yacc flex imake gccmakedep ]; + nativeBuildInputs = [ which bison flex imake gccmakedep ]; buildInputs = [ tcl tk libX11 xorgproto ]; dontUseImakeConfigure = true; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 7d052c6c5e9..47b826078f2 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, ctags, swig # data, compression -, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy +, bzip2, curl, hdf5, json_c, xz, lzo, protobuf, snappy # maths , blas, lapack, eigen, nlopt, lp_solve, colpack, glpk # libraries @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = with lib; [ - blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve xz lzo protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 144827413b5..75607fdda34 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2 -, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl_1, xxHash +, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, xz, gsl_1, xxHash , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] + buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl_1 xxHash ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 2f3d57c31e7..9df3b0020a0 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5 -, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre +, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre , pkg-config, python, xxHash, zlib, zstd , libAfterImage, giflib, libjpeg, libtiff, libpng , Cocoa, OpenGL, noSplash ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper cmake pkg-config ]; - buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 lzma gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] + buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 56cc2a4ea5a..cfde0721baf 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib -, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw +, libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw }: # We need an old version of Graphviz for format compatibility reasons. # This version is vulnerable, but monotone-viz will never feed it bad input. let graphviz_2_0 = import ./graphviz-2.0.nix { inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw - yacc libtool fontconfig pango gd libwebp; + bison libtool fontconfig pango gd libwebp; }; in let inherit (gnome2) libgnomecanvas; in let inherit (ocamlPackages) ocaml lablgtk camlp4; in diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index d7ec4a86463..541a2262f99 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, libwebp +, bison, libtool, fontconfig, pango, gd, libwebp }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xlibsWrapper libpng libjpeg expat libXaw yacc + xlibsWrapper libpng libjpeg expat libXaw bison libtool fontconfig pango gd libwebp ]; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 6317d7b1ab3..e14d902681d 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -9,7 +9,7 @@ { stdenv, lib, fetchFromGitHub, # Main build tools - pkg-config, autoconf, automake, libtool, m4, lzma, python3, + pkg-config, autoconf, automake, libtool, m4, xz, python3, numactl, # Processing, video codecs, containers ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, @@ -100,7 +100,7 @@ _EOF ffmpeg-full libogg libtheora x264 x265 libvpx dav1d libopus lame libvorbis a52dec speex libsamplerate libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz - libdvdread libdvdnav libdvdcss libbluray lzma + libdvdread libdvdnav libdvdcss libbluray xz ] ++ lib.optional (!stdenv.isDarwin) numactl ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify diff --git a/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix b/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix index 6819f7bfdcb..2db17f17aba 100644 --- a/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix +++ b/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libarchive, lzma, bzip2, zlib, lz4, lzo, openssl }: +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libarchive, xz, bzip2, zlib, lz4, lzo, openssl }: buildKodiBinaryAddon rec { pname = namespace; namespace = "vfs.libarchive"; @@ -11,7 +11,7 @@ buildKodiBinaryAddon rec { sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5"; }; - extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ]; + extraBuildInputs = [ libarchive xz bzip2 zlib lz4 lzo openssl ]; meta = with lib; { description = "LibArchive Virtual Filesystem add-on for Kodi"; diff --git a/pkgs/applications/video/kodi/packages.nix b/pkgs/applications/video/kodi/packages.nix new file mode 100644 index 00000000000..e6ce955e055 --- /dev/null +++ b/pkgs/applications/video/kodi/packages.nix @@ -0,0 +1,560 @@ +{ lib, stdenv, callPackage, fetchFromGitHub +, cmake, kodi, libcec_platform, tinyxml, pugixml +, steam, udev, libusb1, jsoncpp, libhdhomerun, zlib +, python3Packages, expat, glib, nspr, nss, openssl +, libssh, libarchive, xz, bzip2, lz4, lzo }: + +with lib; + +let self = rec { + + addonDir = "/share/kodi/addons"; + rel = "Matrix"; + + inherit kodi; + + # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix + toKodiAddon = drv: drv.overrideAttrs(oldAttrs: { + # Use passthru in order to prevent rebuilds when possible. + passthru = (oldAttrs.passthru or {})// { + kodiAddonFor = kodi; + requiredKodiAddons = requiredKodiAddons drv.propagatedBuildInputs; + }; + }); + + # Check whether a derivation provides a Kodi addon. + hasKodiAddon = drv: drv ? kodiAddonFor && drv.kodiAddonFor == kodi; + + # Get list of required Kodi addons given a list of derivations. + requiredKodiAddons = drvs: let + modules = filter hasKodiAddon drvs; + in unique (modules ++ concatLists (catAttrs "requiredKodiAddons" modules)); + + kodi-platform = stdenv.mkDerivation rec { + project = "kodi-platform"; + version = "17.1"; + name = "${project}-${version}"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = project; + rev = "c8188d82678fec6b784597db69a68e74ff4986b5"; + sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ kodi libcec_platform tinyxml ]; + }; + + buildKodiAddon = + { name ? "${attrs.pname}-${attrs.version}" + , namespace + , sourceDir ? "" + , ... } @ attrs: + toKodiAddon (stdenv.mkDerivation ({ + name = "kodi-" + name; + + dontStrip = true; + + extraRuntimeDependencies = [ ]; + + installPhase = '' + cd $src/$sourceDir + d=$out${addonDir}/${namespace} + mkdir -p $d + sauce="." + [ -d ${namespace} ] && sauce=${namespace} + cp -R "$sauce/"* $d + ''; + } // attrs)); + + buildKodiBinaryAddon = + { name ? "${attrs.pname}-${attrs.version}" + , namespace + , version + , extraBuildInputs ? [] + , extraRuntimeDependencies ? [] + , extraInstallPhase ? "", ... } @ attrs: + toKodiAddon (stdenv.mkDerivation ({ + name = "kodi-" + name; + + dontStrip = true; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs; + + inherit extraRuntimeDependencies; + + # disables check ensuring install prefix is that of kodi + cmakeFlags = [ + "-DOVERRIDE_PATHS=1" + ]; + + # kodi checks for addon .so libs existance in the addon folder (share/...) + # and the non-wrapped kodi lib/... folder before even trying to dlopen + # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use + installPhase = let n = namespace; in '' + make install + ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version} + ${extraInstallPhase} + ''; + } // attrs)); + + advanced-launcher = buildKodiAddon rec { + + pname = "advanced-launcher"; + namespace = "plugin.program.advanced.launcher"; + version = "2.5.8"; + + src = fetchFromGitHub { + owner = "edwtjo"; + repo = pname; + rev = version; + sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2"; + }; + + meta = { + homepage = "https://forum.kodi.tv/showthread.php?tid=85724"; + description = "A program launcher for Kodi"; + longDescription = '' + Advanced Launcher allows you to start any Linux, Windows and + macOS external applications (with command line support or not) + directly from the Kodi GUI. Advanced Launcher also give you + the possibility to edit, download (from Internet resources) + and manage all the meta-data (informations and images) related + to these applications. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + broken = true; # requires port to python3 + }; + + }; + + advanced-emulator-launcher = buildKodiAddon rec { + + pname = "advanced-emulator-launcher"; + namespace = "plugin.program.advanced.emulator.launcher"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "Wintermute0110"; + repo = namespace; + rev = version; + sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2"; + }; + + meta = { + homepage = "https://forum.kodi.tv/showthread.php?tid=287826"; + description = "A program launcher for Kodi"; + longDescription = '' + Advanced Emulator Launcher is a multi-emulator front-end for Kodi + scalable to collections of thousands of ROMs. Includes offline scrapers + for MAME and No-Intro ROM sets and also supports scrapping ROM metadata + and artwork online. ROM auditing for No-Intro ROMs using No-Intro XML + DATs. Launching of games and standalone applications is also available. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + broken = true; # requires port to python3 + }; + + }; + + controllers = let + pname = "game-controller"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "kodi-game-controllers"; + rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18"; + sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb"; + }; + + meta = { + description = "Add support for different gaming controllers."; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + mkController = controller: { + ${controller} = buildKodiAddon rec { + pname = pname + "-" + controller; + namespace = "game.controller." + controller; + sourceDir = "addons/" + namespace; + inherit version src meta; + }; + }; + in (mkController "default") + // (mkController "dreamcast") + // (mkController "gba") + // (mkController "genesis") + // (mkController "mouse") + // (mkController "n64") + // (mkController "nes") + // (mkController "ps") + // (mkController "snes"); + + hyper-launcher = let + pname = "hyper-launcher"; + version = "1.5.2"; + src = fetchFromGitHub rec { + name = pname + "-" + version + ".tar.gz"; + owner = "teeedubb"; + repo = owner + "-xbmc-repo"; + rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6"; + sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5"; + }; + meta = { + homepage = "https://forum.kodi.tv/showthread.php?tid=258159"; + description = "A ROM launcher for Kodi that uses HyperSpin assets."; + maintainers = with maintainers; [ edwtjo ]; + broken = true; # requires port to python3 + }; + in { + service = buildKodiAddon { + pname = pname + "-service"; + version = "1.2.1"; + namespace = "service.hyper.launcher"; + inherit src meta; + }; + plugin = buildKodiAddon { + namespace = "plugin.hyper.launcher"; + inherit pname version src meta; + }; + }; + + joystick = buildKodiBinaryAddon rec { + pname = namespace; + namespace = "peripheral.joystick"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914"; + }; + + meta = { + description = "Binary addon for raw joystick input."; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + extraBuildInputs = [ tinyxml udev ]; + }; + + simpleplugin = buildKodiAddon rec { + pname = "simpleplugin"; + namespace = "script.module.simpleplugin"; + version = "2.3.2"; + + src = fetchFromGitHub { + owner = "romanvm"; + repo = namespace; + rev = "v.${version}"; + sha256 = "0myar8dqjigb75pcc8zx3i5z79p1ifgphgb82s5syqywk0zaxm3j"; + }; + + meta = { + homepage = src.meta.homepage; + description = "Simpleplugin API"; + license = licenses.gpl3; + broken = true; # requires port to python3 + }; + }; + + svtplay = buildKodiAddon rec { + + pname = "svtplay"; + namespace = "plugin.video.svtplay"; + version = "5.1.12"; + + src = fetchFromGitHub { + name = pname + "-" + version + ".tar.gz"; + owner = "nilzen"; + repo = "xbmc-" + pname; + rev = "v${version}"; + sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6"; + }; + + meta = { + homepage = "https://forum.kodi.tv/showthread.php?tid=67110"; + description = "Watch content from SVT Play"; + longDescription = '' + With this addon you can stream content from SVT Play + (svtplay.se). The plugin fetches the video URL from the SVT + Play website and feeds it to the Kodi video player. HLS (m3u8) + is the preferred video format by the plugin. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + }; + + steam-controller = buildKodiBinaryAddon rec { + pname = namespace; + namespace = "peripheral.steamcontroller"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = namespace; + rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb"; + sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg"; + }; + + extraBuildInputs = [ libusb1 ]; + + meta = { + description = "Binary addon for steam controller."; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + }; + + steam-launcher = buildKodiAddon { + + pname = "steam-launcher"; + namespace = "script.steam.launcher"; + version = "3.5.1"; + + src = fetchFromGitHub rec { + owner = "teeedubb"; + repo = owner + "-xbmc-repo"; + rev = "8260bf9b464846a1f1965da495d2f2b7ceb81d55"; + sha256 = "1fj3ry5s44nf1jzxk4bmnpa4b9p23nrpmpj2a4i6xf94h7jl7p5k"; + }; + + propagatedBuildInputs = [ steam ]; + + meta = { + homepage = "https://forum.kodi.tv/showthread.php?tid=157499"; + description = "Launch Steam in Big Picture Mode from Kodi"; + longDescription = '' + This add-on will close/minimise Kodi, launch Steam in Big + Picture Mode and when Steam BPM is exited (either by quitting + Steam or returning to the desktop) Kodi will + restart/maximise. Running pre/post Steam scripts can be + configured via the addon. + ''; + maintainers = with maintainers; [ edwtjo ]; + }; + }; + + pdfreader = buildKodiAddon rec { + pname = "pdfreader"; + namespace = "plugin.image.pdf"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "i96751414"; + repo = "plugin.image.pdfreader"; + rev = "v${version}"; + sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml"; + }; + + meta = { + homepage = "https://forum.kodi.tv/showthread.php?tid=187421"; + description = "A comic book reader"; + maintainers = with maintainers; [ edwtjo ]; + }; + }; + + pvr-hts = buildKodiBinaryAddon rec { + + pname = "pvr-hts"; + namespace = "pvr.hts"; + version = "8.2.2"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.hts"; + rev = "${version}-${rel}"; + sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q"; + }; + + meta = { + homepage = "https://github.com/kodi-pvr/pvr.hts"; + description = "Kodi's Tvheadend HTSP client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ cpages ]; + }; + + }; + + pvr-hdhomerun = buildKodiBinaryAddon rec { + + pname = "pvr-hdhomerun"; + namespace = "pvr.hdhomerun"; + version = "7.1.0"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.hdhomerun"; + rev = "${version}-${rel}"; + sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm"; + }; + + meta = { + homepage = "https://github.com/kodi-pvr/pvr.hdhomerun"; + description = "Kodi's HDHomeRun PVR client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ titanous ]; + }; + + extraBuildInputs = [ jsoncpp libhdhomerun ]; + + }; + + pvr-iptvsimple = buildKodiBinaryAddon rec { + + pname = "pvr-iptvsimple"; + namespace = "pvr.iptvsimple"; + version = "7.4.2"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.iptvsimple"; + rev = "${version}-${rel}"; + sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr"; + }; + + meta = { + homepage = "https://github.com/kodi-pvr/pvr.iptvsimple"; + description = "Kodi's IPTV Simple client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + }; + + extraBuildInputs = [ zlib pugixml ]; + }; + + osmc-skin = buildKodiAddon rec { + + pname = "osmc-skin"; + namespace = "skin.osmc"; + version = "18.0.0"; + + src = fetchFromGitHub { + owner = "osmc"; + repo = namespace; + rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0"; + sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s"; + }; + + meta = { + homepage = "https://github.com/osmc/skin.osmc"; + description = "The default skin for OSMC"; + platforms = platforms.all; + maintainers = with maintainers; [ worldofpeace ]; + license = licenses.cc-by-nc-sa-30; + }; + }; + + yatp = python3Packages.toPythonModule (buildKodiAddon rec { + pname = "yatp"; + namespace = "plugin.video.yatp"; + version = "3.3.2"; + + src = fetchFromGitHub { + owner = "romanvm"; + repo = "kodi.yatp"; + rev = "v.${version}"; + sha256 = "12g1f57sx7dy6wy7ljl7siz2qs1kxcmijcg7xx2xpvmq61x9qa2d"; + }; + + patches = [ ./yatp/dont-monkey.patch ]; + + propagatedBuildInputs = [ + simpleplugin + python3Packages.requests + python3Packages.libtorrent-rasterbar + ]; + + meta = { + homepage = src.meta.homepage; + description = "Yet Another Torrent Player: libtorrent-based torrent streaming for Kodi"; + license = licenses.gpl3; + broken = true; # requires port to python3 + }; + }); + + inputstream-adaptive = buildKodiBinaryAddon rec { + + pname = "inputstream-adaptive"; + namespace = "inputstream.adaptive"; + version = "2.6.7"; + + src = fetchFromGitHub { + owner = "peak3d"; + repo = "inputstream.adaptive"; + rev = "${version}-${rel}"; + sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s"; + }; + + extraBuildInputs = [ expat ]; + + extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; + + extraInstallPhase = let n = namespace; in '' + ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so + ''; + + meta = { + homepage = "https://github.com/peak3d/inputstream.adaptive"; + description = "Kodi inputstream addon for several manifest types"; + platforms = platforms.all; + maintainers = with maintainers; [ sephalon ]; + }; + }; + + vfs-sftp = buildKodiBinaryAddon rec { + pname = namespace; + namespace = "vfs.sftp"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk"; + }; + + meta = with lib; { + description = "SFTP Virtual Filesystem add-on for Kodi"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + }; + + extraBuildInputs = [ openssl libssh zlib ]; + }; + + vfs-libarchive = buildKodiBinaryAddon rec { + pname = namespace; + namespace = "vfs.libarchive"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5"; + }; + + meta = with lib; { + description = "LibArchive Virtual Filesystem add-on for Kodi"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + }; + + extraBuildInputs = [ libarchive xz bzip2 zlib lz4 lzo openssl ]; + }; +}; in self diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 73f4812ee59..a6f64444f87 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -13,7 +13,7 @@ rec { , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config , go-md2man, go, containerd, runc, docker-proxy, tini, libtool - , sqlite, iproute, lvm2, systemd, docker-buildx + , sqlite, iproute2, lvm2, systemd, docker-buildx , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp , nixosTests @@ -72,7 +72,7 @@ rec { nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ]; - extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]); + extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); buildPhase = '' export GOCACHE="$TMPDIR/go-cache" diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 56760c293eb..e6b83286c00 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -5,7 +5,7 @@ , git , glibcLocales , go -, iproute +, iproute2 , iptables , makeWrapper , procps @@ -87,7 +87,7 @@ in buildBazelPackage rec { # Needed for the 'runsc do' subcomand wrapProgram $out/bin/runsc \ - --prefix PATH : ${lib.makeBinPath [ iproute iptables procps ]} + --prefix PATH : ${lib.makeBinPath [ iproute2 iptables procps ]} ''; }; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 1afe994977c..e56293dcc64 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, + pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ - --prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd which ]}" + --prefix PATH ':' "${lib.makeBinPath [ iproute2 dbus systemd which ]}" ''; meta = with lib; { diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index b90033e438d..ea3b87b47e4 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; version = "6.6.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D x11docker "$out/bin/x11docker"; wrapProgram "$out/bin/x11docker" \ - --prefix PATH : "${lib.makeBinPath [ getopt gnugrep gawk ps mount iproute nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}" + --prefix PATH : "${lib.makeBinPath [ getopt gnugrep gawk ps mount iproute2 nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}" ''; meta = { diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 5019ce23282..3d0ff3a6f33 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -13,7 +13,7 @@ config: # Scripts , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools -, iproute, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd +, iproute2, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd , lvm2, util-linux, procps, systemd # Documentation @@ -31,7 +31,7 @@ let scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [ which perl coreutils gawk gnused gnugrep diffutils util-linux multipath-tools - iproute inetutils iptables bridge-utils openvswitch nbd drbd + iproute2 inetutils iptables bridge-utils openvswitch nbd drbd ]; withXenfiles = f: concatStringsSep "\n" (mapAttrsToList f config.xenfiles); diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index 69c9cc1c37c..24c59508157 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkg-config }: +{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, bison, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXinerama libXrandr libXft yacc ]; + buildInputs = [ libX11 libXinerama libXrandr libXft bison ]; prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index d419b0ebe3a..e32cd38ec2d 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,10 +1,10 @@ { lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg , enableAlsaUtils ? true, alsaUtils, coreutils -, enableNetwork ? true, dnsutils, iproute, wirelesstools }: +, enableNetwork ? true, dnsutils, iproute2, wirelesstools }: let bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ] - ++ lib.optionals enableNetwork [ dnsutils iproute wirelesstools ]; + ++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ]; in rustPlatform.buildRustPackage rec { diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index 9c97c72ad5d..df774aa417f 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, lib, stdenv, perl, makeWrapper -, iproute, acpi, sysstat, alsaUtils +, iproute2, acpi, sysstat, alsaUtils , scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" "load_average" "memory" "volume" "wifi" ] }: @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/libexec/i3blocks/bandwidth \ - --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)} + --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute2)} wrapProgram $out/libexec/i3blocks/battery \ --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)} wrapProgram $out/libexec/i3blocks/cpu_usage \ --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)} wrapProgram $out/libexec/i3blocks/iface \ - --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)} + --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute2)} wrapProgram $out/libexec/i3blocks/volume \ --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} ''; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 759245aed1a..f6be1b299f6 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -573,7 +573,7 @@ rec { buildCommand = '' ${createRootFS} - PATH=$PATH:${lib.makeBinPath [ dpkg dpkg glibc lzma ]} + PATH=$PATH:${lib.makeBinPath [ dpkg dpkg glibc xz ]} # Unpack the .debs. We do this to prevent pre-install scripts # (which have lots of circular dependencies) from barfing. diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index b943a02a56f..dc43bdfd493 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit , db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja -, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber +, libkrb5, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber , gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas, boost, protobuf }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libsoup libxml2 gtk3 gnome-online-accounts gcr p11-kit libgweather libgdata libaccounts-glib json-glib - icu sqlite kerberos openldap webkitgtk glib-networking + icu sqlite libkrb5 openldap webkitgtk glib-networking libcanberra-gtk3 pcre libphonenumber boost protobuf ]; diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index b54f57e9b64..ccfb4a18a12 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, fetchgit, mercurial_4, python27, setJavaClassPath, which, zlib, makeWrapper, openjdk, unzip, git, clang, llvm, icu, ruby, glibc, bash, gcc, libobjc, - xcodebuild, gfortran, readline, bzip2, lzma, pcre, curl, ed, libresolv, libiconv, writeScriptBin, + xcodebuild, gfortran, readline, bzip2, xz, pcre, curl, ed, libresolv, libiconv, writeScriptBin, openssl, perl, CoreFoundation, Foundation, JavaNativeFoundation, JavaRuntimeSupport, JavaVM, Cocoa }: @@ -372,7 +372,7 @@ in rec { buildInputs = [ mx zlib.dev mercurial jvmci8 git llvm clang python27withPackages icu ruby bzip2 which - readline bzip2 lzma pcre curl ed gfortran + readline bzip2 xz pcre curl ed gfortran ] ++ lib.optional stdenv.isDarwin [ CoreFoundation gcc.cc.lib libiconv perl openssl ]; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 72b47b7afd3..38ee086a88f 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -3,7 +3,7 @@ , expat , libffi , gdbm -, lzma +, xz , mime-types ? null, mimetypesSupport ? true , ncurses , openssl @@ -103,7 +103,7 @@ let ]; buildInputs = filter (p: p != null) ([ - zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] + zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl ] ++ optionals x11Support [ tcl tk libX11 xorgproto ] ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ] ++ optionals stdenv.isDarwin [ configd ]) diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index b4e9343b5d4..a5ba4983e43 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, substituteAll, fetchurl , zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 -, self, gdbm, db, lzma +, self, gdbm, db, xz , python-setup-hook # For the Python package set , packageOverrides ? (self: super: {}) @@ -53,7 +53,7 @@ in with passthru; stdenv.mkDerivation rec { buildInputs = [ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db ] ++ optionals isPy3k [ - lzma + xz ] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [ stdenv.cc.libc ] ++ optionals zlibSupport [ diff --git a/pkgs/development/libraries/comedilib/default.nix b/pkgs/development/libraries/comedilib/default.nix index fef22dea06a..d59f4acd8dc 100644 --- a/pkgs/development/libraries/comedilib/default.nix +++ b/pkgs/development/libraries/comedilib/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , flex -, yacc +, bison , xmlto , docbook_xsl , docbook_xml_dtd_44 @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook flex - yacc + bison swig xmlto docbook_xml_dtd_44 diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index b1a6401284a..6e97c61a6a5 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext +{ lib, stdenv, fetchurl, openssl, openldap, libkrb5, db, gettext , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false , buildPackages, pruneLibtoolFiles, fetchpatch }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = - [ openssl db gettext kerberos ] + [ openssl db gettext libkrb5 ] ++ lib.optional enableLdap openldap ++ lib.optional stdenv.isLinux pam; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index a09ad0e871e..d861d25e67a 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -99,7 +99,7 @@ , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support , libXext ? null # Xlib support -, lzma ? null # xz-utils +, xz ? null # xz-utils , nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code @@ -381,7 +381,7 @@ stdenv.mkDerivation rec { (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") (enableFeature libxcbshapeExtlib "libxcb-shape") - (enableFeature (lzma != null) "lzma") + (enableFeature (xz != null) "lzma") (enableFeature nvenc "nvenc") (enableFeature (openal != null) "openal") #(enableFeature opencl "opencl") @@ -431,7 +431,7 @@ stdenv.mkDerivation rec { bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext lzma openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr + libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optionals openglExtlib [ libGL libGLU ] diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 99a08470396..82f1a8bf564 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,6 +1,6 @@ { lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg -, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr +, libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d , openglSupport ? false, libGLU ? null, libGL ? null , libmfxSupport ? false, intel-media-sdk ? null @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora - libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers + libvorbis xz soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers ] ++ optionals openglSupport [ libGL libGLU ] ++ optional libmfxSupport intel-media-sdk ++ optional libaomSupport libaom diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 13a33f68d25..018ffd68fa7 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -13,7 +13,7 @@ , xmlto , appstream-glib , substituteAll -, yacc +, bison , xdg-dbus-proxy , p11-kit , bubblewrap @@ -35,7 +35,7 @@ , fuse , nixosTests , libsoup -, lzma +, xz , zstd , ostree , polkit @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { pkg-config xmlto appstream-glib - yacc + bison wrapGAppsNoGuiHook ]; @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { libcap libseccomp libsoup - lzma + xz zstd polkit python3 diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 063678cbccc..212b656adda 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -8,7 +8,7 @@ , gflags , libiberty , lz4 -, lzma +, xz , zlib , jemalloc , openssl @@ -43,7 +43,7 @@ stdenv.mkDerivation (rec { libiberty openssl lz4 - lzma + xz zlib jemalloc libunwind diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 824d5c38318..ab71b2ccf9a 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -22,7 +22,7 @@ , docbook_xml_dtd_412 , gnome3 , gcr -, kerberos +, libkrb5 , gvfs , dbus , wrapGAppsHook @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { gvfs # OwnCloud, Google Drive icu json-glib - kerberos + libkrb5 librest libsecret libsoup diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 245b0c1e638..7b3b4561efb 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -2,7 +2,7 @@ , perl, gmp, autogen, libidn, p11-kit, unbound, libiconv , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake -, yacc, texinfo +, bison, texinfo # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] @@ -55,7 +55,7 @@ stdenv.mkDerivation { enableParallelBuilding = false; buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp - autogen gperftools gperf gettext automake yacc texinfo ] + autogen gperftools gperf gettext automake bison texinfo ] ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 9b6562b9891..fc2edc18712 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libidn, kerberos }: +{ fetchurl, lib, stdenv, libidn, libkrb5 }: stdenv.mkDerivation rec { name = "gsasl-1.10.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM="; }; - buildInputs = [ libidn kerberos ]; + buildInputs = [ libidn libkrb5 ]; configureFlags = [ "--with-gssapi-impl=mit" ]; diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index a5f499e6744..7a9ea86bbb5 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - bzip2, lzma, qtbase, zlib, + bzip2, xz, qtbase, zlib, }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ bzip2 lzma zlib ]; + buildInputs = [ bzip2 xz zlib ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 3e81b45362f..b9d97052031 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, perl, yacc, flex +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, perl, bison, flex , texinfo, perlPackages , openldap, libcap_ng, sqlite, openssl, db, libedit, pam , CoreFoundation, Security, SystemConfiguration @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./heimdal-make-missing-headers.patch ]; - nativeBuildInputs = [ autoreconfHook pkg-config python3 perl yacc flex texinfo ] + nativeBuildInputs = [ autoreconfHook pkg-config python3 perl bison flex texinfo ] ++ (with perlPackages; [ JSON ]); buildInputs = optionals (stdenv.isLinux) [ libcap_ng ] ++ [ db sqlite openssl libedit openldap pam] diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 5ef9e496b94..ebec5936b54 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds +{ lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds , openssl, openldap, libedit, keyutils # Extra Arguments @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config perl ] - ++ optional (!libOnly) yacc + ++ optional (!libOnly) bison # Provides the mig command used by the build scripts ++ optional stdenv.isDarwin bootstrap_cmds; diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index c3934db5b3f..c291c07abad 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }: +{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, bison, flex }: # library that allows libbluray to play AACS protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt libgpgerror ]; - nativeBuildInputs = [ yacc flex ]; + nativeBuildInputs = [ bison flex ]; meta = with lib; { homepage = "https://www.videolan.org/developers/libaacs.html"; diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index 678af459a30..d4bf3ff1c2b 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kerberos }: +{ lib, stdenv, fetchurl, libkrb5 }: stdenv.mkDerivation rec { name = "libgssglue-0.4"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/etc cat < $out/etc/gssapi_mech.conf - ${kerberos}/lib/libgssapi_krb5.so mechglue_internal_krb5_init + ${libkrb5}/lib/libgssapi_krb5.so mechglue_internal_krb5_init EOF ''; diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index 2ff59e055f9..f36b5436d69 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }: +{ lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu }: stdenv.mkDerivation rec { pname = "phonenumber"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - gmock + gtest pkg-config ]; diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index b6db462f3c3..e430a447336 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, - libyamlcpp, gmock }: + libyamlcpp, gtest }: stdenv.mkDerivation rec { pname = "librime"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ]; + buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest ]; meta = with lib; { homepage = "https://rime.im/"; diff --git a/pkgs/development/libraries/libticalcs2/default.nix b/pkgs/development/libraries/libticalcs2/default.nix index 6eb013a7ffd..2488a5bbb0b 100644 --- a/pkgs/development/libraries/libticalcs2/default.nix +++ b/pkgs/development/libraries/libticalcs2/default.nix @@ -7,7 +7,7 @@ , libticonv , libtifiles2 , libticables2 -, lzma +, xz , bzip2 , acl , libobjc @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libticonv libtifiles2 libticables2 - lzma + xz bzip2 ] ++ lib.optionals stdenv.isLinux [ acl diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix index c11d698079b..c8ad0e7e603 100644 --- a/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/pkgs/development/libraries/libvirt/5.9.0.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchgit , pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr -, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext +, iproute2, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { preConfigure = '' ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } - PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { postInstall = let - binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; + binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; in '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \ diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 0ec0b0693a3..ea4b40c3c89 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchgit , makeWrapper, autoreconfHook, fetchpatch , coreutils, libxml2, gnutls, perl, python3, attr, glib, docutils -, iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext +, iproute2, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, iptables, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" ''; in '' - PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ @@ -126,7 +126,7 @@ in stdenv.mkDerivation rec { postInstall = let # Keep the legacy iptables binary for now for backwards compatibility (comment on #109332) - binPath = [ iptables ebtables-compat iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; + binPath = [ iptables ebtables-compat iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; in '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index fbf3117fa35..d6e8b3958e4 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, bison, doxygen , xkeyboard_config, libxcb, libxml2 , python3 , libX11 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ] + nativeBuildInputs = [ meson ninja pkg-config bison doxygen ] ++ lib.optional withWaylandSupport wayland; buildInputs = [ xkeyboard_config libxcb libxml2 ] ++ lib.optionals withWaylandSupport [ wayland wayland-protocols ]; diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index cf5f6e320c0..9f374c22c1e 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }: +{ lib, stdenv, fetchurl, pkg-config, bison, flex, xkeyboard_config, libxcb, libX11 }: stdenv.mkDerivation rec { name = "libxkbcommon-0.7.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ yacc flex xkeyboard_config libxcb ]; + buildInputs = [ bison flex xkeyboard_config libxcb ]; configureFlags = [ "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb" diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index f31a7868d5e..6867940d1f2 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, autoreconfHook, zlib, gmock, buildPackages +, autoreconfHook, zlib, gtest, buildPackages , version, sha256 , ... }: @@ -20,8 +20,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { postPatch = '' rm -rf gmock - cp -r ${gmock.src}/googlemock gmock - cp -r ${gmock.src}/googletest googletest + cp -r ${gtest.src}/googlemock gmock + cp -r ${gtest.src}/googletest googletest chmod -R a+w gmock chmod -R a+w googletest ln -s ../googletest gmock/gtest diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index cb3a543ad2a..3233a29449a 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }: +{ lib, stdenv, fetchurl, zlib, bzip2, xz, curl, perl }: stdenv.mkDerivation rec { pname = "htslib"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # perl is only used during the check phase. nativeBuildInputs = [ perl ]; - buildInputs = [ zlib bzip2 lzma curl ]; + buildInputs = [ zlib bzip2 xz curl ]; configureFlags = [ "--enable-libcurl" ]; # optional but strongly recommended diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 5b603e6a0c7..2549704c1a8 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos +{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, libkrb5 , pkg-config, libiconv }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ apr openssl aprutil zlib libiconv ] - ++ lib.optional (!stdenv.isCygwin) kerberos; + ++ lib.optional (!stdenv.isCygwin) libkrb5; patches = [ ./scons.patch ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sconsFlags+=" OPENSSL=${openssl}" sconsFlags+=" ZLIB=${zlib}" '' + lib.optionalString (!stdenv.isCygwin) '' - sconsFlags+=" GSSAPI=${kerberos.dev}" + sconsFlags+=" GSSAPI=${libkrb5.dev}" ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix index b24b0b9bcd4..b956967ee88 100644 --- a/pkgs/development/libraries/sope/default.nix +++ b/pkgs/development/libraries/sope/default.nix @@ -1,5 +1,5 @@ { gnustep, lib, fetchFromGitHub , libxml2, openssl_1_1 -, openldap, mysql, libmysqlclient, postgresql }: +, openldap, mariadb, libmysqlclient, postgresql }: with lib; gnustep.stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ gnustep.stdenv.mkDerivation rec { nativeBuildInputs = [ gnustep.make ]; buildInputs = flatten ([ gnustep.base libxml2 openssl_1_1 ] ++ optional (openldap != null) openldap - ++ optionals (mysql != null) [ libmysqlclient mysql ] + ++ optionals (mariadb != null) [ libmysqlclient mariadb ] ++ optional (postgresql != null) postgresql); postPatch = '' @@ -31,7 +31,7 @@ gnustep.stdenv.mkDerivation rec { configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ] ++ optional (openldap != null) "--enable-openldap" - ++ optional (mysql != null) "--enable-mysql" + ++ optional (mariadb != null) "--enable-mysql" ++ optional (postgresql != null) "--enable-postgresql"; # Yes, this is ugly. diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 42e6e920be4..a272cf8b934 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl , openssl, json_c, curl, libgcrypt -, cmocka, uthash, ibm-sw-tpm2, iproute, procps, which +, cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl json_c curl libgcrypt ]; checkInputs = [ - cmocka uthash ibm-sw-tpm2 iproute procps which + cmocka uthash ibm-sw-tpm2 iproute2 procps which ]; preAutoreconf = "./bootstrap"; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index faf74bcab47..14f41b015e9 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, libuuid, patchelf, libiconv, fetchFromGitHub }: +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fetchFromGitHub }: # I haven't done any parameter tweaking.. So the defaults provided here might be bad @@ -79,7 +79,7 @@ }; nativeBuildInputs = [ cmake ]; - buildInputs = [ unixODBC mysql ]; + buildInputs = [ unixODBC mariadb ]; cmakeFlags = [ "-DWITH_UNIXODBC=1" ]; @@ -157,7 +157,7 @@ ''; postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl.out kerberos libuuid stdenv.cc.cc ]} \ + patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl.out libkrb5 libuuid stdenv.cc.cc ]} \ $out/lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional} ''; diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix index 1ebae86dec9..bf346f3a3ca 100644 --- a/pkgs/development/python-modules/backports_lzma/default.nix +++ b/pkgs/development/python-modules/backports_lzma/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy3k -, lzma +, xz , python , pythonOlder }: @@ -18,7 +18,7 @@ if !(pythonOlder "3.3") then null else buildPythonPackage rec { sha256 = "16d8b68e4d3cd4e6c9ddb059850452946da3914c8a8e197a7f2b0954559f2df4"; }; - buildInputs = [ lzma ]; + buildInputs = [ xz ]; checkPhase = '' ${python.interpreter} test/test_lzma.py diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index b9120d412cb..a3e48d20c60 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -14,7 +14,6 @@ , cramfsswap , sasquatch , squashfsTools -, lzma , matplotlib , nose , pycrypto @@ -32,7 +31,7 @@ buildPythonPackage rec { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ] ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ] ++ lib.optionals (!stdenv.isDarwin) [ cramfsprogs cramfsswap sasquatch ]; diff --git a/pkgs/development/python-modules/deeptoolsintervals/default.nix b/pkgs/development/python-modules/deeptoolsintervals/default.nix index eef8d51ae91..0dde3c51c3a 100644 --- a/pkgs/development/python-modules/deeptoolsintervals/default.nix +++ b/pkgs/development/python-modules/deeptoolsintervals/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytest , zlib -, lzma +, xz }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1xnl80nblysj6dylj4683wgrfa425rkx4dp5k65hvwdns9pw753x"; }; - buildInputs = [ zlib lzma ]; + buildInputs = [ zlib xz ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix index 7a9ce3aab44..c4772d60651 100644 --- a/pkgs/development/python-modules/kerberos/default.nix +++ b/pkgs/development/python-modules/kerberos/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, kerberos +, libkrb5 }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "cdd046142a4e0060f96a00eb13d82a5d9ebc0f2d7934393ed559bac773460a2c"; }; - nativeBuildInputs = [ kerberos ]; + nativeBuildInputs = [ libkrb5 ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 2f40a297333..31e01e83dbf 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -7,7 +7,7 @@ , cython , htslib , libdeflate -, lzma +, xz , pytest , samtools , zlib @@ -33,7 +33,7 @@ buildPythonPackage rec { curl cython libdeflate - lzma + xz zlib ]; diff --git a/pkgs/development/python-modules/rpy2/2.nix b/pkgs/development/python-modules/rpy2/2.nix index e178d3c8211..3108861e9ce 100644 --- a/pkgs/development/python-modules/rpy2/2.nix +++ b/pkgs/development/python-modules/rpy2/2.nix @@ -9,7 +9,7 @@ , rWrapper , rPackages , pcre -, lzma +, xz , bzip2 , zlib , icu @@ -35,7 +35,7 @@ buildPythonPackage rec { readline R pcre - lzma + xz bzip2 zlib icu diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index c913ab53b28..c5443a37382 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -7,7 +7,7 @@ , rWrapper , rPackages , pcre -, lzma +, xz , bzip2 , zlib , icu @@ -46,7 +46,7 @@ buildPythonPackage rec { buildInputs = [ pcre - lzma + xz bzip2 zlib icu diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 24f6e7ccfc4..ae23b32b71a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -310,10 +310,10 @@ let RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; Rhdf5lib = [ pkgs.zlib ]; - Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.mpi pkgs.pcre.dev ]; - Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.lzma.dev pkgs.curl.dev ]; + Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.mpi pkgs.pcre.dev ]; + Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.xz.dev pkgs.curl.dev ]; rjags = [ pkgs.jags ]; - rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ]; + rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ]; Rlibeemd = [ pkgs.gsl_1 ]; rmatio = [ pkgs.zlib.dev ]; Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; @@ -334,7 +334,7 @@ let RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; rzmq = [ pkgs.zeromq pkgs.pkg-config ]; clustermq = [ pkgs.zeromq ]; - SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; + SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.xz pkgs.pcre ]; sdcTable = [ pkgs.gmp pkgs.glpk ]; seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; seqinr = [ pkgs.zlib.dev ]; @@ -939,7 +939,7 @@ let }); littler = old.littler.overrideAttrs (attrs: with pkgs; { - buildInputs = [ pcre lzma zlib bzip2 icu which ] ++ attrs.buildInputs; + buildInputs = [ pcre xz zlib bzip2 icu which ] ++ attrs.buildInputs; postInstall = '' install -d $out/bin $out/share/man/man1 ln -s ../library/littler/bin/r $out/bin/r diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 6d8313954c3..3f1c2190a3c 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -17,7 +17,7 @@ # This seperates "what to build" (the exact gem versions) from "how to build" # (to make gems behave if necessary). -{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which +{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl @@ -607,7 +607,7 @@ in }; timfel-krb5-auth = attrs: { - buildInputs = [ kerberos ]; + buildInputs = [ libkrb5 ]; }; tiny_tds = attrs: { diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 49e31f53a84..58bb58fa2b0 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, yacc, gcc +{ stdenv, lib, fetchurl, makeWrapper, bison, gcc , withISpin ? true, tk, swarm, graphviz }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ yacc ]; + buildInputs = [ bison ]; sourceRoot = "Spin/Src${version}"; diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 6f5ecde8f88..859497345ff 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, yacc }: +{ lib, stdenv, fetchurl, bison }: stdenv.mkDerivation rec { name = "jam-2.6.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19xkvkpycxfsncxvin6yqrql3x3z9ypc1j8kzls5k659q4kv5rmc"; }; - nativeBuildInputs = [ yacc ]; + nativeBuildInputs = [ bison ]; preConfigure = '' unset AR diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index 7e0a07ad834..bc44741cffe 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}: +{lib, stdenv, fetchurl, bison, flex, readline, ncurses, gnused}: stdenv.mkDerivation { name = "cdecl-2.5"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1 CC=$CC"; mkdir -p $out/bin; ''; - buildInputs = [yacc flex readline ncurses]; + buildInputs = [bison flex readline ncurses]; meta = { description = "Translator English -- C/C++ declarations"; diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix index 447dbc23fdf..a25a3956451 100644 --- a/pkgs/development/tools/database/shmig/default.nix +++ b/pkgs/development/tools/database/shmig/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , withMySQL ? true, withPSQL ? false, withSQLite ? false -, mysql, postgresql, sqlite, gawk, gnugrep, findutils, gnused +, mariadb, postgresql, sqlite, gawk, gnugrep, findutils, gnused , lib }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patchShebangs . substituteInPlace shmig \ - --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mysql.client}/bin/mysql"}" \ + --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mariadb.client}/bin/mysql"}" \ --replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \ --replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \ --replace "awk" "${gawk}/bin/awk" \ diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index a4f4911f589..8a976f44bf7 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security , sqliteSupport ? true, sqlite , postgresqlSupport ? true, postgresql -, mysqlSupport ? true, mysql, zlib, libiconv +, mysqlSupport ? true, mariadb, zlib, libiconv }: assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysqlSupport == true) @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { ++ optional (stdenv.isDarwin && mysqlSupport) libiconv ++ optional sqliteSupport sqlite ++ optional postgresqlSupport postgresql - ++ optionals mysqlSupport [ mysql zlib ]; + ++ optionals mysqlSupport [ mariadb zlib ]; buildAndTestSubdir = "diesel_cli"; diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index e5280d46b59..26d6d9178ed 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, m4, perl, lzma}: +{lib, stdenv, fetchurl, m4, perl, xz}: stdenv.mkDerivation rec { name = "autoconf-2.13"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"; }; - nativebuildInputs = [ lzma ]; + nativebuildInputs = [ xz ]; buildInputs = [ m4 perl ]; doCheck = true; diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 4d95310c342..9cfd9380010 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline +{ lib, stdenv, fetchurl, bison, flex, libusb-compat-0_1, libelf, libftdi1, readline # docSupport is a big dependency, disabled by default , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals docSupport "--enable-doc"; - buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ] + buildInputs = [ bison flex libusb-compat-0_1 libelf libftdi1 readline ] ++ lib.optionals docSupport [ texLive texinfo texi2html ]; meta = with lib; { diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index c557f9600c3..0cc7769d3c5 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -2,7 +2,7 @@ , makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx , top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt , perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json -, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar +, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, xz, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , migration ? false, patches ? [] , tests ? {}, mdbook @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { hydraPath = lib.makeBinPath ( [ sqlite subversion openssh nix coreutils findutils pixz - gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy + gzip bzip2 xz gnutar unzip git top-git mercurial /*darcs*/ gnused breezy ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); nativeBuildInputs = [ autoreconfHook pkg-config mdbook ]; diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index 5f4478bd4fb..b8da38ace6f 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo, ncurses, lzma }: +{ stdenv, fetchurl, texinfo, ncurses, xz }: stdenv.mkDerivation rec { pname = "texinfo"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses ]; - nativeBuildInputs = [ lzma ]; + nativeBuildInputs = [ xz ]; # Disabled because we don't have zdiff in the stdenv bootstrap. #doCheck = true; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index 315a896929d..2e9e8936ddb 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub , cmake, git, pkg-config, wget, zip , qtbase, qtx11extras -, libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 +, libdwarf, libjpeg_turbo, libunwind, xz, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf , freeglut, libGLU , fetchpatch @@ -31,7 +31,7 @@ mkDerivation { buildInputs = [ git wget zip qtbase qtx11extras - libdwarf libjpeg_turbo libunwind lzma tinyxml libX11 + libdwarf libjpeg_turbo libunwind xz tinyxml libX11 SDL2 SDL2_gfx SDL2_image SDL2_ttf freeglut libGLU ]; diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/development/tools/xcbuild/toolchains.nix index e435f0978c5..e0abf90847f 100644 --- a/pkgs/development/tools/xcbuild/toolchains.nix +++ b/pkgs/development/tools/xcbuild/toolchains.nix @@ -44,8 +44,8 @@ runCommand "Toolchains" {} ('' fi done - ln -s ${buildPackages.yacc}/bin/yacc $toolchain/bin/yacc - ln -s ${buildPackages.yacc}/bin/bison $toolchain/bin/bison + ln -s ${buildPackages.bison}/bin/yacc $toolchain/bin/yacc + ln -s ${buildPackages.bison}/bin/bison $toolchain/bin/bison ln -s ${buildPackages.flex}/bin/flex $toolchain/bin/flex ln -s ${buildPackages.flex}/bin/flex++ $toolchain/bin/flex++ ln -s $toolchain/bin/flex $toolchain/bin/lex diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index dea159f53bf..3ffb7e0c549 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkg-config, python3 -, zlib, bzip2, curl, lzma, gettext, libiconv +, zlib, bzip2, curl, xz, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth , gtkClient ? false, gtk3 , qtClient ? false, qt5 @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] ++ optional qtClient [ qt5.wrapQtAppsHook ]; - buildInputs = [ lua5_3 zlib bzip2 curl lzma gettext libiconv ] + buildInputs = [ lua5_3 zlib bzip2 curl xz gettext libiconv ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] ++ optionals gtkClient [ gtk3 ] ++ optionals qtClient [ qt5.qtbase ] diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index fef1a0f0928..21aca573062 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, lzma, boost, libdevil, zlib, p7zip +{ lib, stdenv, fetchFromGitHub, cmake, xz, boost, libdevil, zlib, p7zip , openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL , asciidoc, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, which, minizip @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "-DPREFER_STATIC_LIBS:BOOL=OFF"]; nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ]; - buildInputs = [ lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 + buildInputs = [ xz boost libdevil zlib p7zip openal libvorbis freetype SDL2 xorg.libX11 xorg.libXcursor libGLU libGL glew curl systemd libunwind which minizip ] ++ lib.optional withAI jdk diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index 0b8090ce41d..9813c906bef 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,5 +1,5 @@ { callPackage, gobject-introspection, cmake, pkg-config -, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool +, glib, libsndfile, zlib, bzip2, xz, libsamplerate, intltool , pcre, util-linux, libselinux, libsepol }: let pkg = import ./base.nix { @@ -8,7 +8,7 @@ let pkg = import ./base.nix { pkgSha256 = "08mfvqyk3833ksfd47i4j3ppmrw5ry219km6h7lywdh9hm9x14yf"; }; in callPackage pkg { - buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ]; + buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate intltool ]; drvParams = { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index c45240982a7..7c9a4815e0a 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, zlib, ffmpeg_3, glew, pcre -, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, lzma, nasm +, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, xz, nasm , llvm, glibmm }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg - pango lzma nasm llvm glibmm + pango xz nasm llvm glibmm ]; meta = with lib; { diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 2d51c11f04a..b86891352f0 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, yacc, flex +{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, bison, flex , writeText, buildPackages, splicePackages, symlinkJoin }: let @@ -563,7 +563,7 @@ let sha256 = "0630lbvz6v4ic13bfg8ccwfhqkgcv76bfdw9f36rfsnwfgpxqsmq"; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = [ makeMinimal install mandoc groff flex - yacc genassym gencat lorder tsort stat ]; + bison genassym gencat lorder tsort stat ]; extraPaths = [ sys.src ld_elf_so.src ]; }; @@ -587,7 +587,7 @@ let librpcsvc.src libutil.src librt.src libcrypt.src ]; buildInputs = [ buildPackages.netbsd.headers csu ]; nativeBuildInputs = [ makeMinimal install mandoc groff flex - yacc genassym gencat lorder tsort stat ]; + bison genassym gencat lorder tsort stat ]; NIX_CFLAGS_COMPILE = "-B${csu}/lib"; meta.platforms = lib.platforms.netbsd; SHLIBINSTALLDIR = "$(out)/lib"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix index 4855c532acb..b4c28e23c14 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix @@ -1,4 +1,4 @@ -{ lib, appleDerivation, fetchzip, bsdmake, perl, flex, yacc +{ lib, appleDerivation, fetchzip, bsdmake, perl, flex, bison }: # this derivation sucks @@ -16,7 +16,7 @@ let recentAdvCmds = fetchzip { }; in appleDerivation { - nativeBuildInputs = [ bsdmake perl yacc flex ]; + nativeBuildInputs = [ bsdmake perl bison flex ]; buildInputs = [ flex ]; patchPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix index 5ac971d02f7..800da92dae9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, appleDerivation, yacc, flex }: +{ lib, stdenv, appleDerivation, bison, flex }: appleDerivation { - nativeBuildInputs = [ yacc flex ]; + nativeBuildInputs = [ bison flex ]; buildPhase = '' cd migcom.tproj diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index 258d9785e70..53f98e2b457 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,8 +1,8 @@ -{ lib, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: +{ lib, appleDerivation, xcbuildHook, zlib, bzip2, xz, ncurses, libutil }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ zlib bzip2 lzma ncurses libutil ]; + buildInputs = [ zlib bzip2 xz ncurses libutil ]; # some commands not working: # mtree: _simple.h not found diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index 3f0c91db91c..9e3d6e49204 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -1,14 +1,14 @@ -{ lib, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: +{ lib, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, xz }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ ncurses bzip2 zlib lzma ]; + buildInputs = [ ncurses bzip2 zlib xz ]; # patches to use ncursees # disables md5 patchPhase = '' substituteInPlace text_cmds.xcodeproj/project.pbxproj \ - --replace 'FC6C98FB149A94EB00DDCC47 /* libcurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurses.dylib; path = /usr/lib/libcurses.dylib; sourceTree = ""; };' 'FC6C98FB149A94EB00DDCC47 /* libncurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.dylib; path = /usr/lib/libncurses.dylib; sourceTree = ""; };' \ + --replace 'FC6C98FB149A94EB00DDCC47 /* libcurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurses.dylib; path = /usr/lib/libcurses.dylib; sourceTree = ""; };' 'FC6C98FB149A94EB00DDCC47 /* libncurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.dylib; path = /usr/lib/libncurses.dylib; sourceTree = ""; };' \ --replace 'FC7A7EB5149875E00086576A /* PBXTargetDependency */,' "" ''; diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index f7ca3f71d43..3055a91161b 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs -, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }: +, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }: let version = "5.1.6"; @@ -36,7 +36,7 @@ in stdenv.mkDerivation { #make install SUBDIRS="samples" # impure! ''; - buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd + buildInputs = [ linuxHeaders libtirpc libxml2 libkrb5 kmod openldap sssd openssl cyrus_sasl rpcsvc-proto ]; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index c4ed4d4fc0f..38f958fe9dd 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config -, kerberos, keyutils, pam, talloc, python3 }: +, libkrb5, keyutils, pam, talloc, python3 }: stdenv.mkDerivation rec { pname = "cifs-utils"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docutils pkg-config ]; - buildInputs = [ kerberos keyutils pam talloc python3 ]; + buildInputs = [ libkrb5 keyutils pam talloc python3 ]; configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # AC_FUNC_MALLOC is broken on cross builds. diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index f7f02037800..80730fdbefb 100644 --- a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: +{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: rustPlatform.buildRustPackage rec { pname = "firmware-manager"; version = "0.1.2"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; + buildInputs = [ xz openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen"; diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 138fea042fc..9d47d50b43f 100644 --- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, efibootmgr, makeWrapper }: +{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, efibootmgr, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ lzma openssl dbus ]; + buildInputs = [ xz openssl dbus ]; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index b5eb1ce1a50..83ac93fbf71 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, openssl, nettools, iproute, sysctl}: +{lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}: let baseName = "gogoclient"; version = "1.2"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { substituteInPlace "$out/template/linux.sh" \ --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \ --replace "/sbin/route" "${nettools}/bin/route" \ - --replace "/sbin/ip" "${iproute}/sbin/ip" \ + --replace "/sbin/ip" "${iproute2}/sbin/ip" \ --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh ''; diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix index 2d7644e6bda..2b6bf6fc63a 100644 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, python, kernel, makeWrapper, writeText -, gawk, iproute }: +, gawk, iproute2 }: let libexec = "libexec/hypervkvpd"; @@ -42,7 +42,7 @@ let postFixup = '' wrapProgram $out/bin/hv_kvp_daemon \ - --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute2 ]} ''; }; diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix index 7285e27ff36..12723213901 100644 --- a/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/pkgs/os-specific/linux/iproute/mptcp.nix @@ -1,6 +1,6 @@ -{ lib, iproute, fetchFromGitHub }: +{ lib, iproute2, fetchFromGitHub }: -iproute.overrideAttrs (oa: rec { +iproute2.overrideAttrs (oa: rec { pname = "iproute_mptcp"; version = "0.95"; diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index 4e0ae7955be..33152cc51c1 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, kerberos, pam }: +{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, libkrb5, pam }: # TODO: These tools are supposed to work under NetBSD and FreeBSD as # well, so I guess it's not appropriate to place this expression in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf"; }; - buildInputs = [ readline openssl flex kerberos pam ]; + buildInputs = [ readline openssl flex libkrb5 pam ]; patches = [ ./dont-create-localstatedir-during-install.patch diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index b43d70f21bb..e40a59ce823 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pam, yacc, flex }: +{ lib, stdenv, fetchurl, fetchpatch, pam, bison, flex }: stdenv.mkDerivation rec { pname = "libcgroup"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4"; }; - buildInputs = [ pam yacc flex ]; + buildInputs = [ pam bison flex ]; patches = [ (fetchpatch { diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index c2d2996c54d..7b5f6e72001 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent -, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers +, sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers , python3, buildPackages, nixosTests, rpcsvc-proto , enablePython ? true }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtirpc libcap libevent sqlite lvm2 - libuuid keyutils kerberos tcp_wrappers + libuuid keyutils libkrb5 tcp_wrappers ] ++ lib.optional enablePython python3; enableParallelBuilding = true; @@ -33,15 +33,15 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace configure \ - --replace '$dir/include/gssapi' ${lib.getDev kerberos}/include/gssapi \ - --replace '$dir/bin/krb5-config' ${lib.getDev kerberos}/bin/krb5-config + --replace '$dir/include/gssapi' ${lib.getDev libkrb5}/include/gssapi \ + --replace '$dir/bin/krb5-config' ${lib.getDev libkrb5}/bin/krb5-config ''; configureFlags = [ "--enable-gss" "--enable-svcgss" "--with-statedir=/var/lib/nfs" - "--with-krb5=${lib.getLib kerberos}" + "--with-krb5=${lib.getLib libkrb5}" "--with-systemd=${placeholder "out"}/etc/systemd/system" "--enable-libmount-mount" "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { # https://bugzilla.kernel.org/show_bug.cgi?id=203793 doCheck = false; - disallowedReferences = [ (lib.getDev kerberos) ]; + disallowedReferences = [ (lib.getDev libkrb5) ]; passthru.tests = { nfs3-simple = nixosTests.nfs3.simple; diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index f379633e198..4a6cf887c3b 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which -, procps, libcap_ng, openssl, python2, iproute , perl +, procps, libcap_ng, openssl, python2, perl , automake, autoconf, libtool, kernel ? null }: with lib; diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index c0b8ce272d7..cb04fa5b424 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pam, kerberos }: +{ lib, stdenv, fetchurl, pam, libkrb5 }: stdenv.mkDerivation rec { name = "pam-krb5-4.10"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "09wzxd5zrj5bzqpb01qf148npj5k8hmd2bx2ij1qsy40hdxqyq79"; }; - buildInputs = [ pam kerberos ]; + buildInputs = [ pam libkrb5 ]; meta = with lib; { homepage = "https://www.eyrie.org/~eagle/software/pam-krb5/"; diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index ff3100cbb22..a4da6be691e 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl -, yacc, flex +, bison, flex , sysfsutils, kmod, udev , firmware ? config.pcmciaUtils.firmware or [] # Special pcmcia cards. , configOpts ? config.pcmciaUtils.config or null # Special hardware (map memory & port & irq) @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk"; }; - buildInputs = [udev yacc sysfsutils kmod flex]; + buildInputs = [udev bison sysfsutils kmod flex]; patchPhase = '' sed -i " diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index e58b97654af..33192392888 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp +, bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd, dhcp }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { installPhase = '' install -D pipework $out/bin/pipework wrapProgram $out/bin/pipework --prefix PATH : \ - ${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]}; + ${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd dhcp ]}; ''; meta = with lib; { description = "Software-Defined Networking tools for LXC"; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 2844badc730..e62716e4796 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }: +{ lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, bison, flex, p7zip, rsync }: assert kernel != null -> lib.versionAtLeast kernel.version "4.0"; @@ -7,7 +7,7 @@ let in stdenv.mkDerivation { pname = "ply"; inherit version; - nativeBuildInputs = [ autoreconfHook flex yacc p7zip rsync ]; + nativeBuildInputs = [ autoreconfHook flex bison p7zip rsync ]; src = fetchFromGitHub { owner = "iovisor"; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index aef87e7c82d..c37514eaf48 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils -, pandoc, ethtool, iproute, libnl, udev, python3, perl +, pandoc, ethtool, iproute2, libnl, udev, python3, perl , makeWrapper } : @@ -18,7 +18,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ]; - buildInputs = [ libnl ethtool iproute udev python3 perl ]; + buildInputs = [ libnl ethtool iproute2 udev python3 perl ]; cmakeFlags = [ "-DCMAKE_INSTALL_RUNDIR=/run" diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 2973b87210b..d768546b12b 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen, python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap, - pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, + pcre, libkrb5, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, nss_wrapper, ncurses, Po4a, http-parser, jansson, docbook_xsl, docbook_xml_dtd_44, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss samba nfs-utils doxygen python python3 popt - talloc tdb tevent pkg-config ldb pam openldap pcre kerberos + talloc tdb tevent pkg-config ldb pam openldap pcre libkrb5 cifs-utils glib keyutils dbus fakeroot libxslt libxml2 libuuid ldap systemd nspr check cmocka uid_wrapper nss_wrapper ncurses Po4a http-parser jansson ]; diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index c51cafa9ace..91dad81f1f5 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config -, zlib, bzip2, lzma, libgcrypt +, zlib, bzip2, xz, libgcrypt }: with lib; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = map mkStatic (o.buildInputs or []); propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []); }); - in map mkStatic [ zlib bzip2 lzma libgcrypt ]; + in map mkStatic [ zlib bzip2 xz libgcrypt ]; configureFlags = [ "--disable-shared" ]; diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 4ed03450af7..c79a9fe3fd2 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -5,7 +5,7 @@ , fetchurl , fuse , libevent -, lzma +, xz , openssl , pkg-config , systemd @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake doxygen pkg-config ]; - buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ]; + buildInputs = [ bzip2 fuse libevent xz openssl systemd tcp_wrappers zlib ]; meta = with lib; { description = "A caching proxy specialized for linux distribution files"; diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index a174d4dcb1a..65323323962 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -1,6 +1,6 @@ {lib, stdenv , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl -, lighttpd, iproute }: +, lighttpd, iproute2 }: stdenv.mkDerivation rec { version = "2014-06-29-1"; pname = "nix-binary-cache"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --replace @gnugrep@ "${gnugrep}/bin" \ --replace @openssl@ "${openssl.bin}/bin" \ --replace @lighttpd@ "${lighttpd}/sbin" \ - --replace @iproute@ "${iproute}/sbin" \ + --replace @iproute@ "${iproute2}/sbin" \ --replace "xXxXx" "xXxXx" chmod a+x "$out/bin/nix-binary-cache.cgi" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --replace @gnugrep@ "${gnugrep}/bin" \ --replace @openssl@ "${openssl.bin}/bin" \ --replace @lighttpd@ "${lighttpd}/sbin" \ - --replace @iproute@ "${iproute}/sbin" \ + --replace @iproute@ "${iproute2}/sbin" \ --replace "xXxXx" "xXxXx" chmod a+x "$out/bin/nix-binary-cache-start" diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 90510d50252..db9041574fc 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,5 +1,5 @@ { 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, python3 +, db, cyrus_sasl, svrcore, icu, net-snmp, libkrb5, pcre, perlPackages, libevent, openssl, python3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ perl pam nspr nss openldap db cyrus_sasl svrcore icu - net-snmp kerberos pcre libevent openssl python3 + net-snmp libkrb5 pcre libevent openssl python3 ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); patches = [ diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 02841c6acb9..c55c67f5f62 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,4 +1,4 @@ -{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools +{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute2, nettools , fetchFromGitHub, makeWrapper }: @@ -18,9 +18,9 @@ perlPackages.buildPerlPackage rec { patchShebangs bin substituteInPlace "lib/FusionInventory/Agent/Tools/Linux.pm" \ - --replace /sbin/ip ${iproute}/sbin/ip + --replace /sbin/ip ${iproute2}/sbin/ip substituteInPlace "lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm" \ - --replace /sbin/ip ${iproute}/sbin/ip + --replace /sbin/ip ${iproute2}/sbin/ip ''; buildTools = []; @@ -67,7 +67,7 @@ perlPackages.buildPerlPackage rec { for cur in $out/bin/*; do if [ -x "$cur" ]; then sed -e "s|./lib|$out/lib|" -i "$cur" - wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools iproute]} + wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools iproute2]} fi done ''; diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index a8cf124fc7e..8051602489c 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute, nettools }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute2, nettools }: buildGoModule rec { pname = "mackerel-agent"; @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; vendorSha256 = "sha256-yomxALecP+PycelOmwrteK/LoW7wsst7os+jcbF46Bs="; diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index f7944e6a175..918a20ce5a3 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex -, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file +, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file , docbook_xml_dtd_43, libtool_2 , withDevdoc ? false, doxygen, dblatex # Extra developer documentation , ncurses # Extra ncurses utilities. Needed for debugging and monitoring. @@ -16,9 +16,9 @@ in stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl - which yacc ] ++ optionals withDevdoc [ doxygen dblatex ]; + which bison ] ++ optionals withDevdoc [ doxygen dblatex ]; - buildInputs = [ kerberos ncurses ]; + buildInputs = [ libkrb5 ncurses ]; patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 1bb6ee32396..53389db39c9 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, which, autoconf, automake, flex, yacc -, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: +{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison +, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; @@ -13,10 +13,10 @@ in stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; - nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ] ++ kernel.moduleBuildDependencies; - buildInputs = [ kerberos ]; + buildInputs = [ libkrb5 ]; patches = [ # LINUX 5.8: Replace kernel_setsockopt with new funcs @@ -91,5 +91,4 @@ in stdenv.mkDerivation { maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; broken = versionOlder kernel.version "3.18" || kernel.isHardened; }; - } diff --git a/pkgs/servers/openafs/1.9/default.nix b/pkgs/servers/openafs/1.9/default.nix index f7944e6a175..918a20ce5a3 100644 --- a/pkgs/servers/openafs/1.9/default.nix +++ b/pkgs/servers/openafs/1.9/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex -, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file +, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file , docbook_xml_dtd_43, libtool_2 , withDevdoc ? false, doxygen, dblatex # Extra developer documentation , ncurses # Extra ncurses utilities. Needed for debugging and monitoring. @@ -16,9 +16,9 @@ in stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl - which yacc ] ++ optionals withDevdoc [ doxygen dblatex ]; + which bison ] ++ optionals withDevdoc [ doxygen dblatex ]; - buildInputs = [ kerberos ncurses ]; + buildInputs = [ libkrb5 ncurses ]; patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch; diff --git a/pkgs/servers/openafs/1.9/module.nix b/pkgs/servers/openafs/1.9/module.nix index 5ed09a21742..a242d59e2dd 100644 --- a/pkgs/servers/openafs/1.9/module.nix +++ b/pkgs/servers/openafs/1.9/module.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, which, autoconf, automake, flex, yacc -, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: +{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison +, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; @@ -13,10 +13,10 @@ in stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; - nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ] ++ kernel.moduleBuildDependencies; - buildInputs = [ kerberos ]; + buildInputs = [ libkrb5 ]; patches = []; @@ -60,5 +60,4 @@ in stdenv.mkDerivation { maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; broken = versionOlder kernel.version "3.18" || kernel.isHardened; }; - } diff --git a/pkgs/servers/openbgpd/default.nix b/pkgs/servers/openbgpd/default.nix index 58f799c97ba..20b8699aef5 100644 --- a/pkgs/servers/openbgpd/default.nix +++ b/pkgs/servers/openbgpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, m4, yacc }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, m4, bison }: let openbsd_version = @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-TKs6tt/SCWes6kYAGIrSShZgOLf7xKh26xG3Zk7wCCw="; }; - nativeBuildInputs = [ autoconf automake libtool m4 yacc ]; + nativeBuildInputs = [ autoconf automake libtool m4 bison ]; preConfigure = '' mkdir ./openbsd diff --git a/pkgs/servers/pim6sd/default.nix b/pkgs/servers/pim6sd/default.nix index 6752a8089af..0889deee92a 100644 --- a/pkgs/servers/pim6sd/default.nix +++ b/pkgs/servers/pim6sd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, autoreconfHook, yacc, flex }: +{ stdenv, fetchFromGitHub, lib, autoreconfHook, bison, flex }: stdenv.mkDerivation rec { pname = "pim6sd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0x7dyark2mp9xqz9cnmmgaf0z143vxn2835clllpji4ylg77zdjw"; }; - nativeBuildInputs = [ autoreconfHook yacc flex ]; + nativeBuildInputs = [ autoreconfHook bison flex ]; meta = with lib; { description = "PIM for IPv6 sparse mode daemon"; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 714cf517457..d051395027b 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2 }: buildGoModule rec { pname = "tailscale"; @@ -30,7 +30,7 @@ buildGoModule rec { postInstall = '' wrapProgram $out/bin/tailscaled --prefix PATH : ${ - lib.makeBinPath [ iproute iptables ] + lib.makeBinPath [ iproute2 iptables ] } sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 0ae93ed1469..c4e9e915381 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config -, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages +, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages , polkit, util-linuxMinimal, x264, zlib , coreutils, procps, psmisc, nixosTests }: @@ -122,11 +122,11 @@ in stdenv.mkDerivation rec { done substituteInPlace scripts/zmdbbackup.in \ - --replace /usr/bin/mysqldump ${mysql.client}/bin/mysqldump + --replace /usr/bin/mysqldump ${mariadb.client}/bin/mysqldump substituteInPlace scripts/zmupdate.pl.in \ - --replace "'mysql'" "'${mysql.client}/bin/mysql'" \ - --replace "'mysqldump'" "'${mysql.client}/bin/mysqldump'" + --replace "'mysql'" "'${mariadb.client}/bin/mysql'" \ + --replace "'mysqldump'" "'${mariadb.client}/bin/mysqldump'" for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \ scripts/zmupdate.pl.in \ @@ -147,7 +147,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mysql.client pcre perl polkit x264 zlib + curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib util-linuxMinimal # for libmount ] ++ (with perlPackages; [ # build-time dependencies diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 7b2251a3f44..5efb860c1d5 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, readline, yacc }: +{ lib, stdenv, fetchurl, readline, bison }: let version = "0.9.1"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { sourceRoot=. ''; - buildInputs = [ readline yacc ]; + buildInputs = [ readline bison ]; configureFlags = [ "--with-readline" ]; diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 9b4b09c2484..63ca45452e6 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; version = "2.8.8"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { openssl curl dnsutils - (if stdenv.isLinux then iproute else unixtools.netstat) + (if stdenv.isLinux then iproute2 else unixtools.netstat) ] }" ''; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index eb748cc42ca..91f71ece421 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,6 +1,6 @@ { lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq -, squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap +, squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap , libco-canonical, dqlite, raft-canonical, sqlite-replication, udev , writeShellScriptBin, apparmor-profiles, apparmor-parser , criu @@ -48,7 +48,7 @@ buildGoPackage rec { wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( networkPkgs - ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute bash criu ] + ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu ] ++ [ (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') ] diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix index 571798fcd2e..80664a6a449 100644 --- a/pkgs/tools/archivers/fsarchiver/default.nix +++ b/pkgs/tools/archivers/fsarchiver/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config -, zlib, bzip2, lzma, lzo, lz4, zstd, xz +, zlib, bzip2, lzo, lz4, zstd, xz , libgcrypt, e2fsprogs, util-linux, libgpgerror }: let @@ -21,7 +21,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - zlib bzip2 lzma lzo lz4 zstd xz + zlib bzip2 xz lzo lz4 zstd xz libgcrypt e2fsprogs util-linux libgpgerror ]; diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index d1cb93093d3..4822ea82d1e 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, makeWrapper -, boost, lzma +, boost, xz , withGog ? false, unar ? null }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33"; }; - buildInputs = [ lzma boost ]; + buildInputs = [ xz boost ]; # Python is reported as missing during the build, however # including Python does not change the output. diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/pkgs/tools/backup/automysqlbackup/default.nix index 169ef7309fe..5ecdcc4e7ed 100644 --- a/pkgs/tools/backup/automysqlbackup/default.nix +++ b/pkgs/tools/backup/automysqlbackup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, mysql, mailutils, pbzip2, pigz, bzip2, gzip }: +{ lib, stdenv, fetchurl, makeWrapper, mariadb, mailutils, pbzip2, pigz, bzip2, gzip }: stdenv.mkDerivation rec { pname = "automysqlbackup"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp automysqlbackup $out/bin/ cp automysqlbackup.conf $out/etc/ - wrapProgram $out/bin/automysqlbackup --prefix PATH : ${lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]} + wrapProgram $out/bin/automysqlbackup --prefix PATH : ${lib.makeBinPath [ mariadb mailutils pbzip2 pigz bzip2 gzip ]} ''; meta = with lib; { diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index 94c7e711267..3d908dd24a1 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium -, llvmPackages, clang, lzma +, llvmPackages, clang, xz , Security }: rustPlatform.buildRustPackage rec { @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ pkg-config llvmPackages.libclang clang ]; - buildInputs = [ openssl libsodium lzma ] + buildInputs = [ openssl libsodium xz ] ++ (lib.optional stdenv.isDarwin Security); configurePhase = '' diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 69eeb3db711..b30a8763706 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,11 +1,11 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 -, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute +, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2 , gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }: let pythonPackages = python3Packages; - binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute ]; + binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute2 ]; in stdenv.mkDerivation rec { pname = "blueman"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome3.adwaita-icon-theme iproute libappindicator networkmanager ] + gnome3.adwaita-icon-theme iproute2 libappindicator networkmanager ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix index 2804ed7a0b5..8a57d483ab2 100644 --- a/pkgs/tools/compression/pbzx/default.nix +++ b/pkgs/tools/compression/pbzx/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub, lzma, xar}: +{stdenv, lib, fetchFromGitHub, xz, xar}: stdenv.mkDerivation rec { pname = "pbzx"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0bwd7wmnhpz1n5p39mh6asfyccj4cm06hwigslcwbb3pdwmvxc90"; }; - buildInputs = [ lzma xar ]; + buildInputs = [ xz xar ]; buildPhase = '' cc pbzx.c -llzma -lxar -o pbzx ''; diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index 833dcae8850..d0418ffdd60 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl - , libarchive, lzma + , libarchive, xz }: stdenv.mkDerivation rec { baseName = "pixz"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool asciidoc libxslt libxml2 docbook_xml_dtd_45 docbook_xsl - libarchive lzma + libarchive xz ]; preBuild = '' echo "XML_CATALOG_FILES='$XML_CATALOG_FILES'" diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index e337ccdd4ae..eb1f5d3570b 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, xz, lzma }: +{ lib, stdenv, fetchgit, xz }: let name = "pxz"; version = "4.999.9beta+git"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0na2kw8cf0qd8l1aywlv9m3xrxnqlcwxfdwp3f7x9vxwqx3k32kc"; }; - buildInputs = [ lzma ]; + buildInputs = [ xz ]; patches = [ ./_SC_ARG_MAX.patch ]; diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index 5d7c2b09220..32b6c6d005c 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts, autoconf }: +{ lib, stdenv, fetchurl, libxml2, xz, openssl, zlib, bzip2, fts, autoconf }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 lzma openssl zlib bzip2 fts autoconf ]; + buildInputs = [ libxml2 xz openssl zlib bzip2 fts autoconf ]; prePatch = '' substituteInPlace configure.ac \ diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index 7b7eb7ba05a..77c05a61666 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: +{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 }: # Common attributes of irods packages { nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ]; - buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos boost libcxx catch2 ]; + buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost libcxx catch2 ]; cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index fe7a0d73f67..cbc9f19c664 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: +{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 }: let avro-cpp=avro-cpp_llvm; @@ -7,7 +7,7 @@ let common = import ./common.nix { inherit lib stdenv bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive jansson - zeromq openssl pam libiodbc kerberos gcc libcxx + zeromq openssl pam libiodbc libkrb5 gcc libcxx boost avro-cpp which catch2; }; in rec { diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index 7f92da6a224..66f74944150 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -2,7 +2,6 @@ , fetchurl , lz4 ? null , lz4Support ? false -, lzma , lzo , lib, stdenv , xz @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d"; }; - buildInputs = [ lzma lzo xz zlib ] + buildInputs = [ xz lzo xz zlib ] ++ lib.optional lz4Support lz4; patches = [ patch ]; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 34bb1b8cc3a..30a3b9cc98f 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch -, autoreconfHook, bison, glm, yacc, flex +, autoreconfHook, bison, glm, flex , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv , python3Packages @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { autoreconfHook bison flex - yacc + bison texinfo ]; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 977886e90ec..000e2b28089 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -2,7 +2,7 @@ { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex , fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango -, yacc, fetchpatch, xorg ? null, ApplicationServices }: +, bison, fetchpatch, xorg ? null, ApplicationServices }: let inherit (lib) optional optionals optionalString; @@ -37,7 +37,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango + libpng libjpeg expat bison libtool fontconfig gd gts libdevil flex pango gettext ] ++ optionals (xorg != null) (with xorg; [ libXrender libXaw libXpm ]) ++ optionals (stdenv.isDarwin) [ ApplicationServices ]; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 5d3259c4b6e..de2b809eea5 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -8,7 +8,7 @@ , libarchive , libconfuse , libsodium -, lzma +, xz , zlib , coreutils , dosfstools @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libarchive libconfuse libsodium - lzma + xz zlib ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index cb3e8bd057a..4ee1749c6d3 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, glib, libxml2, perl, python3 -, libxslt, libarchive, bzip2, lzma, json-glib, libsoup +, libxslt, libarchive, bzip2, xz, json-glib, libsoup }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config gettext perl python3 ]; - buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; + buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 xz libsoup ]; meta = with lib; { description = "Tools for managing the osinfo database"; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index dc013cfe197..53966705c2d 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -25,7 +25,7 @@ , libarchive , libcap , bzip2 -, yacc +, bison , libxslt , docbook-xsl-nons , docbook_xml_dtd_42 @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { gobject-introspection which makeWrapper - yacc + bison libxslt docbook-xsl-nons docbook_xml_dtd_42 diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 51454ac1197..f62eba66f99 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, perlPackages, iproute, perl }: +{ lib, fetchurl, perlPackages, iproute2, perl }: perlPackages.buildPerlPackage rec { pname = "ddclient"; @@ -19,8 +19,8 @@ perlPackages.buildPerlPackage rec { touch Makefile.PL substituteInPlace ddclient \ --replace 'in the output of ifconfig' 'in the output of ip addr show' \ - --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' \ - --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' \ + --replace 'ifconfig -a' '${iproute2}/sbin/ip addr show' \ + --replace 'ifconfig $arg' '${iproute2}/sbin/ip addr show $arg' \ --replace '/usr/bin/perl' '${perl}/bin/perl' # Until we get the patchShebangs fixed (issue #55786) we need to patch this manually ''; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 751dd2c8c1f..08b3543c5c0 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper +{ stdenv, fetchurl, perl, file, nettools, iputils, iproute2, makeWrapper , coreutils, gnused, openldap ? null , buildPackages, lib }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { cp client/scripts/linux $out/sbin/dhclient-script substituteInPlace $out/sbin/dhclient-script \ - --replace /sbin/ip ${iproute}/sbin/ip + --replace /sbin/ip ${iproute2}/sbin/ip wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \ "${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin" ''; diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 788d61e9ca9..59748f6f967 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }: +{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute2, nettools }: stdenv.mkDerivation rec { pname = "gvpe"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; preBuild = '' - sed -e 's@"/sbin/ifconfig.*"@"${iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C + sed -e 's@"/sbin/ifconfig.*"@"${iproute2}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C ''; diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 93d423a7283..1059baf13ee 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr, - bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python3, + bash, iproute2, iptables, procps, coreutils, gnused, gawk, nss, which, python3, docs ? false, xmlto, libselinux, ldns }: let binPath = lib.makeBinPath [ - bash iproute iptables procps coreutils gnused gawk nss.tools which python3 + bash iproute2 iptables procps coreutils gnused gawk nss.tools which python3 ]; in @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound pam libevent + buildInputs = [ bash iproute2 iptables systemd coreutils gnused gawk gmp unbound pam libevent libcap_ng curl nspr nss python3 ldns ] ++ lib.optional docs xmlto ++ lib.optional stdenv.isLinux libselinux; diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index c4e16ef8b1c..bef421a7ab4 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, glibc -, bison, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient +, bison, curl, flex, gperftools, jansson, jemalloc, libkrb5, lua, libmysqlclient , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , libaio, libedit, libtool, libui, libuuid, zlib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - bison curl flex gperftools jansson jemalloc kerberos lua libmysqlclient + bison curl flex gperftools jansson jemalloc libkrb5 lua libmysqlclient ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl libaio libedit libtool libui libuuid zlib ]; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 9642f254838..05b04cf9484 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchurl, iptables, libuuid, pkg-config -, which, iproute, gnused, coreutils, gawk, makeWrapper +, which, iproute2, gnused, coreutils, gawk, makeWrapper }: let - scriptBinEnv = lib.makeBinPath [ which iproute iptables gnused coreutils gawk ]; + scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ]; in stdenv.mkDerivation rec { name = "miniupnpd-2.1.20190502"; diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index 48b6f5dc4cf..94565db2076 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nettools, iproute, judy }: +{ lib, stdenv, fetchurl, nettools, iproute2, judy }: stdenv.mkDerivation rec { version = "1.2.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { substituteInPlace misc/client-hook.bsd \ --replace '/sbin/route' '${nettools}/bin/route' \ --replace '/sbin/ifconfig' '${nettools}/bin/ifconfig' - substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute}/bin/ip' + substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute2}/bin/ip' ''; configureFlags = [ "--with-Judy" ]; diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index a4737d6baac..e7d984a798b 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, yacc, lzo, db4 }: +{ lib, stdenv, fetchurl, bison, lzo, db4 }: stdenv.mkDerivation rec { name = "netboot-0.10.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0"; }; - buildInputs = [ yacc lzo db4 ]; + buildInputs = [ bison lzo db4 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 9420f77e618..1319e7997dd 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoconf, automake, libtool, pkg-config -, bzip2, libpcap, flex, yacc }: +, bzip2, libpcap, flex, bison }: let version = "1.6.22"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "14x2k85ard1kp99hhd90zsmvyw24g03m84rn13gb4grm9gjggzrj"; }; - nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ]; + nativeBuildInputs = [ autoconf automake flex libtool pkg-config bison ]; buildInputs = [ bzip2 libpcap ]; preConfigure = '' diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 53033b57442..55babb4ca2d 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -20,7 +20,7 @@ , pam , etcDir ? null , withKerberos ? true -, kerberos +, libkrb5 , libfido2 , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , linkOpenssl ? true @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ] - # This is not the same as the kerberos from the inputs! pkgs.kerberos is + # This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is # needed here to access krb5-config in order to cross compile. See: # https://github.com/NixOS/nixpkgs/pull/107606 - ++ optional withKerberos pkgs.kerberos + ++ optional withKerberos pkgs.libkrb5 ++ extraNativeBuildInputs; buildInputs = [ zlib openssl libedit ] ++ optional withFIDO libfido2 - ++ optional withKerberos kerberos + ++ optional withKerberos libkrb5 ++ optional stdenv.isLinux pam; preConfigure = '' @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # Kerberos can be found either by krb5-config or by fall-back shell # code in openssh's configure.ac. Neither of them support static # build, but patching code for krb5-config is simpler, so to get it - # into PATH, kerberos.dev is added into buildInputs. + # into PATH, libkrb5.dev is added into buildInputs. + optionalString stdenv.hostPlatform.isStatic '' sed -i "s,PKGCONFIG --libs,PKGCONFIG --libs --static,g" configure sed -i 's#KRB5CONF --libs`#KRB5CONF --libs` -lkrb5support -lkeyutils#g' configure @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { (if stdenv.isLinux then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" ++ optional withFIDO "--with-security-key-builtin=yes" - ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") + ++ optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index dd5fa9cbed8..6b98df21502 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -3,7 +3,7 @@ , pkg-config , makeWrapper , runtimeShell -, iproute +, iproute2 , lzo , openssl , pam @@ -40,13 +40,13 @@ let buildInputs = [ lzo openssl ] ++ optional stdenv.isLinux pam - ++ optional withIpRoute iproute + ++ optional withIpRoute iproute2 ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper; configureFlags = optionals withIpRoute [ "--enable-iproute2" - "IPROUTE=${iproute}/sbin/ip" + "IPROUTE=${iproute2}/sbin/ip" ] ++ optional useSystemd "--enable-systemd" ++ optional pkcs11Support "--enable-pkcs11" @@ -60,7 +60,7 @@ let '' + optionalString useSystemd '' install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved wrapProgram $out/libexec/update-systemd-resolved \ - --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd util-linux ]} + --prefix PATH : ${makeBinPath [ runtimeShell iproute2 systemd util-linux ]} ''; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix index 9d8e669fe45..5a34d5a7ffe 100644 --- a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix +++ b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , makeWrapper -, iproute, systemd, coreutils, util-linux }: +, iproute2, systemd, coreutils, util-linux }: stdenv.mkDerivation rec { pname = "update-systemd-resolved"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' wrapProgram $out/libexec/openvpn/update-systemd-resolved \ - --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils util-linux ]} + --prefix PATH : ${lib.makeBinPath [ iproute2 systemd coreutils util-linux ]} ''; meta = with lib; { diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 1534d1083f4..7af9e324f2e 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, ppp, iproute }: +{ lib, stdenv, fetchurl, perl, ppp, iproute2 }: stdenv.mkDerivation rec { pname = "pptp"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ + makeFlagsArray=( IP=${iproute2}/bin/ip PPPD=${ppp}/sbin/pppd \ BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ PPPDIR=$out/etc/ppp ) ''; diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/tools/networking/shorewall/default.nix index 2456a760721..f95fc9d92b1 100644 --- a/pkgs/tools/networking/shorewall/default.nix +++ b/pkgs/tools/networking/shorewall/default.nix @@ -3,7 +3,7 @@ , fetchurl , gnugrep , gnused -, iproute +, iproute2 , ipset , iptables , perl @@ -15,7 +15,7 @@ let PATH = lib.concatStringsSep ":" [ "${coreutils}/bin" - "${iproute}/bin" + "${iproute2}/bin" "${iptables}/bin" "${ipset}/bin" "${ebtables}/bin" @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils - iproute + iproute2 ipset iptables ebtables diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index d65f4fae30e..affe6577eb8 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools +{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools ,supportOpenstack ? true }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { done '' + optionalString supportOpenstack '' # We need a way to pass $PATH to the scripts - sed -i '2iexport PATH=${git}/bin:${mysql}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc + sed -i '2iexport PATH=${git}/bin:${mariadb}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc ''; diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index af4cc0fe2e5..4d79fdc9bc5 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, yacc, flex }: +{ lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, bison, flex }: stdenv.mkDerivation rec { name = "vtun-3.0.4"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i -e 's/-m 755//' -e 's/-o root -g 0//' Makefile.in sed -i '/strip/d' Makefile.in ''; - buildInputs = [ lzo openssl zlib yacc flex ]; + buildInputs = [ lzo openssl zlib bison flex ]; configureFlags = [ "--with-lzo-headers=${lzo}/include/lzo" diff --git a/pkgs/tools/networking/wget2/default.nix b/pkgs/tools/networking/wget2/default.nix index 1537da36163..3fd40f8a7ba 100644 --- a/pkgs/tools/networking/wget2/default.nix +++ b/pkgs/tools/networking/wget2/default.nix @@ -17,7 +17,7 @@ , libhsts , libidn2 , libpsl -, lzma +, xz , nghttp2 , sslSupport ? true , openssl @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook flex lzip pkg-config python3 texinfo ]; - buildInputs = [ brotli bzip2 gpgme libhsts libidn2 libpsl lzma nghttp2 pcre2 zlib zstd ] + buildInputs = [ brotli bzip2 gpgme libhsts libidn2 libpsl xz nghttp2 pcre2 zlib zstd ] ++ lib.optional sslSupport openssl; # TODO: include translation files diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 7e702c0559b..e4eb0a2cdc8 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, python2Packages , wpa_supplicant, dhcp, dhcpcd, wirelesstools -, nettools, openresolv, iproute, iputils }: +, nettools, openresolv, iproute2, iputils }: let inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo; @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default - sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in + sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute2 ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index efb5b5c5b42..8bdcd8708d9 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -3,7 +3,7 @@ , fetchzip , nixosTests , iptables -, iproute +, iproute2 , makeWrapper , openresolv , procps @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --replace /usr/bin $out/bin '' + lib.optionalString stdenv.isLinux '' for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute iptables openresolv ]} + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables openresolv ]} done '' + lib.optionalString stdenv.isDarwin '' for f in $out/bin/*; do diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 04711b3d861..60da9b3abcb 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute, ronn }: +{ lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute2, ronn }: stdenv.mkDerivation rec { pname = "zerotierone"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ronn ]; - buildInputs = [ openssl lzo zlib iproute ]; + buildInputs = [ openssl lzo zlib iproute2 ]; enableParallelBuilding = true; diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 178103cdb38..86982bf7f3a 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkg-config, cmake, perlPackages, curl, gtest -, gnutls, libtasn1, lzma, bzip2, lz4, zstd, libseccomp, udev +, gnutls, libtasn1, xz, bzip2, lz4, zstd, libseccomp, udev , db, dpkg, libxslt, docbook_xsl, docbook_xml_dtd_45 # used when WITH_DOC=ON @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake gtest libxslt.bin ]; buildInputs = [ - perlPackages.perl curl gnutls libtasn1 lzma bzip2 lz4 zstd libseccomp udev db dpkg + perlPackages.perl curl gnutls libtasn1 xz bzip2 lz4 zstd libseccomp udev db dpkg ] ++ lib.optionals withDocs [ doxygen perlPackages.Po4a w3m docbook_xml_dtd_45 ] ++ lib.optionals withNLS [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 76eded1e1f0..c54a5b28cee 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -16,7 +16,7 @@ common = , jq, libarchive, libcpuid , lowdown, mdbook # Used by tests - , gmock + , gtest , busybox-sandbox-shell , storeDir , stateDir @@ -56,7 +56,7 @@ common = ] ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is24 [ libarchive gmock lowdown ] + ++ lib.optionals is24 [ libarchive gtest lowdown ] ++ lib.optional (is24 && stdenv.isx86_64) libcpuid ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 7f06cbbd3c2..631274cb722 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2 +{ lib, stdenv, fetchurl, pkg-config, curl, gpgme, libarchive, bzip2, xz, attr, acl, libxml2 , autoreconfHook }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ curl gpgme libarchive bzip2 lzma attr acl libxml2 ]; + buildInputs = [ curl gpgme libarchive bzip2 xz attr acl libxml2 ]; meta = with lib; { description = "A lightweight package management system based upon ipkg"; diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 771454cd409..48fa91c7966 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkg-config, m4, perl, libarchive, openssl, zlib, bzip2, -lzma, curl, runtimeShell }: +xz, curl, runtimeShell }: stdenv.mkDerivation rec { pname = "pacman"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; nativeBuildInputs = [ pkg-config m4 ]; - buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ]; + buildInputs = [ curl perl libarchive openssl zlib bzip2 xz ]; postFixup = '' substituteInPlace $out/bin/repo-add \ diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 107bf56cf82..2444d1f1d72 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -2,7 +2,7 @@ , glib, libGLU, libGL, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk3, pango , makeWrapper , python2Packages, lib -, lsof, curl, libuuid, cups, mesa, lzma, libxkbcommon +, lsof, curl, libuuid, cups, mesa, xz, libxkbcommon }: let @@ -38,7 +38,7 @@ let curl libuuid cups - lzma + xz libxkbcommon ]); package = stdenv.mkDerivation { diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index b243e10d353..e56e99909ff 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 +{ lib, stdenv, fetchurl, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2 , gcc, python3Packages, perl, perlPackages, makeWrapper }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "--with-systemwide" ]; - buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ]; + buildInputs = [ openssl nss nspr libkrb5 gmp zlib libpcap re2 ]; nativeBuildInputs = [ gcc python3Packages.wrapPython perl makeWrapper ]; propagatedBuildInputs = (with python3Packages; [ dpkt scapy lxml ]) ++ # For pcap2john.py (with perlPackages; [ DigestMD4 DigestSHA1 GetoptLong # For pass_gen.pl diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index 88e726bc863..f42a1ec96f4 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, yacc, flex}: +{ lib, stdenv, fetchurl, autoreconfHook, bison, flex}: stdenv.mkDerivation rec { version = "2.4.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; - nativeBuildInputs = [ autoreconfHook yacc flex ]; + nativeBuildInputs = [ autoreconfHook bison flex ]; configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index f040b17f892..0291d7bb3aa 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libevent, openssl, zlib, torsocks -, libseccomp, systemd, libcap, lzma, zstd, scrypt, nixosTests +, libseccomp, systemd, libcap, xz, zstd, scrypt, nixosTests , writeShellScript # for update.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "geoip" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++ + buildInputs = [ libevent openssl zlib xz zstd scrypt ] ++ lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; patches = [ ./disable-monotonic-timer-tests.patch ]; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 12f2a2ef07c..d529e9cf025 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -2,7 +2,7 @@ , ps, dnsutils # dig is recommended for multiple categories , withRecommends ? false # Install (almost) all recommended tools (see --recommends) , withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode -, file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools +, file, hddtemp, iproute2, ipmitool, usbutils, kmod, lm_sensors, smartmontools , binutils, tree, upower, pciutils , withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg }: @@ -11,7 +11,7 @@ let prefixPath = programs: "--prefix PATH ':' '${lib.makeBinPath programs}'"; recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [ - util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod + util-linuxMinimal dmidecode file hddtemp iproute2 ipmitool usbutils kmod lm_sensors smartmontools binutils tree upower pciutils ]; recommendedDisplayInformationPrograms = lib.optionals diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 892920657d2..0f8db091d61 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng -, eventlog, perl, python, yacc, protobufc, libivykis, libcap, czmq +, eventlog, perl, python, bison, protobufc, libivykis, libcap, czmq }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s"; }; - nativeBuildInputs = [ pkg-config autoreconfHook yacc ]; + nativeBuildInputs = [ pkg-config autoreconfHook bison ]; buildInputs = [ glib syslogng eventlog perl python protobufc libivykis libcap czmq diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 5e42a791835..4d2ca811837 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -10,7 +10,7 @@ , libevdev , libtool , libxml2 -, lzma +, xz , pkg-config , lib, stdenv , upower @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { dbus-glib libevdev libxml2 - lzma + xz upower ]; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 6f8ba2b07eb..b4b92b8f90f 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitiles, pkg-config, libuuid, openssl, libyaml, lzma }: +{ lib, stdenv, fetchFromGitiles, pkg-config, libuuid, openssl, libyaml, xz }: stdenv.mkDerivation rec { version = "20180311"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libuuid libyaml lzma ]; + buildInputs = [ openssl libuuid libyaml xz ]; enableParallelBuilding = true; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 177c556a337..8cd67b99263 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcre, zlib, lzma}: +{lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcre, zlib, xz}: stdenv.mkDerivation rec { pname = "silver-searcher"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ pcre zlib lzma ]; + buildInputs = [ pcre zlib xz ]; meta = with lib; { homepage = "https://github.com/ggreer/the_silver_searcher/"; diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix index c2600ec46f6..9a7e495df2b 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -9,7 +9,7 @@ , file , icu , gumbo -, lzma +, xz , xapian , zimlib , zlib @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf libtool pkg-config ]; - buildInputs = [ file icu gumbo lzma zimlib zlib xapian ]; + buildInputs = [ file icu gumbo xz zimlib zlib xapian ]; setSourceRoot = '' sourceRoot=$(echo */zimwriterfs) ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f91dcbac132..75fed66865c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -269,6 +269,7 @@ mapAliases ({ gnustep-make = gnustep.make; # added 2016-7-6 gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 + gmock = gtest; # moved from top-level 2021-03-14 go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobby5 = gobby; # added 2021-02-01 @@ -310,7 +311,9 @@ mapAliases ({ infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; inter-ui = inter; # added 2021-03-27 + iproute = iproute2; # moved from top-level 2021-03-14 i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 + jack2Full = jack2; # moved from top-level 2021-03-14 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15 jbuilder = dune_1; # added 2018-09-09 @@ -335,6 +338,7 @@ mapAliases ({ kicad-with-packages3d = kicad; # added 2019-11-25 kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09 krename-qt5 = krename; # added 2017-02-18 + kerberos = libkrb5; # moved from top-level 2021-03-14 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 kvm = qemu_kvm; # added 2018-04-25 latinmodern-math = lmmath; @@ -395,10 +399,12 @@ mapAliases ({ lua5_expat = luaPackages.luaexpat; # added 2017-05-02 lua5_sec = luaPackages.luasec; # added 2017-05-02 lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # added 2020-06-03 + lzma = xz; # moved from top-level 2021-03-14 m3d-linux = m33-linux; # added 2016-08-13 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 + mysql = mariadb; # moved from top-level 2021-03-14 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 @@ -825,12 +831,14 @@ mapAliases ({ xlibs = xorg; # added 2015-09 xpraGtk3 = xpra; # added 2018-09-13 xv = xxv; # added 2020-02-22 + yacc = bison; # moved from top-level 2021-03-14 youtubeDL = youtube-dl; # added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08 yuzu = yuzu-mainline; # added 2021-01-25 zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # added 2021-03-28 zdfmediathk = mediathekview; # added 2019-01-19 + gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # added 2020-10-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc4a8f236fa..6c5d162a577 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5178,7 +5178,6 @@ in gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest { }; - gmock = gtest; # TODO: move to aliases.nix gbenchmark = callPackage ../development/libraries/gbenchmark {}; @@ -6348,7 +6347,6 @@ in luxcorerender = callPackage ../tools/graphics/luxcorerender { }; xz = callPackage ../tools/compression/xz { }; - lzma = xz; # TODO: move to aliases.nix lz4 = callPackage ../tools/compression/lz4 { }; @@ -12258,7 +12256,6 @@ in }); bison = callPackage ../development/tools/parsing/bison { }; - yacc = bison; # TODO: move to aliases.nix # Ruby fails to build with current bison bison_3_5 = pkgs.bison.overrideAttrs (oldAttrs: rec { @@ -13917,7 +13914,7 @@ in cypress = callPackage ../development/web/cypress { }; cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { - kerberos = if stdenv.isFreeBSD then libheimdal else kerberos; + libkrb5 = if stdenv.isFreeBSD then libheimdal else libkrb5; }; # Make bdb5 the default as it is the last release under the custom @@ -14955,7 +14952,6 @@ in }; krb5Full = krb5; libkrb5 = krb5.override { type = "lib"; }; - kerberos = libkrb5; # TODO: move to aliases.nix l-smash = callPackage ../development/libraries/l-smash { stdenv = gccStdenv; @@ -18119,9 +18115,7 @@ in ### SERVERS - _389-ds-base = callPackage ../servers/ldap/389 { - kerberos = libkrb5; - }; + _389-ds-base = callPackage ../servers/ldap/389 { }; adguardhome = callPackage ../servers/adguardhome {}; @@ -18703,7 +18697,6 @@ in inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; - mysql = mariadb; # TODO: move to aliases.nix mongodb = hiPrio mongodb-3_4; @@ -19502,7 +19495,6 @@ in iotop = callPackage ../os-specific/linux/iotop { }; iproute2 = callPackage ../os-specific/linux/iproute { }; - iproute = iproute2; # Alias added 2020-11-15 (TODO: deprecate and move to pkgs/top-level/aliases.nix) iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { }; @@ -29505,8 +29497,8 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio Accelerate; inherit (darwin) libobjc; }; + libjack2 = jack2.override { prefix = "lib"; }; - jack2Full = jack2; # TODO: move to aliases.nix j2cli = with python3Packages; toPythonApplication j2cli; @@ -29840,7 +29832,11 @@ in mnemonicode = callPackage ../misc/mnemonicode { }; mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in { - gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};}; + gdal = gdal.override { + libmysqlclient = mysql // { + lib = { dev = mysql; } + ;} + ;}; mysql = mysql; pcre = pcre-cpp; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index b42f827d0df..62ddc14ff93 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -8,7 +8,7 @@ { fetchurl, stdenv, lua, unzip, pkg-config , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat , autoreconfHook, gnum4 -, mysql, postgresql, cyrus_sasl +, postgresql, cyrus_sasl , fetchFromGitHub, which, writeText , pkgs , lib diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f460f07a0fc..c11dcd08596 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3659,9 +3659,7 @@ in { keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; - kerberos = callPackage ../development/python-modules/kerberos { - inherit (pkgs) kerberos; - }; + kerberos = callPackage ../development/python-modules/kerberos { }; keyring = if isPy3k then callPackage ../development/python-modules/keyring { } diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index a394c4d8eee..7f86b30aaf0 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -93,7 +93,7 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; ltrace = linux; lvm2 = linux; lynx = linux; - lzma = linux; + xz = linux; man = linux; man-pages = linux; mc = all;