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

Merge pull request #29375 from bkchr/network_manager_1_8_2

Browse Source 
network-manager: 1.6.2 -> 1.8.2
This commit is contained in:
Rickard Nilsson 2017-09-25 09:52:19 +02:00 committed by GitHub
commit 72b46f3631
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,15 +6,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${major}.${minor}"; name = "${pname}-${major}.${minor}";
pname = "network-manager-applet"; pname = "network-manager-applet";
major = "1.4"; major = "1.8";
minor = "6"; minor = "2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
sha256 = "0xpcdwqmnwiqqqsd5rx1gh5rvv5m2skj59bqxhccy1k2ikzgr9hh"; sha256 = "09f9hjpn9nkhw57mk6pi7q1bq3lhf5hvmwas0fknscssak7yjmry";
}; };
configureFlags = [ "--sysconfdir=/etc" ]; configureFlags = [
"--sysconfdir=/etc"
"--without-selinux"
];
buildInputs = [ buildInputs = [
gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas

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

@ -3,19 +3,17 @@
, libgcrypt, dnsmasq, bluez5, readline , libgcrypt, dnsmasq, bluez5, readline
, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
, ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt , ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
, python3Packages, docbook_xsl, fetchpatch, openconnect }: , python3Packages, docbook_xsl, fetchpatch, openconnect, curl, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "network-manager-${version}"; name = "network-manager-${version}";
pname = "NetworkManager"; pname = "NetworkManager";
major = "1.6"; major = "1.8";
version = "${major}.2"; version = "${major}.2";
# FIXME: this problem is fixed upstream (commit 6a77258f4ec2), remove when upgrading ^^^
hardeningDisable = [ "format" ];
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 = "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj"; sha256 = "1x0vzxvrck0snga2n3pc7g74m20zz74cr4r8gfspl8sckv6yz9bi";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -46,13 +44,15 @@ stdenv.mkDerivation rec {
--subst-var-by modprobeBinPath ${kmod}/bin/modprobe --subst-var-by modprobeBinPath ${kmod}/bin/modprobe
# to enable link-local connections # to enable link-local connections
configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"
# Fixes: error: po/Makefile.in.in was not created by intltoolize.
intltoolize --automake --copy --force
''; '';
# Right now we hardcode quite a few paths at build time. Probably we should # Right now we hardcode quite a few paths at build time. Probably we should
# patch networkmanager to allow passing these path in config file. This will # patch networkmanager to allow passing these path in config file. This will
# remove unneeded build-time dependencies. # remove unneeded build-time dependencies.
configureFlags = [ configureFlags = [
"--with-distro=exherbo"
"--with-dhclient=${dhcp}/bin/dhclient" "--with-dhclient=${dhcp}/bin/dhclient"
"--with-dnsmasq=${dnsmasq}/bin/dnsmasq" "--with-dnsmasq=${dnsmasq}/bin/dnsmasq"
# Upstream prefers dhclient, so don't add dhcpcd to the closure # Upstream prefers dhclient, so don't add dhcpcd to the closure
@ -69,26 +69,21 @@ stdenv.mkDerivation rec {
"--with-session-tracking=systemd" "--with-session-tracking=systemd"
"--with-modem-manager-1" "--with-modem-manager-1"
"--with-nmtui" "--with-nmtui"
"--with-libsoup=yes" "--disable-gtk-doc"
]; ];
patches = [ patches = [
./PppdPath.patch ./PppdPath.patch
(fetchpatch {
sha256 = "1n90j5rwg97xkrhlldyr92filc2dmycl9pr0svky9hlcn9csk2z6";
name = "null-dereference.patch";
url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch";
})
./openconnect_helper_path.patch ./openconnect_helper_path.patch
./modprobe.patch ./modprobe.patch
]; ];
buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp curl
bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ]; bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ];
propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ];
nativeBuildInputs = [ intltool pkgconfig libxslt docbook_xsl ]; nativeBuildInputs = [ autoreconfHook 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" )