From 124d4a0031fb838b990b11bbb7f14b483a97ebc4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Jun 2024 08:15:59 +0000 Subject: [PATCH 1/4] =?UTF-8?q?networkmanager:=201.46.0=20=E2=86=92=201.48?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/1.48.0/NEWS?ref_type=tags https://gitlab.gnome.org/GNOME/NetworkManager/-/compare/1.46.0...1.48.0 - fix-paths.patch: Resolve conflict with python.path() being replaced with a variable: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/ef2438414fd3937d26a76e7e822fa477817ff776 --- .../networking/networkmanager/default.nix | 4 +-- .../networking/networkmanager/fix-paths.patch | 26 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 3c338ddc10cb7..22d774f086bcc 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -60,11 +60,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.46.0"; + version = "1.48.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - hash = "sha256-ciZJ4lNiaTszQ3FHOAKnKbDsnuKDN1CWkF+GiAjnQGg="; + hash = "sha256-/IC5Qt444ylGjm/B37QKrWp40C3fa47DH5rMZGC4cj8="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/networkmanager/fix-paths.patch b/pkgs/tools/networking/networkmanager/fix-paths.patch index e2010d8e64eb4..ecdb60ceeb82f 100644 --- a/pkgs/tools/networking/networkmanager/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-paths.patch @@ -11,10 +11,10 @@ index 148acade5c..6395fbfbe5 100644 LABEL="nm_drivers_end" diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c -index a9e8c08508..875d6cc2cd 100644 +index f3441508ab..7cde8d7d39 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c -@@ -14645,14 +14645,14 @@ nm_device_start_ip_check(NMDevice *self) +@@ -14839,14 +14839,14 @@ nm_device_start_ip_check(NMDevice *self) gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET); if (gw) { nm_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); @@ -32,22 +32,22 @@ index a9e8c08508..875d6cc2cd 100644 } } diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build -index 79ac95598a..83f7ab1373 100644 +index 3dd2338a82..de75cc040b 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build -@@ -191,7 +191,6 @@ if enable_introspection +@@ -190,7 +190,6 @@ if enable_introspection input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources, output: 'nm-property-infos-' + name + '.xml', command: [ -- python.path(), +- python_path, gen_infos_cmd, name, '@OUTPUT@', -@@ -207,7 +206,6 @@ if enable_introspection +@@ -206,7 +205,6 @@ if enable_introspection 'env', 'GI_TYPELIB_PATH=' + gi_typelib_path, 'LD_LIBRARY_PATH=' + ld_library_path, -- python.path(), +- python_path, gen_gir_cmd, '--lib-path', meson.current_build_dir(), '--gir', libnm_gir[0], @@ -89,14 +89,14 @@ index cbe76f5f1c..8515f94994 100644 oc_argv[oc_argc++] = path; oc_argv[oc_argc++] = "--authenticate"; diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build -index 7fb460dc33..790a2b75fc 100644 +index 4d5079dfb3..5a15447fde 100644 --- a/src/libnmc-setting/meson.build +++ b/src/libnmc-setting/meson.build @@ -9,7 +9,6 @@ if enable_docs input: [merge_cmd, nm_settings_docs_xml_gir['nmcli'], nm_property_infos_xml['nmcli']], output: 'settings-docs-input.xml', command: [ -- python.path(), +- python_path, merge_cmd, '@OUTPUT@', nm_property_infos_xml['nmcli'], @@ -104,19 +104,19 @@ index 7fb460dc33..790a2b75fc 100644 input: [gen_cmd, settings_docs_input_xml], output: 'settings-docs.h', command: [ -- python.path(), +- python_path, gen_cmd, '--output', '@OUTPUT@', '--xml', settings_docs_input_xml diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build -index 8c36e40559..cfb6649a21 100644 +index 5686a1c174..cfb6649a21 100644 --- a/src/tests/client/meson.build +++ b/src/tests/client/meson.build @@ -6,7 +6,6 @@ test( args: [ build_root, source_root, -- python.path(), +- python_path, '--', 'TestNmcli', ], @@ -124,7 +124,7 @@ index 8c36e40559..cfb6649a21 100644 args: [ build_root, source_root, -- python.path(), +- python_path, '--', 'TestNmCloudSetup', ], From e5466972c5cc3da68977a4f1dee05519c0ec73f1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Jun 2024 17:31:16 +0200 Subject: [PATCH 2/4] networkmanager-iodine: Clean up - Format the expression - Reorder attributes - Use pname + version - Fix update script --- .../networkmanager/iodine/default.nix | 61 ++++++++++++++----- 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix index aff411ea0ed9b..5f86c086502fc 100644 --- a/pkgs/tools/networking/networkmanager/iodine/default.nix +++ b/pkgs/tools/networking/networkmanager/iodine/default.nix @@ -1,11 +1,25 @@ -{ lib, stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkg-config, networkmanager, libsecret, gtk3 -, withGnome ? true, gnome, fetchpatch, libnma, glib }: +{ + lib, + stdenv, + fetchFromGitLab, + substituteAll, + autoreconfHook, + iodine, + intltool, + pkg-config, + networkmanager, + libsecret, + gtk3, + withGnome ? true, + gnome, + fetchpatch, + libnma, + glib, +}: -let - pname = "NetworkManager-iodine"; +stdenv.mkDerivation { + pname = "NetworkManager-iodine${lib.optionalString withGnome "-gnome"}"; version = "unstable-2019-11-05"; -in stdenv.mkDerivation { - name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -27,15 +41,24 @@ in stdenv.mkDerivation { }) ]; - buildInputs = [ iodine networkmanager glib ] - ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; - - nativeBuildInputs = [ intltool autoreconfHook pkg-config ]; + nativeBuildInputs = [ + intltool + autoreconfHook + pkg-config + ]; - # glib-2.62 deprecations - env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + buildInputs = + [ + iodine + networkmanager + glib + ] + ++ lib.optionals withGnome [ + gtk3 + libsecret + libnma + ]; - preConfigure = "intltoolize"; configureFlags = [ "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" @@ -43,11 +66,21 @@ in stdenv.mkDerivation { "--enable-absolute-paths" ]; + preConfigure = '' + intltoolize + ''; + + env = { + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + }; + passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "NetworkManager-iodine"; attrPath = "networkmanager-iodine"; }; + networkManagerPlugin = "VPN/nm-iodine-service.name"; }; From 842621827567f5fbbbe48c5fb717cee7bea7cdec Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Jun 2024 17:35:08 +0200 Subject: [PATCH 3/4] networkmanager-iodine: Fix update script --- pkgs/tools/networking/networkmanager/iodine/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix index 5f86c086502fc..0aa607ca2a05d 100644 --- a/pkgs/tools/networking/networkmanager/iodine/default.nix +++ b/pkgs/tools/networking/networkmanager/iodine/default.nix @@ -11,7 +11,7 @@ libsecret, gtk3, withGnome ? true, - gnome, + unstableGitUpdater, fetchpatch, libnma, glib, @@ -76,9 +76,8 @@ stdenv.mkDerivation { }; passthru = { - updateScript = gnome.updateScript { - packageName = "NetworkManager-iodine"; - attrPath = "networkmanager-iodine"; + updateScript = unstableGitUpdater { + tagPrefix = "v"; }; networkManagerPlugin = "VPN/nm-iodine-service.name"; From 9e5f97e405541170499f137dbf2473dc9a2d1a9d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Jun 2024 16:35:22 +0000 Subject: [PATCH 4/4] =?UTF-8?q?networkmanager-iodine:=20unstable-2019-11-0?= =?UTF-8?q?5=20=E2=86=92=201.2.0-unstable-2024-05-12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/network-manager-iodine/-/compare/2ef0abf089b00a0546f214dde0d45e63f2990b79...8ec0a35e12047ccf256b3951897c701661ddb8af - Removes nm-glib https://gitlab.gnome.org/GNOME/network-manager-iodine/-/commit/dca561224903ea0dc68fdd77011fc47e59dae961 --- .../networkmanager/iodine/default.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix index 0aa607ca2a05d..fa706f1b5892a 100644 --- a/pkgs/tools/networking/networkmanager/iodine/default.nix +++ b/pkgs/tools/networking/networkmanager/iodine/default.nix @@ -12,21 +12,20 @@ gtk3, withGnome ? true, unstableGitUpdater, - fetchpatch, libnma, glib, }: stdenv.mkDerivation { pname = "NetworkManager-iodine${lib.optionalString withGnome "-gnome"}"; - version = "unstable-2019-11-05"; + version = "1.2.0-unstable-2024-05-12"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "network-manager-iodine"; - rev = "2ef0abf089b00a0546f214dde0d45e63f2990b79"; - sha256 = "1ps26fr9b1yyafj7lrzf2kmaxb0ipl0mhagch5kzrjdsc5xkajz7"; + rev = "8ec0a35e12047ccf256b3951897c701661ddb8af"; + sha256 = "cNjznry8wi1UmE5khf0JCEYjs9nDU/u8lFLte53MLTM="; }; patches = [ @@ -34,11 +33,6 @@ stdenv.mkDerivation { src = ./fix-paths.patch; inherit iodine; }) - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/network-manager-iodine/merge_requests/2.patch"; - sha256 = "108pkf0mddj32s46k7jkmpwcaq2ylci4dqpp7wck3zm9q2jffff2"; - }) ]; nativeBuildInputs = [ @@ -60,7 +54,6 @@ stdenv.mkDerivation { ]; configureFlags = [ - "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager "--enable-absolute-paths" @@ -70,11 +63,6 @@ stdenv.mkDerivation { intltoolize ''; - env = { - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - }; - passthru = { updateScript = unstableGitUpdater { tagPrefix = "v";