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

networkmanager: 1.46.0 → 1.48.0

Browse Source 
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
This commit is contained in:
Jan Tojnar
2024-06-01 15:13:12 +02:00
parent ad57eef4ef
commit 124d4a0031
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/networkmanager/default.nix
+2 -2
View File
@@ -60,11 +60,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "networkmanager"; pname = "networkmanager";
version = "1.46.0"; version = "1.48.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; 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" ]; outputs = [ "out" "dev" "devdoc" "man" "doc" ];
pkgs/tools/networking/networkmanager/fix-paths.patch
+13 -13
View File
@@ -11,10 +11,10 @@ index 148acade5c..6395fbfbe5 100644
LABEL="nm_drivers_end" LABEL="nm_drivers_end"
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c 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 --- a/src/core/devices/nm-device.c
+++ b/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); gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET);
if (gw) { if (gw) {
nm_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); 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 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 --- a/src/libnm-client-impl/meson.build
+++ b/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, input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources,
output: 'nm-property-infos-' + name + '.xml', output: 'nm-property-infos-' + name + '.xml',
command: [ command: [
- python.path(), - python_path,
gen_infos_cmd, gen_infos_cmd,
name, name,
'@OUTPUT@', '@OUTPUT@',
@@ -207,7 +206,6 @@ if enable_introspection @@ -206,7 +205,6 @@ if enable_introspection
'env', 'env',
'GI_TYPELIB_PATH=' + gi_typelib_path, 'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path, 'LD_LIBRARY_PATH=' + ld_library_path,
- python.path(), - python_path,
gen_gir_cmd, gen_gir_cmd,
'--lib-path', meson.current_build_dir(), '--lib-path', meson.current_build_dir(),
'--gir', libnm_gir[0], '--gir', libnm_gir[0],
@@ -89,14 +89,14 @@ index cbe76f5f1c..8515f94994 100644
oc_argv[oc_argc++] = path; oc_argv[oc_argc++] = path;
oc_argv[oc_argc++] = "--authenticate"; oc_argv[oc_argc++] = "--authenticate";
diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build 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 --- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build +++ b/src/libnmc-setting/meson.build
@@ -9,7 +9,6 @@ if enable_docs @@ -9,7 +9,6 @@ if enable_docs
input: [merge_cmd, nm_settings_docs_xml_gir['nmcli'], nm_property_infos_xml['nmcli']], input: [merge_cmd, nm_settings_docs_xml_gir['nmcli'], nm_property_infos_xml['nmcli']],
output: 'settings-docs-input.xml', output: 'settings-docs-input.xml',
command: [ command: [
- python.path(), - python_path,
merge_cmd, merge_cmd,
'@OUTPUT@', '@OUTPUT@',
nm_property_infos_xml['nmcli'], nm_property_infos_xml['nmcli'],
@@ -104,19 +104,19 @@ index 7fb460dc33..790a2b75fc 100644
input: [gen_cmd, settings_docs_input_xml], input: [gen_cmd, settings_docs_input_xml],
output: 'settings-docs.h', output: 'settings-docs.h',
command: [ command: [
- python.path(), - python_path,
gen_cmd, gen_cmd,
'--output', '@OUTPUT@', '--output', '@OUTPUT@',
'--xml', settings_docs_input_xml '--xml', settings_docs_input_xml
diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build 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 --- a/src/tests/client/meson.build
+++ b/src/tests/client/meson.build +++ b/src/tests/client/meson.build
@@ -6,7 +6,6 @@ test( @@ -6,7 +6,6 @@ test(
args: [ args: [
build_root, build_root,
source_root, source_root,
- python.path(), - python_path,
'--', '--',
'TestNmcli', 'TestNmcli',
], ],
@@ -124,7 +124,7 @@ index 8c36e40559..cfb6649a21 100644
args: [ args: [
build_root, build_root,
source_root, source_root,
- python.path(), - python_path,
'--', '--',
'TestNmCloudSetup', 'TestNmCloudSetup',
], ],