Merge branch 'master' into staging

A few thousand rebuilds from master.

lib/maintainers.nix

@@ -196,6 +196,7 @@
   garrison = "Jim Garrison <jim@garrison.cc>";
   gavin = "Gavin Rogers <gavin@praxeology.co.uk>";
   gebner = "Gabriel Ebner <gebner@gebner.org>";
+  georgewhewell = "George Whewell <georgerw@gmail.com>";
   gilligan = "Tobias Pflug <tobias.pflug@gmail.com>";
   giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
   gleber = "Gleb Peregud <gleber.p@gmail.com>";

nixos/modules/hardware/video/displaylink.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
@@ -6,7 +6,11 @@ let
 
   enabled = elem "displaylink" config.services.xserver.videoDrivers;
 
-  displaylink = config.boot.kernelPackages.displaylink;
+  evdi = config.boot.kernelPackages.evdi;
+
+  displaylink = pkgs.displaylink.override {
+    inherit evdi;
+  };
 
 in
 
@@ -14,15 +18,11 @@ in
 
   config = mkIf enabled {
 
-    boot.extraModulePackages = [ displaylink ];
+    boot.extraModulePackages = [ evdi ];
-
-    boot.kernelModules = [ "evdi" ];
 
     # Those are taken from displaylink-installer.sh and from Arch Linux AUR package.
 
-    services.udev.extraRules = ''
+    services.udev.packages = [ displaylink ];
-      ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{bNumInterfaces}=="*5", TAG+="uaccess"
-    '';
 
     powerManagement.powerDownCommands = ''
       #flush any bytes in pipe
@@ -32,7 +32,10 @@ in
       echo "S" > /tmp/PmMessagesPort_in
 
       #wait until suspend of DisplayLinkManager finish
-      read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out
+      if [ -f /tmp/PmMessagesPort_out ]; then
+        #wait until suspend of DisplayLinkManager finish
+        read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out
+      fi
     '';
 
     powerManagement.resumeCommands = ''
@@ -40,10 +43,11 @@ in
       echo "R" > /tmp/PmMessagesPort_in
     '';
 
-    systemd.services.displaylink = {
+    systemd.services.dlm = {
       description = "DisplayLink Manager Service";
       after = [ "display-manager.service" ];
-      wantedBy = [ "graphical.target" ];
+      conflicts = [ "getty@tty7.service" ];
+      path = [ pkgs.kmod ];
 
       serviceConfig = {
         ExecStart = "${displaylink}/bin/DisplayLinkManager";
@@ -53,6 +57,7 @@ in
 
       preStart = ''
         mkdir -p /var/log/displaylink
+        modprobe evdi
       '';
     };
 

nixos/modules/module-list.nix

@@ -614,6 +614,7 @@
   ./services/x11/window-managers/windowlab.nix
   ./services/x11/window-managers/wmii.nix
   ./services/x11/window-managers/xmonad.nix
+  ./services/x11/xautolock.nix
   ./services/x11/xbanish.nix
   ./services/x11/xfs.nix
   ./services/x11/xserver.nix

nixos/modules/services/networking/miredo.nix

@@ -20,7 +20,7 @@ in
 
     services.miredo = {
 
-      enable = mkEnableOption "Whether miredo should be run on startup.";
+      enable = mkEnableOption "the Miredo IPv6 tunneling service.";
 
       package = mkOption {
         type = types.package;

nixos/modules/services/x11/xautolock.nix

@@ -0,0 +1,72 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.xautolock;
+in
+  {
+    options = {
+      services.xserver.xautolock = {
+        enable = mkEnableOption "xautolock";
+        enableNotifier = mkEnableOption "xautolock.notify" // {
+          description = ''
+            Whether to enable the notifier feature of xautolock.
+            This publishes a notification before the autolock.
+          '';
+        };
+
+        time = mkOption {
+          default = 15;
+          type = types.int;
+
+          description = ''
+            Idle time to wait until xautolock locks the computer.
+          '';
+        };
+
+        locker = mkOption {
+          default = "xlock"; # default according to `man xautolock`
+          example = "i3lock -i /path/to/img";
+          type = types.string;
+
+          description = ''
+            The script to use when locking the computer.
+          '';
+        };
+
+        notify = mkOption {
+          default = 10;
+          type = types.int;
+
+          description = ''
+            Time (in seconds) before the actual lock when the notification about the pending lock should be published.
+          '';
+        };
+
+        notifier = mkOption {
+          default = "notify-send 'Locking in 10 seconds'";
+          type = types.string;
+
+          description = ''
+            Notification script to be used to warn about the pending autolock.
+          '';
+        };
+      };
+    };
+
+    config = mkIf cfg.enable {
+      environment.systemPackages = with pkgs; [ xautolock ];
+
+      services.xserver.displayManager.sessionCommands = with builtins; with pkgs; ''
+        ${xautolock}/bin/xautolock \
+          ${concatStringsSep " \\\n" ([
+            "-time ${toString(cfg.time)}"
+            "-locker ${cfg.locker}"
+          ] ++ optional cfg.enableNotifier (concatStringsSep " " [ 
+            "-notify ${toString(cfg.notify)}"
+            "-notifier \"${cfg.notifier}\""
+          ]))} &
+      '';
+    };
+  }

pkgs/applications/editors/nano/default.nix

@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.8.2";
+  version = "2.8.3";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1q5rxkvsv974085xrd2k11ffazadabcb9cnpfra0shmj71xqlgh2";
+    sha256 = "0m8g1f1c09kjmy7w6dxq30yw373nsv1ylj7986xyv4a0jddybf32";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

pkgs/applications/kde/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/17.04.0/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/17.04.1/ -A '*.tar.xz' )

pkgs/applications/kde/l10n.nix

@@ -10,187 +10,141 @@ in
 lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
   ar = {
     qt4 = callPackage (kdeLocale4 "ar" {}) {};
-    qt5 = callPackage (kdeLocale5 "ar" {}) {};
   };
   bg = {
     qt4 = callPackage (kdeLocale4 "bg" {}) {};
-    qt5 = callPackage (kdeLocale5 "bg" {}) {};
   };
   bs = {
     qt4 = callPackage (kdeLocale4 "bs" {}) {};
-    qt5 = callPackage (kdeLocale5 "bs" {}) {};
   };
   ca = {
     qt4 = callPackage (kdeLocale4 "ca" {}) {};
-    qt5 = callPackage (kdeLocale5 "ca" {}) {};
   };
   ca_valencia = {
     qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
-    qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {};
   };
   cs = {
     qt4 = callPackage (kdeLocale4 "cs" {}) {};
-    qt5 = callPackage (kdeLocale5 "cs" {}) {};
   };
   da = {
     qt4 = callPackage (kdeLocale4 "da" {}) {};
-    qt5 = callPackage (kdeLocale5 "da" {}) {};
   };
   de = {
     qt4 = callPackage (kdeLocale4 "de" {}) {};
-    qt5 = callPackage (kdeLocale5 "de" {}) {};
   };
   el = {
     qt4 = callPackage (kdeLocale4 "el" {}) {};
-    qt5 = callPackage (kdeLocale5 "el" {}) {};
   };
   en_GB = {
     qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
-    qt5 = callPackage (kdeLocale5 "en_GB" {}) {};
   };
   eo = {
     qt4 = callPackage (kdeLocale4 "eo" {}) {};
-    qt5 = callPackage (kdeLocale5 "eo" {}) {};
   };
   es = {
     qt4 = callPackage (kdeLocale4 "es" {}) {};
-    qt5 = callPackage (kdeLocale5 "es" {}) {};
   };
   et = {
     qt4 = callPackage (kdeLocale4 "et" {}) {};
-    qt5 = callPackage (kdeLocale5 "et" {}) {};
   };
   eu = {
     qt4 = callPackage (kdeLocale4 "eu" {}) {};
-    qt5 = callPackage (kdeLocale5 "eu" {}) {};
   };
   fa = {
     qt4 = callPackage (kdeLocale4 "fa" {}) {};
-    qt5 = callPackage (kdeLocale5 "fa" {}) {};
   };
   fi = {
     qt4 = callPackage (kdeLocale4 "fi" {}) {};
-    qt5 = callPackage (kdeLocale5 "fi" {}) {};
   };
   fr = {
     qt4 = callPackage (kdeLocale4 "fr" {}) {};
-    qt5 = callPackage (kdeLocale5 "fr" {}) {};
   };
   ga = {
     qt4 = callPackage (kdeLocale4 "ga" {}) {};
-    qt5 = callPackage (kdeLocale5 "ga" {}) {};
   };
   gl = {
     qt4 = callPackage (kdeLocale4 "gl" {}) {};
-    qt5 = callPackage (kdeLocale5 "gl" {}) {};
   };
   he = {
     qt4 = callPackage (kdeLocale4 "he" {}) {};
-    qt5 = callPackage (kdeLocale5 "he" {}) {};
   };
   hi = {
     qt4 = callPackage (kdeLocale4 "hi" {}) {};
-    qt5 = callPackage (kdeLocale5 "hi" {}) {};
   };
   hr = {
     qt4 = callPackage (kdeLocale4 "hr" {}) {};
-    qt5 = callPackage (kdeLocale5 "hr" {}) {};
   };
   hu = {
     qt4 = callPackage (kdeLocale4 "hu" {}) {};
-    qt5 = callPackage (kdeLocale5 "hu" {}) {};
   };
   ia = {
     qt4 = callPackage (kdeLocale4 "ia" {}) {};
-    qt5 = callPackage (kdeLocale5 "ia" {}) {};
   };
   id = {
     qt4 = callPackage (kdeLocale4 "id" {}) {};
-    qt5 = callPackage (kdeLocale5 "id" {}) {};
   };
   is = {
     qt4 = callPackage (kdeLocale4 "is" {}) {};
-    qt5 = callPackage (kdeLocale5 "is" {}) {};
   };
   it = {
     qt4 = callPackage (kdeLocale4 "it" {}) {};
-    qt5 = callPackage (kdeLocale5 "it" {}) {};
   };
   ja = {
     qt4 = callPackage (kdeLocale4 "ja" {}) {};
-    qt5 = callPackage (kdeLocale5 "ja" {}) {};
   };
   kk = {
     qt4 = callPackage (kdeLocale4 "kk" {}) {};
-    qt5 = callPackage (kdeLocale5 "kk" {}) {};
   };
   km = {
     qt4 = callPackage (kdeLocale4 "km" {}) {};
-    qt5 = callPackage (kdeLocale5 "km" {}) {};
   };
   ko = {
     qt4 = callPackage (kdeLocale4 "ko" {}) {};
-    qt5 = callPackage (kdeLocale5 "ko" {}) {};
   };
   lt = {
     qt4 = callPackage (kdeLocale4 "lt" {}) {};
-    qt5 = callPackage (kdeLocale5 "lt" {}) {};
   };
   lv = {
     qt4 = callPackage (kdeLocale4 "lv" {}) {};
-    qt5 = callPackage (kdeLocale5 "lv" {}) {};
   };
   mr = {
     qt4 = callPackage (kdeLocale4 "mr" {}) {};
-    qt5 = callPackage (kdeLocale5 "mr" {}) {};
   };
   nb = {
     qt4 = callPackage (kdeLocale4 "nb" {}) {};
-    qt5 = callPackage (kdeLocale5 "nb" {}) {};
   };
   nds = {
     qt4 = callPackage (kdeLocale4 "nds" {}) {};
-    qt5 = callPackage (kdeLocale5 "nds" {}) {};
   };
   nl = {
     qt4 = callPackage (kdeLocale4 "nl" {}) {};
-    qt5 = callPackage (kdeLocale5 "nl" {}) {};
   };
   nn = {
     qt4 = callPackage (kdeLocale4 "nn" {}) {};
-    qt5 = callPackage (kdeLocale5 "nn" {}) {};
   };
   pa = {
     qt4 = callPackage (kdeLocale4 "pa" {}) {};
-    qt5 = callPackage (kdeLocale5 "pa" {}) {};
   };
   pl = {
     qt4 = callPackage (kdeLocale4 "pl" {}) {};
-    qt5 = callPackage (kdeLocale5 "pl" {}) {};
   };
   pt = {
     qt4 = callPackage (kdeLocale4 "pt" {}) {};
-    qt5 = callPackage (kdeLocale5 "pt" {}) {};
   };
   pt_BR = {
     qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
-    qt5 = callPackage (kdeLocale5 "pt_BR" {}) {};
   };
   ro = {
     qt4 = callPackage (kdeLocale4 "ro" {}) {};
-    qt5 = callPackage (kdeLocale5 "ro" {}) {};
   };
   ru = {
     qt4 = callPackage (kdeLocale4 "ru" {}) {};
-    qt5 = callPackage (kdeLocale5 "ru" {}) {};
   };
   sk = {
     qt4 = callPackage (kdeLocale4 "sk" {}) {};
-    qt5 = callPackage (kdeLocale5 "sk" {}) {};
   };
   sl = {
     qt4 = callPackage (kdeLocale4 "sl" {}) {};
-    qt5 = callPackage (kdeLocale5 "sl" {}) {};
   };
   sr = {
     qt4 = callPackage (kdeLocale4 "sr" {
@@ -203,39 +157,26 @@ lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
             4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py
         '';
     }) {};
-    qt5 = callPackage (kdeLocale5 "sr" {
-      preConfigure = ''
-        patchShebangs 5/sr/cmake_modules/resolve-sr-hybrid
-        sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
-      '';
-    }) {};
   };
   sv = {
     qt4 = callPackage (kdeLocale4 "sv" {}) {};
-    qt5 = callPackage (kdeLocale5 "sv" {}) {};
   };
   tr = {
     qt4 = callPackage (kdeLocale4 "tr" {}) {};
-    qt5 = callPackage (kdeLocale5 "tr" {}) {};
   };
   ug = {
     qt4 = callPackage (kdeLocale4 "ug" {}) {};
-    qt5 = callPackage (kdeLocale5 "ug" {}) {};
   };
   uk = {
     qt4 = callPackage (kdeLocale4 "uk" {}) {};
-    qt5 = callPackage (kdeLocale5 "uk" {}) {};
   };
   wa = {
     qt4 = callPackage (kdeLocale4 "wa" {}) {};
-    qt5 = callPackage (kdeLocale5 "wa" {}) {};
   };
   zh_CN = {
     qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
-    qt5 = callPackage (kdeLocale5 "zh_CN" {}) {};
   };
   zh_TW = {
     qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
-    qt5 = callPackage (kdeLocale5 "zh_TW" {}) {};
   };
 }

pkgs/applications/video/obs-studio/default.nix

@@ -31,8 +31,8 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
-    rev = "26c28b45";
+    rev = "2bf9d548";
-    sha256 = "06rr70z2p2l8prxmd075pnlc759ddlqn3jprn8ns148x6s2vqik2";
+    sha256 = "036l29m3dlqadvaazj0nmgi2lcji8zckdvx3gjrx1kp96yd5myqd";
   };
 
   patches = [ ./find-xcb.patch ];

pkgs/data/fonts/go-font/default.nix

@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "go-font-${version}";
-  version = "2016-11-17";
+  version = "2017-03-30";
 
   src = fetchgit {
     url = "https://go.googlesource.com/image";
-    rev = "d2f07f8aaaa906f1a64eee0e327fc681cdb2944f";
+    rev = "f03a046406d4d7fbfd4ed29f554da8f6114049fc";
-    sha256 = "1kmsipa4cyrwx86acc695c281hchrz9k9ni8r7giyggvdi577iga";
+    sha256 = "1aq6mnjayks55gd9ahavk6jfydlq5lm4xm0xk4pd5sqa74p5p74d";
   };
 
   installPhase = ''

pkgs/development/haskell-modules/configuration-common.nix

@@ -688,9 +688,6 @@ self: super: {
   # It makes no sense to have intero-nix-shim in Hackage, so we publish it here only.
   intero-nix-shim = self.callPackage ../tools/haskell/intero-nix-shim {};
 
-  # The latest Hoogle needs versions not yet in LTS Haskell 7.x.
-  hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };
-
   # https://github.com/Philonous/hs-stun/pull/1
   # Remove if a version > 0.1.0.1 ever gets released.
   stunclient = overrideCabal super.stunclient (drv: {

pkgs/development/libraries/ffmpeg-full/default.nix

@@ -17,6 +17,7 @@
 , multithreadBuild ? true # Multithreading via pthreads/win32 threads
 , networkBuild ? true # Network support
 , pixelutilsBuild ? true # Pixel utils in libavutil
+, enableLto ? false # build with link-time optimization
 /*
  *  Program options
  */
@@ -257,6 +258,7 @@ stdenv.mkDerivation rec {
     (if stdenv.cc.isClang then "--cc=clang" else null)
     (enableFeature smallBuild "small")
     (enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
+    (enableFeature enableLto "lto")
     (enableFeature grayBuild "gray")
     (enableFeature swscaleAlphaBuild "swscale-alpha")
     (enableFeature hardcodedTablesBuild "hardcoded-tables")

pkgs/development/libraries/ffmpeg/generic.nix

@@ -55,6 +55,8 @@ let
 
   # Disable dependency that needs fixes before it will work on Darwin or Arm
   disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isArm) && reqMin minVer) then fixArg else origArg;
+
+  vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm);
 in
 
 assert openglSupport -> mesa != null;
@@ -121,7 +123,7 @@ stdenv.mkDerivation rec {
       "--enable-libmp3lame"
       (ifMinVer "1.2" "--enable-iconv")
       "--enable-libtheora"
-      (ifMinVer "0.6" (enableFeature (isLinux || isFreeBSD) "vaapi"))
+      (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
       "--enable-vdpau"
       "--enable-libvorbis"
       (disDarwinOrArmFix (ifMinVer "0.6" "--enable-libvpx") "0.6" "--disable-libvpx")
@@ -197,8 +199,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "install-man" ];
 
   passthru = {
-    vaapiSupport = if reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm) then true else false;
+    inherit vaapiSupport vdpauSupport;
-    inherit vdpauSupport;
   };
 
   meta = with stdenv.lib; {

pkgs/development/libraries/gtk+/2.x.nix

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ setupHook perl pkgconfig gettext ];
 
-  patches = [ ./2.0-immodules.cache.patch ];
+  patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch ];
 
   propagatedBuildInputs = with xorg;
     [ glib cairo pango gdk_pixbuf atk ]

pkgs/development/libraries/gtk+/gtk2-theme-paths.patch

@@ -0,0 +1,40 @@
+Subject: [PATCHv2] gtk: Patch GTK+ to look for themes in profiles.
+To: guix-devel@gnu.org
+Date: Sun, 13 Mar 2016 15:17:37 +1100
+Url: https://lists.gnu.org/archive/html/guix-devel/2016-03/msg00492.html
+
+diff -Naur gtk+-2.24.28.new/gtk/gtkrc.c gtk+-2.24.28/gtk/gtkrc.c
+--- gtk+-2.24.28.new/gtk/gtkrc.c	2016-03-13 10:31:14.413644362 +1100
++++ gtk+-2.24.28/gtk/gtkrc.c	2016-03-13 12:51:34.723398423 +1100
+@@ -808,6 +808,8 @@
+   gchar *path = NULL;
+   const gchar *home_dir;
+   gchar *subpath;
++  const gchar * const *xdg_data_dirs;
++  gint i;
+ 
+   if (type)
+     subpath = g_strconcat ("gtk-2.0-", type,
+@@ -830,6 +832,22 @@
+     }
+ 
+   if (!path)
++    {
++      xdg_data_dirs = g_get_system_data_dirs ();
++      for (i = 0; xdg_data_dirs[i]; i++)
++        {
++          path = g_build_filename (xdg_data_dirs[i], "themes", name, subpath, NULL);
++          if (g_file_test (path, G_FILE_TEST_EXISTS))
++            break;
++          else
++            {
++              g_free (path);
++              path = NULL;
++            }
++        }
++    }
++
++  if (!path)
+     {
+       gchar *theme_dir = gtk_rc_get_theme_dir ();
+       path = g_build_filename (theme_dir, name, subpath, NULL);

pkgs/development/libraries/qt-4.x/4.8/default.nix

@@ -6,7 +6,8 @@
 , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
 , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
 , flashplayerFix ? false, gdk_pixbuf
-, gtkStyle ? false, libgnomeui, gtk2, GConf, gnome_vfs
+, gtkStyle ? true, gtk2
+, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
 , developerBuild ? false
 , docs ? false
 , examples ? false
@@ -73,14 +74,15 @@ stdenv.mkDerivation rec {
         glibc = stdenv.cc.libc.out;
         openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path";
       })
-    ] ++ stdenv.lib.optional gtkStyle (substituteAll {
+    ] ++ stdenv.lib.optional gtkStyle (substituteAll ({
         src = ./dlopen-gtkstyle.diff;
         # substituteAll ignores env vars starting with capital letter
-        gconf = GConf.out;
         gtk = gtk2.out;
+      } // stdenv.lib.optionalAttrs gnomeStyle {
+        gconf = GConf.out;
         libgnomeui = libgnomeui.out;
         gnome_vfs = gnome_vfs.out;
-      })
+      }))
     ++ stdenv.lib.optional flashplayerFix (substituteAll {
         src = ./dlopen-webkit-nsplugin.diff;
         gtk = gtk2.out;

pkgs/development/libraries/science/math/clblas/cuda/default.nix

@@ -5,6 +5,7 @@
 , blas
 , boost
 , python
+, ocl-icd
 , cudatoolkit
 , nvidia_x11
 , gtest
@@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
     gfortran
     blas
     python
+    ocl-icd
     cudatoolkit
     nvidia_x11
     gtest

pkgs/development/tools/build-managers/bazel/default.nix

@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper }:
+{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper, which }:
 
 stdenv.mkDerivation rec {
 
-  version = "0.4.4";
+  version = "0.4.5";
 
   meta = with stdenv.lib; {
     homepage = http://github.com/bazelbuild/bazel/;
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "1fwfahkqi680zyxmdriqj603lpacyh6cg6ff25bn9bkilbfj2anm";
+    sha256 = "0asmq3kxnl4326zhgh13mvcrc8jvmiswjj4ymrq0943q4vj7nwrb";
   };
 
   sourceRoot = ".";
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     zip
     unzip
     makeWrapper
+    which
   ];
 
   # These must be propagated since the dependency is hidden in a compressed
@@ -58,6 +59,10 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     export TMPDIR=/tmp
     ./compile.sh
+    ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \
+      --spawn_strategy=standalone \
+      --genrule_strategy=standalone
+    cp bazel-bin/scripts/bazel-complete.bash output/
   '';
 
   # Build the CPP and Java examples to verify that Bazel works.
@@ -76,6 +81,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     mv output/bazel $out/bin
     wrapProgram "$out/bin/bazel" --prefix PATH : "${stdenv.cc}/bin:${jdk}/bin"
+    mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
+    mv output/bazel-complete.bash $out/share/bash-completion/completions/
+    cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
   '';
 
   dontStrip = true;

pkgs/misc/themes/flat-plat/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "flat-plat-gtk-theme-${version}";
-  version = "20170323";
+  version = "20170515";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "Flat-Plat";
     rev = "v${version}";
-    sha256 = "18s05x5qkl9cwywd01498xampyya1lnpjyyknj61qxxw5rsgay9y";
+    sha256 = "0z0l9ch6symcjhbfkj1q5i46ajbn7l7slhjgrcjm0ppqh05xc4y7";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 ];

