Merge pull request #116335 from SuperSandro2000/move-aliases.nix

This commit is contained in:
Sandro 2021-04-05 04:07:15 +02:00 committed by GitHub
commit 7c932296e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
237 changed files with 1074 additions and 515 deletions

View file

@ -8,7 +8,7 @@ let
cfg = config.programs.mininet; cfg = config.programs.mininet;
generatedPath = with pkgs; makeSearchPath "bin" [ generatedPath = with pkgs; makeSearchPath "bin" [
iperf ethtool iproute socat iperf ethtool iproute2 socat
]; ];
pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]); pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]);

View file

@ -53,7 +53,7 @@ in
description = "MAME TUN/TAP Ethernet interface"; description = "MAME TUN/TAP Ethernet interface";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;

View file

@ -225,7 +225,7 @@ in {
}; };
}; };
config = mkIf cfg.enable { 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 = { users.users.datadog = {
description = "Datadog Agent User"; description = "Datadog Agent User";
@ -239,7 +239,7 @@ in {
systemd.services = let systemd.services = let
makeService = attrs: recursiveUpdate { 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" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
User = "datadog"; User = "datadog";

View file

@ -113,7 +113,7 @@ in {
description = "scollector metrics collector (part of Bosun)"; description = "scollector metrics collector (part of Bosun)";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ pkgs.coreutils pkgs.iproute ]; path = [ pkgs.coreutils pkgs.iproute2 ];
serviceConfig = { serviceConfig = {
User = cfg.user; User = cfg.user;

View file

@ -191,7 +191,7 @@ in
ExecStop = "${cfg.package}/bin/consul leave"; ExecStop = "${cfg.package}/bin/consul leave";
}); });
path = with pkgs; [ iproute gnugrep gawk consul ]; path = with pkgs; [ iproute2 gnugrep gawk consul ];
preStart = '' preStart = ''
mkdir -m 0700 -p ${dataDir} mkdir -m 0700 -p ${dataDir}
chown -R consul ${dataDir} chown -R consul ${dataDir}

View file

@ -10,7 +10,7 @@ let
name = "ircd-hybrid-service"; name = "ircd-hybrid-service";
scripts = [ "=>/bin" ./control.in ]; scripts = [ "=>/bin" ./control.in ];
substFiles = [ "=>/conf" ./ircd.conf ]; 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; ipv6Enabled = boolToString config.networking.enableIPv6;

View file

@ -85,7 +85,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.libreswan pkgs.iproute ]; environment.systemPackages = [ pkgs.libreswan pkgs.iproute2 ];
systemd.services.ipsec = { systemd.services.ipsec = {
description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec"; description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec";

View file

@ -465,7 +465,7 @@ in {
restartTriggers = [ configFile overrideNameserversScript ]; restartTriggers = [ configFile overrideNameserversScript ];
# useful binaries for user-specified hooks # 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" ]; aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
}; };

View file

@ -63,7 +63,7 @@ let
wantedBy = optional cfg.autoStart "multi-user.target"; wantedBy = optional cfg.autoStart "multi-user.target";
after = [ "network.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.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";

View file

@ -132,7 +132,7 @@ in
{ table = "mangle"; command = "OUTPUT ! -o lo -p tcp -m connmark --mark 0x02/0x0f -j CONNMARK --restore-mark --mask 0x0f"; } { table = "mangle"; command = "OUTPUT ! -o lo -p tcp -m connmark --mark 0x02/0x0f -j CONNMARK --restore-mark --mask 0x0f"; }
]; ];
in { in {
path = [ pkgs.iptables pkgs.iproute pkgs.procps ]; path = [ pkgs.iptables pkgs.iproute2 pkgs.procps ];
preStart = '' preStart = ''
# Cleanup old iptables entries which might be still there # Cleanup old iptables entries which might be still there

View file

@ -63,7 +63,7 @@ in {
description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl"; description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ]; after = [ "network-online.target" ];
path = with pkgs; [ kmod iproute iptables util-linux ]; path = with pkgs; [ kmod iproute2 iptables util-linux ];
environment = { environment = {
STRONGSWAN_CONF = pkgs.writeTextFile { STRONGSWAN_CONF = pkgs.writeTextFile {
name = "strongswan.conf"; name = "strongswan.conf";

View file

@ -152,7 +152,7 @@ in
systemd.services.strongswan = { systemd.services.strongswan = {
description = "strongSwan IPSec Service"; description = "strongSwan IPSec Service";
wantedBy = [ "multi-user.target" ]; 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" ]; after = [ "network-online.target" ];
environment = { environment = {
STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; };

View file

@ -63,7 +63,7 @@ let
preSetup = mkOption { preSetup = mkOption {
example = literalExample '' example = literalExample ''
${pkgs.iproute}/bin/ip netns add foo ${pkgs.iproute2}/bin/ip netns add foo
''; '';
default = ""; default = "";
type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;
@ -278,7 +278,7 @@ let
wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ]; wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ];
environment.DEVICE = interfaceName; environment.DEVICE = interfaceName;
environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity"; environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity";
path = with pkgs; [ iproute wireguard-tools ]; path = with pkgs; [ iproute2 wireguard-tools ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
@ -333,7 +333,7 @@ let
after = [ "network.target" "network-online.target" ]; after = [ "network.target" "network-online.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment.DEVICE = name; environment.DEVICE = name;
path = with pkgs; [ kmod iproute wireguard-tools ]; path = with pkgs; [ kmod iproute2 wireguard-tools ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";

View file

@ -243,7 +243,7 @@ in
restartTriggers = [ fail2banConf jailConf pathsConf ]; restartTriggers = [ fail2banConf jailConf pathsConf ];
reloadIfChanged = true; reloadIfChanged = true;
path = [ cfg.package cfg.packageFirewall pkgs.iproute ]; path = [ cfg.package cfg.packageFirewall pkgs.iproute2 ];
unitConfig.Documentation = "man:fail2ban(1)"; unitConfig.Documentation = "man:fail2ban(1)";

View file

@ -108,8 +108,8 @@ in {
partOf = optional config.networking.firewall.enable "firewall.service"; partOf = optional config.networking.firewall.enable "firewall.service";
path = with pkgs; if config.networking.nftables.enable path = with pkgs; if config.networking.nftables.enable
then [ nftables iproute systemd ] then [ nftables iproute2 systemd ]
else [ iptables ipset iproute systemd ]; else [ iptables ipset iproute2 systemd ];
# The sshguard ipsets must exist before we invoke # The sshguard ipsets must exist before we invoke
# iptables. sshguard creates the ipsets after startup if # iptables. sshguard creates the ipsets after startup if

View file

@ -101,7 +101,7 @@ let
unitConfig.ConditionCapability = "CAP_NET_ADMIN"; unitConfig.ConditionCapability = "CAP_NET_ADMIN";
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
@ -185,7 +185,7 @@ let
# Restart rather than stop+start this unit to prevent the # Restart rather than stop+start this unit to prevent the
# network from dying during switch-to-configuration. # network from dying during switch-to-configuration.
stopIfChanged = false; stopIfChanged = false;
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
script = script =
'' ''
state="/run/nixos/network/addresses/${i.name}" state="/run/nixos/network/addresses/${i.name}"
@ -258,7 +258,7 @@ let
wantedBy = [ "network-setup.service" (subsystemDevice i.name) ]; wantedBy = [ "network-setup.service" (subsystemDevice i.name) ];
partOf = [ "network-setup.service" ]; partOf = [ "network-setup.service" ];
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
@ -284,7 +284,7 @@ let
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
script = '' script = ''
# Remove Dead Interfaces # Remove Dead Interfaces
echo "Removing old bridge ${n}..." echo "Removing old bridge ${n}..."
@ -372,7 +372,7 @@ let
wants = deps; # if one or more interface fails, the switch should continue to run wants = deps; # if one or more interface fails, the switch should continue to run
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute config.virtualisation.vswitch.package ]; path = [ pkgs.iproute2 config.virtualisation.vswitch.package ];
preStart = '' preStart = ''
echo "Resetting Open vSwitch ${n}..." echo "Resetting Open vSwitch ${n}..."
ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \ ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \
@ -413,7 +413,7 @@ let
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute pkgs.gawk ]; path = [ pkgs.iproute2 pkgs.gawk ];
script = '' script = ''
echo "Destroying old bond ${n}..." echo "Destroying old bond ${n}..."
${destroyBond n} ${destroyBond n}
@ -451,7 +451,7 @@ let
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
script = '' script = ''
# Remove Dead Interfaces # Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
@ -476,7 +476,7 @@ let
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
script = '' script = ''
# Remove Dead Interfaces # Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
@ -504,7 +504,7 @@ let
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
script = '' script = ''
# Remove Dead Interfaces # Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"

View file

@ -259,7 +259,7 @@ in
wants = deps; # if one or more interface fails, the switch should continue to run wants = deps; # if one or more interface fails, the switch should continue to run
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute config.virtualisation.vswitch.package ]; path = [ pkgs.iproute2 config.virtualisation.vswitch.package ];
preStart = '' preStart = ''
echo "Resetting Open vSwitch ${n}..." echo "Resetting Open vSwitch ${n}..."
ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \ ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \

View file

@ -1171,7 +1171,7 @@ in
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
after = [ "network-pre.target" ]; after = [ "network-pre.target" ];
unitConfig.ConditionCapability = "CAP_NET_ADMIN"; unitConfig.ConditionCapability = "CAP_NET_ADMIN";
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
script = '' 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 == "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 == "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.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. # 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 == "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 == "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.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. # Udev attributes for systemd to name the device and to create a .device target.

View file

@ -119,7 +119,7 @@ in
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
after = [ "network-online.target" ]; after = [ "network-online.target" ];
path = [ pkgs.wget pkgs.iproute ]; path = [ pkgs.wget pkgs.iproute2 ];
script = script =
'' ''

View file

@ -19,7 +19,7 @@ with lib;
wantedBy = [ "multi-user.target" "sshd.service" ]; wantedBy = [ "multi-user.target" "sshd.service" ];
before = [ "sshd.service" ]; before = [ "sshd.service" ];
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
script = script =
'' ''

View file

@ -110,7 +110,7 @@ in
systemd.services.google-network-daemon = { systemd.services.google-network-daemon = {
description = "Google Compute Engine Network Daemon"; description = "Google Compute Engine Network Daemon";
after = [ "network-online.target" "network.target" "google-instance-setup.service" ]; after = [ "network-online.target" "network.target" "google-instance-setup.service" ];
path = with pkgs; [ iproute ]; path = with pkgs; [ iproute2 ];
serviceConfig = { serviceConfig = {
ExecStart = "${gce}/bin/google_network_daemon"; ExecStart = "${gce}/bin/google_network_daemon";
StandardOutput="journal+console"; StandardOutput="journal+console";

View file

@ -739,7 +739,7 @@ in
unitConfig.RequiresMountsFor = "/var/lib/containers/%i"; unitConfig.RequiresMountsFor = "/var/lib/containers/%i";
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
environment = { environment = {
root = "/var/lib/containers/%i"; root = "/var/lib/containers/%i";

View file

@ -17,7 +17,7 @@ in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "xe-linux-distribution.service" ]; after = [ "xe-linux-distribution.service" ];
requires = [ "proc-xen.mount" ]; requires = [ "proc-xen.mount" ];
path = [ pkgs.coreutils pkgs.iproute ]; path = [ pkgs.coreutils pkgs.iproute2 ];
serviceConfig = { serviceConfig = {
PIDFile = "/run/xe-daemon.pid"; PIDFile = "/run/xe-daemon.pid";
ExecStart = "${pkgs.xe-guest-utilities}/bin/xe-daemon -p /run/xe-daemon.pid"; ExecStart = "${pkgs.xe-guest-utilities}/bin/xe-daemon -p /run/xe-daemon.pid";

View file

@ -248,7 +248,7 @@ in
# Xen provides udev rules. # Xen provides udev rules.
services.udev.packages = [ cfg.package ]; 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 = { systemd.services.xen-store = {
description = "Xen Store Daemon"; description = "Xen Store Daemon";

View file

@ -2,7 +2,7 @@ import ./../make-test-python.nix ({ pkgs, ...} :
let let
mysqlenv-common = pkgs.buildEnv { name = "mysql-path-env-common"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ bash gawk gnutar inetutils which ]; }; 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 { in {
name = "mariadb-galera-mariabackup"; name = "mariadb-galera-mariabackup";

View file

@ -52,9 +52,9 @@ import ../make-test-python.nix ({ pkgs, lib, ...} :
inherit (wg-snakeoil-keys.peer0) publicKey; inherit (wg-snakeoil-keys.peer0) publicKey;
}; };
postSetup = let inherit (pkgs) iproute; in '' postSetup = let inherit (pkgs) iproute2; in ''
${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0 ${iproute2}/bin/ip route replace 10.23.42.1/32 dev wg0
${iproute}/bin/ip route replace fc00::1/128 dev wg0 ${iproute2}/bin/ip route replace fc00::1/128 dev wg0
''; '';
}; };
}; };

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkg-config }: { lib, stdenv, fetchurl, alsaLib, jack2, minixml, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = packageName + "-" + version ; name = packageName + "-" + version ;
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsaLib minixml jack2Full ]; buildInputs = [ alsaLib minixml jack2 ];
meta = with lib; { meta = with lib; {
description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files";

View file

@ -1,6 +1,6 @@
{ faust { faust
, gtk2 , gtk2
, jack2Full , jack2
, alsaLib , alsaLib
, opencv , opencv
, libsndfile , libsndfile
@ -18,7 +18,7 @@ faust.wrapWithBuildEnv {
propagatedBuildInputs = [ propagatedBuildInputs = [
gtk2 gtk2
jack2Full jack2
alsaLib alsaLib
opencv opencv
libsndfile libsndfile

View file

@ -1,5 +1,5 @@
{ faust { faust
, jack2Full , jack2
, qt4 , qt4
, libsndfile , libsndfile
, alsaLib , alsaLib
@ -16,7 +16,7 @@ faust.wrapWithBuildEnv {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
jack2Full jack2
qt4 qt4
libsndfile libsndfile
alsaLib alsaLib

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper { lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper
, libsndfile, jack2Full , libsndfile, jack2
, libGLU, libGL, lv2, cairo , libGLU, libGL, lv2, cairo
, ladspaH, php }: , ladspaH, php }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config php makeWrapper ]; nativeBuildInputs = [ pkg-config php makeWrapper ];
buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH ];
makeFlags = [ makeFlags = [
"PREFIX=${placeholder "out"}" "PREFIX=${placeholder "out"}"

View file

@ -9,7 +9,7 @@
, pkg-config , pkg-config
, boost , boost
, bash , bash
, jack2Full , jack2
, supercollider , supercollider
, qwt , qwt
, osmid , osmid
@ -102,7 +102,7 @@ mkDerivation rec {
dontWrapQtApps = true; dontWrapQtApps = true;
preFixup = '' preFixup = ''
wrapQtApp "$out/bin/sonic-pi" \ 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" --set AUBIO_LIB "${aubio}/lib/libaubio.so"
''; '';

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeWrapper { lib, stdenv, fetchurl, makeWrapper
, expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient , expat, fftwFloat, fontconfig, freetype, libjack2, jack2, libclthreads, libclxclient
, libsndfile, libxcb, xorg , libsndfile, libxcb, xorg
}: }:
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
# Make sure Jack is avalable in $PATH for tetraproc # 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; { meta = with lib; {

View file

@ -12,7 +12,7 @@
, dxflib , dxflib
, curl , curl
, libiodbc , libiodbc
, lzma , xz
, libharu , libharu
, opencv , opencv
, vigra , vigra
@ -64,7 +64,7 @@ mkDerivation rec {
vigra vigra
postgresql postgresql
libiodbc libiodbc
lzma xz
qhull qhull
giflib giflib
] ]

View file

@ -1,6 +1,6 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, lzma , xz
, qt5 , qt5
, wrapQtAppsHook , wrapQtAppsHook
, miniupnpc_2 , miniupnpc_2
@ -39,7 +39,7 @@ pythonPackages.buildPythonPackage rec {
service-identity service-identity
twisted twisted
lz4 lz4
lzma xz
pysocks pysocks
matplotlib matplotlib
qtpy qtpy

View file

@ -1,5 +1,5 @@
{ boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint { 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, }: , qtmultimedia, qtscript, lib, stdenv, superlu, wrapQtAppsHook, }:
let source = import ./source.nix { inherit fetchFromGitHub; }; let source = import ./source.nix { inherit fetchFromGitHub; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
libtiff libtiff
libusb1 libusb1
lz4 lz4
lzma xz
lzo lzo
openblas openblas
qtbase qtbase

View file

@ -2,8 +2,8 @@
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools,
signond, lzma, signond, xz,
}: }:
mkDerivation { mkDerivation {
@ -21,15 +21,15 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [ buildInputs = [
kaccounts-integration kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin 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 ]; propagatedBuildInputs = [ boost kitemmodels ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
CXXFLAGS = [ CXXFLAGS = [
''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mysql}/bin/mysqld\"'' ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mariadb}/bin/mysqld\"''
''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mysql}/bin/mysqladmin\"'' ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mariadb}/bin/mysqladmin\"''
''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mysql}/bin/mysql_install_db\"'' ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mariadb}/bin/mysql_install_db\"''
''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mysql}/bin/mysqlcheck\"'' ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mariadb}/bin/mysqlcheck\"''
''-DNIXPKGS_POSTGRES_PG_CTL=\"\"'' ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"'' ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"''
''-DNIXPKGS_POSTGRES_INITDB=\"\"'' ''-DNIXPKGS_POSTGRES_INITDB=\"\"''

View file

@ -12,7 +12,7 @@
, at-spi2-atk , at-spi2-atk
, gnutar , gnutar
, atomEnv , atomEnv
, kerberos , libkrb5
}: }:
# from justinwoo/azuredatastudio-nix # from justinwoo/azuredatastudio-nix
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
at-spi2-core at-spi2-core
at-spi2-atk at-spi2-atk
stdenv.cc.cc.lib stdenv.cc.cc.lib
kerberos libkrb5
] ]
) )
targetPath targetPath

View file

@ -1,12 +1,12 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper { stdenv, lib, fetchFromGitHub, makeWrapper
, curl, python3, bind, iproute, bc, gitMinimal }: , curl, python3, bind, iproute2, bc, gitMinimal }:
let let
version = "1.23.0"; version = "1.23.0";
deps = lib.makeBinPath [ deps = lib.makeBinPath [
curl curl
python3 python3
bind.dnsutils bind.dnsutils
iproute iproute2
bc bc
gitMinimal gitMinimal
]; ];

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, fetchpatch, mkDerivation { lib, fetchFromGitHub, fetchpatch, mkDerivation
, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
, qtconnectivity, qtcharts, libusb-compat-0_1 , qtconnectivity, qtcharts, libusb-compat-0_1
, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper , bison, flex, zlib, qmake, makeDesktopItem, makeWrapper
}: }:
let let
@ -29,7 +29,7 @@ in mkDerivation rec {
qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib
qtconnectivity qtcharts libusb-compat-0_1 qtconnectivity qtcharts libusb-compat-0_1
]; ];
nativeBuildInputs = [ flex makeWrapper qmake yacc ]; nativeBuildInputs = [ flex makeWrapper qmake bison ];
patches = [ patches = [
# allow building with bison 3.7 # allow building with bison 3.7

View file

@ -4,7 +4,7 @@
, makeWrapper , makeWrapper
, pkg-config , pkg-config
, which , which
, yacc , bison
, gnuplot , gnuplot
, libxls , libxls
, libxml2 , libxml2
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
makeWrapper makeWrapper
pkg-config pkg-config
which which
yacc bison
]; ];
buildInputs = [ buildInputs = [

View file

@ -17,7 +17,7 @@
, glib , glib
, gtk3 , gtk3
, icu , icu
, iproute , iproute2
, krb5 , krb5
, lib , lib
, mesa , 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 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary
done 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 wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH
''; '';
meta = with lib; { meta = with lib; {

View file

@ -8,7 +8,7 @@
, libusb1, pciutils, nss, re2 , libusb1, pciutils, nss, re2
, python2Packages, perl, pkg-config , python2Packages, perl, pkg-config
, nspr, systemd, kerberos , nspr, systemd, libkrb5
, util-linux, alsaLib , util-linux, alsaLib
, bison, gperf , bison, gperf
, glib, gtk3, dbus-glib , glib, gtk3, dbus-glib
@ -135,7 +135,7 @@ let
buildInputs = defaultDependencies ++ [ buildInputs = defaultDependencies ++ [
nspr nss systemd nspr nss systemd
util-linux alsaLib util-linux alsaLib
bison gperf kerberos bison gperf libkrb5
glib gtk3 dbus-glib glib gtk3 dbus-glib
libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
pciutils protobuf speechd libXdamage at-spi2-core pciutils protobuf speechd libXdamage at-spi2-core

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib { 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 , gpm, libidn, tre, expat
, # Incompatible licenses, LGPLv3 - GPLv2 , # Incompatible licenses, LGPLv3 - GPLv2
enableGuile ? false, guile ? null enableGuile ? false, guile ? null
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
ncurses xlibsWrapper bzip2 zlib brotli zstd lzma ncurses xlibsWrapper bzip2 zlib brotli zstd xz
openssl libidn tre expat libev openssl libidn tre expat libev
] ]
++ lib.optional stdenv.isLinux gpm ++ lib.optional stdenv.isLinux gpm

View file

@ -13,7 +13,7 @@
, glibc , glibc
, gtk2 , gtk2
, gtk3 , gtk3
, kerberos , libkrb5
, libX11 , libX11
, libXScrnSaver , libXScrnSaver
, libxcb , libxcb
@ -106,7 +106,7 @@ stdenv.mkDerivation {
glibc glibc
gtk2 gtk2
gtk3 gtk3
kerberos libkrb5
mesa mesa
libX11 libX11
libXScrnSaver libXScrnSaver

View file

@ -24,7 +24,7 @@
, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
, waylandSupport ? true, libxkbcommon , waylandSupport ? true, libxkbcommon
, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages
, gssSupport ? true, kerberos , gssSupport ? true, libkrb5
, pipewireSupport ? waylandSupport && webrtcSupport, pipewire , pipewireSupport ? waylandSupport && webrtcSupport, pipewire
## privacy-related options ## privacy-related options
@ -174,7 +174,7 @@ buildStdenv.mkDerivation ({
++ lib.optional alsaSupport alsaLib ++ lib.optional alsaSupport alsaLib
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
++ lib.optional gtk3Support gtk3 ++ lib.optional gtk3Support gtk3
++ lib.optional gssSupport kerberos ++ lib.optional gssSupport libkrb5
++ lib.optional waylandSupport libxkbcommon ++ lib.optional waylandSupport libxkbcommon
++ lib.optional pipewireSupport pipewire ++ lib.optional pipewireSupport pipewire
++ lib.optional (lib.versionAtLeast ffversion "82") gnum4 ++ lib.optional (lib.versionAtLeast ffversion "82") gnum4

View file

@ -8,7 +8,7 @@
, tridactyl-native , tridactyl-native
, fx_cast_bridge , fx_cast_bridge
, udev , udev
, kerberos , libkrb5
, libva , libva
, mesa # firefox wants gbm for drm+dmabuf , mesa # firefox wants gbm for drm+dmabuf
}: }:
@ -65,7 +65,7 @@ let
libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver ] libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver ]
++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire ++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire
++ lib.optional ffmpegSupport ffmpeg ++ lib.optional ffmpegSupport ffmpeg
++ lib.optional gssSupport kerberos ++ lib.optional gssSupport libkrb5
++ lib.optional useGlvnd libglvnd ++ lib.optional useGlvnd libglvnd
++ lib.optionals (cfg.enableQuakeLive or false) ++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])

View file

@ -5,7 +5,7 @@
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
, alsaLib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , alsaLib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups
, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
, kerberos, libdrm, mesa , libkrb5, libdrm, mesa
, libxkbcommon, wayland # ozone/wayland , libxkbcommon, wayland # ozone/wayland
# Command line programs # Command line programs
@ -66,7 +66,7 @@ let
liberation_ttf curl util-linux xdg-utils wget liberation_ttf curl util-linux xdg-utils wget
flac harfbuzz icu libpng opusWithCustomModes snappy speechd flac harfbuzz icu libpng opusWithCustomModes snappy speechd
bzip2 libcap at-spi2-atk at-spi2-core bzip2 libcap at-spi2-atk at-spi2-core
kerberos libdrm mesa coreutils libkrb5 libdrm mesa coreutils
libxkbcommon wayland libxkbcommon wayland
] ++ optional pulseSupport libpulseaudio ] ++ optional pulseSupport libpulseaudio
++ optional libvaSupport libva ++ optional libvaSupport libva

View file

@ -3,7 +3,7 @@
, makeWrapper , makeWrapper
, socat , socat
, iptables , iptables
, iproute , iproute2
, bridge-utils , bridge-utils
, conntrack-tools , conntrack-tools
, buildGoPackage , buildGoPackage
@ -240,7 +240,7 @@ stdenv.mkDerivation rec {
kmod kmod
socat socat
iptables iptables
iproute iproute2
bridge-utils bridge-utils
ethtool ethtool
util-linux util-linux

View file

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux { lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux
, coreutils, kerberos, ncurses, clang, installShellFiles , coreutils, libkrb5, ncurses, clang, installShellFiles
, components ? [ , components ? [
"cmd/oc" "cmd/oc"
"cmd/openshift" "cmd/openshift"
@ -33,7 +33,7 @@ in buildGoPackage rec {
goPackagePath = "github.com/openshift/origin"; goPackagePath = "github.com/openshift/origin";
buildInputs = [ kerberos ncurses ]; buildInputs = [ libkrb5 ncurses ];
nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ];

View file

@ -1,5 +1,5 @@
{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb { 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 { stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
libpcap libpcap
openssl openssl
libtins libtins
lzma xz
libctemplate libctemplate
libmaxminddb libmaxminddb
]; ];

View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, pkgs { 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 , kmod, nettools, procps, tcpdump, traceroute, util-linux, whois
# If true, just install FireQOS without FireHOL # If true, just install FireQOS without FireHOL
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake ]; nativeBuildInputs = [ autoconf automake ];
buildInputs = [ buildInputs = [
curl iprange iproute ipset iptables iputils kmod curl iprange iproute2 ipset iptables iputils kmod
nettools procps tcpdump traceroute util-linux whois nettools procps tcpdump traceroute util-linux whois
]; ];

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, cmake, openssl, libedit, flex, bison, qt4, makeWrapper { 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"; # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp";
# launch with "iked -f /etc/iked.conf" # launch with "iked -f /etc/iked.conf"
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ cmake flex bison makeWrapper ]; nativeBuildInputs = [ cmake flex bison makeWrapper ];
buildInputs = [ openssl libedit qt4 nettools iproute ]; buildInputs = [ openssl libedit qt4 nettools iproute2 ];
postPatch = '' postPatch = ''
# fix build with bison3 # fix build with bison3

View file

@ -1,6 +1,6 @@
{ mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja
, qtbase, qtimageformats, libdbusmenu, hunspell, xdg-utils, ffmpeg_3, openalSoft , 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 , range-v3
}: }:
@ -21,7 +21,7 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config python3 cmake ninja ]; nativeBuildInputs = [ pkg-config python3 cmake ninja ];
buildInputs = [ 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 zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3
]; ];

View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos {lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, libkrb5
, openldap , openldap
}: }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
ncurses tcl openssl pam kerberos openldap ncurses tcl openssl pam libkrb5 openldap
]; ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

View file

@ -4,7 +4,7 @@
, cyrus_sasl ? null , cyrus_sasl ? null
, gnupg ? null , gnupg ? null
, gpgme ? null , gpgme ? null
, kerberos ? null , libkrb5 ? null
, headerCache ? true , headerCache ? true
, sslSupport ? true , sslSupport ? true
, saslSupport ? true , saslSupport ? true
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
[ ncurses which perl ] [ ncurses which perl ]
++ optional headerCache gdbm ++ optional headerCache gdbm
++ optional sslSupport openssl ++ optional sslSupport openssl
++ optional gssSupport kerberos ++ optional gssSupport libkrb5
++ optional saslSupport cyrus_sasl ++ optional saslSupport cyrus_sasl
++ optional gpgmeSupport gpgme; ++ optional gpgmeSupport gpgme;

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which { 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 , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
cyrus_sasl gss gpgme kerberos libidn ncurses cyrus_sasl gss gpgme libkrb5 libidn ncurses
notmuch openssl perl lmdb notmuch openssl perl lmdb
mailcap sqlite mailcap sqlite
]; ];

View file

@ -16,7 +16,7 @@
, glibc , glibc
, gtk2 , gtk2
, gtk3 , gtk3
, kerberos , libkrb5
, libX11 , libX11
, libXScrnSaver , libXScrnSaver
, libXcomposite , libXcomposite
@ -94,7 +94,7 @@ stdenv.mkDerivation {
glibc glibc
gtk2 gtk2
gtk3 gtk3
kerberos libkrb5
libX11 libX11
libXScrnSaver libXScrnSaver
libXcomposite libXcomposite

View file

@ -20,7 +20,7 @@
, gpgme , gpgme
, gtk2 , gtk2
, gtk3 , gtk3
, kerberos , libkrb5
, libcanberra , libcanberra
, libGL , libGL
, libGLU , libGLU
@ -93,7 +93,7 @@ stdenv.mkDerivation {
glibc glibc
gtk2 gtk2
gtk3 gtk3
kerberos libkrb5
libX11 libX11
libXScrnSaver libXScrnSaver
libXcomposite libXcomposite

View file

@ -1,6 +1,6 @@
{ stdenv, lib { stdenv, lib
, makeWrapper, dpkg, fetchurl, autoPatchelfHook , 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 { stdenv.mkDerivation rec {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
stdenv.cc.cc.lib stdenv.cc.cc.lib
kerberos libkrb5
curl curl
lttng-ust lttng-ust
libpulseaudio libpulseaudio

View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs { stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs
, util-linux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg , 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 let
@ -31,7 +31,7 @@ let
binaryDeps = [ binaryDeps = [
perlEnv which nx-libs util-linux coreutils glibc.bin gawk gnused gnugrep 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.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil
xorg.xkbcomp xorg.setxkbmap xorg.xkbcomp xorg.setxkbmap
]; ];

View file

@ -23,7 +23,7 @@
, libtool , libtool
, libuuid , libuuid
, libxml2 , libxml2
, lzma , xz
, nspr , nspr
, nss , nss
, openssl , openssl
@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
libuuid libuuid
libxcb libxcb
libxml2 libxml2
lzma xz
nspr nspr
nss nss
openssl openssl

View file

@ -4,7 +4,7 @@
, cmake , cmake
, gmp , gmp
, glog , glog
, gmock , gtest
, openssl , openssl
, gflags , gflags
, gnuradio3_8 , gnuradio3_8
@ -42,7 +42,7 @@ gnuradio3_8.pkgs.mkDerivation rec {
armadillo armadillo
gnuradio3_8.unwrapped.boost gnuradio3_8.unwrapped.boost
glog glog
gmock gtest
openssl openssl
gflags gflags
orc orc

View file

@ -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 { stdenv.mkDerivation rec {
pname = "bcftools"; pname = "bcftools";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
python3 python3
]; ];
buildInputs = [ htslib zlib bzip2 lzma curl ]; buildInputs = [ htslib zlib bzip2 xz curl ];
strictDeps = true; strictDeps = true;

View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchFromGitHub, zlib, python3, bzip2, lzma}: {lib, stdenv, fetchFromGitHub, zlib, python3, bzip2, xz}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bedtools"; pname = "bedtools";
@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
python3 python3
]; ];
buildInputs = [ zlib bzip2 lzma ]; buildInputs = [ zlib bzip2 xz ];
cxx = if stdenv.cc.isClang then "clang++" else "g++"; cxx = if stdenv.cc.isClang then "clang++" else "g++";
cc = if stdenv.cc.isClang then "clang" else "gcc"; cc = if stdenv.cc.isClang then "clang" else "gcc";
buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} -j $NIX_BUILD_CORES"; buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} -j $NIX_BUILD_CORES";

View file

@ -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 { stdenv.mkDerivation rec {
pname = "delly"; pname = "delly";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-DWwC35r8cQbePUzppkFQlev0YZdxk2+BSrNTW/DOY3M="; sha256 = "sha256-DWwC35r8cQbePUzppkFQlev0YZdxk2+BSrNTW/DOY3M=";
}; };
buildInputs = [ zlib htslib bzip2 lzma ncurses boost ]; buildInputs = [ zlib htslib bzip2 xz ncurses boost ];
EBROOTHTSLIB = htslib; EBROOTHTSLIB = htslib;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, zlib, bzip2, lzma }: { lib, stdenv, fetchFromGitHub, zlib, bzip2, xz }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "freebayes"; pname = "freebayes";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
buildInputs = [ zlib bzip2 lzma ]; buildInputs = [ zlib bzip2 xz ];
installPhase = '' installPhase = ''
install -vD bin/freebayes bin/bamleftalign scripts/* -t $out/bin install -vD bin/freebayes bin/bamleftalign scripts/* -t $out/bin

View file

@ -3,7 +3,7 @@
, libuuid , libuuid
, zlib , zlib
, bzip2 , bzip2
, lzma , xz
, openssl , openssl
, curl , curl
, libmysqlclient , libmysqlclient
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
sha256 = "0l5lmqqc6sqkf4hyk3z4825ly0vdlj5xdfad6zd0708cb1v81nbx"; sha256 = "0l5lmqqc6sqkf4hyk3z4825ly0vdlj5xdfad6zd0708cb1v81nbx";
}; };
buildInputs = [ libpng libuuid zlib bzip2 lzma openssl curl libmysqlclient ]; buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ];
patchPhase = '' patchPhase = ''
substituteInPlace ./src/checkUmask.sh \ substituteInPlace ./src/checkUmask.sh \

View file

@ -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 { stdenv.mkDerivation rec {
pname = "octopus"; pname = "octopus";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ boost gmp htslib zlib lzma ]; buildInputs = [ boost gmp htslib zlib xz ];
postInstall = '' postInstall = ''
mkdir $out/bin mkdir $out/bin

View file

@ -1,4 +1,4 @@
{ lib, stdenv, zlib, bzip2, lzma, fetchFromGitHub } : { lib, stdenv, zlib, bzip2, xz, fetchFromGitHub } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1.0"; version = "1.1.0";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
buildInputs = [ zlib bzip2 lzma ]; buildInputs = [ zlib bzip2 xz ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

View file

@ -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 let
libiconvInc = lib.optionalString stdenv.isLinux "${glibc.dev}/include"; libiconvInc = lib.optionalString stdenv.isLinux "${glibc.dev}/include";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs"; sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs";
}; };
nativeBuildInputs = [ which yacc flex imake gccmakedep ]; nativeBuildInputs = [ which bison flex imake gccmakedep ];
buildInputs = [ tcl tk libX11 xorgproto ]; buildInputs = [ tcl tk libX11 xorgproto ];
dontUseImakeConfigure = true; dontUseImakeConfigure = true;

View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, ctags, swig { stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, ctags, swig
# data, compression # data, compression
, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy , bzip2, curl, hdf5, json_c, xz, lzo, protobuf, snappy
# maths # maths
, blas, lapack, eigen, nlopt, lp_solve, colpack, glpk , blas, lapack, eigen, nlopt, lp_solve, colpack, glpk
# libraries # libraries
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = with lib; [ 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 protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk
] ]
++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ])

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2 { 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 }: , Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake pkg-config ]; 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) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
; ;

View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_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 , pkg-config, python, xxHash, zlib, zstd
, libAfterImage, giflib, libjpeg, libtiff, libpng , libAfterImage, giflib, libjpeg, libtiff, libpng
, Cocoa, OpenGL, noSplash ? false }: , Cocoa, OpenGL, noSplash ? false }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper cmake pkg-config ]; 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) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
; ;

View file

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib { 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. # We need an old version of Graphviz for format compatibility reasons.
# This version is vulnerable, but monotone-viz will never feed it bad input. # This version is vulnerable, but monotone-viz will never feed it bad input.
let graphviz_2_0 = import ./graphviz-2.0.nix { let graphviz_2_0 = import ./graphviz-2.0.nix {
inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw
yacc libtool fontconfig pango gd libwebp; bison libtool fontconfig pango gd libwebp;
}; in }; in
let inherit (gnome2) libgnomecanvas; in let inherit (gnome2) libgnomecanvas; in
let inherit (ocamlPackages) ocaml lablgtk camlp4; in let inherit (ocamlPackages) ocaml lablgtk camlp4; in

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw { 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 { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
xlibsWrapper libpng libjpeg expat libXaw yacc xlibsWrapper libpng libjpeg expat libXaw bison
libtool fontconfig pango gd libwebp libtool fontconfig pango gd libwebp
]; ];

View file

@ -9,7 +9,7 @@
{ stdenv, lib, fetchFromGitHub, { stdenv, lib, fetchFromGitHub,
# Main build tools # Main build tools
pkg-config, autoconf, automake, libtool, m4, lzma, python3, pkg-config, autoconf, automake, libtool, m4, xz, python3,
numactl, numactl,
# Processing, video codecs, containers # Processing, video codecs, containers
ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d,
@ -100,7 +100,7 @@ _EOF
ffmpeg-full libogg libtheora x264 x265 libvpx dav1d ffmpeg-full libogg libtheora x264 x265 libvpx dav1d
libopus lame libvorbis a52dec speex libsamplerate libopus lame libvorbis a52dec speex libsamplerate
libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz
libdvdread libdvdnav libdvdcss libbluray lzma libdvdread libdvdnav libdvdcss libbluray xz
] ++ lib.optional (!stdenv.isDarwin) numactl ] ++ lib.optional (!stdenv.isDarwin) numactl
++ lib.optionals useGtk [ ++ lib.optionals useGtk [
glib gtk3 libappindicator-gtk3 libnotify glib gtk3 libappindicator-gtk3 libnotify

View file

@ -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 { buildKodiBinaryAddon rec {
pname = namespace; pname = namespace;
namespace = "vfs.libarchive"; namespace = "vfs.libarchive";
@ -11,7 +11,7 @@ buildKodiBinaryAddon rec {
sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5"; sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5";
}; };
extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ]; extraBuildInputs = [ libarchive xz bzip2 zlib lz4 lzo openssl ];
meta = with lib; { meta = with lib; {
description = "LibArchive Virtual Filesystem add-on for Kodi"; description = "LibArchive Virtual Filesystem add-on for Kodi";

View file

@ -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

View file

@ -13,7 +13,7 @@ rec {
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
, makeWrapper, installShellFiles, pkg-config , makeWrapper, installShellFiles, pkg-config
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool , 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 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
, procps, libseccomp , procps, libseccomp
, nixosTests , nixosTests
@ -72,7 +72,7 @@ rec {
nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ];
buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ]; 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 = '' buildPhase = ''
export GOCACHE="$TMPDIR/go-cache" export GOCACHE="$TMPDIR/go-cache"

View file

@ -5,7 +5,7 @@
, git , git
, glibcLocales , glibcLocales
, go , go
, iproute , iproute2
, iptables , iptables
, makeWrapper , makeWrapper
, procps , procps
@ -87,7 +87,7 @@ in buildBazelPackage rec {
# Needed for the 'runsc do' subcomand # Needed for the 'runsc do' subcomand
wrapProgram $out/bin/runsc \ wrapProgram $out/bin/runsc \
--prefix PATH : ${lib.makeBinPath [ iproute iptables procps ]} --prefix PATH : ${lib.makeBinPath [ iproute2 iptables procps ]}
''; '';
}; };

View file

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,
fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto,
libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, 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 }: withX ? true }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ 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; { meta = with lib; {

View file

@ -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 { stdenv.mkDerivation rec {
pname = "x11docker"; pname = "x11docker";
version = "6.6.2"; version = "6.6.2";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
install -D x11docker "$out/bin/x11docker"; install -D x11docker "$out/bin/x11docker";
wrapProgram "$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 = { meta = {

View file

@ -13,7 +13,7 @@ config:
# Scripts # Scripts
, coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools , 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 , lvm2, util-linux, procps, systemd
# Documentation # Documentation
@ -31,7 +31,7 @@ let
scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [ scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [
which perl which perl
coreutils gawk gnused gnugrep diffutils util-linux multipath-tools 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); withXenfiles = f: concatStringsSep "\n" (mapAttrsToList f config.xenfiles);

View file

@ -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 { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXinerama libXrandr libXft yacc ]; buildInputs = [ libX11 libXinerama libXrandr libXft bison ];
prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';

View file

@ -1,10 +1,10 @@
{ lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg { lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg
, enableAlsaUtils ? true, alsaUtils, coreutils , enableAlsaUtils ? true, alsaUtils, coreutils
, enableNetwork ? true, dnsutils, iproute, wirelesstools }: , enableNetwork ? true, dnsutils, iproute2, wirelesstools }:
let let
bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ] bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ]
++ lib.optionals enableNetwork [ dnsutils iproute wirelesstools ]; ++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ];
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {

View file

@ -1,5 +1,5 @@
{ fetchFromGitHub, lib, stdenv, perl, makeWrapper { fetchFromGitHub, lib, stdenv, perl, makeWrapper
, iproute, acpi, sysstat, alsaUtils , iproute2, acpi, sysstat, alsaUtils
, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" , scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
"load_average" "memory" "volume" "wifi" ] "load_average" "memory" "volume" "wifi" ]
}: }:
@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
wrapProgram $out/libexec/i3blocks/bandwidth \ 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 \ wrapProgram $out/libexec/i3blocks/battery \
--prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)} --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)}
wrapProgram $out/libexec/i3blocks/cpu_usage \ wrapProgram $out/libexec/i3blocks/cpu_usage \
--prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)} --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)}
wrapProgram $out/libexec/i3blocks/iface \ 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 \ wrapProgram $out/libexec/i3blocks/volume \
--prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}
''; '';

View file

@ -573,7 +573,7 @@ rec {
buildCommand = '' buildCommand = ''
${createRootFS} ${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 # Unpack the .debs. We do this to prevent pre-install scripts
# (which have lots of circular dependencies) from barfing. # (which have lots of circular dependencies) from barfing.

View file

@ -1,7 +1,7 @@
{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection { fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection
, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit
, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja , 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 }: , gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas, boost, protobuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib libsoup libxml2 gtk3 gnome-online-accounts glib libsoup libxml2 gtk3 gnome-online-accounts
gcr p11-kit libgweather libgdata libaccounts-glib json-glib 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 libcanberra-gtk3 pcre libphonenumber boost protobuf
]; ];

View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, fetchgit, mercurial_4, python27, setJavaClassPath, { stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, fetchgit, mercurial_4, python27, setJavaClassPath,
which, zlib, makeWrapper, openjdk, unzip, git, clang, llvm, icu, ruby, glibc, bash, gcc, libobjc, 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 openssl, perl, CoreFoundation, Foundation, JavaNativeFoundation, JavaRuntimeSupport, JavaVM, Cocoa
}: }:
@ -372,7 +372,7 @@ in rec {
buildInputs = [ mx zlib.dev mercurial jvmci8 git llvm clang buildInputs = [ mx zlib.dev mercurial jvmci8 git llvm clang
python27withPackages icu ruby bzip2 which python27withPackages icu ruby bzip2 which
readline bzip2 lzma pcre curl ed gfortran readline bzip2 xz pcre curl ed gfortran
] ++ lib.optional stdenv.isDarwin [ ] ++ lib.optional stdenv.isDarwin [
CoreFoundation gcc.cc.lib libiconv perl openssl CoreFoundation gcc.cc.lib libiconv perl openssl
]; ];

View file

@ -3,7 +3,7 @@
, expat , expat
, libffi , libffi
, gdbm , gdbm
, lzma , xz
, mime-types ? null, mimetypesSupport ? true , mime-types ? null, mimetypesSupport ? true
, ncurses , ncurses
, openssl , openssl
@ -103,7 +103,7 @@ let
]; ];
buildInputs = filter (p: p != null) ([ 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 x11Support [ tcl tk libX11 xorgproto ]
++ optionals (bluezSupport && stdenv.isLinux) [ bluez ] ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ]
++ optionals stdenv.isDarwin [ configd ]) ++ optionals stdenv.isDarwin [ configd ])

View file

@ -1,7 +1,7 @@
{ lib, stdenv, substituteAll, fetchurl { lib, stdenv, substituteAll, fetchurl
, zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security , zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security
, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
, self, gdbm, db, lzma , self, gdbm, db, xz
, python-setup-hook , python-setup-hook
# For the Python package set # For the Python package set
, packageOverrides ? (self: super: {}) , packageOverrides ? (self: super: {})
@ -53,7 +53,7 @@ in with passthru; stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db
] ++ optionals isPy3k [ ] ++ optionals isPy3k [
lzma xz
] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [ ] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [
stdenv.cc.libc stdenv.cc.libc
] ++ optionals zlibSupport [ ] ++ optionals zlibSupport [

View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, autoreconfHook , autoreconfHook
, flex , flex
, yacc , bison
, xmlto , xmlto
, docbook_xsl , docbook_xsl
, docbook_xml_dtd_44 , docbook_xml_dtd_44
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
flex flex
yacc bison
swig swig
xmlto xmlto
docbook_xml_dtd_44 docbook_xml_dtd_44

View file

@ -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 , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false
, buildPackages, pruneLibtoolFiles, fetchpatch }: , buildPackages, pruneLibtoolFiles, fetchpatch }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ] nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ]
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = buildInputs =
[ openssl db gettext kerberos ] [ openssl db gettext libkrb5 ]
++ lib.optional enableLdap openldap ++ lib.optional enableLdap openldap
++ lib.optional stdenv.isLinux pam; ++ lib.optional stdenv.isLinux pam;

View file

@ -99,7 +99,7 @@
, libxcbshapeExtlib ? true # X11 grabbing shape rendering , libxcbshapeExtlib ? true # X11 grabbing shape rendering
, libXv ? null # Xlib support , libXv ? null # Xlib support
, libXext ? 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 , nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support
, openal ? null # OpenAL 1.1 capture support , openal ? null # OpenAL 1.1 capture support
#, opencl ? null # OpenCL code #, opencl ? null # OpenCL code
@ -381,7 +381,7 @@ stdenv.mkDerivation rec {
(enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbshmExtlib "libxcb-shm")
(enableFeature libxcbxfixesExtlib "libxcb-xfixes") (enableFeature libxcbxfixesExtlib "libxcb-xfixes")
(enableFeature libxcbshapeExtlib "libxcb-shape") (enableFeature libxcbshapeExtlib "libxcb-shape")
(enableFeature (lzma != null) "lzma") (enableFeature (xz != null) "lzma")
(enableFeature nvenc "nvenc") (enableFeature nvenc "nvenc")
(enableFeature (openal != null) "openal") (enableFeature (openal != null) "openal")
#(enableFeature opencl "opencl") #(enableFeature opencl "opencl")
@ -431,7 +431,7 @@ stdenv.mkDerivation rec {
bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa
libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 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 samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore
zeromq4 zlib zeromq4 zlib
] ++ optionals openglExtlib [ libGL libGLU ] ] ++ optionals openglExtlib [ libGL libGLU ]

View file

@ -1,6 +1,6 @@
{ lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm { lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , 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 , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
, openglSupport ? false, libGLU ? null, libGL ? null , openglSupport ? false, libGLU ? null, libGL ? null
, libmfxSupport ? false, intel-media-sdk ? null , libmfxSupport ? false, intel-media-sdk ? null
@ -171,7 +171,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora 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 ] ] ++ optionals openglSupport [ libGL libGLU ]
++ optional libmfxSupport intel-media-sdk ++ optional libmfxSupport intel-media-sdk
++ optional libaomSupport libaom ++ optional libaomSupport libaom

View file

@ -13,7 +13,7 @@
, xmlto , xmlto
, appstream-glib , appstream-glib
, substituteAll , substituteAll
, yacc , bison
, xdg-dbus-proxy , xdg-dbus-proxy
, p11-kit , p11-kit
, bubblewrap , bubblewrap
@ -35,7 +35,7 @@
, fuse , fuse
, nixosTests , nixosTests
, libsoup , libsoup
, lzma , xz
, zstd , zstd
, ostree , ostree
, polkit , polkit
@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
xmlto xmlto
appstream-glib appstream-glib
yacc bison
wrapGAppsNoGuiHook wrapGAppsNoGuiHook
]; ];
@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
libcap libcap
libseccomp libseccomp
libsoup libsoup
lzma xz
zstd zstd
polkit polkit
python3 python3

View file

@ -8,7 +8,7 @@
, gflags , gflags
, libiberty , libiberty
, lz4 , lz4
, lzma , xz
, zlib , zlib
, jemalloc , jemalloc
, openssl , openssl
@ -43,7 +43,7 @@ stdenv.mkDerivation (rec {
libiberty libiberty
openssl openssl
lz4 lz4
lzma xz
zlib zlib
jemalloc jemalloc
libunwind libunwind

View file

@ -22,7 +22,7 @@
, docbook_xml_dtd_412 , docbook_xml_dtd_412
, gnome3 , gnome3
, gcr , gcr
, kerberos , libkrb5
, gvfs , gvfs
, dbus , dbus
, wrapGAppsHook , wrapGAppsHook
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
gvfs # OwnCloud, Google Drive gvfs # OwnCloud, Google Drive
icu icu
json-glib json-glib
kerberos libkrb5
librest librest
libsecret libsecret
libsoup libsoup

View file

@ -2,7 +2,7 @@
, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv , perl, gmp, autogen, libidn, p11-kit, unbound, libiconv
, guileBindings ? config.gnutls.guile or false, guile , guileBindings ? config.gnutls.guile or false, guile
, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake , tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake
, yacc, texinfo , bison, texinfo
# Version dependent args # Version dependent args
, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
@ -55,7 +55,7 @@ stdenv.mkDerivation {
enableParallelBuilding = false; enableParallelBuilding = false;
buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp 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 doCheck nettools
++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional (tpmSupport && stdenv.isLinux) trousers

View file

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, libidn, kerberos }: { fetchurl, lib, stdenv, libidn, libkrb5 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gsasl-1.10.0"; name = "gsasl-1.10.0";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM="; sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM=";
}; };
buildInputs = [ libidn kerberos ]; buildInputs = [ libidn libkrb5 ];
configureFlags = [ "--with-gssapi-impl=mit" ]; configureFlags = [ "--with-gssapi-impl=mit" ];

Some files were not shown because too many files have changed in this diff Show more