From 6bd0c3fe9de1572f06ae0b44b6f0c96318246bd1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 3 Mar 2016 19:40:54 +0100 Subject: [PATCH] ifplugd: Remove This package hasn't been updated in 11 years, and isn't really useful anymore in a modern Linux system. --- nixos/modules/module-list.nix | 1 - nixos/modules/services/networking/ifplugd.nix | 82 ------------------- pkgs/os-specific/linux/ifplugd/default.nix | 16 ---- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/release-small.nix | 1 - 5 files changed, 102 deletions(-) delete mode 100644 nixos/modules/services/networking/ifplugd.nix delete mode 100644 pkgs/os-specific/linux/ifplugd/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4e3acd2c31d8..5d487776be24 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -322,7 +322,6 @@ ./services/networking/hostapd.nix ./services/networking/i2pd.nix ./services/networking/i2p.nix - ./services/networking/ifplugd.nix ./services/networking/iodined.nix ./services/networking/ircd-hybrid/default.nix ./services/networking/kippo.nix diff --git a/nixos/modules/services/networking/ifplugd.nix b/nixos/modules/services/networking/ifplugd.nix deleted file mode 100644 index 00b94fe2284e..000000000000 --- a/nixos/modules/services/networking/ifplugd.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - inherit (pkgs) ifplugd; - - cfg = config.networking.interfaceMonitor; - - # The ifplugd action script, which is called whenever the link - # status changes (i.e., a cable is plugged in or unplugged). - plugScript = pkgs.writeScript "ifplugd.action" - '' - #! ${pkgs.stdenv.shell} - iface="$1" - status="$2" - ${cfg.commands} - ''; - -in - -{ - - ###### interface - - options = { - - networking.interfaceMonitor.enable = mkOption { - type = types.bool; - default = false; - description = '' - If true, monitor Ethernet interfaces for - cables being plugged in or unplugged. When this occurs, the - commands specified in - are - executed. - ''; - }; - - networking.interfaceMonitor.beep = mkOption { - type = types.bool; - default = false; - description = '' - If true, beep when an Ethernet cable is - plugged in or unplugged. - ''; - }; - - networking.interfaceMonitor.commands = mkOption { - type = types.lines; - default = ""; - description = '' - Shell commands to be executed when the link status of an - interface changes. On invocation, the shell variable - iface contains the name of the interface, - while the variable status contains either - up or down to indicate - the new status. - ''; - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - systemd.services.ifplugd = { - description = "Network interface connectivity monitor"; - after = [ "network-interfaces.target" ]; - wantedBy = [ "multi-user.target" ]; - script = '' - ${ifplugd}/sbin/ifplugd --no-daemon --no-startup --no-shutdown \ - ${if config.networking.interfaceMonitor.beep then "" else "--no-beep"} \ - --run ${plugScript} - ''; - }; - - environment.systemPackages = [ ifplugd ]; - }; -} diff --git a/pkgs/os-specific/linux/ifplugd/default.nix b/pkgs/os-specific/linux/ifplugd/default.nix deleted file mode 100644 index 2d9ff16c8ade..000000000000 --- a/pkgs/os-specific/linux/ifplugd/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libdaemon}: - -stdenv.mkDerivation { - name = "ifplugd-0.28"; - src = fetchurl { - url = http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.28.tar.gz; - sha256 = "1w21cpyzkr7igp6vsf4a0jwp2b0axs3kwjiapy676bdk9an58is7"; - }; - buildInputs = [pkgconfig libdaemon]; - configureFlags = "--with-initdir=$out/etc/init.d --disable-lynx"; - patches = [ - # From http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch?rev=1.1. - ./interface.patch - ]; - patchFlags = "-p0"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c971f3157b94..cb592d252df8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10242,8 +10242,6 @@ let i7z = callPackage ../os-specific/linux/i7z { }; - ifplugd = callPackage ../os-specific/linux/ifplugd { }; - ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { }; intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 017865919739..fbfa4903b45a 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -71,7 +71,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; iana_etc = linux; icewm = linux; idutils = all; - ifplugd = linux; inetutils = linux; iputils = linux; jnettop = linux;