From 2d2be966595702d3c91d4c0cfe7ed56154fb9914 Mon Sep 17 00:00:00 2001
From: Maxine Aubrey <maxeaubrey@gmail.com>
Date: Thu, 18 Aug 2022 00:19:59 +0200
Subject: [PATCH] networkmanager: 1.38.4 -> 1.40.0

---
 .../networking/networkmanager/default.nix     | 10 ++++---
 .../networkmanager/fix-install-paths.patch    |  4 +--
 .../networking/networkmanager/fix-paths.patch | 30 +++++++++----------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix
index 2c49c3951cfd..099c629154ff 100644
--- a/pkgs/tools/networking/networkmanager/default.nix
+++ b/pkgs/tools/networking/networkmanager/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchurl
 , substituteAll
-, intltool
+, gettext
 , pkg-config
 , fetchpatch
 , dbus
@@ -24,6 +24,7 @@
 , libselinux
 , audit
 , gobject-introspection
+, perl
 , modemmanager
 , openresolv
 , libndp
@@ -57,11 +58,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "networkmanager";
-  version = "1.38.4";
+  version = "1.40.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
-    sha256 = "sha256-hB9k1Bd2qt2SsVH0flD2K+igYRqQVv5r+BiBAk5qlsU=";
+    sha256 = "sha256-rufgV7wsyl2rhOQfFfHai3lespB0ewTL7ugiutnp/AM=";
   };
 
   outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@@ -153,10 +154,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    intltool
+    gettext
     pkg-config
     vala
     gobject-introspection
+    perl
     elfutils # used to find jansson soname
     # Docs
     gtk-doc
diff --git a/pkgs/tools/networking/networkmanager/fix-install-paths.patch b/pkgs/tools/networking/networkmanager/fix-install-paths.patch
index 642c386d07cf..3a2973060a1d 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 9675cd8d03..a4562b693c 100644
+index 300e71319c..2a9fba7116 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1005,9 +1005,9 @@ meson.add_install_script(
+@@ -996,9 +996,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 79b1fd373739..5b099e134849 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 6b854517e5..7a642e76fe 100644
+index c51da9ac82..ad67a301ef 100644
 --- a/src/core/devices/nm-device.c
 +++ b/src/core/devices/nm-device.c
-@@ -13605,14 +13605,14 @@ nm_device_start_ip_check(NMDevice *self)
+@@ -13879,14 +13879,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 6b854517e5..7a642e76fe 100644
              }
          }
 diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
-index 2026f98dc3..8ec6978b8e 100644
+index 46464a6328..d943d4351a 100644
 --- a/src/libnm-client-impl/meson.build
 +++ b/src/libnm-client-impl/meson.build
-@@ -170,7 +170,6 @@ if enable_introspection
+@@ -171,7 +171,6 @@ if enable_introspection
        input: libnm_core_settings_sources,
        output: 'nm-propery-infos-' + info + '.xml',
        command: [
@@ -56,7 +56,7 @@ index 2026f98dc3..8ec6978b8e 100644
          join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'),
          info,
          '@OUTPUT@',
-@@ -227,7 +226,6 @@ if enable_introspection
+@@ -228,7 +227,6 @@ if enable_introspection
        'env',
        'GI_TYPELIB_PATH=' + gi_typelib_path,
        'LD_LIBRARY_PATH=' + ld_library_path,
@@ -78,7 +78,7 @@ index bebc53a851..93710455d5 100644
      g_ptr_array_add(argv, (char *) arg1);
  
 diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c
-index e2c0c394bd..1a507aa0d4 100644
+index 7ad5bee509..2641dbf637 100644
 --- a/src/libnmc-base/nm-vpn-helpers.c
 +++ b/src/libnmc-base/nm-vpn-helpers.c
 @@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host,
@@ -86,13 +86,13 @@ index e2c0c394bd..1a507aa0d4 100644
      const char *const   *iter;
      const char          *path;
 -    const char *const    DEFAULT_PATHS[] = {
--        "/sbin/",
--        "/usr/sbin/",
--        "/usr/local/sbin/",
--        "/bin/",
--        "/usr/bin/",
--        "/usr/local/bin/",
--        NULL,
+-           "/sbin/",
+-           "/usr/sbin/",
+-           "/usr/local/sbin/",
+-           "/bin/",
+-           "/usr/bin/",
+-           "/usr/local/bin/",
+-           NULL,
 -    };
  
 -    path = nm_utils_file_search_in_paths("openconnect",
@@ -109,10 +109,10 @@ index e2c0c394bd..1a507aa0d4 100644
      if (!g_spawn_sync(NULL,
                        (char **) NM_MAKE_STRV(path, "--authenticate", host),
 diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
-index 8f07ae634e..a1326b3403 100644
+index 49314cad2e..6d52624699 100644
 --- a/src/libnmc-setting/meson.build
 +++ b/src/libnmc-setting/meson.build
-@@ -6,7 +6,6 @@ if enable_docs
+@@ -7,7 +7,6 @@ if enable_docs
      input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']],
      output: 'settings-docs-input.xml',
      command: [