MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

networkmanager: 1.14.4 -> 1.16.0

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.16.0/NEWS
This commit is contained in:
Tor Hedin Brønner 2019-03-07 16:44:02 +01:00 committed by Jan Tojnar
parent 43d0b425b8
commit 99d4472db2
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/networking/network-manager/default.nix
View file

@ -9,11 +9,11 @@ let
pname = "NetworkManager";
in stdenv.mkDerivation rec {
name = "network-manager-${version}";
version = "1.14.6";
version = "1.16.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0p9s6b1z9bdmzdjw2gnjsar1671vvcyy9inb0rxg1izf2nnwsfv9";
sha256 = "0b2x9hrg41cd17psqi0vacwj733v99hxczn53gdfs0yanqrji5lf";
};
outputs = [ "out" "dev" ];

5
pkgs/tools/networking/network-manager/fix-paths.patch
View file

@ -43,7 +43,7 @@
+ ping_binary = "@inetutils@/bin/ping";
log_domain = LOGD_IP4;
}
} else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) {
} else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) {
gw = nm_ip6_config_best_default_route_get (priv->ip_config_6);
if (gw) {
nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf);
@ -54,12 +54,13 @@
}
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -421,7 +421,7 @@
@@ -421,8 +421,8 @@
/* construct the argument list */
argv = g_ptr_array_sized_new (4);
- g_ptr_array_add (argv, "/sbin/modprobe");
+ g_ptr_array_add (argv, "@kmod@/bin/modprobe");
g_ptr_array_add (argv, "--use-blacklist");
g_ptr_array_add (argv, (char *) arg1);
va_start (ap, arg1);