public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60060 from dtzWill/update/networkmanager-1.18

Browse Source 
networkmanager: 1.16.0 -> 1.18.0
This commit is contained in:
Will Dietz 2019-04-26 15:05:04 -05:00 committed by GitHub
commit 1cf626ce29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/networking/network-manager/default.nix
View File

@ -2,7 +2,7 @@
, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala , gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala
, libgcrypt, dnsmasq, bluez5, readline, libselinux, audit , libgcrypt, dnsmasq, bluez5, readline, libselinux, audit
, gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup
, ethtool, gnused, coreutils, inetutils, kmod, jansson, gtk-doc, libxslt , ethtool, gnused, coreutils, iputils, kmod, jansson, gtk-doc, libxslt
, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43 , docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43
, openconnect, curl, meson, ninja, libpsl, libredirect }: , openconnect, curl, meson, ninja, libpsl, libredirect }:
@ -11,11 +11,11 @@ let
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "network-manager-${version}"; name = "network-manager-${version}";
version = "1.16.0"; version = "1.18.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0b2x9hrg41cd17psqi0vacwj733v99hxczn53gdfs0yanqrji5lf"; sha256 = "19lb5afx4iq8dgfsy26x9j4194v8f64vwr3nq6dk1ix3wljxzs66";
}; };
outputs = [ "out" "dev" "devdoc" "man" "doc" ]; outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@ -43,15 +43,18 @@ in stdenv.mkDerivation rec {
"-Dmodem_manager=true" "-Dmodem_manager=true"
"-Dnmtui=true" "-Dnmtui=true"
"-Ddocs=true" "-Ddocs=true"
"-Dlibnm_glib=true" # legacy library, TODO: remove # TODO: legacy library, will be *removed* in next release!
"-Dlibnm_glib=true"
"-Dtests=no" "-Dtests=no"
"-Dqt=false" "-Dqt=false"
# Allow using iwd when configured to do so
"-Diwd=true"
]; ];
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit inetutils kmod openconnect ethtool coreutils dbus; inherit iputils kmod openconnect ethtool coreutils dbus;
inherit (stdenv) shell; inherit (stdenv) shell;
}) })
@ -84,6 +87,7 @@ in stdenv.mkDerivation rec {
doCheck = false; # requires /sys, the net doCheck = false; # requires /sys, the net
postPatch = '' postPatch = ''
patchShebangs ./tools patchShebangs ./tools
patchShebangs libnm/generate-setting-docs.py patchShebangs libnm/generate-setting-docs.py

11
pkgs/tools/networking/network-manager/fix-paths.patch
View File

@ -35,12 +35,12 @@
Restart=on-failure Restart=on-failure
--- a/src/devices/nm-device.c --- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c +++ b/src/devices/nm-device.c
@@ -12350,14 +12350,14 @@ @@ -12451,14 +12451,14 @@ nm_device_start_ip_check (NMDevice *self)
gw = nm_ip4_config_best_default_route_get (priv->ip_config_4); gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
if (gw) { if (gw) {
nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf); nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);
- ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL); - ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL);
+ ping_binary = "@inetutils@/bin/ping"; + ping_binary = "@iputils@/bin/ping";
log_domain = LOGD_IP4; log_domain = LOGD_IP4;
} }
} else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) { } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) {
@ -48,13 +48,15 @@
if (gw) { if (gw) {
nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf); nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf);
- ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL); - ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL);
+ ping_binary = "@inetutils@/bin/ping"; + ping_binary = "@iputils@/bin/ping";
log_domain = LOGD_IP6; log_domain = LOGD_IP6;
} }
} }
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 6f55e62a7..93721e7fb 100644
--- a/src/nm-core-utils.c --- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c +++ b/src/nm-core-utils.c
@@ -421,8 +421,8 @@ @@ -442,7 +442,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char *
/* construct the argument list */ /* construct the argument list */
argv = g_ptr_array_sized_new (4); argv = g_ptr_array_sized_new (4);
@ -63,4 +65,3 @@
g_ptr_array_add (argv, "--use-blacklist"); g_ptr_array_add (argv, "--use-blacklist");
g_ptr_array_add (argv, (char *) arg1); g_ptr_array_add (argv, (char *) arg1);
va_start (ap, arg1);