Merge branch 'master' into staging

* master: (32 commits)
  qt4: fix parallel building of moc_qtgradientviewdialog.o
  qt4: enable parallel building in the configure phase
  aseprite-unfree: 1.2.2 -> 1.2.4
  peek: disable on darwin, add optional dependencies
  vdrsymbols: init at 20100612
  xorg.bitmap: provide resource search path
  xorg.bitmap: init at 1.0.8
  firefox-devedition-bin: 58.0b7 -> 58.0b7
  firefox-beta-bin: 58.0b7 -> 58.0b7
  lua-mpack: fix darwin build
  lua5_1: provide version
  libmpack: fix darwin build
  libamqpcpp: init at 2.7.4
  nano: fix darwin build
  gnome3.gnome-software: enable parallel building
  dbus-broker: 3 -> 8
  nix-exec: mark as broken
  peek: init at 1.2.0
  gnucash: use nativeBuildInputs
  gnucash: 2.6.12 -> 2.6.18-1
  ...

lib/maintainers.nix

@@ -422,6 +422,7 @@
   mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
   mirrexagon = "Andrew Abbott <mirrexagon@mirrexagon.com>";
   mjanczyk = "Marcin Janczyk <m@dragonvr.pl>";
+  mjp = "Mike Playle <mike@mythik.co.uk>"; # github = "MikePlayle";
   mlieberman85 = "Michael Lieberman <mlieberman85@gmail.com>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mog = "Matthew O'Gorman <mog-lists@rldn.net>";

nixos/modules/services/games/factorio.nix

@@ -6,7 +6,7 @@ let
   cfg = config.services.factorio;
   factorio = pkgs.factorio-headless;
   name = "Factorio";
-  stateDir = "/var/lib/factorio";
+  stateDir = cfg.stateDir;
   mkSavePath = name: "${stateDir}/saves/${name}.zip";
   configFile = pkgs.writeText "factorio.conf" ''
     use-system-read-write-data-directories=true
@@ -25,7 +25,7 @@ let
     password = cfg.password;
     token = cfg.token;
     game_password = cfg.game-password;
-    require_user_verification = true;
+    require_user_verification = cfg.requireUserVerification;
     max_upload_in_kilobytes_per_second = 0;
     minimum_latency_in_ticks = 0;
     ignore_player_limit_for_returning_players = false;
@@ -80,6 +80,15 @@ in
           customizations.
         '';
       };
+      stateDir = mkOption {
+        type = types.path;
+        default = "/var/lib/factorio";
+        description = ''
+          The server's data directory.
+
+          The configuration and map will be stored here.
+        '';
+      };
       mods = mkOption {
         type = types.listOf types.package;
         default = [];
@@ -148,6 +157,13 @@ in
           Game password.
         '';
       };
+      requireUserVerification = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          When set to true, the server will only allow clients that have a valid factorio.com account.
+        '';
+      };
       autosave-interval = mkOption {
         type = types.nullOr types.int;
         default = null;

nixos/modules/services/network-filesystems/ipfs.nix

@@ -39,8 +39,6 @@ let
     # NB: migration must be performed prior to pre-start, else we get the failure message!
     preStart = ''
       ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214)
-      ipfs --local config Addresses.API ${cfg.apiAddress}
-      ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}
     '' + optionalString cfg.autoMount ''
       ipfs --local config Mounts.FuseAllowOther --json true
       ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir}
@@ -56,7 +54,11 @@ let
               EOF
               ipfs --local config --json "${concatStringsSep "." path}" "$value"
             '')
