diff options
| author | Robin Gloster <mail@glob.in> | 2017-08-01 23:38:48 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-04 02:24:07 +0200 |
| commit | dc13376ee2849e0802b6e10c1e568a803d9bd5b5 (patch) | |
| tree | a34e630c152b980348c0c37b3ab2a30f650c3e7e /nixos | |
| parent | a4647bc33fba969b8091b0772272414ba4ecac30 (diff) | |
| download | nixlib-dc13376ee2849e0802b6e10c1e568a803d9bd5b5.tar nixlib-dc13376ee2849e0802b6e10c1e568a803d9bd5b5.tar.gz nixlib-dc13376ee2849e0802b6e10c1e568a803d9bd5b5.tar.bz2 nixlib-dc13376ee2849e0802b6e10c1e568a803d9bd5b5.tar.lz nixlib-dc13376ee2849e0802b6e10c1e568a803d9bd5b5.tar.xz nixlib-dc13376ee2849e0802b6e10c1e568a803d9bd5b5.tar.zst nixlib-dc13376ee2849e0802b6e10c1e568a803d9bd5b5.zip | |
wvdial: remove
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1709.xml | 6 | ||||
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/programs/wvdial.nix | 71 |
3 files changed, 6 insertions, 72 deletions
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. </para> </listitem> + <listitem> + <para> + <literal>wvdial</literal> package and module were removed. This is due to the project + being dead and not building with openssl 1.1. + </para> + </listitem> </itemizedlist> <para>Other notable improvements:</para> 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 - <filename>/etc/wvdial.conf</filename>. - ''; - }; - - 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"; - } - ]; - - }; - - }; - -} |