Merge branch 'master' into staging

There have been some larger security rebuilds on master.
2024-11-22 23:13:19 +00:00 · 2017-02-01 15:56:35 +01:00 · 2017-02-01 15:56:35 +01:00 · a2e7770b51
commit a2e7770b51
parent 9cd2dbc569 05ee54782e
100 changed files with 2444 additions and 1668 deletions
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -351,6 +351,7 @@
  olejorgenb = "Ole Jørgen Brønner <olejorgenb@yahoo.no>";
  orbekk = "KJ Ørbekk <kjetil.orbekk@gmail.com>";
  orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
+  orivej = "Orivej Desh <orivej@gmx.fr>";
  osener = "Ozan Sener <ozan@ozansener.com>";
  otwieracz = "Slawomir Gonet <slawek@otwiera.cz>";
  oxij = "Jan Malakhovski <oxij@oxij.org>";
@ -495,6 +496,7 @@
  vcunat = "Vladimír Čunát <vcunat@gmail.com>";
  vdemeester = "Vincent Demeester <vincent@sbr.pm>";
  veprbl = "Dmitry Kalinkin <veprbl@gmail.com>";
+  vifino = "Adrian Pistol <vifino@tty.sh>";
  viric = "Lluís Batlle i Rossell <viric@viric.name>";
  vizanto = "Danny Wilson <danny@prime.vc>";
  vklquevs = "vklquevs <vklquevs@gmail.com>";
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@ -133,13 +133,10 @@ in
      '';

    environment.sessionVariables.LD_LIBRARY_PATH =
-      [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ];
+      [ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib";

-    environment.extraInit = ''
-      export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver/share
-    '' + optionalString cfg.driSupport32Bit ''
-      export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver-32/share
-    '';
+    environment.variables.XDG_DATA_DIRS =
+      [ "/run/opengl-driver/share" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/share";

    hardware.opengl.package = mkDefault (makePackage pkgs);
    hardware.opengl.package32 = mkDefault (makePackage pkgs_i686);
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixos/modules/hardware/video/amdgpu-pro.nix
@ -44,9 +44,6 @@ in
      "amd/amdrc".source = package + "/etc/amd/amdrc";
      "amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb";
      "gbm/gbm.conf".source = package + "/etc/gbm/gbm.conf";
-      "OpenCL/vendors/amdocl64.icd".source = package + "/etc/OpenCL/vendors/amdocl64.icd";
-    } // optionalAttrs opengl.driSupport32Bit {
-      "OpenCL/vendors/amdocl32.icd".source = package32 + "/etc/OpenCL/vendors/amdocl32.icd";
    };

  };
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@ -62,8 +62,6 @@ in

    services.acpid.enable = true;

-    environment.etc."OpenCL/vendors/nvidia.icd".source = "${nvidia_x11}/lib/vendors/nvidia.icd";
-
  };

 }
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@ -45,9 +45,8 @@ let
 in

 {
-  options = {
-
-    nixpkgs.config = mkOption {
+  options.nixpkgs = {
+    config = mkOption {
      default = {};
      example = literalExample
        ''
@ -61,7 +60,7 @@ in
      '';
    };

-    nixpkgs.overlays = mkOption {
+    overlays = mkOption {
      default = [];
      example = literalExample
        ''
@ -85,7 +84,7 @@ in
      '';
    };

-    nixpkgs.system = mkOption {
+    system = mkOption {
      type = types.str;
      example = "i686-linux";
      description = ''
@ -95,14 +94,9 @@ in
        multi-platform deployment, or when building virtual machines.
      '';
    };
-
  };

  config = {
-    _module.args.pkgs = import ../../.. {
-      system = config.nixpkgs.system;
-
-      inherit (config.nixpkgs) config;
-    };
+    _module.args.pkgs = import ../../.. config.nixpkgs;
  };
 }
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@ -20,18 +20,6 @@ in
        description = "Autostart an IHaskell notebook service.";
      };

-      haskellPackages = mkOption {
-        default = pkgs.haskellPackages;
-        defaultText = "pkgs.haskellPackages";
-        example = literalExample "pkgs.haskell.packages.ghc784";
-        description = ''
-          haskellPackages used to build IHaskell and other packages.
-          This can be used to change the GHC version used to build
-          IHaskell and the packages listed in
-          <varname>extraPackages</varname>.
-        '';
-      };
-
      extraPackages = mkOption {
        default = self: [];
        example = literalExample ''
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@ -104,30 +104,72 @@ in
      };
    };

-    systemd.services.ipfs = {
-      description = "IPFS Daemon";
+    systemd.services.ipfs-init = {
+      description = "IPFS Initializer";
+
+      after = [ "local-fs.target" ];
+      before = [ "ipfs.service" "ipfs-offline.service" ];

-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "local-fs.target" ];
      path  = [ pkgs.ipfs pkgs.su pkgs.bash ];

      preStart = ''
        install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}
+      '';
+
+      script =  ''
        if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then
          cd ${cfg.dataDir}
-          ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \
-             "${ipfs}/bin/ipfs init ${if cfg.emptyRepo then "-e" else ""}"
+          ${ipfs}/bin/ipfs init ${optionalString cfg.emptyRepo "-e"}
        fi
-        ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \
-           "${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress} && \
-            ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}"
+        ${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress}
+        ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}
      '';

+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        Type = "oneshot";
+        RemainAfterExit = true;
+        PermissionsStartOnly = true;
+      };
+    };
+
+    systemd.services.ipfs = {
+      description = "IPFS Daemon";
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" "local-fs.target" "ipfs-init.service" ];
+
+      conflicts = [ "ipfs-offline.service" ];
+      wants = [ "ipfs-init.service" ];
+
+      path  = [ pkgs.ipfs ];
+
      serviceConfig = {
        ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}";
        User = cfg.user;
        Group = cfg.group;
-        PermissionsStartOnly = true;
+        Restart = "on-failure";
+        RestartSec = 1;
+      };
+    };
+
+    systemd.services.ipfs-offline = {
+      description = "IPFS Daemon (offline mode)";
+
+      after = [ "local-fs.target" "ipfs-init.service" ];
+
+      conflicts = [ "ipfs.service" ];
+      wants = [ "ipfs-init.service" ];
+
+      path  = [ pkgs.ipfs ];
+
+      serviceConfig = {
+        ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --offline";
+        User = cfg.user;
+        Group = cfg.group;
+        Restart = "on-failure";
+        RestartSec = 1;
      };
    };
  };
--- a/nixos/modules/services/networking/nylon.nix
+++ b/nixos/modules/services/networking/nylon.nix
@ -8,7 +8,7 @@ let

  homeDir = "/var/lib/nylon";

-  configFile = pkgs.writeText "nylon.conf" ''
+  configFile = cfg: pkgs.writeText "nylon-${cfg.name}.conf" ''
    [General]
    No-Simultaneous-Conn=${toString cfg.nrConnections}
    Log=${if cfg.logging then "1" else "0"}
@ -22,15 +22,9 @@ let
    Deny-IP=${concatStringsSep " " cfg.deniedIPRanges}
  '';

