Merge pull request #37712 from flokli/nuke-networkmanager-pptp

networkmanager-pptp: remove package
This commit is contained in:
Jörg Thalheim 2018-03-23 22:58:09 +00:00 committed by GitHub
commit f8891d61f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 2 additions and 61 deletions

View file

@ -32,7 +32,6 @@ with lib;
networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; };
networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; };
networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; };
networkmanager-pptp = pkgs.networkmanager-pptp.override { withGnome = false; };
networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; };
networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; };
pinentry = pkgs.pinentry_ncurses;

View file

@ -135,8 +135,7 @@ in {
default = { inherit networkmanager modemmanager wpa_supplicant
networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-pptp networkmanager-l2tp
networkmanager-iodine; };
networkmanager-l2tp networkmanager-iodine; };
internal = true;
};
@ -267,8 +266,6 @@ in {
message = "You can not use networking.networkmanager with networking.wireless";
}];
boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections.
environment.etc = with cfg.basePackages; [
{ source = configFile;
target = "NetworkManager/NetworkManager.conf";
@ -285,9 +282,6 @@ in {
{ source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
}
{ source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
target = "NetworkManager/VPN/nm-pptp-service.name";
}
{ source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
target = "NetworkManager/VPN/nm-l2tp-service.name";
}

View file

@ -182,8 +182,7 @@ in {
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant;
inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-pptp networkmanager-iodine
networkmanager-l2tp; };
networkmanager-iodine networkmanager-l2tp; };
# Needed for themes and backgrounds
environment.pathsToLink = [ "/share" ];

View file

@ -206,10 +206,6 @@ let
inherit gnome3;
};
networkmanager-pptp = pkgs.networkmanager-pptp.override {
inherit gnome3;
};
networkmanager-vpnc = pkgs.networkmanager-vpnc.override {
inherit gnome3;
};
@ -436,7 +432,6 @@ let
networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25
networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
networkmanager_pptp = networkmanager-pptp; # added 2018-02-25
networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
yelp_xsl = yelp-xsl; # added 2018-02-25
yelp_tools = yelp-tools; # added 2018-02-25

View file

@ -1,43 +0,0 @@
{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig
, libsecret, withGnome ? true, gnome3 }:
let
pname = "NetworkManager-pptp";
version = "1.2.4";
in stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "bd97ce768c34cce6d5b5d43681149a8300bec754397a3f46a0d8d0aea7030c5e";
};
buildInputs = [ networkmanager pptp ppp libsecret ]
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring
gnome3.networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig ];
postPatch = ''
sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-pptp-service.c
substituteInPlace ./src/nm-pptp-service.c \
--replace /sbin/pptp ${pptp}/bin/pptp \
--replace /sbin/pppd ${ppp}/bin/pppd
'';
configureFlags =
if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome";
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "networkmanager-pptp";
};
};
meta = {
description = "PPtP plugin for NetworkManager";
inherit (networkmanager.meta) maintainers platforms;
};
}

View file

@ -148,7 +148,6 @@ mapAliases (rec {
networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25
networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
networkmanager_pptp = networkmanager-pptp; # added 2018-02-25
networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
nmap_graphical = nmap-graphical; # added 2017-01-19
nfsUtils = nfs-utils; # added 2014-12-06

View file

@ -3841,8 +3841,6 @@ with pkgs;
networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { };
networkmanager-pptp = callPackage ../tools/networking/network-manager/pptp.nix { };
networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { };
networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { };