diff options
author | Rickard Nilsson <rickynils@gmail.com> | 2017-09-25 09:52:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-25 09:52:19 +0200 |
commit | 72b46f36310aac7c9cc37a0cbf5da26df16fa0b7 (patch) | |
tree | af9fbe791fe4ab2cc84c39f07767b435020e41d1 /pkgs/tools | |
parent | 32e4e2c47ba464baa32b92c53eba6d5d169125c0 (diff) | |
parent | 6c9a1b7aa305d48669f846a75aec8607d5e30494 (diff) |
Merge pull request #29375 from bkchr/network_manager_1_8_2
network-manager: 1.6.2 -> 1.8.2
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/network-manager-applet/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 23 |
2 files changed, 16 insertions, 18 deletions
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index c596ea63f4d3e..35678061b6721 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -6,15 +6,18 @@ stdenv.mkDerivation rec { name = "${pname}-${major}.${minor}"; pname = "network-manager-applet"; - major = "1.4"; - minor = "6"; + major = "1.8"; + minor = "2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "0xpcdwqmnwiqqqsd5rx1gh5rvv5m2skj59bqxhccy1k2ikzgr9hh"; + sha256 = "09f9hjpn9nkhw57mk6pi7q1bq3lhf5hvmwas0fknscssak7yjmry"; }; - configureFlags = [ "--sysconfdir=/etc" ]; + configureFlags = [ + "--sysconfdir=/etc" + "--without-selinux" + ]; buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index d2a51b3acc862..ace568d6900b0 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -3,19 +3,17 @@ , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt -, python3Packages, docbook_xsl, fetchpatch, openconnect }: +, python3Packages, docbook_xsl, fetchpatch, openconnect, curl, autoreconfHook }: stdenv.mkDerivation rec { name = "network-manager-${version}"; pname = "NetworkManager"; - major = "1.6"; + major = "1.8"; version = "${major}.2"; - # FIXME: this problem is fixed upstream (commit 6a77258f4ec2), remove when upgrading ^^^ - hardeningDisable = [ "format" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj"; + sha256 = "1x0vzxvrck0snga2n3pc7g74m20zz74cr4r8gfspl8sckv6yz9bi"; }; outputs = [ "out" "dev" ]; @@ -46,13 +44,15 @@ stdenv.mkDerivation rec { --subst-var-by modprobeBinPath ${kmod}/bin/modprobe # to enable link-local connections 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 # patch networkmanager to allow passing these path in config file. This will # remove unneeded build-time dependencies. configureFlags = [ - "--with-distro=exherbo" "--with-dhclient=${dhcp}/bin/dhclient" "--with-dnsmasq=${dnsmasq}/bin/dnsmasq" # Upstream prefers dhclient, so don't add dhcpcd to the closure @@ -69,26 +69,21 @@ stdenv.mkDerivation rec { "--with-session-tracking=systemd" "--with-modem-manager-1" "--with-nmtui" - "--with-libsoup=yes" + "--disable-gtk-doc" ]; patches = [ ./PppdPath.patch - (fetchpatch { - sha256 = "1n90j5rwg97xkrhlldyr92filc2dmycl9pr0svky9hlcn9csk2z6"; - name = "null-dereference.patch"; - url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch"; - }) ./openconnect_helper_path.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 ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ]; - nativeBuildInputs = [ intltool pkgconfig libxslt docbook_xsl ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig libxslt docbook_xsl ]; preInstall = '' installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" ) |