swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24625 from Mic92/networkmanager

Browse source 
networkmanager: 1.4.4 -> 1.6.4
This commit is contained in:
Jörg Thalheim 2017-04-05 12:49:58 +02:00 committed by GitHub
parent 26084166c3 b552de7525
commit 052cd88921
5 changed files with 47 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/libproxy/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake { stdenv, lib, fetchFromGitHub, pkgconfig, cmake
, dbus, networkmanager, spidermonkey_1_8_5 }: , dbus, networkmanager, webkitgtk214x, pcre, python2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libproxy-${version}"; name = "libproxy-${version}";
@ -16,7 +16,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ dbus networkmanager spidermonkey_1_8_5 ]; buildInputs = [ dbus networkmanager webkitgtk214x pcre ];
cmakeFlags = [
"-DWITH_WEBKIT3=ON"
"-DWITH_MOZJS=OFF"
"-DPYTHON_SITEPKG_DIR=$(out)/${python2.sitePackages}"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;

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

@ -1,16 +1,17 @@
{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
, libnotify, libsecret, polkit, isocodes, modemmanager, librsvg , libnotify, libsecret, polkit, isocodes, modemmanager, librsvg
, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook }: , makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${major}.${minor}";
pname = "network-manager-applet"; pname = "network-manager-applet";
version = networkmanager.version; major = "1.4";
minor = "6";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
sha256 = "09ijxicsqf39y6h8kwbfjyljfbqkkx4vrpyfn6gfg1h9mvp4cf39"; sha256 = "0xpcdwqmnwiqqqsd5rx1gh5rvv5m2skj59bqxhccy1k2ikzgr9hh";
}; };
configureFlags = [ "--sysconfdir=/etc" ]; configureFlags = [ "--sysconfdir=/etc" ];
@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas
polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring
modemmanager jansson librsvg glib_networking gnome3.dconf modemmanager jansson librsvg glib_networking gnome3.dconf webkitgtk
]; ];
nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];

8
pkgs/tools/networking/network-manager/PppdPath.patch
View file

@ -1,8 +1,6 @@
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c --- NetworkManager-1.6.2.org/src/ppp/nm-ppp-manager.c 2017-02-15 13:10:27.000000000 +0100
index 89a7add..ae99eb4 100644 +++ NetworkManager-1.6.2/./src/ppp/nm-ppp-manager.c 2017-04-03 11:45:39.891653216 +0200
--- a/src/ppp-manager/nm-ppp-manager.c @@ -724,7 +724,7 @@
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -843,7 +843,7 @@ create_pppd_cmd_line (NMPPPManager *self,
g_return_val_if_fail (setting != NULL, NULL); g_return_val_if_fail (setting != NULL, NULL);

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

@ -2,25 +2,34 @@
, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables
, libgcrypt, dnsmasq, bluez5, readline , libgcrypt, dnsmasq, bluez5, readline
, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
, ethtool, gnused, coreutils, file, inetutils, kmod }: , ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
, python3Packages, docbook_xsl, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "network-manager-${version}"; name = "network-manager-${version}";
pname = "NetworkManager"; pname = "NetworkManager";
major = "1.4"; major = "1.6";
version = "${major}.4"; version = "${major}.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
sha256 = "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2"; sha256 = "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
postPatch = ''
patchShebangs ./tools
'';
preConfigure = '' preConfigure = ''
substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname
substituteInPlace configure --replace /usr/bin/file ${file}/bin/file substituteInPlace configure --replace /usr/bin/file ${file}/bin/file
substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping substituteInPlace src/devices/nm-device.c \
--replace /usr/bin/ping ${inetutils}/bin/ping \
--replace /usr/bin/ping6 ${inetutils}/bin/ping
substituteInPlace src/devices/nm-arping-manager.c \
--replace '("arping", NULL, NULL);' '("arping", "${inetutils}/bin/arping", NULL);'
substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe
substituteInPlace data/84-nm-drivers.rules \ substituteInPlace data/84-nm-drivers.rules \
--replace /bin/sh ${stdenv.shell} --replace /bin/sh ${stdenv.shell}
@ -58,14 +67,21 @@ stdenv.mkDerivation rec {
"--with-libsoup=yes" "--with-libsoup=yes"
]; ];
patches = [ ./PppdPath.patch ]; patches = [
./PppdPath.patch
(fetchpatch {
sha256 = "1n90j5rwg97xkrhlldyr92filc2dmycl9pr0svky9hlcn9csk2z6";
name = "null-dereference.patch";
url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch";
})
];
buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp
bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ];
propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ];
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = [ intltool pkgconfig libxslt docbook_xsl ];
preInstall = '' preInstall = ''
installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" ) installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" )
@ -78,7 +94,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
# rename to network-manager to be in style # rename to network-manager to be in style
mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service
# systemd in NixOS doesn't use `systemctl enable`, so we need to establish # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
# aliases ourselves. # aliases ourselves.

6
pkgs/tools/networking/network-manager/l2tp.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
pname = "NetworkManager-l2tp"; pname = "NetworkManager-l2tp";
version = networkmanager.version; version = "1.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nm-l2tp"; owner = "nm-l2tp";
repo = "network-manager-l2tp"; repo = "network-manager-l2tp";
rev = "c0cedda5e2a0ded695b497c361eaf577068520cb"; rev = "${version}";
sha256 = "01f39ghc37vw4n4i7whyikgqz8vzxf41q9fsv2gfw1g501cny1j2"; sha256 = "1mvn0z1vl4j9drl3dsw2dv0pppqvj29d2m07487dzzi8cbxrqj36";
}; };
buildInputs = [ networkmanager ppp libsecret ] buildInputs = [ networkmanager ppp libsecret ]