diff options
Diffstat (limited to 'pkgs/tools/networking/network-manager')
7 files changed, 66 insertions, 13 deletions
diff --git a/pkgs/tools/networking/network-manager/PppdPath.patch b/pkgs/tools/networking/network-manager/PppdPath.patch new file mode 100644 index 000000000000..98c1308e4dbf --- /dev/null +++ b/pkgs/tools/networking/network-manager/PppdPath.patch @@ -0,0 +1,13 @@ +diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c +index 89a7add..ae99eb4 100644 +--- a/src/ppp-manager/nm-ppp-manager.c ++++ b/src/ppp-manager/nm-ppp-manager.c +@@ -843,7 +843,7 @@ create_pppd_cmd_line (NMPPPManager *self, + + g_return_val_if_fail (setting != NULL, NULL); + +- pppd_binary = nm_utils_find_helper ("pppd", NULL, err); ++ pppd_binary = nm_utils_find_helper ("pppd", PPPD_PATH, err); + if (!pppd_binary) + return NULL; + diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 57bf1a51a1ae..d96bc08495f0 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "network-manager-${version}"; pname = "NetworkManager"; - major = "1.2"; + major = "1.4"; version = "${major}.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "41d8082e027f58bb5fa4181f93742606ab99c659794a18e2823eff22df0eecd9"; + sha256 = "a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204"; }; preConfigure = '' @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { "--with-libsoup=yes" ]; + patches = [ ./PppdPath.patch ]; + buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index b1b24bceb576..303ca70aace1 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -4,10 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openconnect"; - version = networkmanager.version; + major = "1.2"; + version = "${major}.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; sha256 = "522979593e21b4e884112816708db9eb66148b3491580dacfad53472b94aafec"; }; diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 6fd1a666f0e8..92dc45ac82c0 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -4,11 +4,12 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openvpn"; - version = networkmanager.version; + major = "1.2"; + version = "${major}.6"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; - sha256 = "47a6d219a781eff8491c7876b7fb95b12dcfb8f8a05f916f95afc65c7babddef"; + url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; + sha256 = "2373e2bb0a8a876cb2997cd8b0e3d6e10012d9bef3705ea3ac21f6394b3f1fb0"; }; buildInputs = [ openvpn networkmanager libsecret ] diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index a9bee0c74811..6cc8107f2c89 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -4,11 +4,12 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-pptp"; - version = networkmanager.version; + major = "1.2"; + version = "${major}.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; - sha256 = "a72cb88ecc0a9edec836e8042c592d68b8b290c0d78082e6b25cf08b46c6be5d"; + url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; + sha256 = "bd97ce768c34cce6d5b5d43681149a8300bec754397a3f46a0d8d0aea7030c5e"; }; buildInputs = [ networkmanager pptp ppp libsecret ] diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix new file mode 100644 index 000000000000..9e0033cca90c --- /dev/null +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, procps +, gnome3, libgnome_keyring, libsecret }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "NetworkManager-strongswan"; + version = "1.4.0"; + + src = fetchurl { + url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; + sha256 = "0qfnylg949lkyw1nmyggz2ipgmy154ic5q5ljjcwcgi14r90ys02"; + }; + + postPatch = '' + sed -i "s,nm_plugindir=.*,nm_plugindir=$out/lib/NetworkManager," "configure" + sed -i "s,nm_libexecdir=.*,nm_libexecdir=$out/libexec," "configure" + ''; + + buildInputs = [ networkmanager libsecret ] + ++ (with gnome3; [ gtk libgnome_keyring networkmanagerapplet ]); + + nativeBuildInputs = [ intltool pkgconfig ]; + + preConfigure = '' + substituteInPlace "configure" \ + --replace "/sbin/sysctl" "${procps}/bin/sysctl" + ''; + + meta = { + description = "NetworkManager's strongswan plugin"; + inherit (networkmanager.meta) platforms; + }; +} + diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index b760fe6e4f7d..44233b351290 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -4,11 +4,12 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-vpnc"; - version = networkmanager.version; + major = "1.2"; + version = "${major}.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; - sha256 = "e900f6500026f8c3ee4feb92e1d0a0c0abbee9ba507dad915b47a8ab7df9e1f3"; + url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; + sha256 = "39c7516418e90208cb534c19628ce40fd50eba0a08b2ebaef8da85720b10fb05"; }; buildInputs = [ vpnc networkmanager libsecret ] |