diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-03-07 16:44:02 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-04-05 12:13:28 +0200 |
| commit | 99d4472db23d4577d1ffb00c30565a98da8dac9f (patch) | |
| tree | 32579b5903d3240dac5818f21370e74291719ebf /pkgs/tools/networking | |
| parent | 43d0b425b80fd232340b193056e1954f571b7432 (diff) | |
| download | nixlib-99d4472db23d4577d1ffb00c30565a98da8dac9f.tar nixlib-99d4472db23d4577d1ffb00c30565a98da8dac9f.tar.gz nixlib-99d4472db23d4577d1ffb00c30565a98da8dac9f.tar.bz2 nixlib-99d4472db23d4577d1ffb00c30565a98da8dac9f.tar.lz nixlib-99d4472db23d4577d1ffb00c30565a98da8dac9f.tar.xz nixlib-99d4472db23d4577d1ffb00c30565a98da8dac9f.tar.zst nixlib-99d4472db23d4577d1ffb00c30565a98da8dac9f.zip | |
networkmanager: 1.14.4 -> 1.16.0
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.16.0/NEWS
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/fix-paths.patch | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 2ead22a550a6..1695e23514a9 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -9,11 +9,11 @@ let pname = "NetworkManager"; in stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.14.6"; + version = "1.16.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0p9s6b1z9bdmzdjw2gnjsar1671vvcyy9inb0rxg1izf2nnwsfv9"; + sha256 = "0b2x9hrg41cd17psqi0vacwj733v99hxczn53gdfs0yanqrji5lf"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch index 949608095528..adf70421ed82 100644 --- a/pkgs/tools/networking/network-manager/fix-paths.patch +++ b/pkgs/tools/networking/network-manager/fix-paths.patch @@ -43,7 +43,7 @@ + ping_binary = "@inetutils@/bin/ping"; log_domain = LOGD_IP4; } - } else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) { + } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) { gw = nm_ip6_config_best_default_route_get (priv->ip_config_6); if (gw) { nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf); @@ -54,12 +54,13 @@ } --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c -@@ -421,7 +421,7 @@ +@@ -421,8 +421,8 @@ /* construct the argument list */ argv = g_ptr_array_sized_new (4); - g_ptr_array_add (argv, "/sbin/modprobe"); + g_ptr_array_add (argv, "@kmod@/bin/modprobe"); + g_ptr_array_add (argv, "--use-blacklist"); g_ptr_array_add (argv, (char *) arg1); va_start (ap, arg1); |