-            cfg.extraConfig)
+            ({ Addresses.API = cfg.apiAddress;
+               Addresses.Gateway = cfg.gatewayAddress;
+               Addresses.Swarm = cfg.swarmAddress;
+            } //
+            cfg.extraConfig))
         );
     serviceConfig = {
       ExecStart = "${wrapped}/bin/ipfs daemon ${ipfsFlags}";
@@ -140,6 +142,12 @@ in {
         description = "Where IPFS exposes its API to";
       };
 
+      swarmAddress = mkOption {
+        type = types.listOf types.str;
+        default = [ "/ip4/0.0.0.0/tcp/4001" "/ip6/::/tcp/4001" ];
+        description = "Where IPFS listens for incoming p2p connections";
+      };
+
       enableGC = mkOption {
         type = types.bool;
         default = false;

nixos/modules/services/x11/compton.nix

@@ -181,10 +181,10 @@ in {
     };
 
     backend = mkOption {
-      type = types.enum [ "glx" "xrender" ];
+      type = types.enum [ "glx" "xrender" "xr_glx_hybrid" ];
       default = "xrender";
       description = ''
-        Backend to use: <literal>glx</literal> or <literal>xrender</literal>.
+        Backend to use: <literal>glx</literal>, <literal>xrender</literal> or <literal>xr_glx_hybrid</literal>.
       '';
     };
 

pkgs/applications/editors/aseprite/default.nix

@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   name = "aseprite-${version}";
-  version = if unfree then "1.2.2" else "1.1.7";
+  version = if unfree then "1.2.4" else "1.1.7";
 
   src = fetchFromGitHub {
     owner = "aseprite";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     fetchSubmodules = true;
     sha256 = if unfree
-      then "1ldi7zikl1g6rq3g9lkypx5wqzza5j0054j1r8bh7lyvb0szicig"
+      then "1rnf4a8vgddz8x55rpqaihlxmqip1kgpdhqb4d3l71h1zmidg5k3"
       else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di";
   };
 

pkgs/applications/editors/nano/default.nix

@@ -27,6 +27,8 @@ in stdenv.mkDerivation rec {
     sha256 = "0z5sxji8jh8sh0g3inbzndhsrbm4qyqlvjrxl5wkxbr61lnxa5k3";
   };
 
+  patches = [ ./nano-2.9.1-darwin.patch ];
+
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
   buildInputs = [ ncurses ];
 
@@ -42,6 +44,8 @@ in stdenv.mkDerivation rec {
     cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = https://www.nano-editor.org/;
     description = "A small, user-friendly console text editor";

pkgs/applications/editors/nano/nano-2.9.1-darwin.patch

@@ -0,0 +1,9 @@
+--- a/lib/stat.c
++++ b/lib/stat.c
+@@ -48,4 +48,6 @@ orig_stat (const char *filename, struct stat *buf)
+ #include "sys/stat.h"
+ 
++#include "stat-time.h"
++
+ #include <errno.h>
+ #include <limits.h>

pkgs/applications/networking/instant-messengers/rambox/default.nix

@@ -1,7 +1,4 @@
 { stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
-# These credentials are only for this derivation. If you want to get credentials
-# for another distribution, go to https://auth0.com. If you want to reuse the same
-# domain, drop a line at yegortimoshenko@gmail.com!
 , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
 , auth0Domain ? "nixpkgs.auth0.com" }:
 

pkgs/applications/office/gnucash/2.6.nix

@@ -1,6 +1,7 @@
-{ fetchurl, stdenv, pkgconfig, libxml2, libxslt, perl, perlPackages, gconf, guile
+{ fetchurl, fetchpatch, stdenv, intltool, pkgconfig, file, makeWrapper
-, intltool, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
+, libxml2, libxslt, perl, perlPackages, gconf, guile
-, webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file
+, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
+, webkit, glibcLocales, gsettings_desktop_schemas, dconf
 , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers
 , pango, gdk_pixbuf
 }:
@@ -13,16 +14,26 @@ Two cave-ats right now:
 */
 
 stdenv.mkDerivation rec {
-  name = "gnucash-2.6.12";
+  name = "gnucash-2.6.18-1";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
-    sha256 = "0x84f07p30pwhriamv8ifljgw755cj87rc12jy1xddf47spyj7rp";
+    sha256 = "1794qi7lkn1kbnhzk08wawacfcphbln3ngdl3q0qax5drv7hnwv8";
   };
 
+  patches = [
+    (fetchpatch {
+     sha256 = "11nlf9j7jm1i37mfcmmnkplxr3nlf257fxd01095vd65i2rn1m8h";
+     name = "fix-brittle-test.patch";
+     url = "https://github.com/Gnucash/gnucash/commit/42ac55e03a1a84739f4a5b7a247c31d91c0adc4a.patch";
+    })
+  ];
+
+  nativeBuildInputs = [ intltool pkgconfig file makeWrapper ];
+
   buildInputs = [
     # general
-    intltool pkgconfig libxml2 libxslt glibcLocales file gettext swig enchant
+    libxml2 libxslt glibcLocales gettext swig enchant
     bzip2 isocodes
     # glib, gtk...
     glib gtk2 goffice webkit
@@ -36,12 +47,10 @@ stdenv.mkDerivation rec {
     guile slibGuile
     # database backends
     libdbi libdbiDrivers
-    # build
-    makeWrapper
   ];
 
-  patchPhase = ''
+  postPatch = ''
-  patchShebangs ./src
+    patchShebangs ./src
   '';
 
   configureFlags = [

pkgs/applications/office/mendeley/default.nix

@@ -37,14 +37,14 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.17.11-stable";
+  shortVersion = "1.17.12-stable";
 
   version = "${shortVersion}_${arch}";
 
   url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
   sha256 = if stdenv.system == arch32
-    then "033855ix5qj1gwd3pa6qws5k94hgbp6rvibrrxl3rn5bvhrvvbkq"
+    then "09n910ny8k103g1v8m19f9n827l2y0kmz79cwgy95k6acf2rkc2x"
-    else "09h6br8qhvphkvzy28y1pnh7dhyigb3w41w3kjwqj6027i46chi7";
+    else "11z65mj1a2rw6cwfarl8r1vzpcz4ww5mgvd5fyv31l60mbmnqkap";
 
   deps = [
     qt5.qtbase

pkgs/applications/video/peek/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook
+, gsettings_desktop_schemas, gtk3, keybinder3
+}:
+
+stdenv.mkDerivation rec {
+  name = "peek-${version}";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "phw";
+    repo = "peek";
+    rev = version;
+    sha256 = "04sc6gfrqvnx288rmgsywpjx9l6jcfn2qdbwjcbdvx4wl3gna0qm";
+  };
+
+  nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ];
+
+  buildInputs = [ gsettings_desktop_schemas gtk3 keybinder3 ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage    = https://github.com/phw/peek;
+    description = "Simple animated GIF screen recorder with an easy to use interface";
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ puffnfresh ];
+    platforms   = platforms.linux;
+  };
+}

pkgs/data/fonts/vdrsymbols/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchzip }:
+
+fetchzip rec {
+  name = "vdrsymbols-20100612";
+
+  url = http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz;
+
+  sha256 = "0wpxns8zqic98c84j18dr4zmj092v07yq07vwwgzblr0rw9n6gzr";
+
+  postFetch = ''
+    tar xvzf "$downloadedFile"
+    install -Dm444 -t "$out/share/fonts/truetype" */*.ttf
+  '';
+
+  meta = with stdenv.lib; {
+    description = "DejaVu fonts with additional symbols used by VDR";
+    homepage = http://andreas.vdr-developer.org/fonts/;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ck3d ];
+
+    # Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
+    # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+    # DejaVu changes are in public domain
+    # See https://dejavu-fonts.github.io/License.html for details
+    license = licenses.free;
+  };
+}

pkgs/desktops/gnome-3/core/gnome-software/default.nix

@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
     ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = https://www.freedesktop.org/software/PackageKit/;
     platforms = platforms.linux;

pkgs/development/interpreters/lua-5/5.1.nix

@@ -8,7 +8,8 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "lua-5.1.5";
+  name = "lua-${version}";
+  version = "5.1.5";
   luaversion = "5.1";
 
   src = fetchurl {

pkgs/development/interpreters/nix-exec/default.nix

@@ -18,5 +18,6 @@ in stdenv.mkDerivation {
     homepage = https://github.com/shlevy/nix-exec;
     license = stdenv.lib.licenses.mit;
     platforms = nix.meta.platforms;
+    broken = true;
   };
 }

pkgs/development/libraries/libamqpcpp/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "libamqpcpp-${version}";
+  version = "2.7.4";
+
+  src = fetchFromGitHub {
+    owner = "CopernicaMarketingSoftware";
+    repo = "AMQP-CPP";
+    rev = "v${version}";
+    sha256 = "0m010bz0axawcpv4d1p1vx7c6r8lg27w2s2vjqpbpg99w35n6c8k";
+  };
+
+  patches = [ ./libamqpcpp-darwin.patch ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Library for communicating with a RabbitMQ server";
+    homepage = https://github.com/CopernicaMarketingSoftware/AMQP-CPP;
+    license = licenses.asl20;
+    maintainers = [ maintainers.mjp ];
+    platforms = platforms.all;
+  };
+}

pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch

@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -0,0 +1 @@
++CXX ?= g++
+@@ -43 +44 @@ ${SHARED_LIB}: ${SHARED_OBJECTS}
+-	${LD} ${LD_FLAGS} -Wl,${SONAMEPARAMETER},lib$(LIBRARY_NAME).so.$(SONAME) -o $@ ${SHARED_OBJECTS}
++	${CXX} ${LD_FLAGS} -Wl,${SONAMEPARAMETER},lib$(LIBRARY_NAME).so.$(SONAME) -o $@ ${SHARED_OBJECTS}
+@@ -52 +53 @@ ${SHARED_OBJECTS}:
+-	${CPP} ${CPPFLAGS} -fpic -o $@ ${@:%.o=%.cpp}
++	${CXX} ${CPPFLAGS} -fpic -o $@ ${@:%.o=%.cpp}
+@@ -55 +56 @@ ${STATIC_OBJECTS}:
+-	${CPP} ${CPPFLAGS} -o $@ ${@:%.s.o=%.cpp}
++	${CXX} ${CPPFLAGS} -o $@ ${@:%.s.o=%.cpp}

pkgs/development/libraries/libmpack/default.nix

@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     rev = version;
     sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2";
   };
-  LIBTOOL = "libtool";
+
-  buildInputs = [ libtool ];
+  nativeBuildInputs = [ libtool ];
-  preInstall = ''
+
-    export PREFIX=$out
+  makeFlags = [ "LIBTOOL=libtool" "PREFIX=$(out)" ];
-  '';
+
   meta = with stdenv.lib; {
     description = "Simple implementation of msgpack in C";
     homepage = https://github.com/tarruda/libmpack/;

pkgs/development/libraries/libskk/default.nix

@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, fetchFromGitHub,
+  libtool, intltool, pkgconfig,
+  vala, gnome_common, gobjectIntrospection,
+  libgee_0_8, json_glib, skk-dicts }:
+
+stdenv.mkDerivation rec {
+  name = "libskk-${version}";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "ueno";
+    repo = "libskk";
+    rev = "6a232e75de6d5dbe543ab17c9b85dc7560093509";
+    sha256 = "1xa9akf95jyi4laiw1llnjdpfq5skhidm7dnkd0i0ds6npzzqnxc";
+  };
+
+  buildInputs = [ skk-dicts ];
+  nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool intltool pkgconfig ];
+  propagatedBuildInputs = [ libgee_0_8 json_glib ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  # link SKK-JISYO.L from skkdicts for the bundled tool `skk`
+  preInstall = ''
+    dictDir=$out/share/skk
+    mkdir -p $dictDir
+    ln -s ${skk-dicts}/share/SKK-JISYO.L $dictDir/
+  '';
+
+  meta = {
+    description = "A library to deal with Japanese kana-to-kanji conversion method";
+    longDescription = ''
+      Libskk is a library that implements basic features of SKK including:
+      new word registration, completion, numeric conversion, abbrev mode, kuten input,
+      hankaku-katakana input, Lisp expression evaluation (concat only), and re-conversion.
+      It also supports various typing rules including: romaji-to-kana, AZIK, TUT-Code, and NICOLA,
+      as well as various dictionary types including: file dictionary (such as SKK-JISYO.[SML]),
+      user dictionary, skkserv, and CDB format dictionary.
+    '';
+    homepage = https://github.com/ueno/libskk;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

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

@@ -67,6 +67,7 @@ stdenv.mkDerivation rec {
   patches =
     [ ./glib-2.32.patch
       ./libressl.patch
+      ./parallel-configure.patch
       (substituteAll {
         src = ./dlopen-absolute-paths.diff;
         cups = if cups != null then stdenv.lib.getLib cups else null;
@@ -117,6 +118,7 @@ stdenv.mkDerivation rec {
       -demosdir $TMPDIR/share/doc/${name}/demos
       -datadir $out/share/${name}
       -translationdir $out/share/${name}/translations
+      --jobs=$NIX_BUILD_CORES
     "
     unset LD # Makefile uses gcc for linking; setting LD interferes
   '' + optionalString stdenv.cc.isClang ''
@@ -124,6 +126,11 @@ stdenv.mkDerivation rec {
     sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf
   '';
 
+  postConfigure = ''
+    echo "applying patch ${./parallel-build.patch}"
+    patch -p1 < ${./parallel-build.patch}
+  '';
+
   prefixKey = "-prefix ";
 
   configureFlags =
@@ -251,7 +258,7 @@ stdenv.mkDerivation rec {
     homepage    = http://qt-project.org/;
     description = "A cross-platform application framework for C++";
     license     = licenses.lgpl21Plus; # or gpl3
-    maintainers = with maintainers; [ lovek323 phreedom sander ];
+    maintainers = with maintainers; [ orivej lovek323 phreedom sander ];
     platforms   = platforms.unix;
   };
 }

pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch

@@ -0,0 +1,6 @@
+--- a/tools/designer/src/lib/Makefile
++++ b/tools/designer/src/lib/Makefile
+@@ -7167,2 +7167,3 @@ compiler_moc_header_clean:
+                .uic/release-shared/ui_qtgradientviewdialog.h \
++               .uic/release-shared/ui_qtgradientview.h \
+                ../../../shared/qtgradienteditor/qtgradientviewdialog.h

pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch

@@ -0,0 +1,22 @@
+--- a/configure
++++ b/configure
+@@ -1087,2 +1087,3 @@ fi
+ #-------------------------------------------------------------------------------
++JOBS=
+ 
+@@ -2528,2 +2529,5 @@ while [ "$#" -gt 0 ]; do
+         ;;
++    jobs)
++        JOBS=-j$VAL
++        ;;
+     *)
+@@ -5072,3 +5076,3 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+         if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then
+-            (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1
++            (cd "$outpath/qmake" && "$MAKE" $JOBS -f "$mkfile" depend) >/dev/null 2>&1
+            sed "s,^.*/\([^/]*.o\):,\1:,g" "$mkfile" >"$mkfile.tmp"
+@@ -5080,3 +5084,3 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+     QMAKE_BUILD_ERROR=no
+-    (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes
++    (cd "$outpath/qmake"; "$MAKE" $JOBS) || QMAKE_BUILD_ERROR=yes
+     [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake

pkgs/development/python-modules/bash_kernel/default.nix

@@ -4,6 +4,7 @@
 , fetchpatch
 , ipykernel
 , isPy27
+, python
 , pexpect
 }:
 buildPythonPackage rec {
@@ -35,7 +36,7 @@ buildPythonPackage rec {
   '';
 
   postInstall = ''
-    python -m bash_kernel.install --prefix $out
+    ${python.interpreter} -m bash_kernel.install --prefix $out
   '';
 
   meta = {

pkgs/development/tools/container-linux-config-transpiler/default.nix

@@ -4,7 +4,7 @@ with lib;
 
 buildGoPackage rec {
   name = "ct-${version}";
-  version = "0.4.1";
+  version = "0.5.0";
 
   goPackagePath = "github.com/coreos/container-linux-config-transpiler";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "coreos";
     repo = "container-linux-config-transpiler";
     rev = "v${version}";
-    sha256="1017xkinja30jcam8p1x2d9q4vkgkfn7gvkad004jkbbmd2216sa";
+    sha256="1gchqvx5a2fhw9bw359azd9zg8d6h50gkzfz21c41vkjln2z6jq6";
   };
 
   buildFlagsArray = ''

pkgs/development/tools/continuous-integration/jenkins/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.91";
+  version = "2.92";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "04ck1sq73v94xz1293qgypzahjdn5xlhl7ya7x0rzyf3x4zz6q5y";
+    sha256 = "085h2hfhizli7bpvi06vi6jsav1cn86jw8l6vdpqq4ddx2hrhn39";
   };
 
   buildCommand = ''

pkgs/misc/cups/drivers/cnijfilter2/default.nix

@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
         --replace /usr/include/libusb-1.0 \
                   ${libusb.dev}/include/libusb-1.0
       ./autogen.sh --prefix=$out --enable-progpath=$out/bin \
+                   --datadir=$out/share \
                    --enable-libdir=/var/cache/cups
       make
     )

pkgs/os-specific/linux/dbus-broker/default.nix

@@ -1,21 +1,24 @@
-{ stdenv, fetchgit, fetchFromGitHub, meson, ninja, pkgconfig
+{ stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig
 , dbus, glib, systemd }:
 
 stdenv.mkDerivation rec {
   name = "dbus-broker-${version}";
-  version = "3";
+  version = "8";
 
   src = fetchFromGitHub {
     owner           = "bus1";
     repo            = "dbus-broker";
     rev             = "v${version}";
-    sha256          = "1f2vw5b2cbdgd3g7vnzwr9lsw9v4xc5nc0nf9xc3qb5xqzsq7v7i";
+    sha256          = "07k8y6pcx58dfd0vvxcbz352v4apajs5lf0chv6fdp7xf7wbbcwb";
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
+  nativeBuildInputs = [ docutils meson ninja pkgconfig ];
+
   buildInputs = [ dbus glib systemd ];
 
+  enableParallelBuilding = true;
+
   prePatch = ''
     substituteInPlace meson.build \
       --replace "dep_systemd.get_pkgconfig_variable('systemdsystemunitdir')" "'$out/lib/systemd/system'" \

pkgs/servers/x11/xorg/default.nix

@@ -67,6 +67,18 @@ let
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
+  bitmap = (mkDerivation "bitmap" {
+    name = "bitmap-1.0.8";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/app/bitmap-1.0.8.tar.gz;
+      sha256 = "1z06a1sn3iq72rmh73f11xgb7n46bdav1fvpgczxjp6al88bsbqs";
+    };
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ libX11 libXaw xbitmaps libXmu xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
+  }) // {inherit libX11 libXaw xbitmaps libXmu xproto libXt ;};
+
   compositeproto = (mkDerivation "compositeproto" {
     name = "compositeproto-0.4.2";
     builder = ./builder.sh;

pkgs/servers/x11/xorg/overrides.nix

@@ -28,6 +28,21 @@ in
     buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.fontsproto ];
   };
 
+  bitmap = attrs: attrs // {
+    nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ];
+    postInstall = ''
+      paths=(
+        "$out/share/X11/%T/%N"
+        "$out/include/X11/%T/%N"
+        "${xorg.xbitmaps}/include/X11/%T/%N"
+      )
+      wrapProgram "$out/bin/bitmap" \
+        --suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}")
+      makeWrapper "$out/bin/bitmap" "$out/bin/bitmap-color" \
+        --suffix XFILESEARCHPATH : "$out/share/X11/%T/%N-color"
+    '';
+  };
+
   encodings = attrs: attrs // {
     buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ];
   };

pkgs/servers/x11/xorg/tarballs-7.7.list

@@ -1,6 +1,7 @@
 mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2
 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2
+mirror://xorg/individual/app/bitmap-1.0.8.tar.gz
 mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2

pkgs/tools/misc/direnv/default.nix

@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   name = "direnv-${version}";
-  version = "2.13.1";
+  version = "2.13.2";
   goPackagePath = "github.com/direnv/direnv";
 
   src = fetchFromGitHub {
     owner = "direnv";
     repo = "direnv";
     rev = "v${version}";
-    sha256 = "1j2jkxzd6rh4ms39izqfm4w8h12dg0ccvqsj0z1z4hb3f1jqcgbz";
+    sha256 = "1lvpfqaa7hv8mf7pkj0vnidq4c3zjxlz34pk3w4y3n0v0pwfpy9z";
   };
 
   postConfigure = ''

pkgs/top-level/all-packages.nix

@@ -1494,6 +1494,8 @@ with pkgs;
 
   libpinyin = callPackage ../development/libraries/libpinyin { };
 
+  libskk = callPackage ../development/libraries/libskk { gnome_common = gnome3.gnome_common; };
+
   m17n_db = callPackage ../tools/inputmethods/m17n-db { };
 
   m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
@@ -8914,6 +8916,8 @@ with pkgs;
 
   libabw = callPackage ../development/libraries/libabw { };
 
+  libamqpcpp = callPackage ../development/libraries/libamqpcpp { };
+
   libantlr3c = callPackage ../development/libraries/libantlr3c {};
 
   libappindicator-gtk2 = callPackage ../development/libraries/libappindicator { gtkVersion = "2"; };
@@ -13708,6 +13712,8 @@ with pkgs;
 
   vanilla-dmz = callPackage ../data/icons/vanilla-dmz { };
 
+  vdrsymbols = callPackage ../data/fonts/vdrsymbols { };
+
   vistafonts = callPackage ../data/fonts/vista-fonts { };
 
   vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { };
@@ -13862,6 +13868,7 @@ with pkgs;
   atom-beta = callPackage ../applications/editors/atom/beta.nix { };
 
   aseprite = callPackage ../applications/editors/aseprite { };
+  aseprite-unfree = aseprite.override { unfree = true; };
 
   astah-community = callPackage ../applications/graphics/astah-community { };
 
@@ -16180,6 +16187,8 @@ with pkgs;
     inherit (gst_all_1) gstreamer gst-plugins-base;
   };
 
+  peek = callPackage ../applications/video/peek { };
+
   pflask = callPackage ../os-specific/linux/pflask {};
 
   photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { };

pkgs/top-level/lua-packages.nix

@@ -614,34 +614,30 @@ let
   };
 
   mpack = buildLuaPackage rec {
-    name = "lua-mpack-${version}";
+    name = "mpack-${version}";
-    version = "1.0.7_${rev}";
+    version = "1.0.7";
-    rev = "ef025224a799066b818120fb1f30a308543a6e99";
 
     src = fetchFromGitHub {
       owner = "libmpack";
       repo = "libmpack-lua";
-      inherit rev;
+      rev = version;
       sha256 = "1nydi6xbmxwl1fmi32v5v8n74msnmzblzqaqnb102w6vkinampsb";
     };
 
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ libmpack ]; # ++ [ libtool lua ];
+    buildInputs = [ libmpack ];
     dontBuild = true;
 
-    preInstall = ''
+    postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-      mkdir -p $out/lib/lua/${lua.luaversion}
+      substituteInPlace Makefile \
-      export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${libmpack}
+        --replace '-shared' '-bundle -undefined dynamic_lookup -all_load'
     '';
 
-    NIX_CFLAGS_COMPILE = "-Wno-error -fpic";
-
     installFlags = [
       "USE_SYSTEM_LUA=yes"
       "USE_SYSTEM_MPACK=yes"
-      "MPACK_LUA_VERSION=${(builtins.parseDrvName lua.name).version}"
+      "MPACK_LUA_VERSION=${lua.version}"
-      "LUA_INCLUDE=-I${lua}/include"
+      "LUA_CMOD_INSTALLDIR=$(out)/lib/lua/${lua.luaversion}"
-      "LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}"
     ];
 
     meta = with stdenv.lib; {