From 824ac982991e580a12ce3e806868aad89e3785ee Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 12 Aug 2022 23:25:44 +0200 Subject: [PATCH] networkmanager: 1.38.2 -> 1.38.4 --- .../networking/networkmanager/default.nix | 20 ++----------------- .../networkmanager/fix-install-paths.patch | 4 ++-- .../networking/networkmanager/fix-paths.patch | 14 ++++++------- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 2d4e11f5b998..2c49c3951cfd 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.38.2"; + version = "1.38.4"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-nP/SrcaGUTFt8tL4oJ4XF7sdDC6jic/HIaAQnbmzWCY="; + sha256 = "sha256-hB9k1Bd2qt2SsVH0flD2K+igYRqQVv5r+BiBAk5qlsU="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -124,22 +124,6 @@ stdenv.mkDerivation rec { # Meson does not support using different directories during build and # for installation like Autotools did with flags passed to make install. ./fix-install-paths.patch - - (fetchpatch { - # Prevent downgrade to plain network on Enhanced Open profiles - url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/b7946e50acc0d20d31b0c1098fdadc2f105ba799.patch"; - hash = "sha256-CdZiubfqhJQ5w4+s9O8C5WI9Ls/paONzDX4rX6yEmS0="; - }) - (fetchpatch { - # Treat OWE BSSIDs as valid candidates for open profiles - url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/dd80cdcc1bd5e2535b8e4a1d1d0c62f1d3328a7c.patch"; - hash = "sha256-QMZvWN3g8K+UH6y05+RkCmF+gHHU4pB+UXfU770AUis="; - }) - (fetchpatch { - # Allow distinguishing pure OWE networks from those with transition mode enabled - url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/13ea8d2e7dddd8279c82230594cea533ca349dd3.patch"; - hash = "sha256-BiINGzX/Zp8pwdbMiDScrZvrHtH7coXkZm1HScFuFWA="; - }) ]; buildInputs = [ diff --git a/pkgs/tools/networking/networkmanager/fix-install-paths.patch b/pkgs/tools/networking/networkmanager/fix-install-paths.patch index 4e80247cf144..642c386d07cf 100644 --- a/pkgs/tools/networking/networkmanager/fix-install-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-install-paths.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index a2d925a7e..5a65cd2fe 100644 +index 9675cd8d03..a4562b693c 100644 --- a/meson.build +++ b/meson.build -@@ -959,9 +959,9 @@ meson.add_install_script( +@@ -1005,9 +1005,9 @@ meson.add_install_script( join_paths('tools', 'meson-post-install.sh'), nm_datadir, nm_bindir, diff --git a/pkgs/tools/networking/networkmanager/fix-paths.patch b/pkgs/tools/networking/networkmanager/fix-paths.patch index 75d2b7c75411..79b1fd373739 100644 --- a/pkgs/tools/networking/networkmanager/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-paths.patch @@ -24,10 +24,10 @@ index e23b3a5282..c7246a3b61 100644 ExecStart=@sbindir@/NetworkManager --no-daemon Restart=on-failure diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c -index a11486d54b..de8e9022c6 100644 +index 6b854517e5..7a642e76fe 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c -@@ -13571,14 +13571,14 @@ nm_device_start_ip_check(NMDevice *self) +@@ -13605,14 +13605,14 @@ nm_device_start_ip_check(NMDevice *self) gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET); if (gw) { _nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); @@ -45,10 +45,10 @@ index a11486d54b..de8e9022c6 100644 } } diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build -index 21a01e0b04..091c98428f 100644 +index 2026f98dc3..8ec6978b8e 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build -@@ -162,7 +162,6 @@ if enable_introspection +@@ -170,7 +170,6 @@ if enable_introspection input: libnm_core_settings_sources, output: 'nm-propery-infos-' + info + '.xml', command: [ @@ -56,7 +56,7 @@ index 21a01e0b04..091c98428f 100644 join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'), info, '@OUTPUT@', -@@ -219,7 +218,6 @@ if enable_introspection +@@ -227,7 +226,6 @@ if enable_introspection 'env', 'GI_TYPELIB_PATH=' + gi_typelib_path, 'LD_LIBRARY_PATH=' + ld_library_path, @@ -65,10 +65,10 @@ index 21a01e0b04..091c98428f 100644 '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c -index 9ad030df76..8d800fb1c0 100644 +index bebc53a851..93710455d5 100644 --- a/src/libnm-platform/nm-platform-utils.c +++ b/src/libnm-platform/nm-platform-utils.c -@@ -2207,7 +2207,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char * +@@ -2209,7 +2209,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char * /* construct the argument list */ argv = g_ptr_array_sized_new(4);