pkgs/os-specific/linux/displaylink/default.nix

@@ -1,64 +1,47 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, unzip, kernel, utillinux, libdrm, libusb1, makeWrapper }:
+{ stdenv, lib, fetchurl, unzip, utillinux, libusb1, evdi, systemd, makeWrapper }:
 
 let
   arch =
     if stdenv.system == "x86_64-linux" then "x64"
     else if stdenv.system == "i686-linux" then "x86"
     else throw "Unsupported architecture";
-  libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 ];
+  bins = "${arch}-ubuntu-1604";
+  libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ];
 
 in stdenv.mkDerivation rec {
   name = "displaylink-${version}";
-  version = "1.1.62";
+  version = "1.3.52";
 
-  src = fetchFromGitHub {
+  src = fetchurl {
-    owner = "DisplayLink";
-    repo = "evdi";
-    rev = "fe779940ff9fc7b512019619e24a5b22e4070f6a";
-    sha256 = "02hw83f6lscms8hssjzf30hl9zly3b28qcxwmxvnqwfhx1q491z9";
-  };
-
-  daemon = fetchurl {
     name = "displaylink.zip";
-    url = "http://www.displaylink.com/downloads/file?id=607";
+    url = "http://www.displaylink.com/downloads/file?id=744";
-    sha256 = "0jky3xk4dfzbzg386qya9l9952i4m8zhf55fdl06pi9r82k2iijx";
+    sha256 = "0ridpsxcf761vym0nlpq702qa46ynddzci17bjmyax2pph7khr0k";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];
 
-  buildInputs = [ kernel libdrm ];
-
   buildCommand = ''
-    unpackPhase
+    unzip $src
-    cd $sourceRoot
-    unzip $daemon
     chmod +x displaylink-driver-${version}.run
-    ./displaylink-driver-${version}.run --target daemon --noexec
+    ./displaylink-driver-${version}.run --target . --noexec
 
-    ( cd module
+    sed -i "s,/opt/displaylink/udev.sh,$out/lib/udev/displaylink.sh,g" udev-installer.sh
-      export makeFlags="$makeFlags KVER=${kernel.modDirVersion} KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    ( source udev-installer.sh
-      export hardeningDisable="pic format"
+      mkdir -p $out/lib/udev/rules.d
-      buildPhase
+      main systemd "$out/lib/udev/rules.d/99-displaylink.rules" "$out/lib/udev/displaylink.sh"
-      install -Dm755 evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko
     )
+    sed -i '2iPATH=${systemd}/bin:$PATH' $out/lib/udev/displaylink.sh
 
-    ( cd library
+    install -Dt $out/lib/displaylink *.spkg
-      buildPhase
+    install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager
-      install -Dm755 libevdi.so $out/lib/libevdi.so
+    patchelf \
-    )
+      --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
+      --set-rpath ${libPath} \
+      $out/bin/DisplayLinkManager
+    wrapProgram $out/bin/DisplayLinkManager \
+      --run "cd $out/lib/displaylink"
 
     fixupPhase
-
-    ( cd daemon
-      install -Dt $out/lib/displaylink *.spkg
-      install -Dm755 ${arch}/DisplayLinkManager $out/bin/DisplayLinkManager
-      patchelf \
-        --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
-        --set-rpath $out/lib:${libPath} \
-        $out/bin/DisplayLinkManager
-      wrapProgram $out/bin/DisplayLinkManager \
-        --run "cd $out/lib/displaylink"
-    )
   '';
 
   meta = with stdenv.lib; {

pkgs/os-specific/linux/evdi/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, kernel, libdrm }:
+
+stdenv.mkDerivation rec {
+  name = "evdi-${version}";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "DisplayLink";
+    repo = "evdi";
+    rev = "v${version}";
+    sha256 = "176cq83qlmhc4c00dwfnqgd021l7s4gyj8604m5zmxbz0r5mnawv";
+  };
+
+  buildInputs = [ kernel libdrm ];
+
+  makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
+
+  hardeningDisable = [ "pic" "format" ];
+
+  installPhase = ''
+    install -Dm755 module/evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko
+    install -Dm755 library/libevdi.so $out/lib/libevdi.so
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Extensible Virtual Display Interface";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    homepage = "http://www.displaylink.com/";
+  };
+}

