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

networkmanager: 1.20.2 -> 1.20.4

Browse Source 
* fix-paths.patch
We had to add a diff to revert [0] as it makes it use the python
from meson which won't be the specific pythonForDocs that
has pygobject (breaking the build). Unfortunate that upstream
made assumptions like "Of course, who needs a way to invoke
the interpreter that works accross different distributions!"

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.20.4/NEWS

[0]: c162dc00e5
This commit is contained in:
worldofpeace 2019-10-11 21:33:44 -04:00
parent 90be4c2c78
commit ea7918fd0d
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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.20.2"; version = "1.20.4";
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 = "115cgz448vypc7c592lqqjd7lp2kzdczhjk4ran6qls65hzkfkji"; sha256 = "0k4i6m8acp48vl6l13267wv6kfkmzfjq2mraaa5m9n82wyvkimx3";
}; };
outputs = [ "out" "dev" "devdoc" "man" "doc" ]; outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@ -51,15 +51,6 @@ in stdenv.mkDerivation rec {
]; ];
patches = [ patches = [
# 1.20.2 added a decorators.sh script but they forgot to distribute it (breaking the build)
# as it was to fix things with gtk-doc 1.32 we can safely revert it.
(fetchpatch {
url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/2d941dc95a1d94d023ac8f98df2f344dbb1d223e.patch";
sha256 = "1mvbajddwd6diwk6dgjg5p65i6852gx6b9p3949rs63d2i6yzg21";
excludes = [ "tools/decorators.sh" ];
revert = true;
})
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit iputils kmod openconnect ethtool gnused dbus; inherit iputils kmod openconnect ethtool gnused dbus;

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

@ -39,11 +39,33 @@ index 2f442bf23..c3e797bf4 100644
#ExecReload=/bin/kill -HUP $MAINPID #ExecReload=/bin/kill -HUP $MAINPID
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
index 710ef181d..3aa182dd4 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -280,7 +280,7 @@ if enable_introspection
name,
input: libnm_gir[0],
output: name,
- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
depends: libnm_gir,
)
@@ -289,7 +289,7 @@ if enable_introspection
name,
input: libnm_gir[0],
output: name,
- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'],
+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'],
depends: libnm_gir,
)
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 823cf48a5..cda16e48d 100644 index 67e23b8f9..b0ce52711 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
@@ -12822,14 +12822,14 @@ nm_device_start_ip_check (NMDevice *self) @@ -12840,14 +12840,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);