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

network-manager: 1.0.12 -> 1.2.2

Browse Source
This commit is contained in:
obadz 2016-06-22 01:40:18 +01:00
parent 925fb7ebfc
commit 233541a371
2 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,12 +5,14 @@
, ethtool, gnused, coreutils, file, inetutils }: , ethtool, gnused, coreutils, file, inetutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "network-manager-${version}"; name = "network-manager-${version}";
version = "1.0.12"; pname = "NetworkManager";
major = "1.2";
version = "${major}.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; sha256 = "41d8082e027f58bb5fa4181f93742606ab99c659794a18e2823eff22df0eecd9";
}; };
preConfigure = '' preConfigure = ''
@ -61,34 +63,30 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = [ intltool pkgconfig ];
patches = [ ./nm-platform.patch ]; preInstall = ''
installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" )
'';
preInstall = postInstall = ''
'' mkdir -p $out/lib/NetworkManager
installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" )
'';
postInstall = # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy
'' substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
mkdir -p $out/lib/NetworkManager
# FIXME: Workaround until NixOS' dbus+systemd supports at_console policy # rename to network-manager to be in style
substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service
# rename to network-manager to be in style # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service # aliases ourselves.
ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
# systemd in NixOS doesn't use `systemctl enable`, so we need to establish ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
# aliases ourselves. '';
ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://projects.gnome.org/NetworkManager/; homepage = http://projects.gnome.org/NetworkManager/;
description = "Network configuration and management tool"; description = "Network configuration and management tool";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ phreedom urkud rickynils domenkozar ]; maintainers = with maintainers; [ phreedom urkud rickynils domenkozar obadz ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

17
pkgs/tools/networking/network-manager/nm-platform.patch
View File

@ -1,17 +0,0 @@
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 8803377..14e5726 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -39,6 +39,12 @@
#include "nm-enum-types.h"
#include "nm-core-internal.h"
+#if HAVE_LIBNL_INET6_ADDR_GEN_MODE && HAVE_KERNEL_INET6_ADDR_GEN_MODE
+#include <linux/if_link.h>
+#else
+#define IN6_ADDR_GEN_MODE_NONE 1
+#endif
+
#define ADDRESS_LIFETIME_PADDING 5
G_STATIC_ASSERT (sizeof ( ((NMPlatformLink *) NULL)->addr.data ) == NM_UTILS_HWADDR_LEN_MAX);