pkgs/os-specific/linux/kernel/hardened-config.nix

@@ -29,6 +29,7 @@ ${optionalString (versionAtLeast version "4.10") ''
 DEBUG_CREDENTIALS y
 DEBUG_NOTIFIERS y
 DEBUG_LIST y
+DEBUG_SG y
 
 HARDENED_USERCOPY y # Bounds check usercopy
 

pkgs/tools/misc/fwup/default.nix

@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig
+, zlib, lzma, bzip2, mtools, dosfstools, zip, unzip, libconfuse, libsodium
+, libarchive, darwin, coreutils }:
+
+stdenv.mkDerivation rec {
+  name = "fwup-${version}";
+  version = "0.14.2";
+
+  src = fetchFromGitHub {
+    owner = "fhunleth";
+    repo = "fwup";
+    rev = "v${version}";
+    sha256 = "0ddyiprq4qnqpdhh48bivl8c5yrh21p4r99qs0d1rjiwx5h9p21l";
+  };
+
+  doCheck = true;
+  patches = lib.optional stdenv.isDarwin [ ./fix-testrunner-darwin.patch ];
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ];
+  buildInputs = [ zlib lzma bzip2 libconfuse libsodium libarchive ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.DiskArbitration
+    ];
+  propagatedBuildInputs = [ zip unzip mtools dosfstools coreutils ];
+
+  # segfaults on darwin without
+  NIX_LDFLAGS = lib.optional stdenv.isDarwin "-F/System/Library/Frameworks";
+
+  meta = with stdenv.lib; {
+    description = "Configurable embedded Linux firmware update creator and runner";
+    homepage = https://github.com/fhunleth/fwup;
+    license = licenses.asl20;
+    maintainers = [ maintainers.georgewhewell ];
+    platforms = platforms.all;
+  };
+}

