diff options
36 files changed, 35 insertions, 50 deletions
diff --git a/pkgs/tools/networking/cdpr/default.nix b/pkgs/tools/networking/cdpr/default.nix index 6879b7e9d7073..1f9e7b1888d1b 100644 --- a/pkgs/tools/networking/cdpr/default.nix +++ b/pkgs/tools/networking/cdpr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libpcap }: +{ lib, stdenv, fetchurl, libpcap }: stdenv.mkDerivation rec { pname = "cdpr"; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 757a7208c4d2c..1d07843cc48b1 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, file, nettools, iputils, iproute2, makeWrapper +{ stdenv, fetchurl, perl, file, nettools, iputils, iproute2, makeWrapper , coreutils, gnused, openldap ? null , buildPackages, lib diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index f4398cdd03933..8ca5199838e11 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, nettle, fetchpatch +{ lib, stdenv, fetchurl, pkg-config, nettle , libidn, libnetfilter_conntrack, buildPackages , dbusSupport ? stdenv.isLinux , dbus diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index 24e1ef29ef31f..ae663abb08dc5 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -13,14 +13,14 @@ let */ staticdb = symlinkJoin { inherit (db) name; - paths = with db.overrideAttrs(old: { dontDisableStatic = true; }); [ out dev ]; + paths = with db.overrideAttrs { dontDisableStatic = true; }; [ out dev ]; postBuild = '' rm $out/lib/*.so* ''; }; pcap = symlinkJoin { inherit (libpcap) name; - paths = [ (libpcap.overrideAttrs(old: { dontDisableStatic = true; })) ]; + paths = [ (libpcap.overrideAttrs { dontDisableStatic = true; }) ]; postBuild = '' cp -rs $out/include/pcap $out/include/net # prevent references to libpcap @@ -29,15 +29,15 @@ let }; net = symlinkJoin { inherit (libnet) name; - paths = [ (libnet.overrideAttrs(old: { dontDisableStatic = true; })) ]; + paths = [ (libnet.overrideAttrs { dontDisableStatic = true; }) ]; postBuild = '' # prevent dynamic linking, now that we have a static library rm $out/lib/*.so* ''; }; - nids = libnids.overrideAttrs(old: { + nids = libnids.overrideAttrs { dontDisableStatic = true; - }); + }; ssl = symlinkJoin { inherit (openssl) name; paths = with openssl.override { static = true; }; [ out dev ]; diff --git a/pkgs/tools/networking/ebpf-verifier/default.nix b/pkgs/tools/networking/ebpf-verifier/default.nix index 63af32ce1a207..972c72c4e57ff 100644 --- a/pkgs/tools/networking/ebpf-verifier/default.nix +++ b/pkgs/tools/networking/ebpf-verifier/default.nix @@ -9,7 +9,7 @@ , yaml-cpp }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "ebpf-verifier"; version = "unstable-2023-07-15"; @@ -57,4 +57,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.linux; maintainers = with maintainers; [ gaelreyrol ]; }; -}) +} diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/tools/networking/edgedb/default.nix index 1409bd070818a..d1d3f3b426b4f 100644 --- a/pkgs/tools/networking/edgedb/default.nix +++ b/pkgs/tools/networking/edgedb/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, runCommand , patchelf , fetchFromGitHub , rustPlatform diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index e9266a555480d..5f6e0db6d581a 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, fetchpatch , fetchzip , androidenv , makeWrapper diff --git a/pkgs/tools/networking/ifwifi/default.nix b/pkgs/tools/networking/ifwifi/default.nix index 86891f4598711..f04c3369bacf9 100644 --- a/pkgs/tools/networking/ifwifi/default.nix +++ b/pkgs/tools/networking/ifwifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, darwin, networkmanager, iw, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, networkmanager, iw, Security }: rustPlatform.buildRustPackage rec { pname = "ifwifi"; diff --git a/pkgs/tools/networking/mtr-exporter/default.nix b/pkgs/tools/networking/mtr-exporter/default.nix index 0243774262af0..62b884fe64753 100644 --- a/pkgs/tools/networking/mtr-exporter/default.nix +++ b/pkgs/tools/networking/mtr-exporter/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoModule rec { +buildGoModule { pname = "mtr-exporter"; version = "0.1.0"; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 9ce71df109e0d..bf324c57d497a 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , libcap diff --git a/pkgs/tools/networking/nethoscope/default.nix b/pkgs/tools/networking/nethoscope/default.nix index 276579f361fc2..9a17adc3800de 100644 --- a/pkgs/tools/networking/nethoscope/default.nix +++ b/pkgs/tools/networking/nethoscope/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , rustPlatform +, fetchFromGitHub , pkg-config , alsa-lib , libpcap diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 8f3ed67abcfba..a47b23e9634c2 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -21,7 +21,6 @@ , withGnome ? true , gcr_4 , glib -, substituteAll , lib , _experimental-update-script-combinators , makeHardcodeGsettingsPatch diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix index 545dd3d82cdc0..f46fb12720879 100644 --- a/pkgs/tools/networking/networkmanager/strongswan/default.nix +++ b/pkgs/tools/networking/networkmanager/strongswan/default.nix @@ -7,7 +7,6 @@ , strongswanNM , gtk3 , gtk4 -, gnome , libsecret , libnma , libnma-gtk4 diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index f2af99a922fdd..9c1bb43a67327 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, autoreconfHook, pkg-config, stdenv, fetchpatch, fetchFromGitHub }: +{ lib, autoreconfHook, pkg-config, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "nss-mdns"; diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 0da1cb1866a29..778aea8354eb1 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchFromGitLab, fetchurl, darwin }: +{ callPackage, fetchurl, darwin }: let common = opts: callPackage (import ./common.nix opts) { inherit (darwin.apple_sdk.frameworks) PCSC; diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 28bcba68a156e..f3028573c05c0 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -13,7 +13,6 @@ # package without splicing See: https://github.com/NixOS/nixpkgs/pull/107606 , pkgs , fetchurl -, fetchpatch , zlib , openssl , libedit @@ -30,7 +29,7 @@ , linkOpenssl ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit pname version src; patches = [ diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index d202ac446ba8a..ba0ce50d3fbaf 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }: +{ callPackage, lib, fetchurl, fetchpatch, autoreconfHook }: let common = opts: callPackage (import ./common.nix opts) { }; in diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 0ef5076eaf99b..87cbd6881e27b 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -9,7 +9,6 @@ , useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , update-systemd-resolved -, util-linux , pkcs11Support ? false , pkcs11helper }: diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index ff8ecc385cdb4..6d4950b40fca3 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -15,7 +15,6 @@ , boost # Not using boost leads to crashes with gtk3 , gettext , libpng -, autoreconfHook , pkg-config , makeWrapper , libX11 diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 3c9a6e7233273..16eaf0d14e972 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , bison , pkg-config , gettext @@ -10,7 +9,6 @@ , libxml2 , libbfd , zlib -, binutils , gnutls , enableGui ? true }: @@ -40,7 +38,7 @@ stdenv.mkDerivation rec { zlib ] ++ - lib.optionals (enableGui) [ gtk2 ] + lib.optionals enableGui [ gtk2 ] ; configureScript = "./build.sh"; diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index f8e5e33eb4652..ed449ecb992f9 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper +{ lib, buildPythonApplication, fetchFromGitHub , aria , libnotify , pulseaudio diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 535545f42bc2f..20e59167699b3 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -8,7 +8,6 @@ , openssl , bash , nixosTests -, writeTextDir }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/rconc/default.nix b/pkgs/tools/networking/rconc/default.nix index 53fc4d0b5aa05..613c4a8a31b0a 100644 --- a/pkgs/tools/networking/rconc/default.nix +++ b/pkgs/tools/networking/rconc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkgs }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { version = "0.1.4"; diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/tools/networking/shorewall/default.nix index 0c9e515ce094b..79fd1c17a492c 100644 --- a/pkgs/tools/networking/shorewall/default.nix +++ b/pkgs/tools/networking/shorewall/default.nix @@ -7,7 +7,6 @@ , perl , perlPackages , lib, stdenv -, tree , util-linux }: let diff --git a/pkgs/tools/networking/swagger-cli/default.nix b/pkgs/tools/networking/swagger-cli/default.nix index 9c9145f327fdc..5a20ce93cc7cc 100644 --- a/pkgs/tools/networking/swagger-cli/default.nix +++ b/pkgs/tools/networking/swagger-cli/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , buildNpmPackage +, fetchFromGitHub }: buildNpmPackage rec { diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 090357fa6e61f..4866cfea41ee1 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, fetchFromGitHub, makeWrapper, git +{ lib, pythonPackages, fetchFromGitHub, makeWrapper , sshfs-fuse, torsocks, sshuttle, conntrack-tools , openssh, coreutils , iptables, bash }: diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 0b4e75879caa6..6a7c65756a080 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl -, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, util-linux +, docbook_xsl, coreutils, lsof, makeWrapper, sg3_utils }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 24f96e63d7996..f15f398dc7db3 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { pname = "tinc"; diff --git a/pkgs/tools/networking/transmission-rss/default.nix b/pkgs/tools/networking/transmission-rss/default.nix index 50056c3ebdbc2..095ccfb91a5aa 100644 --- a/pkgs/tools/networking/transmission-rss/default.nix +++ b/pkgs/tools/networking/transmission-rss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: rustPlatform.buildRustPackage rec { version = "0.3.1"; diff --git a/pkgs/tools/networking/trurl/default.nix b/pkgs/tools/networking/trurl/default.nix index dea517a67d3c8..3b51398732092 100644 --- a/pkgs/tools/networking/trurl/default.nix +++ b/pkgs/tools/networking/trurl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, python3, python3Packages, trurl, testers }: +{ lib, stdenv, fetchFromGitHub, curl, python3, trurl, testers }: stdenv.mkDerivation rec { pname = "trurl"; diff --git a/pkgs/tools/networking/userhosts/default.nix b/pkgs/tools/networking/userhosts/default.nix index 6cec402638a1a..10bfbd650aa74 100644 --- a/pkgs/tools/networking/userhosts/default.nix +++ b/pkgs/tools/networking/userhosts/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "userhosts"; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index f9507cf459c77..d5fd324719b42 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , makeWrapper, pkg-config, perl -, gawk, gnutls, libgcrypt, openresolv, vpnc-scripts +, gnutls, libgcrypt, vpnc-scripts , opensslSupport ? false, openssl # Distributing this is a GPL violation. }: diff --git a/pkgs/tools/networking/wg-netmanager/default.nix b/pkgs/tools/networking/wg-netmanager/default.nix index 15dc7b163b573..2f74cd86e736f 100644 --- a/pkgs/tools/networking/wg-netmanager/default.nix +++ b/pkgs/tools/networking/wg-netmanager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, wireguard-go, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "wg-netmanager"; diff --git a/pkgs/tools/networking/wtfis/default.nix b/pkgs/tools/networking/wtfis/default.nix index 06c321d99d6ef..ba6175f59b332 100644 --- a/pkgs/tools/networking/wtfis/default.nix +++ b/pkgs/tools/networking/wtfis/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , python3 +, fetchFromGitHub }: let diff --git a/pkgs/tools/networking/xrootd/fetchxrd.nix b/pkgs/tools/networking/xrootd/fetchxrd.nix index b7a77f80549b9..2d197f8504fec 100644 --- a/pkgs/tools/networking/xrootd/fetchxrd.nix +++ b/pkgs/tools/networking/xrootd/fetchxrd.nix @@ -33,10 +33,10 @@ echo "xrdcp failed trying to download any of the urls" >&2 exit $ret fi - '').overrideAttrs (finalAttrs: prevAttrs: + '').overrideAttrs (finalAttrs: if (pname != "" && version != "") then { inherit pname version; - name = with finalAttrs; "${pname}-${version}"; + name = "${pname}-${version}"; } else { name = if (name != "") then name else (baseNameOf finalAttrs.url); }) diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 41ae21b24c8bd..bbd5c2dc260bd 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, patchelf }: +{ lib, stdenv, fetchzip }: let inherit (stdenv.hostPlatform) system; |