diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 14161532a16e..9cf86ac29bd3 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -136,6 +136,12 @@ rmdir /var/lib/ipfs/.ipfs being dead and not building with openssl 1.1. + + + wvdial package and module were removed. This is due to the project + being dead and not building with openssl 1.1. + + Other notable improvements: diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f707f038dd78..6062bf623e75 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -105,7 +105,6 @@ ./programs/venus.nix ./programs/vim.nix ./programs/wireshark.nix - ./programs/wvdial.nix ./programs/xfs_quota.nix ./programs/xonsh.nix ./programs/zsh/oh-my-zsh.nix diff --git a/nixos/modules/programs/wvdial.nix b/nixos/modules/programs/wvdial.nix deleted file mode 100644 index 1ed929ed4afa..000000000000 --- a/nixos/modules/programs/wvdial.nix +++ /dev/null @@ -1,71 +0,0 @@ -# Global configuration for wvdial. - -{ config, lib, pkgs, ... }: - -with lib; - -let - - configFile = '' - [Dialer Defaults] - PPPD PATH = ${pkgs.ppp}/sbin/pppd - ${config.environment.wvdial.dialerDefaults} - ''; - - cfg = config.environment.wvdial; - -in -{ - ###### interface - - options = { - - environment.wvdial = { - - dialerDefaults = mkOption { - default = ""; - type = types.str; - example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"''; - description = '' - Contents of the "Dialer Defaults" section of - /etc/wvdial.conf. - ''; - }; - - pppDefaults = mkOption { - default = '' - noipdefault - usepeerdns - defaultroute - persist - noauth - ''; - type = types.str; - description = "Default ppp settings for wvdial."; - }; - - }; - - }; - - ###### implementation - - config = mkIf (cfg.dialerDefaults != "") { - - environment = { - - etc = - [ - { source = pkgs.writeText "wvdial.conf" configFile; - target = "wvdial.conf"; - } - { source = pkgs.writeText "wvdial" cfg.pppDefaults; - target = "ppp/peers/wvdial"; - } - ]; - - }; - - }; - -} diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix deleted file mode 100644 index 7decd42b376b..000000000000 --- a/pkgs/os-specific/linux/wvdial/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, wvstreams, pkgconfig }: - -stdenv.mkDerivation rec { - name = "wvdial-1.61"; - - src = fetchurl { - url = "http://wvstreams.googlecode.com/files/${name}.tar.gz"; - sha256 = "0mzcrv8mc60gbdrixc9k8ammbslvjb9x2cs50yf1jq67aabapzsg"; - }; - - buildInputs = [ wvstreams pkgconfig ]; - - preConfigure = '' - find -type f | xargs sed -i 's@/bin/bash@bash@g' - export makeFlags="prefix=$out" - # not sure about this line - sed -i 's@/etc/ppp/peers@$out/etc/ppp/peers@' Makefile.in - - sed -e '1i#include ' -i $(find . -name '*.cc') - ''; - - meta = { - description = "A dialer that automatically recognises the modem"; - homepage = http://alumnit.ca/wiki/index.php?page=WvDial; - license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afacaba3e257..6136e12a12ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14254,8 +14254,6 @@ with pkgs; wireshark-qt = wireshark-cli.override { withQt = true; }; wireshark = wireshark-qt; - wvdial = callPackage ../os-specific/linux/wvdial { }; - fbida = callPackage ../applications/graphics/fbida { }; fdupes = callPackage ../tools/misc/fdupes { };