pkgs/tools/misc/fwup/fix-testrunner-darwin.patch

@@ -0,0 +1,25 @@
+diff --git a/tests/common-orig.sh b/tests/common.sh
+index 1f2673f..79dcf74 100755
+--- a/tests/common-orig.sh
++++ b/tests/common.sh
+@@ -21,20 +21,6 @@ else
+ fi
+ 
+ case "$HOST_OS" in
+-    Darwin)
+-	# BSD stat
+-        STAT_FILESIZE_FLAGS="-f %z"
+-
+-	# Not -d?
+-        BASE64_DECODE=-D
+-
+-        READLINK=/usr/local/bin/greadlink
+-        [ -e $READLINK ] || ( echo "Please run 'brew install coreutils' to install greadlink"; exit 1 )
+-        [ -e /usr/local/bin/mdir ] || ( echo "Please run 'brew install mtools' to install mdir"; exit 1 )
+-
+-        FSCK_FAT=fsck_msdos
+-        TIMEOUT=gtimeout
+-        ;;
+     FreeBSD|NetBSD|OpenBSD|DragonFly)
+ 	# BSD stat
+         STAT_FILESIZE_FLAGS="-f %z"

pkgs/tools/package-management/nixops/generic.nix

@@ -5,9 +5,7 @@
 
 python2Packages.buildPythonApplication {
   name = "nixops-${version}";
-  namePrefix = "";
+  inherit version src;
-
-  src = src;
 
   buildInputs = [ libxslt ];
 
@@ -31,23 +29,22 @@ python2Packages.buildPythonApplication {
 
   doCheck = false;
 
-  postInstall =
+  postInstall = ''
-    ''
+    make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \
-      make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \
+      docdir=$out/share/doc/nixops mandir=$out/share/man
-        docdir=$out/share/doc/nixops mandir=$out/share/man
 
-      mkdir -p $out/share/nix/nixops
+    mkdir -p $out/share/nix/nixops
-      cp -av "nix/"* $out/share/nix/nixops
+    cp -av "nix/"* $out/share/nix/nixops
 
-      # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
+    # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
-      # the version of openssh is causing errors when have big networks (40+)
+    # the version of openssh is causing errors when have big networks (40+)
-      wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin"
+    wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin"
-    '';
+  '';
 
   meta = {
     homepage = https://github.com/NixOS/nixops;
     description = "NixOS cloud provisioning and deployment tool";
-    maintainers = [ lib.maintainers.eelco lib.maintainers.rob ];
+    maintainers = with lib.maintainers; [ eelco rob domenkozar ];
     platforms = lib.platforms.unix;
   };
 }

pkgs/tools/package-management/nixops/unstable.nix

@@ -1,9 +1,10 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.5";
+  version = "2017-05-15";
   src = fetchurl {
-    url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
+    # Sadly hydra doesn't offer download links
-    sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd";
+    url = "https://static.domenkozar.com/nixops-tarball-1.5.1pre2165_b2fdc43.tar.bz2";
+    sha256 = "1x8jiskxynx0rzw356sz406bi2vl0vjs7747sbacq0bp1jlnpb2n";
   };
 })

