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

networkmanager: 1.24.2 -> 1.26.0

Browse Source
This commit is contained in:
worldofpeace 2020-07-14 08:01:24 -04:00
parent 7daccdbcc9
commit 4cfaf5b7e3
2 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/network-manager/default.nix
View File

@ -10,11 +10,11 @@ let
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "network-manager"; pname = "network-manager";
version = "1.24.2"; version = "1.26.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "1cnf0cif0l45wxf823xqri3ly9n0ai3ndxx34qs3yk1m85f0giic"; sha256 = "0isdqwp58d7r92sqsk7l2vlqwy518n8b7c7z94jk9gc1bdmjf8sj";
}; };
outputs = [ "out" "dev" "devdoc" "man" "doc" ]; outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@ -48,6 +48,8 @@ in stdenv.mkDerivation rec {
# Allow using iwd when configured to do so # Allow using iwd when configured to do so
"-Diwd=true" "-Diwd=true"
"-Dlibaudit=yes-disabled-by-default" "-Dlibaudit=yes-disabled-by-default"
# We don't use firewalld in NixOS
"-Dfirewalld_zone=false"
]; ];
patches = [ patches = [

62
pkgs/tools/networking/network-manager/fix-paths.patch
View File

@ -1,5 +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 diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index fbcb06479..f13f32408 100644 index 74ff52bb2..638857df4 100644
--- a/clients/common/nm-vpn-helpers.c --- a/clients/common/nm-vpn-helpers.c
+++ b/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, @@ -213,10 +213,7 @@ nm_vpn_openconnect_authenticate_helper (const char *host,
@ -40,45 +53,22 @@ index 91ebd9a36..5201a56c3 100644
ExecStart=@sbindir@/NetworkManager --no-daemon ExecStart=@sbindir@/NetworkManager --no-daemon
Restart=on-failure Restart=on-failure
diff --git a/libnm/meson.build b/libnm/meson.build diff --git a/libnm/meson.build b/libnm/meson.build
index 406766c70..44c158f8a 100644 index d3991ab19..58f01c666 100644
--- a/libnm/meson.build --- a/libnm/meson.build
+++ b/libnm/meson.build +++ b/libnm/meson.build
@@ -265,7 +265,7 @@ if enable_introspection @@ -283,7 +283,6 @@ if enable_introspection
name, output: 'nm-settings-docs-gir.xml',
input: libnm_gir[0], command: [
output: name, generate_setting_docs_env,
- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'], - python.path(),
+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'], join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
depends: libnm_gir, '--lib-path', meson.current_build_dir(),
) '--gir', '@INPUT@',
@@ -274,7 +274,7 @@ if enable_introspection
name,
input: [libnm_gir[0], nm_settings_docs_overrides],
output: name,
- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
depends: libnm_gir,
)
endif
diff --git a/meson.build b/meson.build
index a2d925a7e..23c85f128 100644
--- a/meson.build
+++ b/meson.build
@@ -522,7 +522,7 @@ polkit_agent_dep = dependency('polkit-agent-1', version: '>= 0.97', required : f
if polkit_agent_dep.found()
config_h.set_quoted('POLKIT_PACKAGE_PREFIX', polkit_agent_dep.get_pkgconfig_variable('prefix'))
else
- config_h.set_quoted('POLKIT_PACKAGE_PREFIX', '/usr')
+ config_h.set_quoted('POLKIT_PACKAGE_PREFIX', '@polkit@')
endif
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 44e5183ec..e725845e4 100644 index de09e4807..2755db165 100644
--- a/src/devices/nm-device.c --- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c +++ b/src/devices/nm-device.c
@@ -13493,14 +13493,14 @@ nm_device_start_ip_check (NMDevice *self) @@ -13705,14 +13705,14 @@ nm_device_start_ip_check (NMDevice *self)
gw = nm_ip4_config_best_default_route_get (priv->ip_config_4); gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
if (gw) { if (gw) {
_nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf); _nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);
@ -96,7 +86,7 @@ index 44e5183ec..e725845e4 100644
} }
} }
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 415e1dc41..995eb6ecf 100644 index 3950c3c3a..a9436d75a 100644
--- a/src/nm-core-utils.c --- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c +++ b/src/nm-core-utils.c
@@ -336,7 +336,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char * @@ -336,7 +336,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char *