Merge branch 'master' into staging

19 files changed, 145 insertions, 38 deletions

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index b5429812441..6185e22fb87 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       readline libsndfile udev libical
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.
-      # gstreamer gst_plugins_base
+      # gstreamer gst-plugins-base
     ];
 
   outputs = [ "out" "dev" "test" ];
diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix
index 8cd5e064e1e..11aee0d88f2 100644
--- a/pkgs/os-specific/linux/bluez/bluez5_28.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5_28.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
       readline libsndfile udev libical
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.
-      # gstreamer gst_plugins_base 
+      # gstreamer gst-plugins-base 
     ];
 
   preConfigure = ''
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index d0a875516fa..20b8d01db2d 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
       readline libsndfile
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.
-      # gstreamer gst_plugins_base 
+      # gstreamer gst-plugins-base 
     ];
 
   configureFlags = [
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
new file mode 100644
index 00000000000..4c88e9c6807
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool
+, libgudev, polkit, gcab, appstream-glib, gusb, sqlite, libarchive
+, libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar
+, fwupdate, libgpgerror, libyaml, valgrind
+}:
+let version = "0.8.1"; in
+  stdenv.mkDerivation
+    { name = "fwupd-${version}";
+      src = fetchurl
+        { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
+          sha256 = "0sq0aay5d6b0vgr7j7y4i58flbxmcbpwyw6vfwrd29fim21j6ac8";
+        };
+      buildInputs =
+        [ gtk_doc pkgconfig gobjectIntrospection intltool libgudev
+          polkit gcab appstream-glib gusb sqlite libarchive libsoup
+          docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind
+        ];
+      patchPhase = ''
+        sed -i -e \
+          's|/usr/bin/gpgme-config|${gpgme.dev}/bin/gpgme-config|' -e \
+          's|/usr/bin/gpg-error-config|${libgpgerror.dev}/bin/gpg-error-config|' \
+          ./configure
+      '';
+      preConfigure = ''
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${efivar}/include/efivar"
+      '';
+      configureFlags =
+        [ "--with-systemdunitdir=$(out)/lib/systemd/system"
+          "--with-udevrulesdir=$(out)/lib/udev/rules.d"
+        ];
+      enableParallelBuilding = true;
+      meta =
+        { license = [ stdenv.lib.licenses.gpl2 ];
+          platforms = stdenv.lib.platforms.linux;
+        };
+    }
diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix
new file mode 100644
index 00000000000..3fc7af91636
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, gnu-efi, efivar, libsmbios, popt, pkgconfig
+, gettext }:
+let version = "8"; in
+  stdenv.mkDerivation
+    { name = "fwupdate-${version}";
+      src = fetchurl
+        { url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";
+          sha256 = "10q8k1kghvbcb5fwcl2smzp8vqdfzimx9dkk0c3hz39py1phy4n8";
+        };
+      makeFlags =
+        [ "EFIDIR=nixos"
+          "LIBDIR=$(out)/lib"
+          "GNUEFIDIR=${gnu-efi}/lib"
+          "TARGETDIR=$(out)/boot/efi/nixos/"
+          "prefix=$(out)/"
+        ];
+      buildInputs = [ gnu-efi libsmbios popt pkgconfig gettext ];
+      propagatedBuildInputs = [ efivar ];
+      # TODO: Just apply the disable to the efi subdir
+      hardeningDisable = "all";
+      patchPhase = ''
+        sed -i 's|/usr/include/smbios_c/token.h|smbios_c/token.h|' \
+          linux/libfwup.c
+        sed -i 's|/usr/share|$(prefix)share|' linux/Makefile
+        sed -i "s|/usr/include|$out/include|" linux/fwup.pc.in
+      '';
+      configurePhase = ''
+        arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' )
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi -I${efivar}/include/efivar -I${gnu-efi}/include/efi/$arch"
+      '';
+      meta =
+        { license = [ stdenv.lib.licenses.gpl2 ];
+          platforms = stdenv.lib.platforms.linux;
+        };
+    }
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 0fef297ea5f..6822d7cba5a 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -10,6 +10,21 @@ stdenv.mkDerivation rec {
     sha256 = "0z8ilypad82q3l6q6kbv6hczvhjn8k63j8051x5yqfyjq686nlh1";
   };
 