pkgs/tools/system/socklog/default.nix

@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "man" "doc" ];
 
+  postPatch = ''
+    sed -i src/TARGETS -e '/^chkshsgr/d'
+  '';
+
   configurePhase = ''
     echo "$NIX_CC/bin/cc $NIX_CFLAGS_COMPILE"   >src/conf-cc
     echo "$NIX_CC/bin/cc -s"                    >src/conf-ld

pkgs/top-level/all-packages.nix

@@ -954,6 +954,8 @@ with pkgs;
 
   fsmark = callPackage ../tools/misc/fsmark { };
 
+  fwup = callPackage ../tools/misc/fwup { };
+
   fzf = callPackage ../tools/misc/fzf { };
 
   fzy = callPackage ../tools/misc/fzy { };
@@ -11520,6 +11522,10 @@ with pkgs;
 
   disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
 
+  displaylink = callPackage ../os-specific/linux/displaylink {
+    inherit (linuxPackages) evdi;
+  };
+
   dmidecode = callPackage ../os-specific/linux/dmidecode { };
 
   dmtcp = callPackage ../os-specific/linux/dmtcp { };
@@ -11882,12 +11888,12 @@ with pkgs;
 
     cpupower = callPackage ../os-specific/linux/cpupower { };
 
-    displaylink = callPackage ../os-specific/linux/displaylink { };
-
     dpdk = callPackage ../os-specific/linux/dpdk { };
 
     exfat-nofuse = callPackage ../os-specific/linux/exfat { };
 
+    evdi = callPackage ../os-specific/linux/evdi { };
+
     pktgen = callPackage ../os-specific/linux/pktgen { };
 
     odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };

pkgs/top-level/release-cross.nix

@@ -17,12 +17,12 @@ let
     gmp = nativePlatforms;
   };
 
-  gnuCommon = common // {
+  gnuCommon = lib.recursiveUpdate common {
     buildPackages.gccCrossStageFinal = nativePlatforms;
     coreutils = nativePlatforms;
   };
 
-  linuxCommon = gnuCommon // {
+  linuxCommon = lib.recursiveUpdate gnuCommon {
     buildPackages.gdbCross = nativePlatforms;
 
     bison = nativePlatforms;
@@ -33,7 +33,7 @@ let
     patch = nativePlatforms;
   };
 
-  windowsCommon = gnuCommon // {
+  windowsCommon = lib.recursiveUpdate gnuCommon {
     boehmgc = nativePlatforms;
     guile_1_8 = nativePlatforms;
     libffi = nativePlatforms;