Update from upstream repo nixOS/nixpkgs@master

nixos/modules/programs/thefuck.nix

@@ -31,8 +31,8 @@ in
       environment.systemPackages = with pkgs; [ thefuck ];
       environment.shellInit = initScript;
 
-      programs.zsh.shellInit = mkIf prg.zsh.enable initScript;
-      programs.fish.shellInit = mkIf prg.fish.enable ''
+      programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript;
+      programs.fish.interactiveShellInit = mkIf prg.fish.enable ''
         ${pkgs.thefuck}/bin/thefuck --alias | source
       '';
     };

nixos/tests/installer.nix

@@ -51,6 +51,8 @@ let
 
         hardware.enableAllFirmware = lib.mkForce false;
 
+        services.udisks2.enable = lib.mkDefault false;
+
         ${replaceChars ["\n"] ["\n  "] extraConfig}
       }
     '';
@@ -250,6 +252,8 @@ let
               ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
               ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ];
 
+            services.udisks2.enable = mkDefault false;
+
             nix.binaryCaches = mkForce [ ];
             nix.extraOptions =
               ''

pkgs/applications/networking/browsers/qutebrowser/default.nix

@@ -29,13 +29,13 @@ let
 in python3Packages.buildPythonApplication rec {
   name = "qutebrowser-${version}${versionPostfix}";
   namePrefix = "";
-  version = "1.3.2";
+  version = "1.3.3";
   versionPostfix = "";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0zy2cm85qq095hk94d8jk6yqpyy0f31vb2pfbdpgg93b9vvzajzz";
+    sha256 = "01lrbkddm4wagx4hq6cz5qwvb8q8nlz0xa35k317gvr3pmnvgjk8";
   };
 
   # Needs tox

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

@@ -40,11 +40,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.12.1";
+  version = "1.13.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1p85hpk8kzzgncfm033bzpwm7hk6rrq8zdpwqlk5z2biarwjdqfx";
+    sha256 = "1iapkkfqssbjcksgic7i8x0cwp6gwcbbrfxlw7vp6k1cfvjwv9pf";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

pkgs/applications/window-managers/yabar/build.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig
 , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
 , configFile ? null, lib
-, rev, sha256, version
+, rev, sha256, version, patches ? []
 }:
 
 stdenv.mkDerivation {
@@ -14,6 +14,8 @@ stdenv.mkDerivation {
     repo  = "yabar";
   };
 
+  inherit patches;
+
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ pkgconfig ];

pkgs/applications/window-managers/yabar/default.nix

@@ -1,10 +1,18 @@
-{ callPackage, attrs ? {} }:
+{ callPackage, attrs ? {}, fetchpatch }:
 
 let
-  overrides = {
+  overrides = rec {
     version = "0.4.0";
 
-    rev = "746387f0112f9b7aa2e2e27b3d69cb2892d8c63b";
+    rev = version;
     sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6";
+
+    patches = [
+      (fetchpatch {
+        url = "https://github.com/geommer/yabar/commit/9779a5e04bd6e8cdc1c9fcf5d7ac31416af85a53.patch";
+        sha256 = "1szhr3k1kq6ixgnp74wnzgfvgxm6r4zpc3ny2x2wzy6lh2czc07s";
+      })
+    ];
+
   } // attrs;
 in callPackage ./build.nix overrides

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

@@ -1051,6 +1051,8 @@ self: super: {
     strictDeps = true;
   });
 
+  # dhall-json requires a very particular dhall version
+  dhall-json_1_2_0 = super.dhall-json_1_2_0.override { dhall = self.dhall_1_14_0; };
 }
 
 //

pkgs/servers/nosql/influxdb/default.nix

@@ -27,6 +27,5 @@ buildGoPackage rec {
     license = licenses.mit;
     homepage = https://influxdb.com/;
     maintainers = with maintainers; [ offline zimbatm ];
-    platforms = platforms.linux;
   };
 }

pkgs/tools/misc/jdupes/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jdupes-${version}";
-  version = "1.9";
+  version = "1.10.2";
 
   src = fetchFromGitHub {
     owner = "jbruchon";
     repo  = "jdupes";
     rev   = "v${version}";
-    sha256 = "0z6hb4jva0pnk5fb1p59qwyglgrpxgpnz4djq3g00y5yxv3sj9z9";
+    sha256 = "0msp68h1gaipwpvdylpwd6w9al5gcmawj9cmvi7nw8ihh184g3m7";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
     # directories have such files and will be removed.
@@ -17,6 +17,13 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isLinux "ENABLE_BTRFS=1";
 
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    install -Dm644 -t $out/share/doc/jdupes CHANGES LICENSE README
+
+  '';
+
   meta = with stdenv.lib; {
     description = "A powerful duplicate file finder and an enhanced fork of 'fdupes'";
     longDescription = ''
@@ -26,7 +33,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/jbruchon/jdupes;
     license = licenses.mit;
+    maintainers = with maintainers; [ romildo ];
     platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
   };
 }

pkgs/tools/misc/libcpuid/default.nix

@@ -1,10 +1,5 @@
-{ stdenv
-, fetchFromGitHub
-, libtool
-, automake
-, autoconf
-, python2 # Needed for tests
-}:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
 stdenv.mkDerivation rec {
   name = "libcpuid-${version}";
   version = "0.4.0";
@@ -16,51 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "136kv6m666f7s18mim0vdbzqvs4s0wvixa12brj9p3kmfbx48bw7";
   };
 
-  patchPhase = ''
-    libtoolize
-    autoreconf --install
-  '';
-
-  configurePhase = ''
-    mkdir -p Install
-    ./configure --prefix=$(pwd)/Install
-    substituteInPlace Makefile --replace "/usr/local" "$out"
-  '';
-
-  buildPhase = ''
-    make all
-  '';
-
-  postInstall = ''
-    pushd Install
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib ${python2.interpreter} ../tests/run_tests.py ./bin/cpuid_tool ../tests/
-    popd
-
-    function fixRunPath {
-      p0=$(patchelf --print-rpath $1)
-      p1=$(echo $p0 | sed -re 's#.*Install/lib:##g')
-      patchelf --set-rpath $p1 $1
-    }
-
-    fixRunPath Install/bin/cpuid_tool
-
-    mkdir -p $out
-    sed -i -re "s#(prefix=).*Install#\1$out#g" Install/lib/pkgconfig/libcpuid.pc
-
-    cp -r Install/* $out
-    cp -r tests $out
-  '';
-
-  nativeBuildInputs = [
-    libtool
-    automake
-    autoconf
+  patches = [
+    # Work around https://github.com/anrieff/libcpuid/pull/102.
+    ./stdint.patch
   ];
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   meta = with stdenv.lib; {
     homepage = http://libcpuid.sourceforge.net/;
-    description = "a small C library for x86 CPU detection and feature extraction";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ artuuge ];
+    description = "A small C library for x86 CPU detection and feature extraction";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ orivej artuuge ];
+    platforms = platforms.all;
   };
 }

pkgs/tools/misc/libcpuid/stdint.patch

@@ -0,0 +1,5 @@
+--- a/libcpuid/libcpuid.h
++++ b/libcpuid/libcpuid.h
+@@ -88 +88 @@
+-#include "libcpuid_types.h"
++#include <stdint.h>