pkgs/tools/networking: remove dead code

This commit is contained in:
figsoda 2023-07-25 11:36:57 -04:00
parent fca9a919a8
commit 251d2cbfc2
36 changed files with 35 additions and 50 deletions

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, libpcap }:
{ lib, stdenv, fetchurl, libpcap }:
stdenv.mkDerivation rec {
pname = "cdpr";

View file

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

View file

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

View file

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

View file

@ -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 ];
};
})
}

View file

@ -1,6 +1,5 @@
{ stdenv
, lib
, runCommand
, patchelf
, fetchFromGitHub
, rustPlatform

View file

@ -2,7 +2,6 @@
, stdenv
, rustPlatform
, fetchFromGitHub
, fetchpatch
, fetchzip
, androidenv
, makeWrapper

View file

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

View file

@ -1,6 +1,6 @@
{ lib, buildGoModule, fetchurl, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
buildGoModule {
pname = "mtr-exporter";
version = "0.1.0";

View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, pkg-config
, libcap

View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, fetchFromGitHub
, pkg-config
, alsa-lib
, libpcap

View file

@ -21,7 +21,6 @@
, withGnome ? true
, gcr_4
, glib
, substituteAll
, lib
, _experimental-update-script-combinators
, makeHardcodeGsettingsPatch

View file

@ -7,7 +7,6 @@
, strongswanNM
, gtk3
, gtk4
, gnome
, libsecret
, libnma
, libnma-gtk4

View file

@ -1,4 +1,4 @@
{ fetchurl, lib, autoreconfHook, pkg-config, stdenv, fetchpatch, fetchFromGitHub }:
{ lib, autoreconfHook, pkg-config, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "nss-mdns";

View file

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

View file

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

View file

@ -1,4 +1,4 @@
{ callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }:
{ callPackage, lib, fetchurl, fetchpatch, autoreconfHook }:
let
common = opts: callPackage (import ./common.nix opts) { };
in

View file

@ -9,7 +9,6 @@
, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
, systemd
, update-systemd-resolved
, util-linux
, pkcs11Support ? false
, pkcs11helper
}:

View file

@ -15,7 +15,6 @@
, boost # Not using boost leads to crashes with gtk3
, gettext
, libpng
, autoreconfHook
, pkg-config
, makeWrapper
, libX11

View file

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

View file

@ -1,4 +1,4 @@
{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper
{ lib, buildPythonApplication, fetchFromGitHub
, aria
, libnotify
, pulseaudio

View file

@ -8,7 +8,6 @@
, openssl
, bash
, nixosTests
, writeTextDir
}:
stdenv.mkDerivation rec {

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkgs }:
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
version = "0.1.4";

View file

@ -7,7 +7,6 @@
, perl
, perlPackages
, lib, stdenv
, tree
, util-linux
}:
let

View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, buildNpmPackage
, fetchFromGitHub
}:
buildNpmPackage rec {

View file

@ -1,4 +1,4 @@
{ lib, pythonPackages, fetchFromGitHub, makeWrapper, git
{ lib, pythonPackages, fetchFromGitHub, makeWrapper
, sshfs-fuse, torsocks, sshuttle, conntrack-tools , openssh, coreutils
, iptables, bash }:

View file

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

View file

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

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }:
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:
rustPlatform.buildRustPackage rec {
version = "0.3.1";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, curl, python3, python3Packages, trurl, testers }:
{ lib, stdenv, fetchFromGitHub, curl, python3, trurl, testers }:
stdenv.mkDerivation rec {
pname = "trurl";

View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "userhosts";

View file

@ -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.
}:

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, wireguard-go, Security }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
pname = "wg-netmanager";

View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, python3
, fetchFromGitHub
}:
let

View file

@ -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);
})

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchzip, patchelf }:
{ lib, stdenv, fetchzip }:
let
inherit (stdenv.hostPlatform) system;