networkmanager: 1.26.0 -> 1.30.0

drops build patch as it's been merged
moves polkit path to meson flags from paths patch
rebases paths patch on upstream

pkgs/tools/networking/network-manager/default.nix

@@ -10,11 +10,11 @@ let
   pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
 in stdenv.mkDerivation rec {
   pname = "network-manager";
-  version = "1.26.0";
+  version = "1.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
-    sha256 = "0isdqwp58d7r92sqsk7l2vlqwy518n8b7c7z94jk9gc1bdmjf8sj";
+    sha256 = "1yf3k3pcszn904lk6rdya1qhp3yxbzsbhcd9l6yfrhlbc8r15w1r";
   };
 
   outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@@ -45,6 +45,7 @@ in stdenv.mkDerivation rec {
     "-Ddocs=true"
     "-Dtests=no"
     "-Dqt=false"
+    "-Dpolkit_agent_helper_1=/run/wrappers/bin/polkit-agent-helper-1"
     # Allow using iwd when configured to do so
     "-Diwd=true"
     "-Dlibaudit=yes-disabled-by-default"
@@ -55,20 +56,13 @@ in stdenv.mkDerivation rec {
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
-      inherit iputils kmod openconnect ethtool gnused systemd polkit;
+      inherit iputils kmod openconnect ethtool gnused systemd;
       inherit runtimeShell;
     })
 
     # 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
-
-    # Fix build
-    # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/620
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/54e25f23f53af889703dfc50d51a8afeeea8a439.patch";
-      sha256 = "oy/AZhOC15anWeIMYJfDBcITqJ7CiU715he68XvPRxk=";
-    })
   ];
 
   buildInputs = [

pkgs/tools/networking/network-manager/fix-paths.patch

@@ -1,26 +1,18 @@
-diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
-index ace205e80..f19c1dea0 100644
---- a/clients/common/nm-polkit-listener.c
-+++ b/clients/common/nm-polkit-listener.c
-@@ -552,7 +552,7 @@ begin_authentication (AuthRequest *request)
- {
- 	int fd_flags;
- 	const char *helper_argv[] = {
--		POLKIT_PACKAGE_PREFIX "/lib/polkit-1/polkit-agent-helper-1",
-+		"/run/wrappers/bin/polkit-agent-helper-1",
- 		request->username,
- 		NULL,
- 	};
 diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
-index 74ff52bb2..638857df4 100644
+index 15c47c3ec..4d1913aa6 100644
 --- a/clients/common/nm-vpn-helpers.c
 +++ b/clients/common/nm-vpn-helpers.c
-@@ -213,10 +213,7 @@ nm_vpn_openconnect_authenticate_helper (const char *host,
+@@ -208,15 +208,7 @@ nm_vpn_openconnect_authenticate_helper(const char *host,
          NULL,
      };
  
--	path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS,
+-    path = nm_utils_file_search_in_paths("openconnect",
--	                                      G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error);
+-                                         "/usr/sbin/openconnect",
+-                                         DEFAULT_PATHS,
+-                                         G_FILE_TEST_IS_EXECUTABLE,
+-                                         NULL,
+-                                         NULL,
+-                                         error);
 -    if (!path)
 -        return FALSE;
 +    path = "@openconnect@/bin/openconnect";
@@ -53,10 +45,10 @@ index 91ebd9a36..5201a56c3 100644
  ExecStart=@sbindir@/NetworkManager --no-daemon
  Restart=on-failure
 diff --git a/libnm/meson.build b/libnm/meson.build
-index d3991ab19..58f01c666 100644
+index d0846419c..a7adb2cc6 100644
 --- a/libnm/meson.build
 +++ b/libnm/meson.build
-@@ -283,7 +283,6 @@ if enable_introspection
+@@ -280,7 +280,6 @@ if enable_introspection
      output: 'nm-settings-docs-gir.xml',
      command: [
        generate_setting_docs_env,
@@ -64,11 +56,11 @@ index d3991ab19..58f01c666 100644
        join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
        '--lib-path', meson.current_build_dir(),
        '--gir', '@INPUT@',
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
+diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
-index de09e4807..2755db165 100644
+index 040dd0b4d..98aea3aa9 100644
---- a/src/devices/nm-device.c
+--- a/src/core/devices/nm-device.c
-+++ b/src/devices/nm-device.c
++++ b/src/core/devices/nm-device.c
-@@ -13705,14 +13705,14 @@ nm_device_start_ip_check (NMDevice *self)
+@@ -13957,14 +13957,14 @@ nm_device_start_ip_check(NMDevice *self)
              gw = nm_ip4_config_best_default_route_get(priv->ip_config_4);
              if (gw) {
                  _nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf);
@@ -85,11 +77,11 @@ index de09e4807..2755db165 100644
                  log_domain  = LOGD_IP6;
              }
          }
-diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
+diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c
-index 3950c3c3a..a9436d75a 100644
+index 9075c30dd..4b140e92b 100644
---- a/src/nm-core-utils.c
+--- a/src/core/nm-core-utils.c
-+++ b/src/nm-core-utils.c
++++ b/src/core/nm-core-utils.c
-@@ -336,7 +336,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char *
+@@ -333,7 +333,7 @@ nm_utils_modprobe(GError **error, gboolean suppress_error_logging, const char *a
  
      /* construct the argument list */
      argv = g_ptr_array_sized_new(4);