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: 90be4c2c7875
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 41bfe6ff7bea
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 14, 2019

  1. networkmanager: 1.20.2 -> 1.20.4 

    * 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]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/c162dc00e50431f3db2f560201051c0884ebbb1a
    @worldofpeace
    worldofpeace committed Oct 14, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ea7918f View commit details

  2. dnsmasq: fix build with nettle 3.5

    @worldofpeace
    worldofpeace committed Oct 14, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9058ad8 View commit details

  3. Merge pull request #71011 from worldofpeace/nm-1.20.4 

    networkmanager: 1.20.2 -> 1.20.4
    @worldofpeace
    worldofpeace authored Oct 14, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    41bfe6f View commit details
Showing with 36 additions and 14 deletions.
  1. +10 −1 pkgs/tools/networking/dnsmasq/default.nix
  2. +2 −11 pkgs/tools/networking/network-manager/default.nix
  3. +24 −2 pkgs/tools/networking/network-manager/fix-paths.patch
11 changes: 10 additions & 1 deletion pkgs/tools/networking/dnsmasq/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, dbus, nettle
{ stdenv, fetchurl, pkgconfig, dbus, nettle, fetchpatch
, libidn, libnetfilter_conntrack }:

with stdenv.lib;
@@ -19,6 +19,15 @@ stdenv.mkDerivation rec {
sha256 = "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd";
};

patches = [
# Fix build with nettle 3.5
(fetchpatch {
name = "nettle-3.5.patch";
url = "thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e";
sha256 = "1hnixij3jp1p6zc3bx2dr92yyf9jp1ahhl9hiiq7bkbhbrw6mbic";
})
];

preBuild = ''
makeFlagsArray=("COPTS=${copts}")
'';
13 changes: 2 additions & 11 deletions pkgs/tools/networking/network-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ let
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec {
pname = "network-manager";
version = "1.20.2";
version = "1.20.4";

src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "115cgz448vypc7c592lqqjd7lp2kzdczhjk4ran6qls65hzkfkji";
sha256 = "0k4i6m8acp48vl6l13267wv6kfkmzfjq2mraaa5m9n82wyvkimx3";
};

outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@@ -51,15 +51,6 @@ in stdenv.mkDerivation rec {
];

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 {
src = ./fix-paths.patch;
inherit iputils kmod openconnect ethtool gnused dbus;
26 changes: 24 additions & 2 deletions pkgs/tools/networking/network-manager/fix-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -39,11 +39,33 @@ index 2f442bf23..c3e797bf4 100644
#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
--- 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
index 823cf48a5..cda16e48d 100644
index 67e23b8f9..b0ce52711 100644
--- a/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);
if (gw) {
nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);