-in
+  nylonOpts = { name, config, ... }: {

-{
-
-  ###### interface
-
-  options = {
-
-    services.nylon = {
+    options = {

      enable = mkOption {
        type = types.bool;
@ -40,6 +34,12 @@ in
        '';
      };

+      name = mkOption {
+        type = types.str;
+        default = "";
+        description = "The name of this nylon instance.";
+      };
+
      nrConnections = mkOption {
        type = types.int;
        default = 10;
@ -107,13 +107,51 @@ in
        '';
      };
    };
+    config = { name = mkDefault name; };
+  };
+
+  mkNamedNylon = cfg: {
+    "nylon-${cfg.name}" = {
+      description = "Nylon, a lightweight SOCKS proxy server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig =
+      {
+        User = "nylon";
+        Group = "nylon";
+        WorkingDirectory = homeDir;
+        ExecStart = "${pkgs.nylon}/bin/nylon -f -c ${configFile cfg}";
+      };
+    };
+  };
+
+  anyNylons = collect (p: p ? enable) cfg;
+  enabledNylons = filter (p: p.enable == true) anyNylons;
+  nylonUnits = map (nylon: mkNamedNylon nylon) enabledNylons;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.nylon = mkOption {
+      default = {};
+      description = "Collection of named nylon instances";
+      type = with types; loaOf (submodule nylonOpts);
+      internal = true;
+      options = [ nylonOpts ];
+    };
+
  };

  ###### implementation

-  config = mkIf cfg.enable {
+  config = mkIf (length(enabledNylons) > 0) {

-    users.extraUsers.nylon= {
+    users.extraUsers.nylon = {
      group = "nylon";
      description = "Nylon SOCKS Proxy";
      home = homeDir;
@ -123,17 +161,7 @@ in

    users.extraGroups.nylon.gid = config.ids.gids.nylon;

-    systemd.services.nylon = {
-      description = "Nylon, a lightweight SOCKS proxy server";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig =
-      {
-        User = "nylon";
-        Group = "nylon";
-        WorkingDirectory = homeDir;
-        ExecStart = "${pkgs.nylon}/bin/nylon -f -c ${configFile}";
-      };
-    };
+    systemd.services = fold (a: b: a // b) {} nylonUnits;
+
  };
 }
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@ -78,7 +78,7 @@ in {
      };

      debug = mkEnableOption "gnome-session debug messages";
-    };  
+    };

    environment.gnome3.packageSet = mkOption {
      default = null;
@ -86,7 +86,7 @@ in {
      description = "Which GNOME 3 package set to use.";
      apply = p: if p == null then pkgs.gnome3 else p;
    };
-    
+
    environment.gnome3.excludePackages = mkOption {
      default = [];
      example = literalExample "[ pkgs.gnome3.totem ]";
@ -125,6 +125,9 @@ in {
    services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
    services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ];

+    # If gnome3 is installed, build vim for gtk3 too.
+    nixpkgs.config.vim.gui = "gtk3";
+
    fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];

    services.xserver.desktopManager.session = singleton
--- a/nixos/tests/emacs-daemon.nix
+++ b/nixos/tests/emacs-daemon.nix
@ -1,7 +1,7 @@
 import ./make-test.nix ({ pkgs, ...} : {
  name = "emacs-daemon";
  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ DamienCassou ];
+    maintainers = [ ];
  };

  enableOCR = true;
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux";

 let
  # Please update the stable branch!
-  version = "1.0.47.13.gd8e05b1f-47";
+  version = "1.0.48.103.g15edf1ec-94";

  deps = [
    alsaLib
@ -51,7 +51,7 @@ stdenv.mkDerivation {
  src =
    fetchurl {
      url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "0079vq2nw07795jyqrjv68sc0vqjy6abjh6jjd5cg3hqlxdf4ckz";
+      sha256 = "0rpwxgxv2ihfhlri98k4n87ynlcp569gm9q6hd8jg0vd2jgji8b3";
    };

  buildInputs = [ dpkg makeWrapper ];
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@ -1,7 +1,7 @@
 # TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
 # but I have gvim with python support now :) - Marc
 args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext
-, composableDerivation, writeText, lib, config, glib, gtk2, python, perl, tcl, ruby
+, composableDerivation, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby
 , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
 , libICE

@ -69,8 +69,8 @@ composableDerivation {
    nativeBuildInputs = [ pkgconfig ];

    buildInputs
-      = [ ncurses gtk2 libX11 libXext libSM libXpm libXt libXaw libXau
-          libXmu glib libICE ];
+      = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau
+          libXmu glib libICE ] ++ (if args.gui == "gtk3" then [gtk3] else [gtk2]);

    # most interpreters aren't tested yet.. (see python for example how to do it)
    flags = {
@ -149,7 +149,7 @@ composableDerivation {
    ftNixSupport     = config.vim.ftNix or true;
  };

-  #--enable-gui=OPTS     X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon
+  #--enable-gui=OPTS     X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gtk3/gnome/gnome2/motif/athena/neXtaw/photon/carbon
    /*
      // edf "gtk_check" "gtk_check" { } #If auto-select GUI, check for GTK default=yes
      // edf "gtk2_check" "gtk2_check" { } #If GTK GUI, check for GTK+ 2 default=yes
@ -171,4 +171,3 @@ composableDerivation {

  dontStrip = 1;
 })
-
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@ -2,11 +2,11 @@
 , curl, libexif, perlPackages }:

 stdenv.mkDerivation rec {
-  name = "feh-2.17.1";
+  name = "feh-2.18.1";

  src = fetchurl {
    url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "0lyq17kkmjxj3vxpmri56linr1bnfmx5568pgrcjgd3amnj1is59";
+    sha256 = "1ck55rhh5ax1d9k9gy2crvyjwffh6028f4kxaisd8ymgbql40f2c";
  };

  outputs = [ "out" "doc" ];
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@ -8,11 +8,11 @@

 stdenv.mkDerivation rec {
  name = "krita-${version}";
-  version = "3.0.1.1";
+  version = "3.1.1";

  src = fetchurl {
    url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "0v58p9am2gsrgn5nhynvdg1a7v8d9kcsswb1962r8ijszm3fav5k";
+    sha256 = "13qff9kdd38x81rq6yfmkm3083l8s0yn9h3d5qg3qmhrkd5jrvv2";
  };

  nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@ -0,0 +1,38 @@
+{ stdenv
+, fetchgit
+, autoreconfHook
+, glib
+, pkgconfig
+, libxml2
+, exiv2
+, imagemagick
+, version
+, sha256
+, rev }:
+
+stdenv.mkDerivation rec {
+  inherit version;
+  name = "cataract-${version}";
+
+  src = fetchgit {
+    url = "git://git.bzatek.net/cataract";
+    inherit sha256 rev;
+  };
+
+  buildInputs = [ autoreconfHook glib pkgconfig libxml2 exiv2 imagemagick ];
+
+  installPhase = ''
+    mkdir $out/{bin,share} -p
+    cp src/cgg{,-dirgen} $out/bin/
+  '';
+
+  meta = {
+    homepage = "http://cgg.bzatek.net/";
+    description = "a simple static web photo gallery, designed to be clean and easily usable";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}
+
+
--- a/pkgs/applications/misc/cataract/default.nix
+++ b/pkgs/applications/misc/cataract/default.nix
@ -0,0 +1,17 @@
+{ callPackage
+, stdenv
+, fetchgit
+, autoconf
+, automake
+, glib
+, pkgconfig
+, libxml2
+, exiv2
+, imagemagick }:
+
+callPackage ./build.nix {
+  version = "1.1.0";
+  rev = "675e647dc8ae918d29f520a29be9201ae85a94dd";
+  sha256 = "13b9rvcy9k2ay8w36j28kc7f4lnxp4jc0494ck3xsmwgqsawmzdj";
+}
+
--- a/pkgs/applications/misc/cataract/unstable.nix
+++ b/pkgs/applications/misc/cataract/unstable.nix
@ -0,0 +1,17 @@
+{ callPackage
+, stdenv
+, fetchgit
+, autoconf
+, automake
+, glib
+, pkgconfig
+, libxml2
+, exiv2
+, imagemagick }:
+
+callPackage ./build.nix {
+  version = "unstable-2016-10-18";
+  rev = "db3d992febbe703931840e9bdad95c43081694a5";
+  sha256 = "04f85piy675lq36w1mw6mw66n8911mmn4ifj8h9x47z8z806h3rf";
+}
+
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@ -2,15 +2,15 @@

 let

-  tornado_4_0_1 = pythonPackages.buildPythonPackage rec {
+  tornado_4_0_2 = pythonPackages.buildPythonPackage rec {
    name = "tornado-${version}";
-    version = "4.0.1";
+    version = "4.0.2";

    propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ];

    src = fetchurl {
      url = "mirror://pypi/t/tornado/${name}.tar.gz";
-      sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df";
+      sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";
    };
  };

@ -24,34 +24,53 @@ let
    };

    # This is needed for compatibility with OctoPrint
-    propagatedBuildInputs = [ tornado_4_0_1 ];
+    propagatedBuildInputs = [ tornado_4_0_2 ];
+  };

-    meta = with stdenv.lib; {
-      description = "SockJS python server implementation on top of Tornado framework";
-      homepage = "http://github.com/mrjoes/sockjs-tornado/";
-      license = licenses.mit;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ abbradar ];
+  websocket_client = pythonPackages.buildPythonPackage rec {
+    name = "websocket_client-0.32.0";
+
+    src = fetchurl {
+      url = "mirror://pypi/w/websocket-client/${name}.tar.gz";
+      sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040";
    };
+
+    propagatedBuildInputs = with pythonPackages; [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ];
+  };
+
+  flask_login = pythonPackages.buildPythonPackage rec {
+    name = "Flask-Login-${version}";
+    version = "0.2.2";
+
+    src = fetchurl {
+      url = "mirror://pypi/F/Flask-Login/${name}.tar.gz";
+      sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [ flask ];
+
+    # FIXME
+    doCheck = false;
  };

 in pythonPackages.buildPythonApplication rec {
  name = "OctoPrint-${version}";
-  version = "1.2.17";
+  version = "1.3.1";

  src = fetchFromGitHub {
    owner = "foosel";
    repo = "OctoPrint";
    rev = version;
-    sha256 = "1di2f5npwsfckx5p2fl23bl5zi75i0aksd9qy4sa3zmw672337fh";
+    sha256 = "1av755agyym1k5ig9av0q9ysf26ldfixz82x73v3g47a1m28pxq9";
  };

  # We need old Tornado
  propagatedBuildInputs = with pythonPackages; [
    awesome-slugify flask_assets rsa requests2 pkginfo watchdog
-    semantic-version flask_principal werkzeug flaskbabel tornado_4_0_1
+    semantic-version flask_principal werkzeug flaskbabel tornado_4_0_2
    psutil pyserial flask_login netaddr markdown sockjs-tornado
-    pylru pyyaml sarge feedparser netifaces
+    pylru pyyaml sarge feedparser netifaces click websocket_client
+    scandir chainmap future
  ];

  # Jailbreak dependencies.
@ -67,10 +86,12 @@ in pythonPackages.buildPythonApplication rec {
      -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \
      -e 's,markdown>=[^"]*,markdown,g' \
      -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \
-      -e 's,Flask-Login>=[^"]*,Flask-Login,g' \
      -e 's,rsa>=[^"]*,rsa,g' \
      -e 's,PyYAML>=[^"]*,PyYAML,g' \
      -e 's,flask>=[^"]*,flask,g' \
+      -e 's,Click>=[^"]*,Click,g' \
+      -e 's,websocket-client>=[^"]*,websocket-client,g' \
+      -e 's,scandir>=[^"]*,scandir,g' \
      setup.py
  '';

--- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
+++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
@ -1,4 +1,4 @@
-From c84b2130dab0d26be35294d023ed8f4be404c3c1 Mon Sep 17 00:00:00 2001
+From 0defcf6ec155899c414f66524b7df629f59327f0 Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Wed, 23 Nov 2016 00:40:48 +0300
 Subject: [PATCH] Build and use one version of preprocessor library
@ -9,10 +9,10 @@ Subject: [PATCH] Build and use one version of preprocessor library
 2 files changed, 6 insertions(+), 123 deletions(-)

 diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py
-index f9f84c4..b365024 100755
+index 4b43c59..d1259e4 100755
 --- a/octoprint_m33fio/__init__.py
 +++ b/octoprint_m33fio/__init__.py
-@@ -1061,71 +1061,8 @@ class M33FioPlugin(
+@@ -1062,71 +1062,8 @@ class M33FioPlugin(
 		# Check if using shared library or checking if it is usable
 		if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable :
 	
@ -23,19 +23,19 @@ index f9f84c4..b365024 100755
 -				if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" :
 -	
 -					# Set shared library
-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm1176jzf-s.so")
 -	
 -				# Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3
 -				elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" :
 -	
 -					# Set shared library
-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm_cortex-a7.so")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm_cortex-a7.so")
 -	
 -				# Otherwise check if running on an ARM7 device
 -				elif platform.uname()[4].startswith("armv7") :
 -	
 -					# Set shared library
-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm7.so")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm7.so")
 -	
 -				# Otherwise check if using an i386 or x86-64 device
 -				elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") :
@ -44,13 +44,13 @@ index f9f84c4..b365024 100755
 -					if platform.architecture()[0].startswith("32") :
 -		
 -						# Set shared library
-						self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.so")
+-						self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.so")
 -	
 -					# Otherwise check if Python is running as 64-bit
 -					elif platform.architecture()[0].startswith("64") :
 -		
 -						# Set shared library
-						self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.so")
+-						self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.so")
 -
 -			# Otherwise check if running on Windows and using an i386 or x86-64 device
 -			elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
@ -59,39 +59,39 @@ index f9f84c4..b365024 100755
 -				if platform.architecture()[0].startswith("32") :
 -	
 -					# Set shared library
-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dll")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dll")
 -
 -				# Otherwise check if Python is running as 64-bit
 -				elif platform.architecture()[0].startswith("64") :
 -	
 -					# Set shared library
-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dll")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dll")
 -
-			# Otherwise check if running on OS X and using an i386 or x86-64 device
+-			# Otherwise check if running on macOS and using an i386 or x86-64 device
 -			elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
 -
 -				# Check if Python is running as 32-bit
 -				if platform.architecture()[0].startswith("32") :
 -	
 -					# Set shared library
-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dylib")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dylib")
 -
 -				# Otherwise check if Python is running as 64-bit
 -				elif platform.architecture()[0].startswith("64") :
 -	
 -					# Set shared library
-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib")
-+                        # Set shared library
-+                        self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib")
+			# Set shared library
+			self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
 
 			# Check if shared library was set
 			if self.sharedLibrary :
 diff --git a/shared library source/Makefile b/shared library source/Makefile
-index 887899b..4c74f5c 100755
+index 792b4f4..4c74f5c 100755
 --- a/shared library source/Makefile	
 +++ b/shared library source/Makefile	
@@ -1,68 +1,14 @@
-# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64
+-# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, MACOS32, MACOS64
 -LIBRARY_NAME = preprocessor
 -TARGET_PLATFORM = LINUX64
 +LIBRARY_NAME = libpreprocessor
@ -139,14 +139,14 @@ index 887899b..4c74f5c 100755
 -	CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
 -endif
 -
-ifeq ($(TARGET_PLATFORM), OSX32)
+-ifeq ($(TARGET_PLATFORM), MACOS32)
 -	PROG = $(LIBRARY_NAME)_i386.dylib
 -	CC = clang++
 -	CFLAGS = -fPIC -m32 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)
 -
 -endif
 -
-ifeq ($(TARGET_PLATFORM), OSX64)
+-ifeq ($(TARGET_PLATFORM), MACOS64)
 -	PROG = $(LIBRARY_NAME)_x86-64.dylib
 -	CC = clang++
 -	CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)
@ -164,5 +164,5 @@ index 887899b..4c74f5c 100755
 clean:
 	rm -f ../octoprint_m33fio/static/libraries/$(PROG)
 -- 
-2.10.2
+2.11.0

--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@ -12,13 +12,13 @@ let

    m33-fio = buildPlugin rec {
      name = "M33-Fio-${version}";
-      version = "1.11";
+      version = "1.17";

      src = fetchFromGitHub {
        owner = "donovan6000";
        repo = "M33-Fio";
        rev = "V${version}";
-        sha256 = "11nbsi93clrqlnmaj73ak87hkqyghybccqz5jzhn2dhp0263adhl";
+        sha256 = "19r860hqax09a79s9bl181ab7jsgx0pa8fvnr62lbgkwhis7m8mh";
      };

      patches = [
@ -34,7 +34,7 @@ let
      '';

      meta = with stdenv.lib; {
-        homepage = "https://github.com/donovan6000/M3D-Fio";
+        homepage = "https://github.com/donovan6000/M33-Fio";
        description = "OctoPrint plugin for the Micro 3D printer";
        platforms = platforms.all;
        license = licenses.gpl3;
--- a/pkgs/applications/misc/open-pdf-presenter/default.nix
+++ b/pkgs/applications/misc/open-pdf-presenter/default.nix
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
    homepage = https://github.com/olabini/open-pdf-presenter;
    description = "A program for presenting PDFs on multi-monitor settings (typically a laptop connected to a overhead projector)";
    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    maintainers = [ ];
    platforms = stdenv.lib.platforms.all;
  };
 }
--- a/pkgs/applications/misc/slade/default.nix
+++ b/pkgs/applications/misc/slade/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "slade-${version}";
-  version = "3.1.1.4";
+  version = "3.1.1.5";

  src = fetchFromGitHub {
    owner = "sirjuddington";
    repo = "SLADE";
    rev = version;
-    sha256 = "0c2yjkpcwxkid1wczmc9f16x1p40my8jv61jc93ldgjzcprmrpn8";
+    sha256 = "0mdn59jm6ab4cdh99bgvadif3wdlqmk5mq635gg7krq35njgw6f6";
  };

  nativeBuildInputs = [ cmake pkgconfig zip ];
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/pkgs/applications/misc/tnef/default.nix
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = https://github.com/verdammelt/tnef;
    license = licenses.gpl2;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
    platforms = platforms.all;
  };
 }
--- a/pkgs/applications/misc/yaft/default.nix
+++ b/pkgs/applications/misc/yaft/default.nix
@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.9";
+  name = "yaft-${version}";
+
+  src = fetchFromGitHub {
+    owner = "uobikiemukot";
+    repo = "yaft";
+    rev = "v${version}";
+    sha256 = "0l1ig8wm545kpn4l7186rymny83jkahnjim290wsl7hsszfq1ckd";
+  };
+
+  buildInputs = [ ncurses ];
+
+  installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share/man" ];
+
+  meta = {
+    homepage = https://github.com/uobikiemukot/yaft;
+    description = "Yet another framebuffer terminal";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@ -2,7 +2,7 @@

 buildGoPackage rec {
  name = "nomad-${version}";
-  version = "0.4.1";
+  version = "0.5.3";
  rev = "v${version}";

  goPackagePath = "github.com/hashicorp/nomad";
@ -12,7 +12,7 @@ buildGoPackage rec {
    owner = "hashicorp";
    repo = "nomad";
    inherit rev;
-    sha256 = "093nljhibphhccjwxkylbvlc8dh8g2js36mlxxdh9nh21b3mghcs";
+    sha256 = "06s4irjz7k5qp895hvwv68xmr6mdq8bv91vhgh6rmx58my8jb68b";
  };

  meta = with stdenv.lib; {
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@ -2,11 +2,11 @@

 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-3.5";
+  name = "bitlbee-3.5.1";

  src = fetchurl {
    url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "06c371bjly38yrkvfwdh5rjfx9xfl7bszyhrlbldy0xk38c057al";
+    sha256 = "0sgsn0fv41rga46mih3fyv65cvfa6rvki8x92dn7bczbi7yxfdln";
  };

  nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check;
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, pidgin } :
+
+let
+  version = "0.7";
+in
+stdenv.mkDerivation rec {
+  name = "pidgin-xmpp-receipts-${version}";
+
+  src = fetchFromGitHub {
+    owner = "noonien-d";
+    repo = "pidgin-xmpp-receipts";
+    rev = "release_${version}";
+    sha256 = "1ackqwsqgy1nfggl9na4jicv7hd542aazkg629y2jmbyj1dl3kjm";
+  };
+
+  buildInputs = [ pidgin ];
+
+  installPhase = ''
+    mkdir -p $out/lib/pidgin/
+    cp xmpp-receipts.so $out/lib/pidgin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://devel.kondorgulasch.de/pidgin-xmpp-receipts/;
+    description = "Message delivery receipts (XEP-0184) Pidgin plugin";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@ -19,14 +19,14 @@ let

 in stdenv.mkDerivation rec {
  name = "telegram-desktop-${version}";
-  version = "1.0.0";
+  version = "1.0.2";
  qtVersion = lib.replaceStrings ["."] ["_"] packagedQt;

  src = fetchFromGitHub {
    owner = "telegramdesktop";
    repo = "tdesktop";
    rev = "v${version}";
-    sha256 = "1qxzi82cgd8klk6rn83rzrmik0s76alarfaknknww5iw5px7gi8b";
+    sha256 = "1pakxzs28v794x9mm7pb2m0phkfrwq19shz8a6lfyidb6ng85hy2";
  };

  tgaur = fetchgit {
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@ -1,22 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
-, gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
-, zlib
-, withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
-, withQt ? false, qt4 ? null
+{ stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
+, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
+, libssh, zlib, cmake, ecm
+, withGtk ? false, gtk3 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
+, withQt ? false, qt5 ? null
 , ApplicationServices, SystemConfiguration, gmp
 }:

-assert withGtk -> !withQt && gtk2 != null;
-assert withQt -> !withGtk && qt4 != null;
+assert withGtk -> !withQt  && gtk3 != null;
+assert withQt  -> !withGtk && qt5  != null;

 with stdenv.lib;

 let
  version = "2.2.4";
  variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
-in

-stdenv.mkDerivation {
+in stdenv.mkDerivation {
  name = "wireshark-${variant}-${version}";

  src = fetchurl {
@ -25,45 +24,35 @@ stdenv.mkDerivation {
  };

  buildInputs = [
-    bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls
+    bison cmake ecm flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls
    geoip c-ares python glib zlib
-  ] ++ optional withQt qt4
-    ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf])
-    ++ optionals stdenv.isLinux [ libcap libnl ]
+  ] ++ (optionals withQt  (with qt5; [ qtbase qtmultimedia qtsvg qttools ]))
+    ++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ])
+    ++ optionals stdenv.isLinux  [ libcap libnl ]
    ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];

  patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];

-  configureFlags = "--disable-usr-local --disable-silent-rules --with-ssl"
-    + (if withGtk then
-         " --with-gtk2 --without-gtk3 --without-qt"
-       else if withQt then
-         " --without-gtk2 --without-gtk3 --with-qt"
-       else " --disable-wireshark");
-
-  desktopItem = makeDesktopItem {
-    name = "Wireshark";
-    exec = "wireshark";
-    icon = "wireshark";
-    comment = "Powerful network protocol analysis suite";
-    desktopName = "Wireshark";
-    genericName = "Network packet analyzer";
-    categories = "Network;System";
-  };
-
  postInstall = optionalString (withQt || withGtk) ''
-    mkdir -p "$out"/share/applications/
-    mkdir -p "$out"/share/icons/
-    cp "$desktopItem/share/applications/"* "$out/share/applications/"
-    cp image/wsicon.svg "$out"/share/icons/wireshark.svg
+    ${optionalString withGtk ''
+      install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop
+    ''}
+    ${optionalString withQt ''
+      install -Dm644 -t $out/share/applications ../wireshark.desktop
+    ''}
+
+    substituteInPlace $out/share/applications/*.desktop \
+      --replace "Exec=wireshark" "Exec=$out/bin/wireshark"
+
+    install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
  '';

  enableParallelBuilding = true;

-  meta = {
+  meta = with stdenv.lib; {
    homepage = http://www.wireshark.org/;
    description = "Powerful network protocol analyzer";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;

    longDescription = ''
      Wireshark (formerly known as "Ethereal") is a powerful network
@ -71,7 +60,7 @@ stdenv.mkDerivation {
      experts. It runs on UNIX, OS X and Windows.
    '';

-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ bjornfor fpletz ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bjornfor fpletz ];
  };
 }
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
    homepage = https://github.com/bit-team/backintime;
    description = "Simple backup tool for Linux";
    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    maintainers = [ ];
    platforms = stdenv.lib.platforms.all;
    longDescription = ''
      Back In Time is a simple backup tool (on top of rsync) for Linux
--- a/pkgs/applications/science/programming/plm/default.nix
+++ b/pkgs/applications/science/programming/plm/default.nix
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
    description = "Free cross-platform programming exerciser";
    Homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/;
    license = licenses.gpl3;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
    platforms = stdenv.lib.platforms.all;
  };
 }
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@ -322,7 +322,7 @@ group :test do
  gem 'email_spec', '~> 1.6.0'
  gem 'json-schema', '~> 2.6.2'
  gem 'webmock', '~> 1.21.0'
-  gem 'test_after_commit', '~> 0.4.2'
+  gem 'test_after_commit', '~> 1.1'
  gem 'sham_rack', '~> 1.3.6'
  gem 'timecop', '~> 0.8.0'
 end
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@ -762,7 +762,7 @@ GEM
    teaspoon-jasmine (2.2.0)
      teaspoon (>= 1.0.0)
    temple (0.7.7)
-    test_after_commit (0.4.2)
+    test_after_commit (1.1.0)
      activerecord (>= 3.2)
    thin (1.7.0)
      daemons (~> 1.0, >= 1.0.9)
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@ -22,7 +22,7 @@ in

 stdenv.mkDerivation rec {
  name = "gitlab-${version}";
-  version = "8.16.1";
+  version = "8.16.3";

  buildInputs = [ env ruby bundler tzdata git nodejs procps ];

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
    owner = "gitlabhq";
    repo = "gitlabhq";
    rev = "v${version}";
-    sha256 = "0c6cf8p1xx21xxmlpldhxs0i01myd4ddpjl7vfv932qmw9bw4in7";
+    sha256 = "0fdm92w97ggnpiqlpr5aia6x8j09v8id7n6pks134hq3pkdiz6mv";
  };

  patches = [
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@ -2579,10 +2579,10 @@
  test_after_commit = {
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb";
+      sha256 = "0s8pz00xq28lsa1rfczm83yqwk8wcb5dqw2imlj8gldnsdapcyc2";
      type = "gem";
    };
-    version = "0.4.2";
+    version = "1.1.0";
  };
  thin = {
    source = {
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@ -110,7 +110,7 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; {
    description = "Powerful and easy-to-use multimedia player";
-    homepage = https://bomi-player.github.io/;
+    homepage = "https://bomi-player.github.io/";
    license = licenses.gpl2Plus;
    maintainers = [ maintainers.abbradar ];
    platforms = platforms.linux;
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
    homepage = https://github.com/GNOME/byzanz;
    license = licenses.gpl3;
    platforms = platforms.linux;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
  };
 }
--- a/pkgs/applications/video/recordmydesktop/default.nix
+++ b/pkgs/applications/video/recordmydesktop/default.nix
@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
    homepage = http://recordmydesktop.sourceforge.net/;
    license = licenses.gpl2;
    platforms = platforms.linux;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
  };
 }
--- a/pkgs/applications/video/recordmydesktop/gtk.nix
+++ b/pkgs/applications/video/recordmydesktop/gtk.nix
@ -32,6 +32,6 @@ in stdenv.mkDerivation rec {
    homepage = http://recordmydesktop.sourceforge.net/;
    license = licenses.gpl2;
    platforms = platforms.linux;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
  };
 }
--- a/pkgs/applications/video/recordmydesktop/qt.nix
+++ b/pkgs/applications/video/recordmydesktop/qt.nix
@ -32,6 +32,6 @@ in stdenv.mkDerivation rec {
    homepage = http://recordmydesktop.sourceforge.net/;
    license = licenses.gpl2;
    platforms = platforms.linux;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
  };
 }
--- a/pkgs/data/fonts/gentium-book-basic/default.nix
+++ b/pkgs/data/fonts/gentium-book-basic/default.nix
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    homepage = "http://software.sil.org/gentium/";
    description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
-    maintainers = with maintainers; [ DamienCassou ];
+    maintainers = with maintainers; [ ];
    license = licenses.ofl;
    platforms = platforms.all;
  };
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@ -6,6 +6,6 @@
 fetchFromGitHub {
  owner = "commercialhaskell";
  repo = "all-cabal-hashes";
-  rev = "5c5b04af472eb6c2854b21cb52ee6324252280de";
-  sha256 = "1cnr350044yrlg7wa09fmdarl7y9gkydh25lv94wcqg3w9cdv0fb";
+  rev = "a7e72af80fb1e68d9a2c4a5927a253b71ed68239";
+  sha256 = "1ppk5r7yllvibsgxgs7k9kb2dcwh4pphf0876hcdh392cal47h3x";
 }
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/default.nix
@ -14,7 +14,7 @@ let
  callPackage = pkgs.newScope self;

  version = "3.22";
-  maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds DamienCassou ];
+  maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ];

  corePackages = with gnome3; [
    pkgs.desktop_file_utils pkgs.ibus
--- a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix
@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
    description = "Make Pidgin IM conversations appear in the Gnome Shell message tray";
    license = licenses.gpl2;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ DamienCassou ];
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
      This GNOME utility helps to manage time according to Pomodoro Technique.
      It intends to improve productivity and focus by taking short breaks.
    '';
-    maintainers = with maintainers; [ DamienCassou jgeerds ];
+    maintainers = with maintainers; [ jgeerds ];
    license = licenses.gpl3;
    platforms = platforms.linux;
  };
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
  configurePhase = ''
    substituteInPlace ./configure --replace pl2 pl3
    substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
-    ./configure -prefix $out -toolprefix ${tools}/bin/ '' +
+    ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +
    (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");

  installTargets = "documentation install";
--- a/pkgs/development/compilers/ghcjs/head.nix
+++ b/pkgs/development/compilers/ghcjs/head.nix
@ -10,8 +10,8 @@ bootPkgs.callPackage ./base.nix {
  ghcjsSrc = fetchFromGitHub {
    owner = "ghcjs";
    repo = "ghcjs";
-    rev = "899c834a36692bbbde9b9d16fe5b92ce55a623c4";
-    sha256 = "024yj4k0dxy7nvyq19n3xbhh4b4csdrgj19a3l4bmm1zn84gmpl6";
+    rev = "2dc14802e78d7d9dfa35395d5dbfc9c708fb83e6";
+    sha256 = "0cvmapbrwg0h1pbz648isc2l84z694ylnfm8ncd1g4as28lmj0pz";
  };
  ghcjsBootSrc = fetchgit {
    url = git://github.com/ghcjs/ghcjs-boot.git;
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@ -2,15 +2,15 @@

 stdenv.mkDerivation rec {
  name = "glslang-git-${version}";
-  version = "2016-08-26";
+  version = "2016-12-21";

  # `vulkan-loader` requires a specific version of `glslang` as specified in
  # `<vulkan-loader-repo>/glslang_revision`.
  src = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "glslang";
-    rev = "81cd764b5ffc475bc73f1fb35f75fd1171bb2343";
-    sha256 = "1vfwl6lzkjh9nh29q32b7zca4q1abf3q4nqkahskijgznw5lr59g";
+    rev = "807a0d9e2f4e176f75d62ac3c179c81800ec2608";
+    sha256 = "02jckgihqhagm73glipb4c6ri5fr3pnbxb5vrznn2vppyfdfghbj";
  };

  patches = [ ./install-headers.patch ];
--- a/pkgs/development/compilers/glslang/install-headers.patch
+++ b/pkgs/development/compilers/glslang/install-headers.patch
@ -1,21 +1,30 @@
 diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-index 48a6c46..593d941 100755
+index c538e84..6ece1ab 100755
 --- a/SPIRV/CMakeLists.txt
 +++ b/SPIRV/CMakeLists.txt
-@@ -42,3 +42,8 @@ endif(WIN32)
+@@ -34,8 +34,9 @@ if(ENABLE_AMD_EXTENSIONS)
+ endif(ENABLE_AMD_EXTENSIONS)
+ 
+ if(ENABLE_NV_EXTENSIONS)
+-    set(HEADERS
+-        GLSL.ext.NV.h)
+    list(APPEND
+         HEADERS
+         GLSL.ext.NV.h)
+ endif(ENABLE_NV_EXTENSIONS)
+ 
+ add_library(SPIRV STATIC ${SOURCES} ${HEADERS})
+@@ -51,3 +52,5 @@ endif(WIN32)
 
 install(TARGETS SPIRV SPVRemapper
         ARCHIVE DESTINATION lib)
 +
-+foreach(file ${HEADERS} ${SPVREMAP_HEADERS})
-+    get_filename_component(dir ${file} DIRECTORY)
-+    install(FILES ${file} DESTINATION include/SPIRV/${dir})
-+endforeach()
+install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION include/SPIRV/)
 diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index ff91135..4318279 100644
+index 95d4bdd..e7fda90 100644
 --- a/glslang/CMakeLists.txt
 +++ b/glslang/CMakeLists.txt
-@@ -90,3 +90,8 @@ endif(WIN32)
+@@ -93,3 +93,8 @@ endif(WIN32)
 
 install(TARGETS glslang 
         ARCHIVE DESTINATION lib)
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@ -55,18 +55,26 @@ let
        inherit packages;
      };

-      hackage2nix = name: version: pkgs.stdenv.mkDerivation {
-        name = "cabal2nix-${name}-${version}";
-        buildInputs = [ pkgs.cabal2nix ];
-        phases = ["installPhase"];
-        LANG = "en_US.UTF-8";
-        LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";
-        installPhase = ''
-          export HOME="$TMP"
-          mkdir $out
-          hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${all-cabal-hashes}/${name}/${version}/${name}.json)
-          cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${all-cabal-hashes}/${name}/${version}/${name}.cabal >$out/default.nix
-        '';
+      haskellSrc2nix = { name, src, sha256 ? null }:
+        let
+          sha256Arg = if isNull sha256 then "" else ''--sha256="${sha256}"'';
+        in pkgs.stdenv.mkDerivation {
+          name = "cabal2nix-${name}";
+          buildInputs = [ pkgs.cabal2nix ];
+          phases = ["installPhase"];
+          LANG = "en_US.UTF-8";
+          LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";
+          installPhase = ''
+            export HOME="$TMP"
+            mkdir -p "$out"
+            cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix"
+          '';
+      };
+
+      hackage2nix = name: version: haskellSrc2nix {
+        name   = "${name}-${version}";
+        sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")'';
+        src    = "${all-cabal-hashes}/${name}/${version}/${name}.cabal";
      };

    in
@ -76,6 +84,12 @@ let

        callHackage = name: version: self.callPackage (hackage2nix name version);

+        # Creates a Haskell package from a source package by calling cabal2nix on the source.
+        callCabal2nix = src: self.callPackage (haskellSrc2nix {
+          inherit src;
+          name = src.name;
+        });
+
        ghcWithPackages = selectFrom: withPackages (selectFrom self);

        ghcWithHoogle = selectFrom:
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@ -27,6 +27,12 @@ stdenv.mkDerivation (args // {
  LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs);
                    # ^^^ Internally uses `getOutput "lib"` (equiv. to getLib)

+  # Non-NixOS git needs cert
+  GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+  # Fixes https://github.com/commercialhaskell/stack/issues/2358
+  LANG = "en_US.UTF-8";
+
  preferLocalBuild = true;

  configurePhase = args.configurePhase or ''
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, nix, git }: let
-  version = "4.1.5";
+  version = "4.1.6";
 in stdenv.mkDerivation {
  name = "nix-exec-${version}";

  src = fetchurl {
    url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";

-    sha256 = "1npy1did5ysacshclpfxihgh5bc0i9jqmvgxi1fp8prhcdhall9m";
+    sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar";
  };

  buildInputs = [ pkgconfig nix git ];
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; {
    description = "Mozilla's JavaScript engine written in C/C++";
-    homepage = https://developer.mozilla.org/en/SpiderMonkey;
+    homepage = "https://developer.mozilla.org/en/SpiderMonkey";
    # TODO: MPL/GPL/LGPL tri-license.

    maintainers = [ maintainers.abbradar ];
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@ -3,13 +3,13 @@

 stdenv.mkDerivation rec {
  name = "folly-${version}";
-  version = "2016.11.21.00";
+  version = "2016.12.19.00";

  src = fetchFromGitHub {
    owner = "facebook";
    repo = "folly";
    rev = "v${version}";
-    sha256 = "1f7j73avj00mmzz8wyh9rl1k9i0cvk77d0nf9c80vzr2zfk9f31x";
+    sha256 = "1q5nh84sxkdi4x0gwr0x7bgk33pq6071vxz5vnjkznwywhgw2hnn";
  };

  nativeBuildInputs = [ autoreconfHook python pkgconfig ];
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@ -17,6 +17,13 @@ stdenv.mkDerivation rec {
    sha256 = "03q6y428rg723c9fj1vidzjw46w1vf8z0h95lkvz1l9jw571j739";
  };

+  patches = [
+    (fetchurl {
+      url = "https://github.com/libarchive/libarchive/commit/98dcbbf0bf4854bf987557e55e55fff7abbf3ea9.patch";
+      sha256 = "1934krf5imc9rq1av6immpsfn77pglanhz1csq8j22h9ab87n5z6";
+    })
+  ];
+
  outputs = [ "out" "lib" "dev" ];

  nativeBuildInputs = [ pkgconfig ];
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
  checkPhase = "make test";

  preInstall = ''
-    mkdir -p $out/{man/man1,bin,lib,include}
+    mkdir -p $out/{bin,lib,include}
  '';

  meta = with stdenv.lib; {
--- a/pkgs/development/libraries/uhttpmock/default.nix
+++ b/pkgs/development/libraries/uhttpmock/default.nix
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    description = "Project for mocking web service APIs which use HTTP or HTTPS";
    homepage = https://gitlab.com/groups/uhttpmock/;
    license = licenses.lgpl21;
-    maintainers = with maintainers; [ DamienCassou ];
+    maintainers = with maintainers; [ ];
    platforms = with platforms; linux;
  };
 }
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@ -1,13 +1,14 @@
 { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3,
-  python3Packages, glslang, spirv-tools, x11, libxcb, wayland }:
+  python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr,
+  libXext, wayland }:

 let
-  version = "1.0.26.0";
+  version = "1.0.39.1";
  src = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "Vulkan-LoaderAndValidationLayers";
    rev = "sdk-${version}";
-    sha256 = "157m746hc76xrxd3qq0f44f5dy7pjbz8cx74ykqrlbc7rmpjpk58";
+    sha256 = "0y9zzrnjjjza2kkf5jfsdqhn98md6rsq0hb7jg62z2dipzky7zdp";
  };
 in

@ -15,23 +16,13 @@ stdenv.mkDerivation rec {
  name = "vulkan-loader-${version}";
  inherit version src;

-  prePatch = ''
-    if [ "$(cat '${src}/spirv-tools_revision')" != '${spirv-tools.src.rev}' ] \
-      || [ "$(cat '${src}/spirv-headers_revision')" != '${spirv-tools.headers.rev}' ] \
-      || [ "$(cat '${src}/glslang_revision')" != '${glslang.src.rev}' ]
-    then
-      echo "Version mismatch, aborting!"
-      false
-    fi
-  '';
-
  buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml
-                  glslang spirv-tools x11 libxcb wayland
+                  glslang spirv-tools x11 libxcb libXrandr libXext wayland
                ];
  enableParallelBuilding = true;

  cmakeFlags = [
-    "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default
+    "-DBUILD_WSI_MIR_SUPPORT=OFF"
  ];

  patches = [ ./use-xdg-paths.patch ];
@ -40,7 +31,7 @@ stdenv.mkDerivation rec {

  preConfigure = ''
    checkRev() {
-      [ "$2" = $(cat "$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "$1_revision") && exit 1)
+      [ "$2" = $(cat "external_revisions/$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "external_revisions/$1_revision") && exit 1)
    }
    checkRev spirv-tools "${spirv-tools.src.rev}"
    checkRev spirv-headers "${spirv-tools.headers.rev}"
@ -58,7 +49,8 @@ stdenv.mkDerivation rec {
    mkdir -p $dev/include
    cp -rv ../include $dev/
    mkdir -p $demos/bin
-    cp demos/smoketest demos/tri demos/cube demos/*.spv demos/*.ppm $demos/bin
+    cp demos/*.spv demos/*.ppm $demos/bin
+    find demos -type f -executable -not -name vulkaninfo -exec cp {} $demos/bin \;
   '';

  meta = with stdenv.lib; {
--- a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch
+++ b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch
@ -1,142 +1,322 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 27ab6e5..e59256e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -256,17 +256,10 @@ if(NOT WIN32)
+     include(GNUInstallDirs)
+ 
+     add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
+-    add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}")
+-
+     # Make sure /etc is searched by the loader
+-    if (NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))
+    if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))
+         add_definitions(-DEXTRASYSCONFDIR="/etc")
+     endif()
+-
+-    # Make sure /usr/share is searched by the loader
+-    if (NOT (CMAKE_INSTALL_FULL_DATADIR STREQUAL "/usr/share"))
+-        add_definitions(-DEXTRADATADIR="/usr/share")
+-    endif()
+ endif()
+ 
+ if(UNIX)
 diff --git a/loader/loader.c b/loader/loader.c
-index a950ea1..9462d05 100644
+index 24758f4..af7cc85 100644
 --- a/loader/loader.c
 +++ b/loader/loader.c
-@@ -2671,6 +2671,94 @@ static VkResult loader_get_manifest_files(
-         }
+@@ -2909,7 +2909,7 @@ static VkResult
+ loader_get_manifest_files(const struct loader_instance *inst,
+                           const char *env_override, const char *source_override,
+                           bool is_layer, bool warn_if_not_present,
+-                          const char *location, const char *home_location,
+                          const char *location, const char *relative_location,
+                           struct loader_manifest_files *out_files) {
+     const char * override = NULL;
+     char *override_getenv = NULL;
+@@ -2941,9 +2941,9 @@ loader_get_manifest_files(const struct loader_instance *inst,
     }
 
+ #if !defined(_WIN32)
+-    if (location == NULL && home_location == NULL) {
+    if (location == NULL && relative_location == NULL) {
+ #else
+-    home_location = NULL;
+    relative_location = NULL;
+     if (location == NULL) {
+ #endif
+         loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
+@@ -2962,16 +2962,89 @@ loader_get_manifest_files(const struct loader_instance *inst,
+     // Make a copy of the input we are using so it is not modified
+     // Also handle getting the location(s) from registry on Windows
+     if (override == NULL) {
+-        loc = loader_stack_alloc(strlen(location) + 1);
+        size_t loc_size = strlen(location) + 1;
 +#if !defined(_WIN32)
-+    if (home_location && override == NULL) {
-+        char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS");
-+        char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS");
-+        char *cur, *src = loc;
-+        size_t src_size = strlen(src), rel_size = strlen(home_location);
-+        size_t size = 0;
-+
-+        if (src_size > 0)
-+            size += src_size + 1;
-+
-+        if (xdgconfdirs == NULL)
+        const char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS");
+        const char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS");
+        if (xdgconfdirs == NULL || xdgconfdirs[0] == '\0')
 +            xdgconfdirs = "/etc/xdg";
-+        if (xdgdatadirs == NULL)
+        if (xdgdatadirs == NULL || xdgdatadirs[0] == '\0')
 +            xdgdatadirs = "/usr/local/share:/usr/share";
-+
-+        for (char *x = xdgconfdirs; *x; ++x)
-+            if (*x == PATH_SEPERATOR) size += rel_size;
-+        size += strlen(xdgconfdirs) + rel_size + 1;
-+        for (char *x = xdgdatadirs; *x; ++x)
-+            if (*x == PATH_SEPERATOR) size += rel_size;
-+        size += strlen(xdgdatadirs) + rel_size + 1;
-+
-+#if defined(LOCALPREFIX)
-+        size += strlen(LOCALPREFIX "/" SYSCONFDIR) + rel_size + 1;
-+        size += strlen(LOCALPREFIX "/" DATADIR) + rel_size + 1;
+        const size_t rel_size = strlen(relative_location);
+        // Leave space for trailing separators
+        loc_size += strlen(xdgconfdirs) + strlen(xdgdatadirs) + 2*rel_size + 2;
+        for (const char *x = xdgconfdirs; *x; ++x)
+            if (*x == PATH_SEPARATOR) loc_size += rel_size;
+        for (const char *x = xdgdatadirs; *x; ++x)
+            if (*x == PATH_SEPARATOR) loc_size += rel_size;
+        loc_size += strlen(SYSCONFDIR) + rel_size + 1;
+#ifdef EXTRASYSCONFDIR
+        loc_size += strlen(EXTRASYSCONFDIR) + rel_size + 1;
 +#endif
+#endif
+        loc = loader_stack_alloc(loc_size);
+         if (loc == NULL) {
+             loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
+                        "loader_get_manifest_files: Failed to allocate "
+                        "%d bytes for manifest file location.",
+-                       strlen(location));
+                       loc_size);
+             res = VK_ERROR_OUT_OF_HOST_MEMORY;
+             goto out;
+         }
+-        strcpy(loc, location);
+        char *loc_write = loc;
+#if !defined(_WIN32)
+        const char *loc_read;
 +
-+        loc = cur = loader_stack_alloc(size);
-+        if (cur == NULL) {
-+            loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
-+                        "Out of memory can't get manifest files");
-+            res = VK_ERROR_OUT_OF_HOST_MEMORY;
-+            goto out;
-+        }
-+
-+        if (src_size > 0) {
-+          memcpy(cur, src, src_size);
-+          cur += src_size;
-+          *cur++ = PATH_SEPERATOR;
-+        }
-+
-+        src = xdgconfdirs;
-+        for (char *x = src;; ++x) {
-+            if (*x == PATH_SEPERATOR || *x == 0) {
-+                size_t s = x - src;
-+                memcpy(cur, src, s); cur += s;
-+                memcpy(cur, home_location, rel_size); cur += rel_size;
-+                *cur++ = PATH_SEPERATOR;
+        loc_read = &xdgconfdirs[0];
+        for (const char *x = loc_read;; ++x) {
+            if (*x == PATH_SEPARATOR || *x == '\0') {
+                const size_t s = x - loc_read;
+                memcpy(loc_write, loc_read, s);
+                loc_write += s;
+                memcpy(loc_write, relative_location, rel_size);
+                loc_write += rel_size;
+                *loc_write++ = PATH_SEPARATOR;
 +                if (*x == 0)
 +                    break;
-+                src = ++x;
+                loc_read = ++x;
 +            }
 +        }
 +
-+#if defined(LOCALPREFIX)
-+        strcpy(cur, LOCALPREFIX "/" SYSCONFDIR);
-+        cur += strlen(cur);
-+        memcpy(cur, home_location, rel_size); cur += rel_size;
-+        *cur++ = PATH_SEPERATOR;
+        memcpy(loc_write, SYSCONFDIR, strlen(SYSCONFDIR));
+        loc_write += strlen(SYSCONFDIR);
+        memcpy(loc_write, relative_location, rel_size);
+        loc_write += rel_size;
+        *loc_write++ = PATH_SEPARATOR;
+
+#ifdef EXTRASYSCONFDIR
+        memcpy(loc_write, EXTRASYSCONFDIR, strlen(EXTRASYSCONFDIR));
+        loc_write += strlen(EXTRASYSCONFDIR);
+        memcpy(loc_write, relative_location, rel_size);
+        loc_write += rel_size;
+        *loc_write++ = PATH_SEPARATOR;
 +#endif
 +
-+        src = xdgdatadirs;
-+        for (char *x = src;; ++x) {
-+            if (*x == PATH_SEPERATOR || *x == 0) {
-+                size_t s = x - src;
-+                memcpy(cur, src, s); cur += s;
-+                memcpy(cur, home_location, rel_size); cur += rel_size;
-+                *cur++ = PATH_SEPERATOR;
+        loc_read = &xdgdatadirs[0];
+        for (const char *x = loc_read;; ++x) {
+            if (*x == PATH_SEPARATOR || *x == '\0') {
+                const size_t s = x - loc_read;
+                memcpy(loc_write, loc_read, s);
+                loc_write += s;
+                memcpy(loc_write, relative_location, rel_size);
+                loc_write += rel_size;
+                *loc_write++ = PATH_SEPARATOR;
 +                if (*x == 0)
 +                    break;
-+                src = ++x;
+                loc_read = ++x;
 +            }
 +        }
-+
-+#if defined(LOCALPREFIX)
-+        strcpy(cur, LOCALPREFIX "/" DATADIR);
-+        cur += strlen(cur);
-+        memcpy(cur, home_location, rel_size); cur += rel_size;
-+        *cur++ = PATH_SEPERATOR;
+        --loc_write;
+        *loc_write = '\0';
+#else
+        memcpy(loc_write, location, loc_size);
+        loc[loc_size-1] = '\0';
 +#endif
 +
-+        loc[size - 1] = 0;
-+        assert(cur == loc + size);
-+        list_is_dirs = true;
-+    }
-+#endif
-+
-     // Print out the paths being searched if debugging is enabled
-     loader_log(inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0,
-                "Searching the following paths for manifest files: %s\n", loc);
+ #if defined(_WIN32)
+         VkResult reg_result = loaderGetRegistryFiles(inst, loc, &reg);
+         if (VK_SUCCESS != reg_result || NULL == reg) {
+@@ -3122,14 +3195,14 @@ loader_get_manifest_files(const struct loader_instance *inst,
+         }
+         file = next_file;
+ #if !defined(_WIN32)
+-        if (home_location != NULL &&
+        if (relative_location != NULL &&
+             (next_file == NULL || *next_file == '\0') && override == NULL) {
+             char *xdgdatahome = secure_getenv("XDG_DATA_HOME");
+             size_t len;
+             if (xdgdatahome != NULL) {
+ 
+                 char *home_loc = loader_stack_alloc(strlen(xdgdatahome) + 2 +
+-                                                    strlen(home_location));
+                                                    strlen(relative_location));
+                 if (home_loc == NULL) {
+                     loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
+                                "loader_get_manifest_files: Failed to allocate "
+@@ -3139,15 +3212,15 @@ loader_get_manifest_files(const struct loader_instance *inst,
+                 }
+                 strcpy(home_loc, xdgdatahome);
+                 // Add directory separator if needed
+-                if (home_location[0] != DIRECTORY_SYMBOL) {
+                if (relative_location[0] != DIRECTORY_SYMBOL) {
+                     len = strlen(home_loc);
+                     home_loc[len] = DIRECTORY_SYMBOL;
+                     home_loc[len + 1] = '\0';
+                 }
+-                strcat(home_loc, home_location);
+                strcat(home_loc, relative_location);
+                 file = home_loc;
+                 next_file = loader_get_next_path(file);
+-                home_location = NULL;
+                relative_location = NULL;
+ 
+                 loader_log(
+                     inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0,
+@@ -3160,7 +3233,7 @@ loader_get_manifest_files(const struct loader_instance *inst,
+                 char *home = secure_getenv("HOME");
+                 if (home != NULL) {
+                     char *home_loc = loader_stack_alloc(strlen(home) + 16 +
+-                                                        strlen(home_location));
+                                                        strlen(relative_location));
+                     if (home_loc == NULL) {
+                         loader_log(
+                             inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
+@@ -3178,15 +3251,15 @@ loader_get_manifest_files(const struct loader_instance *inst,
+                     }
+                     strcat(home_loc, ".local/share");
+ 
+-                    if (home_location[0] != DIRECTORY_SYMBOL) {
+                    if (relative_location[0] != DIRECTORY_SYMBOL) {
+                         len = strlen(home_loc);
+                         home_loc[len] = DIRECTORY_SYMBOL;
+                         home_loc[len + 1] = '\0';
+                     }
+-                    strcat(home_loc, home_location);
+                    strcat(home_loc, relative_location);
+                     file = home_loc;
+                     next_file = loader_get_next_path(file);
+-                    home_location = NULL;
+                    relative_location = NULL;
+ 
+                     loader_log(
+                         inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0,
+@@ -3263,7 +3336,7 @@ VkResult loader_icd_scan(const struct loader_instance *inst,
+     // Get a list of manifest files for ICDs
+     res = loader_get_manifest_files(inst, "VK_ICD_FILENAMES", NULL, false, true,
+                                     DEFAULT_VK_DRIVERS_INFO,
+-                                    HOME_VK_DRIVERS_INFO, &manifest_files);
+                                    RELATIVE_VK_DRIVERS_INFO, &manifest_files);
+     if (VK_SUCCESS != res || manifest_files.count == 0) {
+         goto out;
+     }
+@@ -3490,7 +3563,7 @@ void loader_layer_scan(const struct loader_instance *inst,
+     if (VK_SUCCESS !=
+         loader_get_manifest_files(inst, LAYERS_PATH_ENV, LAYERS_SOURCE_PATH,
+                                   true, true, DEFAULT_VK_ELAYERS_INFO,
+-                                  HOME_VK_ELAYERS_INFO, &manifest_files[0])) {
+                                  RELATIVE_VK_ELAYERS_INFO, &manifest_files[0])) {
+         goto out;
+     }
+ 
+@@ -3499,7 +3572,7 @@ void loader_layer_scan(const struct loader_instance *inst,
+     // overridden by LAYERS_PATH_ENV
+     if (VK_SUCCESS != loader_get_manifest_files(inst, NULL, NULL, true, false,
+                                                 DEFAULT_VK_ILAYERS_INFO,
+-                                                HOME_VK_ILAYERS_INFO,
+                                                RELATIVE_VK_ILAYERS_INFO,
+                                                 &manifest_files[1])) {
+         goto out;
+     }
+@@ -3569,7 +3642,7 @@ void loader_implicit_layer_scan(const struct loader_instance *inst,
+     // overridden by LAYERS_PATH_ENV
+     VkResult res = loader_get_manifest_files(
+         inst, NULL, NULL, true, false, DEFAULT_VK_ILAYERS_INFO,
+-        HOME_VK_ILAYERS_INFO, &manifest_files);
+        RELATIVE_VK_ILAYERS_INFO, &manifest_files);
+     if (VK_SUCCESS != res || manifest_files.count == 0) {
+         return;
+     }
 diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
-index 3a02640..70a2652 100644
+index dc4ac10..50a7966 100644
 --- a/loader/vk_loader_platform.h
 +++ b/loader/vk_loader_platform.h
-@@ -57,35 +57,10 @@
+@@ -57,47 +57,9 @@
 #define VULKAN_ILAYERCONF_DIR "implicit_layer.d"
 #define VULKAN_LAYER_DIR      "layer"
 
-#if defined(LOCALPREFIX)
-#define LOCAL_DRIVERS_INFO                                                     \
-    LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":"               \
-    LOCALPREFIX "/" DATADIR    VULKAN_DIR VULKAN_ICDCONF_DIR ":"
-#define LOCAL_ELAYERS_INFO                                                     \
-    LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":"            \
-    LOCALPREFIX "/" DATADIR    VULKAN_DIR VULKAN_ELAYERCONF_DIR ":"
-#define LOCAL_ILAYERS_INFO                                                     \
-    LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":"            \
-    LOCALPREFIX "/" DATADIR    VULKAN_DIR VULKAN_ILAYERCONF_DIR ":"
+-#if defined(EXTRASYSCONFDIR)
+-#define EXTRA_DRIVERS_SYSCONFDIR_INFO ":"                                      \
+-    EXTRASYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR
+-#define EXTRA_ELAYERS_SYSCONFDIR_INFO ":"                                      \
+-    EXTRASYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR
+-#define EXTRA_ILAYERS_SYSCONFDIR_INFO ":"                                      \
+-    EXTRASYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR
 -#else
-#define LOCAL_DRIVERS_INFO
-#define LOCAL_ELAYERS_INFO
-#define LOCAL_ILAYERS_INFO
+-#define EXTRA_DRIVERS_SYSCONFDIR_INFO
+-#define EXTRA_ELAYERS_SYSCONFDIR_INFO
+-#define EXTRA_ILAYERS_SYSCONFDIR_INFO
+-#endif
+-
+-#if defined(EXTRADATADIR)
+-#define EXTRA_DRIVERS_DATADIR_INFO ":"                                         \
+-    EXTRADATADIR VULKAN_DIR VULKAN_ICDCONF_DIR
+-#define EXTRA_ELAYERS_DATADIR_INFO ":"                                         \
+-    EXTRADATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR
+-#define EXTRA_ILAYERS_DATADIR_INFO ":"                                         \
+-    EXTRADATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR
+-#else
+-#define EXTRA_DRIVERS_DATADIR_INFO
+-#define EXTRA_ELAYERS_DATADIR_INFO
+-#define EXTRA_ILAYERS_DATADIR_INFO
 -#endif
 -
 -#define DEFAULT_VK_DRIVERS_INFO                                                \
-    LOCAL_DRIVERS_INFO                                                         \
-    "/"  SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":"                          \
-    "/usr/" DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR
-+#define DEFAULT_VK_DRIVERS_INFO ""
- #define DEFAULT_VK_DRIVERS_PATH ""
+-    SYSCONFDIR   VULKAN_DIR VULKAN_ICDCONF_DIR ":"                             \
+-    DATADIR      VULKAN_DIR VULKAN_ICDCONF_DIR                                 \
+-    EXTRA_DRIVERS_SYSCONFDIR_INFO                                              \
+-    EXTRA_DRIVERS_DATADIR_INFO
 -#define DEFAULT_VK_ELAYERS_INFO                                                \
-    LOCAL_ELAYERS_INFO                                                         \
-    "/"  SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":"                       \
-    "/usr/" DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR
+-    SYSCONFDIR   VULKAN_DIR VULKAN_ELAYERCONF_DIR ":"                          \
+-    DATADIR      VULKAN_DIR VULKAN_ELAYERCONF_DIR                              \
+-    EXTRA_ELAYERS_SYSCONFDIR_INFO                                              \
+-    EXTRA_ELAYERS_DATADIR_INFO
 -#define DEFAULT_VK_ILAYERS_INFO                                                \
-    LOCAL_ILAYERS_INFO                                                         \
-    "/"  SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":"                       \
-    "/usr/" DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR
+-    SYSCONFDIR   VULKAN_DIR VULKAN_ILAYERCONF_DIR ":"                          \
+-    DATADIR      VULKAN_DIR VULKAN_ILAYERCONF_DIR                              \
+-    EXTRA_ILAYERS_SYSCONFDIR_INFO                                              \
+-    EXTRA_ILAYERS_DATADIR_INFO
+#define DEFAULT_VK_DRIVERS_INFO ""
 +#define DEFAULT_VK_ELAYERS_INFO ""
 +#define DEFAULT_VK_ILAYERS_INFO ""
- #define DEFAULT_VK_LAYERS_PATH ""
- #if !defined(LAYERS_SOURCE_PATH)
+ 
+ #define DEFAULT_VK_DRIVERS_PATH ""
+ #if !defined(DEFAULT_VK_LAYERS_PATH)
+@@ -109,9 +71,9 @@
+ #endif
+ #define LAYERS_PATH_ENV "VK_LAYER_PATH"
+ 
+-#define HOME_VK_DRIVERS_INFO VULKAN_DIR VULKAN_ICDCONF_DIR
+-#define HOME_VK_ELAYERS_INFO VULKAN_DIR VULKAN_ELAYERCONF_DIR
+-#define HOME_VK_ILAYERS_INFO VULKAN_DIR VULKAN_ILAYERCONF_DIR
+#define RELATIVE_VK_DRIVERS_INFO VULKAN_DIR VULKAN_ICDCONF_DIR
+#define RELATIVE_VK_ELAYERS_INFO VULKAN_DIR VULKAN_ELAYERCONF_DIR
+#define RELATIVE_VK_ILAYERS_INFO VULKAN_DIR VULKAN_ILAYERCONF_DIR
+ 
+ // C99:
+ #define PRINTF_SIZE_T_SPECIFIER "%zu"
+@@ -251,9 +213,9 @@ loader_platform_thread_cond_broadcast(loader_platform_thread_cond *pCond) {
 #define LAYERS_SOURCE_PATH NULL
+ #endif
+ #define LAYERS_PATH_ENV "VK_LAYER_PATH"
+-#define HOME_VK_DRIVERS_INFO ""
+-#define HOME_VK_ELAYERS_INFO ""
+-#define HOME_VK_ILAYERS_INFO ""
+#define RELATIVE_VK_DRIVERS_INFO ""
+#define RELATIVE_VK_ELAYERS_INFO ""
+#define RELATIVE_VK_ILAYERS_INFO ""
+ #define PRINTF_SIZE_T_SPECIFIER "%Iu"
+ 
+ // File IO
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
    sha256 = "d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1";
  };

-  configureFlags = "--with-scanner --disable-documentation";
+  configureFlags = [ "--with-scanner" "--disable-documentation" ];

  nativeBuildInputs = [ pkgconfig ];

--- a/pkgs/development/node-packages/default-v6.nix
+++ b/pkgs/development/node-packages/default-v6.nix
@ -45,4 +45,12 @@ nodePackages // {
      done
    '';
  });
+
+  ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
+    preRebuild = ''
+      tmp=$(mktemp -d)
+      ln -s /usr/bin/xcodebuild $tmp
+      export PATH="$PATH:$tmp"
+    '';
+  });
 }
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@ -22,6 +22,7 @@
 , "gulp"
 , "hipache"
 , "htmlhint"
+, "ios-deploy"
 , "istanbul"
 , "jayschema"
 , "jshint"
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild
-, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20161115" else "20140422"
+, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170101" else "20140422"
 }@args:

 let
  sha256 =
  if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
-  else if version == "20161115" then "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"
+  else if version == "20170101" then "0ika46i9gn3sjvspa62fb5dnr20k783vg5fj30649q0ialv6yscr"
  else throw ("menhir: unknown version " ++ version);
 in

--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = http://pharo.org;
    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    maintainers = [ ];
    platforms = pharo-vm.meta.platforms;
  };
 }
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = http://pharo.org;
    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    maintainers = [ ];
    # Pharo VM sources are packaged separately for darwin (OS X)
    platforms = with stdenv.lib;
                  intersectLists
--- a/pkgs/development/pharo/vm/share.nix
+++ b/pkgs/development/pharo/vm/share.nix
@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
    description = "Shared files for Pharo";
    homepage = http://pharo.org;
    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    maintainers = [ ];
  };
 }
--- a/pkgs/development/python-modules/hypothesis.nix
+++ b/pkgs/development/python-modules/hypothesis.nix
@ -0,0 +1,38 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python
+, isPy27, enum34
+, doCheck ? true, pytest, flake8, flaky
+}:
+buildPythonPackage rec {
+  # http://hypothesis.readthedocs.org/en/latest/packaging.html
+
+  # Hypothesis has optional dependencies on the following libraries
+  # pytz fake_factory django numpy pytest
+  # If you need these, you can just add them to your environment.
+
+  name = "hypothesis-${version}";
+  version = "3.6.0";
+
+  # Upstream prefers github tarballs
+  src = fetchFromGitHub {
+    owner = "HypothesisWorks";
+    repo = "hypothesis";
+    rev = "${version}";
+    sha256 = "0a3r4c8sr9jn7sv419vdzrzfc9sp7zf105f1lgyiwyzi3cgyvcvg";
+  };
+
+  buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ];
+  propagatedBuildInputs = stdenv.lib.optionals isPy27 [ enum34 ];
+
+  inherit doCheck;
+
+  # https://github.com/DRMacIver/hypothesis/issues/300
+  checkPhase = ''
+    ${python.interpreter} -m pytest tests/cover
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Python library for property based testing";
+    homepage = https://github.com/DRMacIver/hypothesis;
+    license = licenses.mpl20;
+  };
+}
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@ -8,14 +8,14 @@ spirv_sources = {
  tools = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "SPIRV-Tools";
-    rev = "923a4596b44831a07060df45caacb522613730c9";
-    sha256 = "0hmgng2sv34amfsag3ya09prnv1w535djwlzfn8h2vh430vgawxa";
+    rev = "37422e9dba1a3a8cb8028b779dd546d43add6ef8";
+    sha256 = "0sp2p4wg902clq0fr94vj19vyv43cq333jjxr0mjzay8dw2h4yzk";
  };
  headers = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "SPIRV-Headers";
-    rev = "33d41376d378761ed3a4c791fc4b647761897f26";
-    sha256 = "1s103bpi3g6hhq453qa4jbabfkyxxpf9vn213j8k4vm26lsi8hs2";
+    rev = "c470b68225a04965bf87d35e143ae92f831e8110";
+    sha256 = "18jgcpmm0ixp6314r5w144l3wayxjkmwqgx8dk5jgyw36dammkwd";
  };
 };

@ -23,7 +23,7 @@ in

 stdenv.mkDerivation rec {
  name = "spirv-tools-${version}";
-  version = "2016-07-18";
+  version = "2016-12-19";

  src = spirv_sources.tools;
  patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers'';
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@ -5,13 +5,13 @@

 stdenv.mkDerivation rec {
  name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
-  version = "0.19.1";
+  version = "0.19.3";

  src = fetchFromGitHub {
    owner = "crawl-ref";
    repo = "crawl-ref";
    rev = version;
-    sha256 = "02iklz5q5h7h27gw86ws8wk5gz1fg86jclkar05nd7zxxgiwsk96";
+    sha256 = "1qn6r5pg568pk8zgp2ijn04h4brvw675q4nxkkvzyf76ljbpzif7";
  };

  patches = [ ./crawl_purify.patch ];
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@ -7,12 +7,12 @@ let
  dfVersion = "0.43.05";
  # version = "${dfVersion}-r1";
  # rev = "refs/tags/${version}";
-  version = "${dfVersion}-alpha2";
-  rev = "13eb5e702beb6d8e40c0e17be64cda9a8d9d1efb";
-  sha256 = "18i8qfhhfnfrpa519akwagn73q2zns1pry2sdfag63vffxh60zr5";
+  version = "${dfVersion}-alpha4";
+  rev = "refs/tags/${version}";
+  sha256 = "0wnwdapw955k69ds5xh5qsh7h0l547wjxgcy8hkvly6wp5c16sls";

  # revision of library/xml submodule
-  xmlRev = "84f6e968a9ec5515f9dbef96b445e3fc83f83e8b";
+  xmlRev = "bb4228f58b1601c4868c95be6763f5ff2e5d0a08";

  arch =
    if stdenv.system == "x86_64-linux" then "64"
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@ -49,7 +49,7 @@ stdenv.mkDerivation {

  meta = with stdenv.lib; {
    description = "A single-player fantasy game with a randomly generated adventure world";
-    homepage = http://www.bay12games.com/dwarves;
+    homepage = "http://www.bay12games.com/dwarves";
    license = licenses.unfreeRedistributable;
    platforms = platforms.linux;
    maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ];
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@ -4,13 +4,13 @@

 stdenv.mkDerivation rec {
  name = "ioquake3-git-${version}";
-  version = "2016-11-02";
+  version = "2017-01-27";

  src = fetchFromGitHub {
    owner = "ioquake";
    repo = "ioq3";
-    rev = "1c1e1f61f180596c925a4ac0eddba4806d1369cd";
-    sha256 = "1sx78hzvcbc05g2ikxcmnm6lq7bhgd86dzxnfzqpibcvgrlgsmy1";
+    rev = "468da0fabca2f21b811a501c184b986e270c5113";
+    sha256 = "14mhkqn6h2mbmz90j4ns1wp72ca5w9481sbyw2ving8xpw376i58";
  };

  nativeBuildInputs = [ which pkgconfig ];
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@ -2,7 +2,7 @@

 buildGoPackage rec {
  name = "consul-${version}";
-  version = "0.7.0";
+  version = "0.7.3";
  rev = "v${version}";

  goPackagePath = "github.com/hashicorp/consul";
@ -11,7 +11,7 @@ buildGoPackage rec {
    owner = "hashicorp";
    repo = "consul";
    inherit rev;
-    sha256 = "04h5y5vixjh9np9lsrk02ypbqwcq855h7l1jlnl1vmfq3sfqjds7";
+    sha256 = "0ab84sm281ibl9h6zfk17mr7yc9vxpi8i2xb4kzi8bg43n05lj4d";
  };

  # Keep consul.ui for backward compatability
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn
-, systemd, nettle, libedit, zlib, libiconv
+, systemd, nettle, libedit, zlib, libiconv, fetchpatch
 }:

 # Note: ATM only the libraries have been tested in nixpkgs.
@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
    sha256 = "0y9nhp9lfmxv4iy1xg7l4lfxv4168qhag26wwg0dbi0zjpkd790b";
  };

+  patches = stdenv.lib.optional stdenv.isDarwin
+      (fetchpatch {
+        name = "before-sierra.diff";
+        url = "https://gitlab.labs.nic.cz/labs/knot/merge_requests/664.diff";
+        sha256 = "0g4gm2m3pi0lfpkp53xayf6jq6yn3ifidh40maiy1a46dfadvw6w";
+      });
+
  outputs = [ "bin" "out" "dev" ];

  nativeBuildInputs = [ pkgconfig ];
@ -27,7 +34,7 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  CFLAGS = [ "-DNDEBUG" ];
+  CFLAGS = [ "-O2" "-DNDEBUG" ];

  #doCheck = true; problems in combination with dynamic linking

--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, utillinux, vimNox, which
+{ stdenv, fetchurl, pkgconfig, utillinux, hexdump, which
 , knot-dns, luajit, libuv, lmdb
 , cmocka, systemd, hiredis, libmemcached
 , gnutls, nettle
@ -21,8 +21,7 @@ stdenv.mkDerivation rec {

  configurePhase = ":";

-  nativeBuildInputs = [ pkgconfig which makeWrapper ]
-    ++ [(if stdenv.isLinux then utillinux.bin/*hexdump*/ else vimNox/*xxd*/)];
+  nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ];

  buildInputs = [ knot-dns luajit libuv gnutls ]
    # TODO: lmdb needs lmdb.pc; embedded for now
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@ -1,33 +1,36 @@
-{ stdenv, fetchurl, pkgs, makeWrapper, mono, ffmpeg, ... }:
+{ stdenv, fetchurl, pkgs, unzip, sqlite, makeWrapper, mono46, ffmpeg, ... }:

 stdenv.mkDerivation rec {
  name = "emby-${version}";
-  version = "3.0.8500";
+  version = "3.1.5";

  src = fetchurl {
-    url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz";
-    sha256 = "0vm2yvwyhswsp31g48qdzm17c4p7c25vyiy1029hgy8nd5qy4shc";
+    url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
+    sha256 = "0s0m456rxdrj58zbaby6mdgc1ndc3zx2c07n94hn3hdlgralgwaa";
  };

  buildInputs = with pkgs; [
+    unzip
    makeWrapper
  ];
  propagatedBuildInputs = with pkgs; [
-    mono
+    mono46
    sqlite
  ];

+  # Need to set sourceRoot as unpacker will complain about multiple directory output
+  sourceRoot = ".";
+
  buildPhase = ''
-    xbuild /p:Configuration="Release Mono" /p:Platform="Any CPU" /t:build MediaBrowser.Mono.sln
-    substituteInPlace MediaBrowser.Server.Mono/bin/Release\ Mono/System.Data.SQLite.dll.config --replace libsqlite3.so ${pkgs.sqlite.out}/lib/libsqlite3.so
-    substituteInPlace MediaBrowser.Server.Mono/bin/Release\ Mono/MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server"
+    substituteInPlace SQLitePCLRaw.provider.sqlite3.dll.config --replace libsqlite3.so ${sqlite.out}/lib/libsqlite3.so
+    substituteInPlace MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server"
  '';

  installPhase = ''
    mkdir -p $out/bin
-    cp -r MediaBrowser.Server.Mono/bin/Release\ Mono/* $out/bin/
+    cp -r * $out/bin

-    makeWrapper "${mono}/bin/mono" $out/bin/MediaBrowser.Server.Mono \
+    makeWrapper "${mono46}/bin/mono" $out/bin/MediaBrowser.Server.Mono \
      --add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
  '';

--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
  name = "minio-${shortVersion}";

-  shortVersion = "20161213";
-  longVersion = "2016-12-13T17:19:42Z";
+  shortVersion = "20170125";
+  longVersion = "2017-01-25T03-14-52Z";

  src = fetchurl {
    url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz";
-    sha256 = "1x23arrah54q2zqhgpyag531mimvs0wx6ap0hdrn4mygy5dahrqs";
+    sha256 = "0yh8fdgl50sza182kl4jly0apf0dw0ya954ky6j8a8hmdcmk6wzk";
  };

  buildInputs = [ go ];
--- a/pkgs/servers/sql/postgresql/pgroonga/default.nix
+++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix
@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, postgresql, libmsgpack, groonga }:
+
+stdenv.mkDerivation rec {
+  name = "pgroonga-${version}";
+  version = "1.1.9";
+
+  src = fetchurl {
+    url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz";
+    sha256 = "07afgwll8nxfb7ziw3qrvw0ryjjw3994vj2f6alrjwpg7ynb46ag";
+  };
+
+  buildInputs = [ postgresql pkgconfig libmsgpack groonga ];
+
+  makeFlags = [ "HAVE_MSGPACK=1" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D pgroonga.so -t $out/lib/
+    install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/extension
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A PostgreSQL extension to use Groonga as the index";
+    longDescription = "PGroonga is a PostgreSQL extension to use Groonga as the index. PostgreSQL supports full text search against languages that use only alphabet and digit. It means that PostgreSQL doesn't support full text search against Japanese, Chinese and so on. You can use super fast full text search feature against all languages by installing PGroonga into your PostgreSQL.";
+    homepage = https://pgroonga.github.io/;
+    license = licenses.postgresql;
+    maintainers = with maintainers; [ DerTim1 ];
+  };
+}
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@ -23,12 +23,12 @@ let
  ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];

 in stdenv.mkDerivation rec {
-  version = "16.09";
+  version = "17.01";
  name = "ejabberd-${version}";

  src = fetchurl {
    url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
-    sha256 = "054gzf4df466a6pyh4w476hxald6637nayy44hvaf31iycxani3v";
+    sha256 = "02y9f1zxqvqrhapfay3avkys0llpyjsag6rpz5vfig01zqjqzyky";
  };

  nativeBuildInputs = [ fakegit ];
@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {

    outputHashMode = "recursive";
    outputHashAlgo = "sha256";
-    outputHash = "12dj1k5pfxc5rw4qjzqf3848190i559h3f9s1dwzpfpkdgjd38vf";
+    outputHash = "0flybfhq6qv1ihsjfg9p7191bffip7gpizg29wdbf1x6qgxhpz5r";
  };

  configureFlags =
--- a/pkgs/shells/es/default.nix
+++ b/pkgs/shells/es/default.nix
@ -1,34 +1,28 @@
-{ stdenv, fetchgit, readline, yacc, autoconf, automake, libtool }:
+{ stdenv, fetchurl, readline, yacc }:

 let
-  version = "git-2015-04-11";
+  version = "0.9.1";
 in
 stdenv.mkDerivation {

  name = "es-${version}";

-  src = fetchgit {
-    url = "git://github.com/wryun/es-shell";
-    rev = "fdf29d5296ce3a0ef96d2b5952cff07878753975";
-    sha256 = "12faa9b5ffwydgwyjp57zr19sqap2ma3crj6wd2rx1hv30dkll7p";
+  src = fetchurl {
+    url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz";
+    sha256 = "1fplzxc6lncz2lv2fyr2ig23rgg5j96rm2bbl1rs28mik771zd5h";
  };

-  buildInputs = [ readline yacc libtool autoconf automake ];
-
-  preConfigure =
-    ''
-      aclocal
-      autoconf
-      libtoolize -qi
-    '';
-
-  configureFlags="--with-readline --prefix=$(out) --bindir=$(out)/bin --mandir=$(out)/man";
-
-  preInstall = ''
-    mkdir -p $out/bin
-    mkdir -p $out/man/man1
+  # The distribution tarball does not have a single top-level directory.
+  preUnpack = ''
+    mkdir $name
+    cd $name
+    sourceRoot=.
  '';

+  buildInputs = [ readline yacc ];
+
+  configureFlags = [ "--with-readline" ];
+
  meta = with stdenv.lib; {
    description = "Es is an extensible shell";
    longDescription =
@ -40,7 +34,7 @@ stdenv.mkDerivation {
      '';
    homepage = http://wryun.github.io/es-shell/;
    license = licenses.publicDomain;
-    maintainers = [ maintainers.sjmackenzie ];
+    maintainers = with maintainers; [ sjmackenzie ttuegel ];
    platforms = platforms.all;
  };

--- a/pkgs/tools/X11/wmutils-opt/default.nix
+++ b/pkgs/tools/X11/wmutils-opt/default.nix
@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, libxcb }:
+
+stdenv.mkDerivation rec {
+  name = "wmutils-opt-${version}";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "wmutils";
+    repo = "opt";
+    rev = "v${version}";
+    sha256 = "0gd05qsir1lnzfrbnfh08qwsryz7arwj20f886nqh41m87yqaljz";
+  };
+
+  buildInputs = [ libxcb ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Optional addons to wmutils";
+    homepage = https://github.com/wmutils/opt;
+    license = licenses.isc;
+    maintainers = with maintainers; [ vifino ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@ -6,13 +6,13 @@ let arch =
  else abort "Unknown architecture";
 in stdenv.mkDerivation rec {
  name = "grub4dos-${version}";
-  version = "0.4.6a-2016-11-09";
+  version = "0.4.6a-2016-12-24";

  src = fetchFromGitHub {
    owner = "chenall";
    repo = "grub4dos";
-    rev = "4cdcd3c1aa4907e7775aa8816ca9cf0175b78bcd";
-    sha256 = "17y5wsiqcb2qk1vr8n1wlhcsj668735hj8l759n8aiydw408bl55";
+    rev = "ca0371bb1e2365bfe4e44031a3b8b59e8c58ce0d";
+    sha256 = "0a9m7n5la3dmbfx6n5iqlfbm607r1mww0wkimn29mlsc30d8aamr";
  };

  nativeBuildInputs = [ nasm ];
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  name = "neofetch-${version}";
-  version = "3.0";
+  version = "3.0.1";
  src = fetchFromGitHub {
    owner = "dylanaraps";
    repo = "neofetch";
    rev = version;
-    sha256 = "0z8sqbspf6j7yqy7wbd8ba3pfn836b0y8kmgkcyvswgjkcyh8m68";
+    sha256 = "0ccdgyn9m7vbrmjlsxdwv7cagsdg8hy8x4n1mx334pkqvl820jjn";
  };

  patchPhase = ''
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
    description = "Instant Terminal Sharing";
    license = stdenv.lib.licenses.mit;
    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ DamienCassou ];
+    maintainers = with stdenv.lib.maintainers; [ ];
  };
 }
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
  '';

  buildInputs = with pythonPackages; [
-    pytest
+    pytest_29
    pytest-rerunfailures
  ];

--- a/pkgs/tools/misc/umlet/default.nix
+++ b/pkgs/tools/misc/umlet/default.nix
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = http://www.umlet.com;
    license = licenses.gpl3;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
    platforms = platforms.all;
  };
 }
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec {
  meta = with stdenv.lib; {
    homepage = https://github.com/pimutils/vdirsyncer;
    description = "Synchronize calendars and contacts";
-    maintainers = with maintainers; [ matthiasbeyer jgeerds DamienCassou ];
+    maintainers = with maintainers; [ matthiasbeyer jgeerds ];
    platforms = platforms.all;
    license = licenses.mit;
  };
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {

  name = "youtube-dl-${version}";
-  version = "2017.01.28";
+  version = "2017.01.29";

  src = fetchurl {
    url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "16dyci631i6dgy1ia9vg69wk5zn8f1zd7bjwhw6adacrcx2nb89w";
+    sha256 = "0visxc4rb6kw4hjcgcv5llis08z0syhian1m5hr1fdbz4w73hx9l";
  };

  buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
--- a/pkgs/tools/networking/asynk/default.nix
+++ b/pkgs/tools/networking/asynk/default.nix
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
    homepage = http://asynk.io/;
    description = "Flexible contacts synchronization program";
    license = licenses.agpl3;
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
    platforms = platforms.unix;
  };
 }
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@ -1,11 +1,13 @@
 { stdenv, fetchurl, libpcap, enableStatic ? false }:

 stdenv.mkDerivation rec {
-  name = "tcpdump-4.8.1";
+  name = "tcpdump-${version}";
+  version = "4.9.0";

  src = fetchurl {
-    url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "0743ipl0l7ymjss3ybvvc5cbk9kb7s8yl4p3ramp5kwgqhg39r10";
+    #url = "http://www.tcpdump.org/release/${name}.tar.gz";
+    url = "mirror://debian/pool/main/t/tcpdump/tcpdump_${version}.orig.tar.gz";
+    sha256 = "0pjsxsy8l71i813sa934cwf1ryp9xbr7nxwsvnzavjdirchq3sga";
  };

  buildInputs = [ libpcap ];
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@ -1,30 +1,18 @@
-{ stdenv, fetchurl
-, IOKit ? null }:
+{ stdenv, fetchurl,
+IOKit ? null , ApplicationServices ? null }:

-let
-  version = "6.4";
-  drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB";
-  dbrev = "4167";
-  driverdb = fetchurl {
-    url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
-    sha256 = "14rv1cxbpmnq12hjwr3icjiahx5i0ak7j69310c09rah0241l5j1";
-    name = "smartmontools-drivedb.h";
-  };
-in
 stdenv.mkDerivation rec {
+  version = "6.5";
  name = "smartmontools-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
-    sha256 = "11bsxcghh7adzdklcslamlynydxb708vfz892d5w7agdq405ddza";
+    sha256 = "1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49";
  };

-  buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit;
+  buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices];

-  patchPhase = ''
-    cp ${driverdb} drivedb.h
-    sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in
-  '';
+  patches = [ ./smartmontools.patch ];

  meta = with stdenv.lib; {
    description = "Tools for monitoring the health of hard drives";
--- a/pkgs/tools/system/smartmontools/smartmontools.patch
+++ b/pkgs/tools/system/smartmontools/smartmontools.patch
@ -0,0 +1,26 @@
+diff --git a/../smartmontools-6.5/configure b/./configure
+index acb028a..5e2c7a1 100755
+--- a/../smartmontools-6.5/configure
+++ b/./configure
+@@ -6703,7 +6703,7 @@ fi
+     ;;
+   *-*-darwin*)
+     os_deps='os_darwin.o'
+-    os_libs='-framework CoreFoundation -framework IOKit'
+    os_libs='-framework ApplicationServices -framework IOKit'
+     os_darwin=yes
+     os_man_filter=Darwin
+     ;;
+diff --git a/../smartmontools-6.5/configure.ac b/./configure.ac
+index 6bd61d7..32ff50c 100644
+--- a/../smartmontools-6.5/configure.ac
+++ b/./configure.ac
+@@ -508,7 +508,7 @@ case "${host}" in
+     ;;
+   *-*-darwin*)
+     os_deps='os_darwin.o'
+-    os_libs='-framework CoreFoundation -framework IOKit'
+    os_libs='-framework ApplicationServices -framework IOKit'
+     os_darwin=yes
+     os_man_filter=Darwin
+     ;;
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
  patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am'';

  preConfigure = ''
-                   export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
-                   ./autogen.sh #--prefix="$out"
-                 '';
+    export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
+    ./autogen.sh
+  '';

  configureFlags = [
    "--sysconfdir=$(out)/etc" "--localstatedir=/var"
@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
    ];

-  preInstall = "sysconfdir=$out/etc";
-
  meta = with stdenv.lib; {
    description = "Thermal Daemon";
    homepage = "https://01.org/linux-thermal-daemon";
--- a/pkgs/tools/typesetting/git-latexdiff/default.nix
+++ b/pkgs/tools/typesetting/git-latexdiff/default.nix
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; {
    description = "View diff on LaTeX source files on the generated PDF files";
-    maintainers = [ maintainers.DamienCassou ];
+    maintainers = [ ];
    license = licenses.free; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9
    platforms = platforms.unix;
  };
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -696,6 +696,9 @@ with pkgs;

  capstone = callPackage ../development/libraries/capstone { };

+  cataract          = callPackage ../applications/misc/cataract { };
+  cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { };
+
  catch = callPackage ../development/libraries/catch { };

  catdoc = callPackage ../tools/text/catdoc { };
@ -3806,7 +3809,7 @@ with pkgs;
  slsnif = callPackage ../tools/misc/slsnif { };

  smartmontools = callPackage ../tools/system/smartmontools {
-    inherit (darwin.apple_sdk.frameworks) IOKit;
+    inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices;
  };

  smbldaptools = callPackage ../tools/networking/smbldaptools {
@ -4530,6 +4533,8 @@ with pkgs;

  xwinmosaic = callPackage ../tools/X11/xwinmosaic {};

+  yaft = callPackage ../applications/misc/yaft { };
+
  yarn = callPackage ../development/tools/yarn  { };

  yank = callPackage ../tools/misc/yank { };
@ -9056,6 +9061,8 @@ with pkgs;

  pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {};

+  pgroonga = callPackage ../servers/sql/postgresql/pgroonga {};
+
  phonon = callPackage ../development/libraries/phonon {};

  phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};
@ -10322,7 +10329,10 @@ with pkgs;
  jetty = callPackage ../servers/http/jetty { };

  knot-dns = callPackage ../servers/dns/knot-dns { };
-  knot-resolver = callPackage ../servers/dns/knot-resolver { };
+  knot-resolver = callPackage ../servers/dns/knot-resolver {
+    # TODO: vimNox after it gets fixed on Darwin or something lighter
+    hexdump = if stdenv.isLinux then utillinux.bin else vim/*xxd*/;
+  };

  rdkafka = callPackage ../development/libraries/rdkafka { };

@ -13262,6 +13272,7 @@ with pkgs;
    withGtk = false;
    inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
  };
+  # The GTK UI is deprecated by upstream. You probably want the QT version.
  wireshark-gtk = wireshark-cli.override { withGtk = true; };
  wireshark-qt = wireshark-cli.override { withQt = true; };
  wireshark = wireshark-qt;
@ -14542,6 +14553,8 @@ with pkgs;

  pidgin-skypeweb = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb { };

+  pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { };
+
  pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { };

  pidginosd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { };
@ -17874,6 +17887,8 @@ with pkgs;

  wmutils-core = callPackage ../tools/X11/wmutils-core { };

+  wmutils-opt = callPackage ../tools/X11/wmutils-opt { };
+
  wraith = callPackage ../applications/networking/irc/wraith { };

  wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@ -61,8 +61,8 @@ rec {
    ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
      bootPkgs = packages.ghc7103;
    };
-    ghcjsHEAD = packages.ghc801.callPackage ../development/compilers/ghcjs/head.nix {
-      bootPkgs = packages.ghc801;
+    ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix {
+      bootPkgs = packages.ghc802;
    };

    jhc = callPackage ../development/compilers/jhc {
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@ -112,6 +112,11 @@ let

    buildInputs = [ expat ];

+    preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace Makefile \
+      --replace '-shared' '-bundle -undefined dynamic_lookup -all_load'
+    '';
+
    preBuild = ''
      makeFlagsArray=(
        LUA_LDIR="$out/share/lua/${lua.luaversion}"
@ -121,7 +126,7 @@ let

    meta = {
      homepage = "http://matthewwild.co.uk/projects/luaexpat";
-      hydraPlatforms = stdenv.lib.platforms.linux;
+      hydraPlatforms = stdenv.lib.platforms.unix;
      maintainers = [ stdenv.lib.maintainers.flosse ];
    };
  };
@ -237,29 +242,31 @@ let

  luazlib = buildLuaPackage rec {
    name = "zlib-${version}";
-    version = "0.4";
+    version = "1.1";

    src = fetchzip {
      url = "https://github.com/brimworks/lua-zlib/archive/v${version}.tar.gz";
-      sha256 = "1pgxnjc0gvk25wsr69nsm60y5ad86z1nlq7mzj3ckygzkgi782dd";
+      sha256 = "1520lk4xpf094xn2zallqgqhs0zb4w61l49knv9y8pmhkdkxzzgy";
    };

    buildInputs = [ zlib ];

+    preConfigure = "substituteInPlace Makefile --replace gcc cc --replace '-llua' ''";
+
    preBuild = ''
      makeFlagsArray=(
        ${platformString}
        LUAPATH="$out/share/lua/${lua.luaversion}"
        LUACPATH="$out/lib/lua/${lua.luaversion}"
        INCDIR="-I${lua}/include"
-        LIBDIR="-L$out/lib");
+        LIBDIR="-L${lua}/lib");
    '';

    preInstall = "mkdir -p $out/lib/lua/${lua.luaversion}";

    meta = with stdenv.lib; {
      homepage = https://github.com/brimworks/lua-zlib;
-      hydraPlatforms = platforms.linux;
+      hydraPlatforms = platforms.unix;
      license = licenses.mit;
      maintainers = [ maintainers.koral ];
    };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -896,7 +896,7 @@ in {
      sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k";
    };

-    buildInputs = with self; [ pytest_30 case ];
+    buildInputs = with self; [ pytest case ];
    propagatedBuildInputs = with self; [ vine ];

    meta = {
@ -1149,6 +1149,25 @@ in {
    };
  };

+  chainmap = buildPythonPackage rec {
+    name = "chainmap-1.0.2";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/c/chainmap/${name}.tar.gz";
+      sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0";
+    };
+
+    # Requires tox
+    doCheck = false;
+
+    meta = {
+      description = "Backport/clone of ChainMap";
+      homepage = "https://bitbucket.org/jeunice/chainmap";
+      license = licenses.psfl;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
  arrow = buildPythonPackage rec {
    name = "arrow-${version}";
    version = "0.7.0";
@ -2651,7 +2670,7 @@ in {
      sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y";
    };

-    buildInputs = with self; [ pytest_30 case ];
+    buildInputs = with self; [ pytest case ];

    meta = {
      homepage = https://github.com/celery/billiard;
@ -3567,7 +3586,7 @@ in {
      sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3";
    };

-    buildInputs = with self; [ pytest_30 case ];
+    buildInputs = with self; [ pytest case ];
    propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ];

    meta = {
@ -3800,7 +3819,7 @@ in {
      homepage = https://github.com/click-contrib/click-log/;
      description = "Logging integration for Click";
      license = licenses.mit;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -3813,7 +3832,7 @@ in {
      sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609";
    };

-    checkInputs = with self; [ pytest ];
+    checkInputs = with self; [ pytest_29 ];
    propagatedBuildInputs = with self; [ click ] ++ optional (!isPy3k) futures;

    checkPhase = ''
@ -3827,7 +3846,7 @@ in {
      homepage = https://github.com/click-contrib/click-threading/;
      description = "Multithreaded Click apps made easy";
      license = licenses.mit;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -4673,7 +4692,7 @@ in {
      sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k";
    };

-    buildInputs = with self; [ pytest ];
+    buildInputs = with self; [ pytest_29 ];
    propagatedBuildInputs = with self; [ future numpy ];

    doCheck = true;
@ -4945,7 +4964,7 @@ in {
    };
  };

-  pytest = self.pytest_29;
+  pytest = self.pytest_30;

  pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {};

@ -4953,7 +4972,13 @@ in {

  pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};

-  pytest_30 = callPackage ../development/python-modules/pytest {};
+  pytest_30 = callPackage ../development/python-modules/pytest{
+    hypothesis = self.hypothesis.override {
+      # hypothesis requires pytest that causes dependency cycle
+      doCheck = false;
+      pytest = null;
+    };
+  };

  pytestcache = buildPythonPackage rec {
    name = "pytest-cache-1.0";
@ -4979,9 +5004,7 @@ in {
    };
  };

-  pytestdjango = callPackage ../development/python-modules/pytestdjango.nix {
-    pytest = self.pytest_30;
-  };
+  pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { };

  pytest-fixture-config = buildPythonPackage rec {
    name = "${pname}-${version}";
@ -5570,7 +5593,7 @@ in {
      sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s";
    };

-    buildInputs = with self; [ pytest ];
+    buildInputs = with self; [ pytest_29 ];
    patchPhase = ''
      sed -i 's/==.*$//' requirements/test.txt
    '';
@ -7380,7 +7403,7 @@ in {
      homepage = https://github.com/matlink/gplaycli;
      description = "Google Play Downloader via Command line";
      license = licenses.agpl3Plus;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -8150,7 +8173,7 @@ in {
    # lpod library currently does not support Python 3.x
    disabled = isPy3k;

-    propagatedBuildInputs = with self; [ ];
+    propagatedBuildInputs = with self; [ lxml docutils pillow ];

    src = pkgs.fetchFromGitHub {
      owner = "lpod";
@ -8342,7 +8365,7 @@ in {
      homepage = https://github.com/cedadev/ndg_httpsclient/;
      description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL";
      license = licenses.bsd2;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -8597,7 +8620,7 @@ in {
      description = "Tool for extracting information from PDF documents";
      homepage = http://euske.github.io/pdfminer/index.html;
      license = licenses.mit;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -9632,6 +9655,23 @@ in {
    };
  };

+  scandir = self.buildPythonPackage rec {
+    name = "scandir-${version}";
+    version = "1.4";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/s/scandir/${name}.tar.gz";
+      sha256 = "0yjrgp0mxp3d8bjkq2m1ac2ys8n76wykksvgyjrnil9gr3fx7a5d";
+    };
+
+    meta = with stdenv.lib; {
+      description = "A better directory iterator and faster os.walk()";
+      homepage = "https://github.com/benhoyt/scandir";
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
  scfbuild = self.buildPythonPackage rec {
    name = "scfbuild-${version}";
    version = "1.0.3";
@ -10308,9 +10348,7 @@ in {
    };
  };

-  django_guardian = callPackage ../development/python-modules/django_guardian.nix {
-    pytest = self.pytest_30;
-  };
+  django_guardian = callPackage ../development/python-modules/django_guardian.nix { };

  django_tagging = buildPythonPackage rec {
    name = "django-tagging-0.4.5";
@ -11091,7 +11129,7 @@ in {
    meta = {
      homepage = https://f-droid.org;
      description = "Server and tools for F-Droid, the Free Software repository system for Android";
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
      license = licenses.agpl3;
    };
  };
@ -12550,41 +12588,7 @@ in {
    propagatedBuildInputs = with self; [ requests2 ];
  };

-  hypothesis = buildPythonPackage rec {
-    # http://hypothesis.readthedocs.org/en/latest/packaging.html
-
-    # Hypothesis has optional dependencies on the following libraries
-    # pytz fake_factory django numpy pytest
-    # If you need these, you can just add them to your environment.
-
-    name = "hypothesis-${version}";
-    version = "3.5.2";
-
-    # Upstream prefers github tarballs
-    src = pkgs.fetchFromGitHub {
-      owner = "HypothesisWorks";
-      repo = "hypothesis";
-      rev = "${version}";
-      sha256 = "030rf4gn4b0hylr90wazilwa3bc038fcqng0wibcx67mqaq035n4";
-    };
-
-    buildInputs = with self; [ flake8 pytest flaky ];
-    propagatedBuildInputs = with self; ([ uncompyle6 ] ++ optionals isPy27 [ enum34  ]);
-
-    # Fails randomly in tests/cover/test_conjecture_engine.py::test_interleaving_engines.
-    doCheck = false;
-
-    # https://github.com/DRMacIver/hypothesis/issues/300
-    checkPhase = ''
-      ${python.interpreter} -m pytest tests/cover
-    '';
-
-    meta = {
-      description = "A Python library for property based testing";
-      homepage = https://github.com/DRMacIver/hypothesis;
-      license = licenses.mpl20;
-    };
-  };
+  hypothesis = callPackage ../development/python-modules/hypothesis.nix { };

  colored = buildPythonPackage rec {
    name = "colored-${version}";
@ -13521,7 +13525,7 @@ in {
      sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h";
    };

-    buildInputs = with self; [ pytest_30 case pytz ];
+    buildInputs = with self; [ pytest case pytz ];

    propagatedBuildInputs = with self; [ amqp ];

@ -15048,7 +15052,7 @@ in {
    meta = {
      homepage = https://github.com/aroig/mutag;
      license = licenses.gpl3;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -15153,7 +15157,7 @@ in {

    meta = {
      description = "Python client library to the MediaWiki API";
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
      license = licenses.mit;
      homepage = https://github.com/mwclient/mwclient;
    };
@ -18424,7 +18428,7 @@ in {
      sha256 = "0v8aq0xzsa7clazszxl42904c3jpq69lg8a5hg754bqcqf72hfrn";
    };
    LC_ALL="en_US.UTF-8";
-    buildInputs = with self; [ pkgs.glibcLocales pytest ];
+    buildInputs = with self; [ pkgs.glibcLocales pytest_29 ];

    checkPhase = ''
      py.test
@ -19543,7 +19547,7 @@ in {
      description = "Module for reading vCard and vCalendar files";
      homepage = http://eventable.github.io/vobject/;
      license = licenses.asl20;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -19564,7 +19568,7 @@ in {
      description = "Command-line interface carddav client";
      homepage = http://lostpackets.de/pycarddav;
      license = licenses.mit;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -20405,7 +20409,7 @@ in {
      description = "Media Meta Data retrieval framework";
      homepage = http://sourceforge.net/projects/mmpython/;
      license = licenses.gpl2;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -20448,7 +20452,7 @@ in {
      description = "Generic application framework, providing the foundation for other modules";
      homepage = https://github.com/freevo/kaa-base;
      license = licenses.lgpl21;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -20495,7 +20499,7 @@ in {
      description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files";
      homepage = https://github.com/freevo/kaa-metadata;
      license = licenses.gpl2;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -23388,7 +23392,7 @@ in {
      url = "mirror://pypi/s/${pname}/${name}.tar.gz";
      sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12";
    };
-    buildInputs = with self; [ pytest virtualenv pytestrunner pytest-virtualenv ];
+    buildInputs = with self; [ pytest_29 virtualenv pytestrunner pytest-virtualenv ];
    propagatedBuildInputs = with self; [ twisted pathlib2 ];
    postPatch = ''
      sed -i '12,$d' tests/test_main.py
@ -23557,7 +23561,7 @@ in {
      description = "A Parser Generator for Python";
      homepage = https://pypi.python.org/pypi/SimpleParse;
      platforms = platforms.all;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -25029,7 +25033,7 @@ in {
      description = "Tool for automatic download/upload subtitles for videofiles using fast hashing";
      homepage = http://www.subdownloader.net;
      license = licenses.gpl3;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -25167,7 +25171,7 @@ in {

    meta = {
      description = " GTK3 & python based GUI for Syncthing ";
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
      platforms = pkgs.syncthing.meta.platforms;
      homepage = "https://github.com/syncthing/syncthing-gtk";
      license = licenses.gpl2;
@ -27839,7 +27843,7 @@ EOF
      homepage = https://github.com/scs3jb/screenkey;
      description = "A screencast tool to show your keys";
      license = licenses.gpl3Plus;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
      platforms = platforms.linux;
    };
  };
@ -29357,7 +29361,7 @@ EOF
      homepage = http://weboob.org;
      description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser";
      license = licenses.agpl3;
-      maintainers = with maintainers; [ DamienCassou ];
+      maintainers = with maintainers; [ ];
    };
  };

@ -31614,7 +31618,7 @@ EOF
      url = "mirror://pypi/a/${pname}/${name}.tar.gz";
      sha256 = "1158ml8h3g0vlsgw2jmy579glbg7dn0mjij8xibdl509b8qv9p51";
    };
-    buildInputs = with self; [ unittest2 mock pytest trollius ];
+    buildInputs = with self; [ unittest2 mock pytest_29 trollius ];
    propagatedBuildInputs = with self; [ six twisted txaio ];
    checkPhase = ''
      py.test $out
@ -31848,7 +31852,7 @@ EOF
      sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7";
    };

-    buildInputs = with self; [ case pytest_30 ];
+    buildInputs = with self; [ case pytest ];

    meta = {
      homepage = https://github.com/celery/vine;