+  patches = [
+    (fetchurl {
+      url = "http://w1.fi/cgit/hostap/patch/?id=0d42179e1246f996d334c8bd18deca469fdb1add";
+      sha256 = "0w5n3ypwavq5zlyfxpcyvbaf96g59xkwbw9xwpjyzb7h5j264615";
+    })
+    (fetchurl {
+      url = "http://w1.fi/cgit/hostap/patch/?id=df426738fb212d62b132d9bb447f0128194e00ab";
+      sha256 = "0ps2prjijlcgv1i97xb5ypw840dhkc7ja1aw8zhlbrap7pbgi1mm";
+    })
+    (fetchurl {
+      url = "http://w1.fi/cgit/hostap/patch/?id=b70d508c50e8e2d2b8fb96ae44ae10f84cf0c1ae";
+      sha256 = "0pslmsbay2cy1k07w1mdcr0b8w059jkrqrr9zi1aljvkm3vbwhj1";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libnl openssl sqlite ];
 
diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
index 0f2038fb2e3..ee47ee11855 100644
--- a/pkgs/os-specific/linux/jool/source.nix
+++ b/pkgs/os-specific/linux/jool/source.nix
@@ -1,9 +1,9 @@
 { fetchzip }:
 
 rec {
-  version = "3.5.0";
+  version = "3.5.2";
   src = fetchzip {
     url = "https://github.com/NICMx/releases/raw/master/Jool/Jool-${version}.zip";
-    sha256 = "06jp6gpfryn66q0z4w3gwkvfr17bcrjvys597nj49pxfiz4vczb2";
+    sha256 = "0gmjdi50c9wfapikniy2i1cfhz124pp7q02a0vbwxw7f21llcv8x";
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index ff6fac2ac6d..01ee7211ba6 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10";
+  version = "4.10.1";
   extraMeta.branch = "4.10";
-  modDirVersion = "4.10.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "3c95d9f049bd085e5c346d2c77f063b8425f191460fcd3ae9fe7e94e0477dc4b";
+    sha256 = "0hrmph137q4j2xfsv1fyayig47g4v8ivd2rqsw03dy7mzasnp83c";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 0aac9b43f1e..fba52eeaee5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.50";
+  version = "4.4.52";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1dqnhajciy9vgcx4lz5mngc21j5w73fzpivxx6kn7pqbpfjlr574";
+    sha256 = "01hz3g7j1m8dis6pyy9p8pi5ixl32g6cvgav0i7a7qbkrspdvlp8";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 09f0fd72eee..9290bb125f5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.11";
+  version = "4.9.13";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1czj88bj27yaiikf88kz131ayivcqhkq9d5r863w1s3qj04c2bsi";
+    sha256 = "0s52hrs3wrsa1chzgcqpxwgb5kjmpfd82i964n9d2bmk9zn4liin";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index c185442c772..859385c4e99 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.11";
+  version = "4.9.13";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "3lh2nrkq3254diqdjry857gmh39ijxxhd7h8563jdzv9i8awv564zajpdcr6bjpf5swyicjsylifym2b5ww41b0fp6z4pkns9mmppny";
+    sha512 = "2mszr7n212ryaw5q2lj92766aqnjznkfr7ly04g2ggzk7cyiirrf1w37d9arzg3smn5695fb1frikacnbrmz2hsaia48kjhwgjbxn2h";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 824d685378c..1f5c07f9b09 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -95,9 +95,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.9.11";
-      grrev  = "201702181444";
-      sha512 = "22yfq0w2hdhn0mhw0m2knm368f69z0qsf7vsfid7sw4m9ylmxfwzlnl92vfz15vldfl10hk78y59dcf8nv6jljh8gb5ycv4q61qlph6";
+    { kver   = "4.9.13";
+      grrev  = "201702270729";
+      sha512 = "07sbgvksjrvawisq4knjq34022blgg8f14blv22d37siplyamydarsykai5dks5573k61dv9q027jigxyamy50h0fd5ic8qpdp0y30c";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,
@@ -174,4 +174,13 @@ rec {
         sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p";
       };
     };
+
+  DCCP_double_free_vulnerability_CVE-2017-6074 = rec
+    { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch";
+      patch = fetchpatch {
+        inherit name;
+        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4";
+        sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
+      };
+    };
 }
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index a3d212dda53..e2b675fb4ff 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, perl }:
+{ stdenv, fetchurl, pkgconfig, libxml2, perl, autoreconfHook, doxygen }:
 
 let
-  name = "libsmbios-2.2.28";
+  version = "2.3.2";
 in
 stdenv.mkDerivation {
-  inherit name;
+  name = "libsmbios-${version}";
 
   src = fetchurl {
-    url = "http://linux.dell.com/libsmbios/download/libsmbios/${name}/${name}.tar.gz";
-    sha256 = "03m0n834w49acwbf5cf9ync1ksnn2jkwaysvy7584y60qpmngb91";
+    url = "https://github.com/dell/libsmbios/archive/v${version}.tar.gz";
+    sha256 = "0kvi36jrvhspyyq0pjfdyvzvimdn27fvbdpf429qm3xdmfi78y2j";
   };
 
-  buildInputs = [ pkgconfig libxml2 perl ];
+  buildInputs = [ pkgconfig libxml2 perl autoreconfHook doxygen ];
 
   # It tries to install some Python stuff even when Python is disabled.
   installFlags = "pkgpythondir=$(TMPDIR)/python";
 
-  # It forgets to install headers.
   postInstall =
     ''
+      mkdir -p $out/include
       cp -va "src/include/"* "$out/include/"
       cp -va "out/public-include/"* "$out/include/"
     '';
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 7e29aa0f67d..3bb61227fe4 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -3,25 +3,25 @@
 stdenv.mkDerivation rec {
   pname = "lttng-modules-${version}";
   name = "${pname}-${kernel.version}";
-  version = "2.8.3";
+  version = "2.9.1";
 
   src = fetchurl {
     url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
-    sha256 = "018lqxbksj9hpjfp2a3yc6lkjkj4rgf2x147l1jjh7mfgqvcb53b";
+    sha256 = "0m0d8sp7fj1qha7qz1204yzpsyfd8a8fawjbvdlmk9jc4piqy1v2";
   };
 
   hardeningDisable = [ "pic" ];
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-function-declaration" ];
 
   preConfigure = ''
     export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     export INSTALL_MOD_PATH="$out"
   '';
 
-  installPhase = ''
-    make modules_install
-  '';
+  installTargets = [ "modules_install" ];
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "Linux kernel modules for LTTng tracing";
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index ccee2a18a90..bf3a05f1116 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
 
   XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
 
+  # FIXME
+  # glibc 2.25 moved major()/minor() to <sys/sysmacros.h>.
+  # this commit should detect this: https://github.com/lxc/lxc/pull/1388/commits/af6824fce9c9536fbcabef8d5547f6c486f55fdf
+  # However autotools checks if mkdev is still defined in <sys/types.h> runs before
+  # checking if major()/minor() is defined there. The mkdev check succeeds with
+  # a warning and the check which should set MAJOR_IN_SYSMACROS is skipped.
+  NIX_CFLAGS_COMPILE = [ "-DMAJOR_IN_SYSMACROS" ];
+
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index dee201c1778..64b937390f1 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "144";
+  version = "148";
 
   src = fetchFromGitHub {
-    sha256 = "05b1x9z6x9yz3xmb93qvwwssjbvp28bawy8as9bfm29pyhzdxx6k";
+    sha256 = "04mzscvr38r2q9da9wmv3cxb99vrkxks1mzgvwsxk753xan3p42c";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";
diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 6fa947fea17..ee9d25dfe20 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "microcode-intel-${version}";
-  version = "20160714";
+  version = "20161104";
 
   src = fetchurl {
-    url = "http://downloadmirror.intel.com/26156/eng/microcode-${version}.tgz";
-    sha256 = "03l4pkymrgbd5y9m5ys7kq85zvckmjbw7xr6pkzg2nr7jgycdagk";
+    url = "http://downloadmirror.intel.com/26400/eng/microcode-${version}.tgz";
+    sha256 = "1lg3bvznvwcxf66k038c57brkcxfva8crpnzj5idmczr5yk4q5bh";
   };
 
   buildInputs = [ libarchive ];
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 7b87c23789b..59b9475160e 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170214";
+  version = "0.0.20170223";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1e4ee213d2a5ac672c952c59e9c64d6d7d5dc3e21c003aee30d75208237e8bf5";
+    sha256 = "6d2c8cd29c4f9fb404546a4749ec050739a26b4a49b5864f1dec531377c3c50d";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
index 80ff9922845..e1bafa93ea6 100644
--- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
@@ -7,6 +7,7 @@
 , xextproto
 , inputproto
 , randrproto
+, xorg
 , libpciaccess
 }:
 
@@ -30,7 +31,11 @@ stdenv.mkDerivation {
     EndSection
   '';
 
-  buildInputs = [ mtdev xproto xextproto inputproto libpciaccess randrproto ];
+  buildInputs = with xorg; [
+    mtdev xproto xextproto inputproto libpciaccess randrproto renderproto
+    xineramaproto resourceproto scrnsaverproto kbproto libxcb videoproto
+    dri3proto presentproto
+  ];
 
   buildPhase = ''
     make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude"