Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 748c42b4f333
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 470037f15f37
Choose a head ref
  • 4 commits
  • 5 files changed
  • 1 contributor

Commits on Jan 13, 2020

  1. networkmanager: 1.20.8 -> 1.22.4 

    https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.22.4/NEWS
    @worldofpeace
    worldofpeace committed Jan 13, 2020
    Copy the full SHA
    0ec87b8 View commit details

  2. modemmanager: 1.10.6 -> 1.12.2 

    https://gitlab.freedesktop.org/mobile-broadband/ModemManager/blob/1.12.2/NEWS
    @worldofpeace
    worldofpeace committed Jan 13, 2020
    Copy the full SHA
    4b33222 View commit details

  3. python3.pkgs.python-dbusmock: 0.18.3 -> 0.19

    @worldofpeace
    worldofpeace committed Jan 13, 2020
    Copy the full SHA
    c17b04c View commit details

Commits on Jan 14, 2020

  1. Merge pull request #76205 from worldofpeace/network-manager/update 

    networkmanager: 1.20.8 -> 1.22.4, modemmanager: 1.10.6 -> 1.12.2
    @worldofpeace
    worldofpeace authored Jan 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    470037f View commit details
12 changes: 7 additions & 5 deletions pkgs/development/python-modules/python-dbusmock/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{ lib, buildPythonPackage, fetchPypi, runtimeShell,
{ lib, buildPythonPackage, fetchFromGitHub, runtimeShell,
nose, dbus, dbus-python, pygobject3,
which, pyflakes, pycodestyle, bluez, networkmanager
}:

buildPythonPackage rec {
pname = "python-dbusmock";
version = "0.18.3";
version = "0.19";

src = fetchPypi {
inherit pname version;
sha256 = "994a178268b6d74aeb158c0f155cd141e9a0cfae14226a764cd022c4949fe242";
src = fetchFromGitHub {
owner = "martinpitt";
repo = pname;
rev = version;
sha256 = "09j338lmrjabbd3fpajr4piz4r20sl33030szfsqfzlwrrmvkyi0";
};

prePatch = ''
4 changes: 2 additions & 2 deletions pkgs/tools/networking/modem-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@

stdenv.mkDerivation rec {
pname = "modem-manager";
version = "1.10.6";
version = "1.12.2";

package = "ModemManager";
src = fetchurl {
url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz";
sha256 = "15n9sd6ymxvw7hidc9pw81j89acwi5cjfhj220a68mi1h8vsfb1w";
sha256 = "1si5bnm0d3b5ccpgj7xakl7pgy9mypm8ds6xgj1q0rzds2yx4xjg";
};

nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ];
12 changes: 6 additions & 6 deletions pkgs/tools/networking/network-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,17 +4,17 @@
, gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup
, ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt
, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43
, openconnect, curl, meson, ninja, libpsl }:
, openconnect, curl, meson, ninja, libpsl, mobile-broadband-provider-info, runtimeShell }:

let
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec {
pname = "network-manager";
version = "1.20.8";
version = "1.22.4";

src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "1ijpnx25wy5bcvp4mc49va942q56d0pncpj4jpknpdzwilmf455d";
sha256 = "0682hm5l3ix8cq35yl5pxidri4kxbdnvj9llf8vg9mcg5abdaslv";
};

outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@@ -54,8 +54,8 @@ in stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit iputils kmod openconnect ethtool gnused dbus;
inherit (stdenv) shell;
inherit iputils kmod openconnect ethtool gnused systemd;
inherit runtimeShell;
})

# Meson does not support using different directories during build and
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
];

buildInputs = [
systemd libselinux audit libpsl libuuid polkit ppp libndp curl
systemd libselinux audit libpsl libuuid polkit ppp libndp curl mobile-broadband-provider-info
bluez5 dnsmasq gobject-introspection modemmanager readline newt libsoup jansson
];

21 changes: 4 additions & 17 deletions pkgs/tools/networking/network-manager/fix-install-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/meson.build b/meson.build
index 4105a9c80..3d912557f 100644
index 0af69f35d..9ab239c8a 100644
--- a/meson.build
+++ b/meson.build
@@ -884,9 +884,9 @@ meson.add_install_script(
@@ -912,9 +912,9 @@ meson.add_install_script(
join_paths('tools', 'meson-post-install.sh'),
nm_datadir,
nm_bindir,
@@ -11,19 +11,6 @@ index 4105a9c80..3d912557f 100644
nm_pkglibdir,
- nm_pkgstatedir,
+ nm_prefix + nm_pkgstatedir,
enable_docs ? 'install_docs' : '',
nm_mandir,
)
diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/settings/plugins/ifcfg-rh/meson.build
index 58acdcfcb..e3a16d597 100644
--- a/src/settings/plugins/ifcfg-rh/meson.build
+++ b/src/settings/plugins/ifcfg-rh/meson.build
@@ -69,7 +69,7 @@ install_data(
)

meson.add_install_script('sh', '-c',
- 'mkdir -p $DESTDIR/@0@/sysconfig/network-scripts'.format(nm_sysconfdir))
+ 'mkdir -p $DESTDIR/@0@/sysconfig/network-scripts'.format(nm_prefix + nm_sysconfdir))

if enable_tests
subdir('tests')
nm_sysconfdir,
enable_docs ? '1' : '0',
34 changes: 17 additions & 17 deletions pkgs/tools/networking/network-manager/fix-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index 204b7c286..8bdb734c2 100644
index ffae5f553..ba1093e4d 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -215,10 +215,7 @@ nm_vpn_openconnect_authenticate_helper (const char *host,
@@ -203,10 +203,7 @@ nm_vpn_openconnect_authenticate_helper (const char *host,
NULL,
};

@@ -15,35 +15,35 @@ index 204b7c286..8bdb734c2 100644
if (!g_spawn_sync (NULL,
(char **) NM_MAKE_STRV (path, "--authenticate", host),
diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
index e398cb9f2..31c56596a 100644
index e398cb9f2..a43d61864 100644
--- a/data/84-nm-drivers.rules
+++ b/data/84-nm-drivers.rules
@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
# Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
DRIVERS=="?*", GOTO="nm_drivers_end"
-PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
+PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
+PROGRAM="@runtimeShell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"

LABEL="nm_drivers_end"
diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
index 2f442bf23..c3e797bf4 100644
index 91ebd9a36..5201a56c3 100644
--- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in
@@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@
[Service]
Type=dbus
BusName=org.freedesktop.NetworkManager
-ExecReload=/usr/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.Reload uint32:0
+ExecReload=@dbus@/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.Reload uint32:0
-ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
+ExecReload=@systemd@/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
#ExecReload=/bin/kill -HUP $MAINPID
ExecStart=@sbindir@/NetworkManager --no-daemon
Restart=on-failure
diff --git a/libnm/meson.build b/libnm/meson.build
index 710ef181d..3aa182dd4 100644
index 51ca46d2b..0c04cc216 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -280,7 +280,7 @@ if enable_introspection
@@ -261,7 +261,7 @@ if enable_introspection
name,
input: libnm_gir[0],
output: name,
@@ -52,20 +52,20 @@ index 710ef181d..3aa182dd4 100644
depends: libnm_gir,
)

@@ -289,7 +289,7 @@ if enable_introspection
@@ -270,7 +270,7 @@ if enable_introspection
name,
input: libnm_gir[0],
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', '@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@'],
- 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/src/devices/nm-device.c b/src/devices/nm-device.c
index 67e23b8f9..b0ce52711 100644
index e7a4a059a..0a8f8b7c6 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -12840,14 +12840,14 @@ nm_device_start_ip_check (NMDevice *self)
@@ -13179,14 +13179,14 @@ nm_device_start_ip_check (NMDevice *self)
gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
if (gw) {
nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);
@@ -83,10 +83,10 @@ index 67e23b8f9..b0ce52711 100644
}
}
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index d896d4d33..4cacb5cb6 100644
index fb92289f0..c91b27b09 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -446,7 +446,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 *

/* construct the argument list */
argv = g_ptr_array_sized_new (4);