Merge branch 'master' into staging-next

2024-12-29 14:57:28 +03:00 · 2019-09-16 19:24:52 +02:00 · 2019-09-16 19:24:52 +02:00 · fa4a3af5a7
commit fa4a3af5a7
parent 6e66cf0f6b a95a53aadc
102 changed files with 1767 additions and 687 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -1109,10 +1109,6 @@
    githubId = 977929;
    name = "Cody Allen";
  };
-  cf6b88f = {
-    email = "elmo.todurov@eesti.ee";
-    name = "Elmo Todurov";
-  };
  cfouche = {
    email = "chaddai.fouche@gmail.com";
    github = "Chaddai";
@ -1219,6 +1215,12 @@
    githubId = 3956062;
    name = "Simon Lackerbauer";
  };
+  cizra = {
+    email = "todurov+nix@gmail.com";
+    github = "cizra";
+    githubId = 2131991;
+    name = "Elmo Todurov";
+  };
  ck3d = {
    email = "ck3d@gmx.de";
    github = "ck3d";
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@ -7,10 +7,12 @@
  <refmiscinfo class="source">NixOS</refmiscinfo>
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
 </refmeta>
+
 <refnamediv>
  <refname><command>nixos-rebuild</command>
  </refname><refpurpose>reconfigure a NixOS machine</refpurpose>
 </refnamediv>
+
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>nixos-rebuild</command><group choice='req'>
@ -74,6 +76,7 @@
   <arg>
    <option>--builders</option> <replaceable>builder-spec</replaceable>
   </arg>
+
   <sbr />
   <arg>
    <group choice='req'>
@ -121,8 +124,10 @@
   </arg>
  </cmdsynopsis>
 </refsynopsisdiv>
+
 <refsection>
  <title>Description</title>
+
  <para>
   This command updates the system so that it corresponds to the configuration
   specified in <filename>/etc/nixos/configuration.nix</filename>. Thus, every
@ -133,9 +138,11 @@
   (re)starts any system services if needed. Please note that user services need
   to be started manually as they aren't detected by the activation script at the moment.
  </para>
+
  <para>
   This command has one required argument, which specifies the desired
   operation. It must be one of the following:
+
   <variablelist>
    <varlistentry>
     <term>
@ -152,6 +159,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>boot</option>
@ -165,6 +173,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>test</option>
@ -179,6 +188,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>build</option>
@ -197,6 +207,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>dry-build</option>
@ -208,6 +219,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>dry-activate</option>
@ -222,6 +234,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>edit</option>
@ -232,6 +245,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>build-vm</option>
@ -249,12 +263,14 @@
 <prompt>$ </prompt>./result/bin/run-*-vm
 </screen>
      </para>
+
      <para>
       The VM is implemented using the <literal>qemu</literal> package. For
       best performance, you should load the <literal>kvm-intel</literal> or
       <literal>kvm-amd</literal> kernel modules to get hardware
       virtualisation.
      </para>
+
      <para>
       The VM mounts the Nix store of the host through the 9P file system. The
       host Nix store is read-only, so Nix commands that modify the Nix store
@ -262,6 +278,7 @@
       <command>nixos-rebuild</command>; to change the VM’s configuration,
       you must halt the VM and re-run the commands above.
      </para>
+
      <para>
       The VM has its own <literal>ext3</literal> root file system, which is
       automatically created when the VM is first started, and is persistent
@ -272,6 +289,7 @@
      </para>
     </listitem>
    </varlistentry>
+
    <varlistentry>
     <term>
      <option>build-vm-with-bootloader</option>
@ -294,11 +312,13 @@
   </variablelist>
  </para>
 </refsection>
+
 <refsection>
  <title>Options</title>
  <para>
   This command accepts the following options:
  </para>
+
  <variablelist>
   <varlistentry>
    <term>
@ -310,6 +330,7 @@
     </para>
    </listitem>
   </varlistentry>
+
   <varlistentry>
    <term>
     <option>--install-bootloader</option>
@ -321,6 +342,7 @@
     </para>
    </listitem>
   </varlistentry>
+
   <varlistentry>
    <term>
     <option>--no-build-nix</option>
@ -336,6 +358,7 @@
     </para>
    </listitem>
   </varlistentry>
+
   <varlistentry>
    <term>
     <option>--fast</option>
@ -349,6 +372,7 @@
     </para>
    </listitem>
   </varlistentry>
+
   <varlistentry>
    <term>
     <option>--rollback</option>
@ -363,6 +387,7 @@
     </para>
    </listitem>
   </varlistentry>
+
   <varlistentry>
    <term>
     <option>--builders</option> <replaceable>builder-spec</replaceable>
@ -382,6 +407,7 @@
     </para>
    </listitem>
   </varlistentry>
+
   <varlistentry>
    <term>
     <option>--profile-name</option>
@ -412,6 +438,7 @@
     </para>
    </listitem>
   </varlistentry>
+
   <varlistentry>
    <term>
     <option>--build-host</option>
@ -437,6 +464,7 @@
     </para>
    </listitem>
   </varlistentry>
+
   <varlistentry>
    <term>
     <option>--target-host</option>
@ -449,6 +477,7 @@
      be accessible over ssh, and for the commands <option>switch</option>,
      <option>boot</option> and <option>test</option> you need root access.
     </para>
+
     <para>
      If <option>--build-host</option> is not explicitly specified,
      <option>--build-host</option> will implicitly be set to the same value as
@ -457,6 +486,7 @@
      place remotely (and no build artifacts will be copied to the local
      machine).
     </para>
+
     <para>
      You can include a remote user name in the host name
      (<replaceable>user@host</replaceable>). You can also set ssh options by
@ -465,6 +495,7 @@
    </listitem>
   </varlistentry>
  </variablelist>
+
  <para>
   In addition, <command>nixos-rebuild</command> accepts various Nix-related
   flags, including <option>--max-jobs</option> / <option>-j</option>,
@ -473,8 +504,10 @@
   <option>-v</option>. See the Nix manual for details.
  </para>
 </refsection>
+
 <refsection>
  <title>Environment</title>
+
  <variablelist>
   <varlistentry>
    <term>
@ -487,6 +520,7 @@
     </para>
    </listitem>
   </varlistentry>
+
   <varlistentry>
    <term>
     <envar>NIX_SSHOPTS</envar>
@ -500,9 +534,12 @@
   </varlistentry>
  </variablelist>
 </refsection>
+
 <refsection>
  <title>Files</title>
+
  <variablelist>
+
   <varlistentry>
    <term>
     <filename>/run/current-system</filename>
@ -513,6 +550,7 @@
     </para>
    </listitem>
   </varlistentry>
+
   <varlistentry>
    <term>
     <filename>/nix/var/nix/profiles/system</filename>
@ -524,8 +562,10 @@
     </para>
    </listitem>
   </varlistentry>
+
  </variablelist>
 </refsection>
+
 <refsection>
  <title>Bugs</title>
  <para>
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@ -273,20 +273,6 @@ with lib;
    (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
    (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])

-    # Redshift
-    (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ]
-      (config:
-        let value = getAttrFromPath [ "services" "redshift" "latitude" ] config;
-        in if value == null then
-          throw "services.redshift.latitude is set to null, you can remove this"
-          else builtins.fromJSON value))
-    (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ]
-      (config:
-        let value = getAttrFromPath [ "services" "redshift" "longitude" ] config;
-        in if value == null then
-          throw "services.redshift.longitude is set to null, you can remove this"
-          else builtins.fromJSON value))
-
    # Redis
    (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
    (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@ -120,16 +120,24 @@ in {
      '';
    };

-    poolConfig = mkOption {
-      type = types.lines;
-      default = ''
-        pm = dynamic
-        pm.max_children = 32
-        pm.start_servers = 2
-        pm.min_spare_servers = 2
-        pm.max_spare_servers = 4
-        pm.max_requests = 500
+    poolSettings = mkOption {
+      type = with types; attrsOf (oneOf [ str int bool ]);
+      default = {
+        "pm" = "dynamic";
+        "pm.max_children" = "32";
+        "pm.start_servers" = "2";
+        "pm.min_spare_servers" = "2";
+        "pm.max_spare_servers" = "4";
+        "pm.max_requests" = "500";
+      };
+      description = ''
+        Options for nextcloud's PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives.
      '';
+    };
+
+    poolConfig = mkOption {
+      type = types.nullOr types.lines;
+      default = null;
      description = ''
        Options for nextcloud's PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives.
      '';
@ -287,6 +295,11 @@ in {
          message = "Please specify exactly one of adminpass or adminpassFile";
        }
      ];
+
+      warnings = optional (cfg.poolConfig != null) ''
+        Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release.
+        Please migrate your configuration to config.services.nextcloud.poolSettings.
+      '';
    }

    { systemd.timers.nextcloud-cron = {
@ -423,7 +436,7 @@ in {
          settings = mapAttrs (name: mkDefault) {
            "listen.owner" = "nginx";
            "listen.group" = "nginx";
-          };
+          } // cfg.poolSettings;
          extraConfig = cfg.poolConfig;
        };
      };
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@ -9,6 +9,22 @@ let

 in {

+  imports = [
+    (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ]
+      (config:
+        let value = getAttrFromPath [ "services" "redshift" "latitude" ] config;
+        in if value == null then
+          throw "services.redshift.latitude is set to null, you can remove this"
+          else builtins.fromJSON value))
+    (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ]
+      (config:
+        let value = getAttrFromPath [ "services" "redshift" "longitude" ] config;
+        in if value == null then
+          throw "services.redshift.longitude is set to null, you can remove this"
+          else builtins.fromJSON value))
+    (mkRenamedOptionModule [ "services" "redshift" "provider" ] [ "location" "provider" ])
+  ];
+
  options.services.redshift = {
    enable = mkOption {
      type = types.bool;
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@ -218,7 +218,7 @@ in

    systemd.user = {
      services.nixos-activation = {
-        description = "Run user specific NixOS activation";
+        description = "Run user-specific NixOS activation";
        script = config.system.userActivationScripts.script;
        unitConfig.ConditionUser = "!@system";
        serviceConfig.Type = "oneshot";
--- a/nixos/modules/tasks/auto-upgrade.nix
+++ b/nixos/modules/tasks/auto-upgrade.nix
@ -88,7 +88,7 @@ let cfg = config.system.autoUpgrade; in
          HOME = "/root";
        } // config.networking.proxy.envVars;

-      path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gitMinimal config.nix.package.out ];
+      path = with pkgs; [ coreutils gnutar xz.bin gzip gitMinimal config.nix.package.out ];

      script = let
          nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild";
--- a/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/pkgs/applications/blockchains/wasabiwallet/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "wasabiwallet";
-  version = "1.1.8";
+  version = "1.1.9";

  src = fetchurl {
    url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
-    sha256 = "10w4f9d0li25ifkmlmj6302i70sw3drdwd54d4r7x1n5kc6p164j";
+    sha256 = "1dz05ivhadfjfp4yfpz492401yznm3rlnx7g4nqzxwh4cmqzisrm";
  };

  dontBuild = true;
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@ -11,13 +11,13 @@ let
  archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q";
-    x86_64-darwin = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky";
+    x86_64-linux = "1wxaxz2q4qizh6f23ipz8ihay6bpjdq0545vijqd84fqazcji6sq";
+    x86_64-darwin = "1gb9w3hvw3avn852an5v8m1ia64fkavnvaawjfc3455b248iiqvk";
  }.${system};
 in
  callPackage ./generic.nix rec {

-    version = "1.38.0";
+    version = "1.38.1";
    pname = "vscode";

    executableName = "code" + lib.optionalString isInsiders "-insiders";
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@ -11,13 +11,13 @@ let
  archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132";
-    x86_64-darwin = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4";
+    x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb";
+    x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5";
  }.${system};
 in
  callPackage ./generic.nix rec {

-    version = "1.38.0";
+    version = "1.38.1";
    pname = "vscodium";

    executableName = "codium";
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@ -70,10 +70,13 @@ mkDerivation {
    kpurpose
    kdeclarative
  ];
+  patches = [ ./mlt-path.patch ];
+  inherit mlt;
  postPatch =
    # Module Qt5::Concurrent must be included in `find_package` before it is used.
    ''
      sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
+      substituteAllInPlace src/kdenlivesettings.kcfg
    '';
  meta = {
    license = with lib.licenses; [ gpl2Plus ];
--- a/pkgs/applications/kde/kmail.nix
+++ b/pkgs/applications/kde/kmail.nix
@ -7,7 +7,7 @@
  kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,
  kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,
  kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon,
-  messagelib, pim-sieve-editor, qtscript, qtwebengine,
+  messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi
 }:

 mkDerivation {
@ -25,6 +25,6 @@ mkDerivation {
    ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar
    libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
  ];
-  propagatedUserEnvPkgs = [ kdepim-runtime kwallet ];
+  propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ];
  patches = [ ./kmail.patch ];
 }
--- a/pkgs/applications/kde/mlt-path.patch
+++ b/pkgs/applications/kde/mlt-path.patch
@ -0,0 +1,22 @@
+diff -ruN old/src/kdenlivesettings.kcfg new/src/kdenlivesettings.kcfg
+--- old/src/kdenlivesettings.kcfg	2019-09-10 23:20:27.555392353 -0400
+++ new/src/kdenlivesettings.kcfg	2019-09-10 23:25:47.533964155 -0400
+@@ -378,14 +378,14 @@
+ </group>
+ 
+   <group name="env">
+-    <entry name="mltpath" type="Path">
+    <entry name="mltpath" type="Path" hidden="true">
+       <label>Mlt framework install path.</label>
+-      <default></default>
+      <default>@mlt@/share/mlt/profiles</default>
+     </entry>
+ 
+-    <entry name="rendererpath" type="Path">
+    <entry name="rendererpath" type="Path" hidden="true">
+       <label>Mlt melt renderer install path.</label>
+-      <default></default>
+      <default>@mlt@/bin/melt</default>
+     </entry>
+ 
+     <entry name="ffmpegpath" type="Path">
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@ -22,17 +22,21 @@ stdenv.mkDerivation {
  nativeBuildInputs = [ autoreconfHook pkgconfig ];
  buildInputs = [ glib libxml2 exiv2 imagemagick ];

+  prePatch = ''
+    sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp
+  '';
+
  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;
+  meta = with stdenv.lib; {
+    homepage = "http://cgg.bzatek.net/";
+    description = "A simple static web photo gallery, designed to be clean and easily usable";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.matthiasbeyer ];
+    platforms = with platforms; linux ++ darwin;
  };
 }

--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@ -7,15 +7,15 @@ let
    else
      [ wxGTK ];
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  pname = "diff-pdf";
-  version = "2017-12-30";
+  version = "0.3";

  src = fetchFromGitHub {
    owner = "vslavik";
    repo = "diff-pdf";
-    rev = "c4d67226ec4c29b30a7399e75f80636ff8a6f9fc";
-    sha256 = "1c3ig7ckrg37p5vzvgjnsfdzdad328wwsx0r31lbs1d8pkjkgq3m";
+    rev = "v${version}";
+    sha256 = "0vzvyjpk6m89zs6j1dq85f93n2b1i6akn2g0z9qhagjd2pds920i";
  };

  nativeBuildInputs = [ autoconf automake pkgconfig ];
@ -24,9 +24,10 @@ stdenv.mkDerivation {
  preConfigure = "./bootstrap";

  meta = with stdenv.lib; {
-    homepage = http://vslavik.github.io/diff-pdf;
+    homepage = "https://vslavik.github.io/diff-pdf/";
    description = "Simple tool for visually comparing two PDF files";
    license = licenses.gpl2;
+    platforms = platforms.all;
    maintainers = with maintainers; [ dtzWill ];
  };
 }
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@ -5,13 +5,13 @@ with python3.pkgs;

 buildPythonApplication rec {
  pname = "gcalcli";
-  version = "4.1.1";
+  version = "4.2.0";

  src = fetchFromGitHub {
    owner  = "insanum";
    repo   = pname;
    rev    = "v${version}";
-    sha256 = "1qlmslywm4dfimggly4p0ckn2gj165mq1p0wkry9jpb3sg1m5fdf";
+    sha256 = "0746vmhfclkpkqnyaidxid2z20mlv86hv0pjxy1qglrja91vkd72";
  };

  postPatch = lib.optionalString stdenv.isLinux ''
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "gpxsee";
-  version = "7.12";
+  version = "7.13";

  src = fetchFromGitHub {
    owner = "tumic0";
    repo = "GPXSee";
    rev = version;
-    sha256 = "0c3axs3mm6xzabwbvy9vgq1sryjpi4h91nwzy9iyv9zjxz7phgzc";
+    sha256 = "08cg5k4ffj2wrcm4rk7vyixbyyz0424276fw2fn8lmziklkdqyjw";
  };

  nativeBuildInputs = [ qmake ];
@ -28,7 +28,7 @@ mkDerivation rec {
      all common GPS log file formats.
    '';
    license = licenses.gpl3;
-    maintainers = [ maintainers.womfoo ];
+    maintainers = with maintainers; [ womfoo sikmir ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@ -2,12 +2,12 @@

 let
  pname = "joplin-desktop";
-  version = "1.0.158";
+  version = "1.0.167";
 in appimageTools.wrapType2 rec {
  name = "${pname}-${version}";
  src = fetchurl {
    url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}-x86_64.AppImage";
-    sha256 = "1xaamwcasihja3agwb0nnfnzc1wmmr0d2ng73qmfil9nhf9v3j6q";
+    sha256 = "062f2av60490ffrml0q8zv68yir6zaqif0g3d32c985gcvmgn9lw";
  };


--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@ -7,7 +7,7 @@

 buildGoModule rec {
  pname = "wtf";
-  version = "0.21.0";
+  version = "0.22.0";

  overrideModAttrs = _oldAttrs : _oldAttrs // {
    preBuild = ''export GOPROXY="https://gocenter.io"'';
@ -17,17 +17,18 @@ buildGoModule rec {
    owner = "wtfutil";
    repo = pname;
    rev = "v${version}";
-    sha256 = "0sd8vrx7nak0by4whdmd9jzr66zm48knv1w1aqi90709fv98brm9";
+    sha256 = "1d8lp94cw8rh9r9y64awxafhw9fmp33v3m761gzy500hrxal2rzb";
   };

-  modSha256 = "0jgq9ql27x0kdp59l5drisl5v7v7sx2wy3zqjbr3bqyh3vdx19ic";
+  modSha256 = "0m180571j4564py5mzdcbyypk71fdlp2vkfdwi6q85nd2q94sx6h";

  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

  nativeBuildInputs = [ makeWrapper ];

  postInstall = ''
-    wrapProgram "$out/bin/wtf" --prefix PATH : "${ncurses.dev}/bin"
+    mv "$out/bin/wtf" "$out/bin/wtfutil"
+    wrapProgram "$out/bin/wtfutil" --prefix PATH : "${ncurses.dev}/bin"
  '';

  meta = with lib; {
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@ -1,6 +1,6 @@
 { lib, buildGoPackage, fetchFromGitHub, ... }:

-let version = "0.12.0"; in
+let version = "0.12.5"; in

 buildGoPackage {
  pname = "kubecfg";
@ -10,7 +10,7 @@ buildGoPackage {
    owner = "bitnami";
    repo = "kubecfg";
    rev = "v${version}";
-    sha256 = "118p1fy6cihswwz03vp62cz8395hgfqd82nmfkw88fx7av23rfhb";
+    sha256 = "0pn37qkwn3kdsd0z3qxk95lqjn2zak7gkk0pwlqp26jmrx0vv18l";
  };

  goPackagePath = "github.com/bitnami/kubecfg";
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@ -3,13 +3,13 @@
 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:

 let
-  version = "5.3.1";
+  version = "5.3.2";
 in stdenv.mkDerivation {
  pname = "franz";
  inherit version;
  src = fetchurl {
    url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
-    sha256 = "16ssg4cjjmq3cps8klyx3jxqma7f83cczwjnknlfqglrwwdpnb5d";
+    sha256 = "19mfw0wgjdhq38p0xvixdxvk07j3rdwlw87p8gjh4yi1qv0paj4i";
  };

  # don't remove runtime deps
--- a/pkgs/applications/networking/instant-messengers/spectral/default.nix
+++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix
@ -1,49 +1,40 @@
 { stdenv, fetchgit
-, pkgconfig, makeWrapper
-, qmake, qtbase, qtquickcontrols2, qtmultimedia
+, pkgconfig, wrapQtAppsHook
+, cmake
+, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain
 , libpulseaudio
 # Not mentioned but seems needed
 , qtgraphicaleffects
 , qtdeclarative
 , qtmacextras
+, olm, cmark
 }:

-let
-  # Following "borrowed" from yubikey-manager-qt
-  qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}";
-
-  inherit (stdenv) lib;
-
-  qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [
-    qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia
-  ];
-
+let qtkeychain-qt5 = qtkeychain.override {
+  inherit qtbase qttools;
+  withQt5 = true;
+};
 in stdenv.mkDerivation {
  pname = "spectral";
-  version = "2019-03-03";
+  version = "unstable-2019-08-30";

  src = fetchgit {
    url = "https://gitlab.com/b0/spectral.git";
-    rev = "0473f25d38a064ee4e18203ec16eeae84fea4866";
-    sha256 = "1n09ginw6g0p42xj3zgxm52dvyyvj5psllv70vx21i50lvkbh9rw";
+    rev = "ee86c948aec5fe72979fc6df97f4a6ef711bdf94";
+    sha256 = "1mqabdkvzq48wki92wm2r79kj8g8m7ganpl47sh60qfsk4bxa8b2";
    fetchSubmodules = true;
  };

-  qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ];
+  #qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ];

-  postInstall = ''
-    wrapProgram $out/bin/spectral \
-      --set QML2_IMPORT_PATH "${qml2ImportPath}"
-  '';
-
-  nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
-  buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]
+  nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ];
+  buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm cmark ]
    ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio
    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras;

  meta = with stdenv.lib; {
-    description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++";
-    homepage = https://gitlab.com/b0/spectral;
+    description = "A glossy cross-platform Matrix client.";
+    homepage = "https://gitlab.com/b0/spectral";
    license = licenses.gpl3;
    platforms = with platforms; linux ++ darwin;
    maintainers = with maintainers; [ dtzWill ];
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@ -28,7 +28,7 @@ let
   "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
   "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh";
   "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2";
-   "8.10+beta2" = "0jk7pwydhd17ab7ii69zvi4sgrr630q2lsxhckaj3sz55cpjlhal";
+   "8.10+beta3" = "08c7q97jyblsf7dhk8jf1fx1cp9qr3dr5s42wigx10wh7i6j7pca";
  }.${version};
  coq-version = stdenv.lib.versions.majorMinor version;
  versionAtLeast = stdenv.lib.versionAtLeast coq-version;
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "cytoscape";
-  version = "3.7.1";
+  version = "3.7.2";

  src = fetchurl {
    url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1mhsngbwbgdwl70wj7850zg94534lasihwv2ryifardm35mkh48k";
+    sha256 = "125vgr8vqbmy2nsm1yl0h0q8p49lxxqfw5cmxzbx1caklcn4rryc";
  };

  buildInputs = [jre makeWrapper];
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "gitkraken";
-  version = "6.1.4";
+  version = "6.2.0";

  src = fetchurl {
    url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
-    sha256 = "10m6pwdwdxj6x64bc7mrvlvwkgqrd5prh9xx7xhvbz55q6gx4vdr";
+    sha256 = "1kvp0fbixpynb0wh8px1qm6gnxwc5ml2q0vwsll0pa8zrjdz4q3k";
  };

  libPath = makeLibraryPath [
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@ -2,10 +2,14 @@
 #
 # Derivation patches HandBrake to use Nix closure dependencies.
 #
+# NOTE: 2019-07-19: This derivation does not currently support the native macOS
+# GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would
+# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that
+# requires invoking the Xcode build system, which is non-trivial for now.

 { stdenv, lib, fetchurl,
  # Main build tools
-  python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4,
+  python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, lzma,
  # Processing, video codecs, containers
  ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora,
  # Codecs, audio
@ -14,7 +18,17 @@
  libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, harfbuzz,
  # Optical media
  libdvdread, libdvdnav, libdvdcss, libbluray,
-  useGtk ? true, wrapGAppsHook ? null,
+  # Darwin-specific
+  AudioToolbox ? null,
+  Foundation ? null,
+  libobjc ? null,
+  VideoToolbox ? null,
+  # GTK
+  # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus,
+  # which in turn depends on systemd. systemd is not supported on Darwin, so
+  # for now we disable GTK GUI support on Darwin. (It may be possible to remove
+  # this restriction later.)
+  useGtk ? !stdenv.isDarwin, wrapGAppsHook ? null,
                             intltool ? null,
                             glib ? null,
                             gtk3 ? null,
@ -25,9 +39,13 @@
                             udev ? null,
                             libgudev ? null,
                             hicolor-icon-theme ? null,
+  # FDK
  useFdk ? false, fdk_aac ? null
 }:

+assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null
+  && libobjc != null && VideoToolbox != null;
+
 stdenv.mkDerivation rec {
  pname = "handbrake";
  version = "1.2.2";
@ -45,12 +63,13 @@ stdenv.mkDerivation rec {
    ffmpeg-full libogg libtheora x264 x265 libvpx
    libopus lame libvorbis a52dec speex libsamplerate
    libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz
-    libdvdread libdvdnav libdvdcss libbluray
+    libdvdread libdvdnav libdvdcss libbluray lzma
  ] ++ lib.optionals useGtk [
    glib gtk3 libappindicator-gtk3 libnotify
    gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev
    libgudev hicolor-icon-theme
  ] ++ lib.optional useFdk fdk_aac
+    ++ lib.optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ]
  # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only,
  # look at ./make/configure.py search "enable_nvenc"
    ++ lib.optional stdenv.isLinux nv-codec-headers;
@ -59,13 +78,16 @@ stdenv.mkDerivation rec {
  # (default distribution bundles&builds 3rd party libs),
  # don't trigger cmake build
  dontUseCmakeConfigure = true;
-  enableParallelBuilding = true;
+  # cp: cannot create regular file './internal_defaults.json': File exists
+  enableParallelBuilding = false;

  preConfigure = ''
    patchShebangs scripts

    substituteInPlace libhb/module.defs \
      --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2
+    substituteInPlace libhb/module.defs \
+      --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2

    # Force using nixpkgs dependencies
    sed -i '/MODULES += contrib/d' make/include/main.defs
@ -77,6 +99,7 @@ stdenv.mkDerivation rec {
    "--disable-df-verify"
    (if useGtk          then "--disable-gtk-update-checks" else "--disable-gtk")
    (if useFdk          then "--enable-fdk-aac"            else "")
+    (if stdenv.isDarwin then "--disable-xcode"             else "")
  ];

  # NOTE: 2018-12-27: Check NixOS HandBrake test if changing
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@ -7,13 +7,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0";

 mkDerivation rec {
  pname = "shotcut";
-  version = "19.08.16";
+  version = "19.09.14";

  src = fetchFromGitHub {
    owner = "mltframework";
    repo = "shotcut";
    rev = "v${version}";
-    sha256 = "0alnnfgimfs8fjddkcfx4pzyijwz5dgnqic5qazaza6f4kf60801";
+    sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn";
  };

  enableParallelBuilding = true;
@ -36,7 +36,7 @@ mkDerivation rec {

  qtWrapperArgs = [
    "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
-    "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2 ]}"
+    "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2]}"
    "--prefix PATH : ${mlt}/bin"
    ];

--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@ -17,7 +17,7 @@

 buildGoPackage rec {
  project = "cri-o";
-  version = "1.15.1";
+  version = "1.15.2";
  name = "${project}-${version}${flavor}";

  goPackagePath = "github.com/${project}/${project}";
@ -26,7 +26,7 @@ buildGoPackage rec {
    owner = "cri-o";
    repo = "cri-o";
    rev = "v${version}";
-    sha256 = "0yjj03qwwb6g05pzavimgj14p6805m3w8qqpl4fp4fpmbrsx4sb0";
+    sha256 = "0fiizxwxdq87h943421ivgw49jndk23yjz3saf1rzmn7g3xh2pn4";
  };

  outputs = [ "bin" "out" ];
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans-pro/default.nix
@ -1,9 +1,11 @@
 { lib, fetchzip }:

-fetchzip {
-  name = "source-sans-pro-2.045";
+let
+  version = "3.006";
+in fetchzip {
+  name = "source-sans-pro-${version}";

-  url = https://github.com/adobe-fonts/source-sans-pro/releases/download/2.045R-ro%2F1.095R-it/source-sans-pro-2.045R-ro-1.095R-it.zip;
+  url = "https://github.com/adobe-fonts/source-sans-pro/releases/download/${version}R/source-sans-pro-${version}R.zip";

  postFetch = ''
    mkdir -p $out/share/fonts/{opentype,truetype,variable}
@ -12,7 +14,7 @@ fetchzip {
    unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
  '';

-  sha256 = "0xjdp226ybdcfylbpfsdgnz2bf4pj4qv1wfs6fv22hjxlzqfixf3";
+  sha256 = "11jd50cqiq2s0z39rclg73iiw2j5yzgs1glfs9psw5wbbisgysmr";

  meta = with lib; {
    homepage = https://adobe-fonts.github.io/source-sans-pro/;
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@ -2,7 +2,7 @@

 let
  pname = "spleen";
-  version = "1.0.5";
+  version = "1.3.0";
 in fetchurl {
  name = "${pname}-${version}";
  url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@ -10,14 +10,13 @@ in fetchurl {
  downloadToTemp = true;
  recursiveHash = true;
  postFetch = ''
-    tar xf $downloadedFile --strip=1
+    tar xvf $downloadedFile --strip=1
    d="$out/share/fonts/X11/misc/spleen"
    gzip -n9 *.pcf
-    install -Dm644 *.pcf.gz  -t $d
-    install -Dm644 *.bdf -t $d
+    install -Dm644 *.{pcf.gz,psfu,bdf} -t $d
    install -m644 fonts.alias-spleen $d/fonts.alias
  '';
-  sha256 = "0144a0lkkl5qx0a8sapymcayj5lp5cs9nfgpbmg3427n41pkqfbb";
+  sha256 = "1l1ksl8xnz1yh7jl8h2g25a7wfm9xgj3lay8ddqzlxzydkkm110q";

  meta = with lib; {
    description = "Monospaced bitmap fonts";
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@ -38,7 +38,9 @@ let
    };
    deepin-turbo = callPackage ./deepin-turbo { };
    deepin-wallpapers = callPackage ./deepin-wallpapers { };
-    deepin-wm = callPackage ./deepin-wm { };
+    deepin-wm = callPackage ./deepin-wm {
+      vala = pkgs.vala_0_42;
+    };
    dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
    dtkcore = callPackage ./dtkcore { };
    dtkwidget = callPackage ./dtkwidget { };
--- a/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
+++ b/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
@ -0,0 +1,147 @@
+From 76477def5c103f10d62e604305802d7f5506afd4 Mon Sep 17 00:00:00 2001
+From: worldofpeace <worldofpeace@protonmail.ch>
+Date: Sun, 15 Sep 2019 20:14:16 -0400
+Subject: [PATCH] Revert "ClutterActor: Preserve valid paint volumes till the
+ next relayout/repaint"
+
+This causes issues for users of mutter like in gala[0].
+
+Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536
+[0]: https://github.com/elementary/gala/issues/605
+---
+ clutter/clutter/clutter-actor.c | 35 +++++----------------------------
+ 1 file changed, 5 insertions(+), 30 deletions(-)
+
+diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
+index e70892308..8cb60fa07 100644
+--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
+@@ -24,7 +24,7 @@
+ 
+ /**
+  * SECTION:clutter-actor
+- * @short_description: The basic element of the scene graph 
+ * @short_description: The basic element of the scene graph
+  *
+  * The ClutterActor class is the basic element of the scene graph in Clutter,
+  * and it encapsulates the position, size, and transformations of a node in
+@@ -840,7 +840,6 @@ struct _ClutterActorPrivate
+   guint needs_compute_expand        : 1;
+   guint needs_x_expand              : 1;
+   guint needs_y_expand              : 1;
+-  guint needs_paint_volume_update   : 1;
+   guint had_effects_on_last_paint_volume_update : 1;
+ };
+ 
+@@ -1511,8 +1510,6 @@ clutter_actor_real_map (ClutterActor *self)
+ 
+   CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_MAPPED);
+ 
+-  self->priv->needs_paint_volume_update = TRUE;
+-
+   stage = _clutter_actor_get_stage_internal (self);
+   priv->pick_id = _clutter_stage_acquire_pick_id (CLUTTER_STAGE (stage), self);
+ 
+@@ -2746,7 +2743,6 @@ clutter_actor_real_queue_relayout (ClutterActor *self)
+   priv->needs_width_request  = TRUE;
+   priv->needs_height_request = TRUE;
+   priv->needs_allocation     = TRUE;
+-  priv->needs_paint_volume_update = TRUE;
+ 
+   /* reset the cached size requests */
+   memset (priv->width_requests, 0,
+@@ -4742,7 +4738,7 @@ clutter_actor_set_rotation_center_internal (ClutterActor        *self,
+                                             ClutterRotateAxis    axis,
+                                             const ClutterVertex *center)
+ {
+-  ClutterVertex v = CLUTTER_VERTEX_INIT_ZERO; 
+  ClutterVertex v = CLUTTER_VERTEX_INIT_ZERO;
+   GObject *obj = G_OBJECT (self);
+   ClutterTransformInfo *info;
+ 
+@@ -8531,7 +8527,6 @@ clutter_actor_init (ClutterActor *self)
+   priv->needs_width_request = TRUE;
+   priv->needs_height_request = TRUE;
+   priv->needs_allocation = TRUE;
+-  priv->needs_paint_volume_update = TRUE;
+ 
+   priv->cached_width_age = 1;
+   priv->cached_height_age = 1;
+@@ -10098,9 +10093,6 @@ clutter_actor_allocate (ClutterActor           *self,
+       return;
+     }
+ 
+-  if (CLUTTER_ACTOR_IS_MAPPED (self))
+-    self->priv->needs_paint_volume_update = TRUE;
+-
+   if (!stage_allocation_changed)
+     {
+       /* If the actor didn't move but needs_allocation is set, we just
+@@ -12992,9 +12984,6 @@ clutter_actor_add_child_internal (ClutterActor              *self,
+       child->priv->needs_height_request = TRUE;
+       child->priv->needs_allocation = TRUE;
+ 
+-      if (CLUTTER_ACTOR_IS_MAPPED (child))
+-        child->priv->needs_paint_volume_update = TRUE;
+-
+       /* we only queue a relayout here, because any possible
+        * redraw has already been queued either by show() or
+        * by our call to queue_redraw() above
+@@ -14130,7 +14119,7 @@ clutter_actor_get_anchor_point_gravity (ClutterActor *self)
+  *
+  * Since: 0.6
+  *
+- * Deprecated: 1.12: Use #ClutterActor:pivot-point and 
+ * Deprecated: 1.12: Use #ClutterActor:pivot-point and
+  * clutter_actor_set_translation() instead.
+  */
+ void
+@@ -14178,7 +14167,7 @@ clutter_actor_move_anchor_point (ClutterActor *self,
+  *
+  * Since: 0.6
+  *
+- * Deprecated: 1.12: Use #ClutterActor:pivot-point and 
+ * Deprecated: 1.12: Use #ClutterActor:pivot-point and
+  * clutter_actor_set_translation() instead.
+  */
+ void
+@@ -14230,7 +14219,7 @@ clutter_actor_move_anchor_point_from_gravity (ClutterActor   *self,
+  *
+  * Since: 0.6
+  *
+- * Deprecated: 1.12: Use #ClutterActor:pivot-point and 
+ * Deprecated: 1.12: Use #ClutterActor:pivot-point and
+  * clutter_actor_set_translation() instead. E.g. For %CLUTTER_GRAVITY_CENTER set
+  * pivot_point to (0.5,0.5) and the translation to (width/2,height/2).
+  */
+@@ -17567,19 +17556,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
+ 
+   if (priv->paint_volume_valid)
+     {
+-      /* If effects are applied, the actor paint volume
+-       * needs to be recomputed on each paint, since those
+-       * paint volumes could change over the duration of the
+-       * effect.
+-       *
+-       * We also need to update the paint volume if we went
+-       * from having effects to not having effects on the last
+-       * paint volume update. */
+-      if (!priv->needs_paint_volume_update &&
+-          priv->current_effect == NULL &&
+-          !has_paint_volume_override_effects &&
+-          !priv->had_effects_on_last_paint_volume_update)
+-        return &priv->paint_volume;
+       clutter_paint_volume_free (&priv->paint_volume);
+     }
+ 
+@@ -17588,7 +17564,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
+   if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume))
+     {
+       priv->paint_volume_valid = TRUE;
+-      priv->needs_paint_volume_update = FALSE;
+       return &priv->paint_volume;
+     }
+   else
+-- 
+2.22.1
+
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@ -54,6 +54,8 @@ stdenv.mkDerivation rec {
      url = "https://github.com/elementary/os-patches/commit/d636a44885c5be662997f8e19f7dcd26670b3219.patch";
      sha256 = "12pbxk6f39a09jxjam5a5hxl4whp3cifzpck2m7fpp0n98nc63qh";
    })
+    # See patch commit message
+    ./0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
  ];

  configureFlags = [
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  pname = "dtc";
-  version = "1.5.0";
+  version = "1.5.1";

  src = fetchgit {
    url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
    rev = "refs/tags/v${version}";
-    sha256 = "075gj8bbahfdb8dlif3d2dpzjrkyf3bwbcmx96zpwhlgs0da8jxh";
+    sha256 = "1jhhfrg22h53lvm2lqhd66pyk20pil08ry03wcwyx1c3ln27k73z";
  };

  nativeBuildInputs = [ flex bison pkgconfig swig which ];
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@ -56,6 +56,8 @@ let
            */
            elm-test = patchBinwrap [elmi-to-json] elmNodePackages.elm-test;
            elm-verify-examples = patchBinwrap [elmi-to-json] elmNodePackages.elm-verify-examples;
+            elm-language-server = elmNodePackages."@elm-tooling/elm-language-server";
+
            # elm-analyse@0.16.4 build is not working
            elm-analyse = elmNodePackages."elm-analyse-0.16.3";
            inherit (elmNodePackages) elm-doc-preview elm-live elm-upgrade elm-xref;
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@ -2,7 +2,7 @@

 {pkgs ? import <nixpkgs> {
    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:

 let
  nodeEnv = import ../../../node-packages/node-env.nix {
--- a/pkgs/development/compilers/elm/packages/node-packages.json
+++ b/pkgs/development/compilers/elm/packages/node-packages.json
@ -5,5 +5,6 @@
    "elm-upgrade",
    { "elm-analyse": "0.16.3" },
    "elm-live",
-    "elm-xref"
+    "elm-xref",
+    "@elm-tooling/elm-language-server"
 ]
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/pkgs/development/compilers/elm/packages/node-packages.nix
--- a/pkgs/development/compilers/unison/default.nix
+++ b/pkgs/development/compilers/unison/default.nix
@ -4,18 +4,18 @@

 stdenv.mkDerivation rec {
  pname = "unison-code-manager";
-  milestone_id = "M1c";
+  milestone_id = "M1d";
  version = "1.0.${milestone_id}-alpha";

  src = if (stdenv.isDarwin) then
    fetchurl {
      url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
-      sha256 = "03q02r7qc7ybqz16kmpk2d8l9vx28kaj9x59mlxzi8a4mr0j3vzb";
+      sha256 = "0cgkqwniw2fclsxgx6b1kgjmylqnn67kjs61iygzbpip8nvcm7pv";
    }
  else
    fetchurl {
      url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
-      sha256 = "1iwynqnp1i39pyq9wc01x7y22y1qa0rrjlx40jjdgnj23y1r6jk4";
+      sha256 = "0rpz40d23daad16r2s4appiay3brbk0awp38yamavlr6dh23c9ws";
    };

  # The tarball is just the prebuilt binary, in the archive root.
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@ -1,17 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:

 stdenv.mkDerivation rec {
-  name = "chmlib-0.40";
+  name = "chmlib-0.40a";

-  src = fetchurl {
-    url = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "18zzb4x3z0d7fjh1x5439bs62dmgsi4c1pg3qyr7h5gp1i5xcj9l";
+  src = fetchFromGitHub {
+    owner = "jedwing";
+    repo = "CHMLib";
+    rev = "2bef8d063ec7d88a8de6fd9f0513ea42ac0fa21f";
+    sha256 = "1hah0nw0l05npva2r35ywwd0kzyiiz4vamghm6d71h8170iva6m9";
  };

+  nativeBuildInputs = [ autoreconfHook ];
+
  meta = {
    homepage = http://www.jedrea.com/chmlib;
    license = stdenv.lib.licenses.lgpl2;
    description = "A library for dealing with Microsoft ITSS/CHM format files";
-    platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
+    platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"];
  };
 }
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, enableShared ? true }:

 stdenv.mkDerivation rec {
-  version = "5.3.0";
+  version = "6.0.0";
  pname = "fmt";

  src = fetchFromGitHub {
    owner = "fmtlib";
    repo = "fmt";
    rev = version;
-    sha256 = "1hl9s69a5ql5nckc0ifh2fzlgsgv1wsn6yhqkpnrhasqkhj0hgv4";
+    sha256 = "0yfrw6by4h27k3psv9x1q7z2kdbz7pkwxidr494bpa6ppglij6ba";
  };

  outputs = [ "out" "dev" ];
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  enableParallelBuilding = true;

  doCheck = true;
-  # preCheckHook ensures the test binaries can find libfmt.so.5
+  # preCheckHook ensures the test binaries can find libfmt.so
  preCheck = if enableShared
             then "export LD_LIBRARY_PATH=\"$PWD\""
             else "";
--- a/pkgs/development/libraries/libcbor/default.nix
+++ b/pkgs/development/libraries/libcbor/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "libcbor";
-  version = "2019-02-23";
+  version = "unstable-2019-07-25";

  src = fetchFromGitHub {
    owner = "PJK";
    repo = pname;
-    rev = "87f977e732ca216682a8583a0e43803eb6b9c028";
-    sha256 = "17p1ahdcpf5d4r472lhciscaqjq4pyxy9xjhqqx8mv646xmyripm";
+    rev = "82512d851205fbc7f65d96a0b4a8e1bad2e4f3c6";
+    sha256 = "01hy7n21gxz4gp3gdwm2ywz822p415bj2k9ccxgwz3plvncs4xa1";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
-, rdma-core, zlib, numactl, libevent, hwloc
+, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget

 # Enable the Sun Grid Engine bindings
 , enableSGE ? false
@ -30,6 +30,13 @@ in stdenv.mkDerivation rec {

  postPatch = ''
    patchShebangs ./
+
+    # Ensure build is reproducible
+    ts=`date -d @$SOURCE_DATE_EPOCH`
+    sed -i 's/OPAL_CONFIGURE_USER=.*/OPAL_CONFIGURE_USER="nixbld"/' configure
+    sed -i 's/OPAL_CONFIGURE_HOST=.*/OPAL_CONFIGURE_HOST="localhost"/' configure
+    sed -i "s/OPAL_CONFIGURE_DATE=.*/OPAL_CONFIGURE_DATE=\"$ts\"/" configure
+    find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \;
  '';

  buildInputs = with stdenv; [ gfortran zlib ]
@ -51,6 +58,23 @@ in stdenv.mkDerivation rec {
    rm -f $out/lib/*.la
   '';

+  postFixup = ''
+    # default compilers should be indentical to the
+    # compilers at build time
+
+    sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \
+      $out/share/openmpi/mpicc-wrapper-data.txt
+
+    sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \
+       $out/share/openmpi/ortecc-wrapper-data.txt
+
+    sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++:' \
+       $out/share/openmpi/mpic++-wrapper-data.txt
+
+    sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.gfortran}/bin/${pkgsTargetTarget.gfortran.targetPrefix}gfortran:'  \
+       $out/share/openmpi/mpifort-wrapper-data.txt
+  '';
+
  doCheck = true;

  meta = with stdenv.lib; {
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@ -103,11 +103,14 @@ EOF
      --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]'
    '');

-  NIX_CFLAGS_COMPILE =
+  NIX_CFLAGS_COMPILE = [
+    # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
+    "-Wno-class-memaccess"
+  ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [
    # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
    # TODO: investigate and fix properly
-    lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ "-march=westmere" ] ++
-    lib.optionals stdenv.isDarwin [
+    "-march=westmere"
+  ] ++ lib.optionals stdenv.isDarwin [
    "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
    "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"

--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "qtutilities";
-  version = "5.13.0";
+  version = "6.0.0";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = pname;
    rev = "v${version}";
-    sha256 = "03drxwpr3xdh4hm8pkd5mhjs0mzhz6634ldyq78pml39ciqm51nl";
+    sha256 = "0d2x4djr8lqb4vad8g8vxvd1sgki4issxhyy5r32snh2i8pxpbp9";
  };

  buildInputs = [ qtbase cpp-utilities ];
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@ -23,8 +23,8 @@ stdenv.mkDerivation {
  nativeBuildInputs = [ python2 ];

  cmakeFlags = [
-    "-DUSE_OPTIMIZED_BLAS=ON"
    "-DCMAKE_Fortran_FLAGS=-fPIC"
+    "-DLAPACKE=ON"
  ]
  ++ (optional shared "-DBUILD_SHARED_LIBS=ON");

--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@ -2,13 +2,13 @@

 buildPythonPackage rec {
  pname = "aioesphomeapi";
-  version = "2.0.1";
+  version = "2.2.0";

  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "db09e34dfc148279f303481c7da94b84c9b1442a41794f039c31253e81a58ffb";
+    sha256 = "0znal1hi964acc8bl3z0ikscax7zziks838ld099rjsbffjwmwn5";
  };

  propagatedBuildInputs = [ attrs protobuf zeroconf ];
@ -18,7 +18,7 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Python Client for ESPHome native API";
-    homepage = https://github.com/esphome/aioesphomeapi;
+    homepage = "https://github.com/esphome/aioesphomeapi";
    license = licenses.mit;
    maintainers = with maintainers; [ dotlambda ];

--- a/pkgs/development/python-modules/azure-common/default.nix
+++ b/pkgs/development/python-modules/azure-common/default.nix
@ -1,8 +1,9 @@
-{ pkgs
+{ lib
 , buildPythonPackage
 , fetchPypi
 , azure-nspkg
 , isPyPy
+, setuptools
 , python
 , isPy3k
 }:
@ -20,7 +21,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    azure-nspkg
-  ];
+  ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup

  postInstall = if isPy3k then "" else ''
    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
@ -28,7 +29,7 @@ buildPythonPackage rec {

  doCheck = false;

-  meta = with pkgs.lib; {
+  meta = with lib; {
    description = "This is the Microsoft Azure common code";
    homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-common;
    license = licenses.mit;
--- a/pkgs/development/python-modules/azure-mgmt-common/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix
@ -28,6 +28,7 @@ buildPythonPackage rec {

  postInstall = if isPy3k then "" else ''
    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
  '';

  doCheck = false;
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect
+{ lib, buildPythonPackage, fetchPypi, libredirect
 , case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet
 }:

@ -17,19 +17,17 @@ buildPythonPackage rec {
      --replace "pytest>=4.3.1,<4.4.0" pytest
  '';

-  # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
-  preCheck = stdenv.lib.optionalString stdenv.isLinux ''
-    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \
-      LD_PRELOAD=${libredirect}/lib/libredirect.so
-  '';
-  postCheck = stdenv.lib.optionalString stdenv.isLinux ''
-    unset NIX_REDIRECTS LD_PRELOAD
+  # ignore test that's incompatible with pytest5
+  # test_eventlet touches network
+  checkPhase = ''
+    pytest -k 'not restore_current_app_fallback' \
+      --ignore=t/unit/concurrency/test_eventlet.py
  '';

  checkInputs = [ case pytest boto3 moto ];
  propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ];

-  meta = with stdenv.lib; {
+  meta = with lib; {
    homepage = https://github.com/celery/celery/;
    description = "Distributed task queue";
    license = licenses.bsd3;
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@ -31,7 +31,7 @@ buildPythonPackage rec {
  checkPhase = ''
    substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" ""
    ${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"}
-    pytest ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"}
+    pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"}
  '';

  meta = with lib; {
--- a/pkgs/development/python-modules/demjson/default.nix
+++ b/pkgs/development/python-modules/demjson/default.nix
@ -1,9 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy36 }:
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:

 buildPythonPackage rec {
  pname = "demjson";
  version = "2.2.4";
-  disabled = isPy36;
+  disabled = isPy3k;

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/hug/default.nix
+++ b/pkgs/development/python-modules/hug/default.nix
@ -1,7 +1,11 @@
-{ lib , buildPythonPackage, fetchPypi, isPy27
+{ lib , buildPythonPackage, fetchFromGitHub, isPy27
 , falcon
 , pytestrunner
 , requests
+, pytest
+, marshmallow
+, mock
+, numpy
 }:

 buildPythonPackage rec {
@ -9,16 +13,22 @@ buildPythonPackage rec {
  version = "2.6.0";
  disabled = isPy27;

-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0iamrzjy8z1xibynkgfl6cn2sbm66awxbp75b26pi32fc41d0k50";
+  src = fetchFromGitHub {
+    owner = "hugapi";
+    repo = pname;
+    rev = version;
+    sha256 = "05rsv16g7ph100p8kl4l2jba0y4wcpp3xblc02mfp67zp1279vaq";
  };

  nativeBuildInputs = [ pytestrunner ];
  propagatedBuildInputs = [ falcon requests ];

-  # tests are not shipped in the tarball
-  doCheck = false;
+  checkInputs = [ mock marshmallow pytest numpy ];
+  checkPhase = ''
+    mv hug hug.hidden
+    # some tests attempt network access
+    PATH=$out/bin:$PATH pytest -k "not (test_request or test_datagram_request)"
+  '';

  meta = with lib; {
    description = "A Python framework that makes developing APIs as simple as possible, but no simpler";
--- a/pkgs/development/python-modules/lightgbm/default.nix
+++ b/pkgs/development/python-modules/lightgbm/default.nix
@ -21,6 +21,8 @@ buildPythonPackage rec {
    cmake
  ];

+  dontUseCmakeConfigure = true;
+
  # we never actually explicitly call the install command so this is the only way
  # to inject these options to it - however, openmp-library doesn't appear to have
  # any effect, so we have to inject it into NIX_LDFLAGS manually below
--- a/pkgs/development/python-modules/minidb/default.nix
+++ b/pkgs/development/python-modules/minidb/default.nix
@ -1,29 +1,31 @@
-{ stdenv
-, buildPythonPackage
-, fetchurl
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
 , nose
+, pytest
 }:

 buildPythonPackage rec {
  pname = "minidb";
  version = "2.0.2";

-  src = fetchurl {
-    url = "https://github.com/thp/minidb/archive/${version}.tar.gz";
-    sha256 = "17rvkpq8v7infvbgsi48vnxamhxb3f635nqn0sln7yyvh4i9k8a0";
+  src = fetchFromGitHub {
+    owner = "thp";
+    repo = "minidb";
+    rev = version;
+    sha256 = "14y5vf8vhgviczhzy9h3xv99fjvrg975nz4w1fj5c1jv37da1lq3";
  };

-  checkInputs = [ nose ];
-
+  # module imports are incompatible with python2
+  doCheck = isPy3k;
+  checkInputs = [ nose pytest ];
  checkPhase = ''
-    nosetests test
+    pytest
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "A simple SQLite3-based store for Python objects";
-    homepage = https://thp.io/2010/minidb/;
-    license = stdenv.lib.licenses.isc;
-    maintainers = [ stdenv.lib.maintainers.tv ];
+    homepage = "https://thp.io/2010/minidb/";
+    license = licenses.isc;
+    maintainers = [ maintainers.tv ];
  };

 }
--- a/pkgs/development/python-modules/percol/default.nix
+++ b/pkgs/development/python-modules/percol/default.nix
@ -1,7 +1,5 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, isPy3k
+{ lib, buildPythonPackage, fetchPypi, isPy3k
+, six
 }:

 buildPythonPackage rec {
@ -14,11 +12,14 @@ buildPythonPackage rec {
    sha256 = "7a649c6fae61635519d12a6bcacc742241aad1bff3230baef2cedd693ed9cfe8";
  };

-  meta = with stdenv.lib; {
+  propagatedBuildInputs = [ six ];
+
+  meta = with lib; {
    homepage = https://github.com/mooz/percol;
    description = "Adds flavor of interactive filtering to the traditional pipe concept of shell";
    license = licenses.mit;
    maintainers = with maintainers; [ koral ];
+    broken = true; # missing cmigemo package which is missing libmigemo.so
+    # also doesn't support python3
  };
-
 }
--- a/pkgs/development/python-modules/pika/default.nix
+++ b/pkgs/development/python-modules/pika/default.nix
@ -1,12 +1,8 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, isPy3k
 , nose
 , mock
-, pyyaml
-, unittest2
-, pyev
 , twisted
 , tornado
 }:
@ -20,11 +16,7 @@ buildPythonPackage rec {
    sha256 = "1gqx9avb9nwgiyw5nz08bf99v9b0hvzr1pmqn9wbhd2hnsj6p9wz";
  };

-  # Tests require twisted which is only availalble for python-2.x
-  doCheck = !isPy3k;
-
-  buildInputs = [ nose mock pyyaml unittest2 pyev ]
-    ++ stdenv.lib.optionals (!isPy3k) [ twisted tornado ];
+  checkInputs = [ nose mock twisted tornado ];

  meta = with stdenv.lib; {
    description = "Pure-Python implementation of the AMQP 0-9-1 protocol";
--- a/pkgs/development/python-modules/pyev/default.nix
+++ b/pkgs/development/python-modules/pyev/default.nix
@ -1,30 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage, libev }:
-
-buildPythonPackage rec {
-  pname = "pyev";
-  version = "0.9.0";
-
-  src = fetchurl {
-    url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz";
-    sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx";
-  };
-
-  buildInputs = [ libev ];
-
-  libEvSharedLibrary =
-    if !stdenv.isDarwin
-    then "${libev}/lib/libev.so.4"
-    else "${libev}/lib/libev.4.dylib";
-
-  postPatch = ''
-    test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; }
-    sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Python bindings for libev";
-    homepage = https://code.google.com/p/pyev/;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.bjornfor ];
-  };
-}
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@ -6,6 +6,8 @@ buildPythonPackage rec {
  version = "5.1.0";
  pname = "pytest";

+  disabled = !isPy3k;
+
  preCheck = ''
    # don't test bash builtins
    rm testing/test_argcomplete.py
@ -19,7 +21,6 @@ buildPythonPackage rec {
  checkInputs = [ hypothesis mock ];
  nativeBuildInputs = [ setuptools_scm ];
  propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]
-    ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
    ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];

  doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@ -2,6 +2,7 @@
 , lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , gfortran, glibcLocales
 , numpy, scipy, pytest, pillow
 , cython
@ -40,6 +41,15 @@ buildPythonPackage rec {
  ];
  checkInputs = [ pytest ];

+  patches = [
+    # Fixes tests by changing threshold of a test-case that broke
+    # with numpy versions >= 1.17. This should be removed for versions > 0.21.2.
+	( fetchpatch {
+	  url = "https://github.com/scikit-learn/scikit-learn/commit/b730befc821caec5b984d9ff3aa7bc4bd7f4d9bb.patch";
+	  sha256 = "0z36m05mv6d494qwq0688rgwa7c4bbnm5s2rcjlrp29fwn3fy1bv";
+	})
+  ];
+
  LC_ALL="en_US.UTF-8";

  doCheck = !stdenv.isAarch64;
--- a/pkgs/development/python-modules/ssdp/default.nix
+++ b/pkgs/development/python-modules/ssdp/default.nix
@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy27
 , pbr
 , pytest
 }:
@ -16,7 +17,9 @@ buildPythonPackage rec {

  buildInputs = [ pbr ];
  checkInputs = [ pytest ];
-  propagatedBuildInputs = [ ];
+
+  # test suite uses new async primitives
+  doCheck = !isPy27;

  meta = with stdenv.lib; {
    homepage = https://github.com/codingjoe/ssdp;
--- a/pkgs/development/python-modules/zake/default.nix
+++ b/pkgs/development/python-modules/zake/default.nix
@ -19,6 +19,10 @@ buildPythonPackage rec {
  propagatedBuildInputs = [ kazoo six ];
  buildInputs = [ testtools ];
  checkPhase = ''
+    # Skip test - fails with our new kazoo version
+    substituteInPlace zake/tests/test_client.py \
+      --replace "test_child_watch_no_create" "_test_child_watch_no_create"
+
    ${python.interpreter} -m unittest discover zake/tests
  '';

--- a/pkgs/development/tools/cue/default.nix
+++ b/pkgs/development/tools/cue/default.nix
@ -2,15 +2,15 @@

 buildGoModule rec {
  pname = "cue";
-  version = "0.0.3";
+  version = "0.0.11";

  src = fetchgit {
    url = "https://cue.googlesource.com/cue";
    rev = "v${version}";
-    sha256 = "1abvvgicr64ssiprkircih2nrbcr1yqxf1qkl21kh0ww1xfp0rw7";
+    sha256 = "146h3nxx72n3byxr854lnxj7m33ipbmg6j9dy6dlwvqpa7rndrmp";
  };

-  modSha256 = "0r5vbplcfq1rsp2jnixq6lfbpcv7grf0q38na76qy7pjb57zikb6";
+  modSha256 = "1q0fjm34mbijjxg089v5330vc820nrvwdkhm02zi45rk2fpdgdqd";

  subPackages = [ "cmd/cue" ];

--- a/pkgs/development/tools/pgformatter/default.nix
+++ b/pkgs/development/tools/pgformatter/default.nix
@ -0,0 +1,40 @@
+{ stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }:
+
+perlPackages.buildPerlPackage rec {
+  pname = "pgformatter";
+  version = "4.0";
+
+  src = fetchFromGitHub {
+    owner = "darold";
+    repo = "pgFormatter";
+    rev = "v${version}";
+    sha256 = "09p242s406mf469p66zp1jmp9pxcim2vk1v6qsxnrbzicchsn5i2";
+  };
+
+  outputs = [ "out" ];
+
+  makeMakerFlags = [ "INSTALLDIRS=vendor" ];
+
+  # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS.
+  patchPhase = ''
+    substituteInPlace pg_format \
+      --replace "#!/usr/bin/env perl" "#!/usr/bin/perl"
+    substituteInPlace Makefile.PL \
+      --replace "'DESTDIR'      => \$DESTDIR," "'DESTDIR'      => '$out/'," \
+      --replace "'INSTALLDIRS'  => \$INSTALLDIRS," "'INSTALLDIRS'  => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3',"
+  '';
+
+  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    shortenPerlShebang $out/bin/pg_format
+  '';
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI";
+    homepage = "https://github.com/darold/pgFormatter";
+    maintainers = [ maintainers.marsam ];
+    license = [ licenses.postgresql licenses.artistic2 ];
+  };
+}
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper , Security }:

 with rustPlatform;

@ -19,7 +19,8 @@ buildRustPackage rec {

  cargoSha256 = "15894qr0kpp5kivx0p71zmmfhfh8in0ydkvfirxh2r12x0r2jhdd";

-  buildInputs = [ makeWrapper ];
+  buildInputs = [ makeWrapper ]
+                ++ stdenv.lib.optional stdenv.isDarwin Security;

  RUST_SRC_PATH = rustPlatform.rustcSrc;

--- a/pkgs/games/chiaki/default.nix
+++ b/pkgs/games/chiaki/default.nix
@ -0,0 +1,31 @@
+{ lib, mkDerivation, fetchFromGitHub
+, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf
+, python3Packages, SDL2 }:
+
+mkDerivation rec {
+  pname = "chiaki";
+  version = "1.0.3";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "thestr4ng3r";
+    repo = "chiaki";
+    fetchSubmodules = true;
+    sha256 = "09c6izprqqvhn1vbr2897ql05w5c7iqakm6jn795a5faghjm1mah";
+  };
+
+  nativeBuildInputs = [
+    cmake pkgconfig protobuf python3Packages.python python3Packages.protobuf
+  ];
+  buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    homepage = "https://github.com/thestr4ng3r/chiaki";
+    description = "Free and Open Source PS4 Remote Play Client";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ delroth ];
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/games/tdm/default.nix
+++ b/pkgs/games/tdm/default.nix
@ -96,7 +96,7 @@ EOF
    description = "The Dark Mod - stealth FPS inspired by the Thief series";
    homepage = "http://www.thedarkmod.com";
    license = licenses.gpl3;
-    maintainers = with maintainers; [ cf6b88f ];
+    maintainers = with maintainers; [ cizra ];
    platforms = with platforms; [ "x86_64-linux" ];  # tdm also supports x86, but I don't have a x86 install at hand to test.
  };
 }
--- a/pkgs/games/tome2/default.nix
+++ b/pkgs/games/tome2/default.nix
@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, makeDesktopItem, ncurses, libX11, boost, cmake }:
+
+let
+  pname = "tome2";
+  description = "A dungeon crawler similar to Angband, based on the works of Tolkien";
+
+  desktopItem = makeDesktopItem {
+    desktopName = pname;
+    name = pname;
+    exec = "${pname}-x11";
+    icon = pname;
+    terminal = "False";
+    comment = description;
+    type = "Application";
+    categories = "Game;RolePlaying;";
+    genericName = pname;
+  };
+
+in stdenv.mkDerivation {
+  inherit pname;
+  version = "2.4";
+
+  src = fetchFromGitHub {
+    owner = "tome2";
+    repo = "tome2";
+    rev = "4e6a906c80ff07b75a6acf4ff585b47303805e46";
+    sha256 = "06bddj55y673d7bnzblk8n01z32l6k2rad3bpzr8dmw464hx4wwf";
+  };
+
+  buildInputs = [ ncurses libX11 boost ];
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    "-DSYSTEM_INSTALL=ON"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/*.desktop $out/share/applications
+  '';
+
+  meta = with stdenv.lib; {
+    inherit description;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ cizra ];
+    platforms = platforms.all;
+    homepage = "https://github.com/tome2/tome2";
+  };
+}
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@ -225,6 +225,16 @@ in rec {
    };
  };

+  sysstat = mkDerivation {
+    pluginName = "sysstat";
+    src = fetchFromGitHub {
+      owner = "samoshkin";
+      repo = "tmux-plugin-sysstat";
+      rev = "29e150f403151f2341f3abcb2b2487a5f011dd23";
+      sha256 = "013mv9p6r2r0ls3p60l8hdad4hm8niv3wr27vgm925gxmibi4hyq";
+    };
+  };
+
  tmux-colors-solarized = mkDerivation {
    pluginName = "tmuxcolors";
    src = fetchFromGitHub {
--- a/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
+++ b/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
@ -0,0 +1,25 @@
+diff --git a/configure.in b/configure.in
+index 5e3f89b..19be6d9 100644
+--- a/configure.in
+++ b/configure.in
+@@ -9,6 +9,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+AC_CHECK_TOOL([AR], [ar])
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in
+index 20512c4..83c802b 100644
+--- a/libbridge/Makefile.in
+++ b/libbridge/Makefile.in
+@@ -1,7 +1,7 @@
+ 
+ KERNEL_HEADERS=-I@KERNEL_HEADERS@
+ 
+-AR=ar
+AR=@AR@
+ RANLIB=@RANLIB@
+ 
+ CC=@CC@
--- a/pkgs/os-specific/linux/bridge-utils/default.nix
+++ b/pkgs/os-specific/linux/bridge-utils/default.nix
@ -8,11 +8,12 @@ stdenv.mkDerivation rec {
    sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688";
  };

-  # Remove patch once the kernel headers are updated
-  patches = [ ./add-ip6-header.patch ];
+  patches = [
+    ./autoconf-ar.patch
+    ./add-ip6-header.patch # Remove patch once the kernel headers are updated
+  ];

  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ];

  postInstall = ''
    # The bridge utils build does not fail even if the brctl binary
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/pkgs/os-specific/linux/drbd/default.nix
@ -10,7 +10,8 @@ stdenv.mkDerivation rec {

  patches = [ ./pass-force.patch ];

-  buildInputs = [ flex perl ];
+  nativeBuildInputs = [ flex ];
+  buildInputs = [ perl ];

  configureFlags = [
    "--without-distro"
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@ -1,11 +1,11 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
-    url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/";
+    url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";

    # Update this if linux_latest-libre fails to build.
-    # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+'
-    rev = "16604";
-    sha256 = "0d2dh52zv073zr74ilspy0fy3ivys5pq32j7fljs4fwi2bcljf51";
+    # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/ | grep -Eo 'Revision [0-9]+'
+    rev = "16791";
+    sha256 = "1lpaka4hs7yrpnrzfybd6radjylwvw2p4aly68pypykqs2srvm7j";
  }
 , ...
 }:
@ -25,7 +25,7 @@ in linux.override {
      name = "${linux.name}-libre-src";
      src = linux.src;
      buildPhase = ''
-        ${scripts}/${majorMinor}-gnu/deblob-${majorMinor} \
+        ${scripts}/${majorMinor}/deblob-${majorMinor} \
            ${major} ${minor} ${patch}
      '';
      checkPhase = ''
--- a/pkgs/servers/lidarr/default.nix
+++ b/pkgs/servers/lidarr/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "lidarr";
-  version = "0.6.2.883";
+  version = "0.7.1.1381";

  src = fetchurl {
-    url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz";
-    sha256 = "0096j2vph739h288vnz481nrwaq540faplir394xqfz7ik0krg4v";
+    url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.linux.tar.gz";
+    sha256 = "1vk1rlsb48ckdc4421a2qs0v5gy7kc4fad24dm3k14znh7llwypr";
  };

  buildInputs = [
@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
    mkdir -p $out/bin
    cp -r * $out/bin/

-    # Mark all executable files as non-executable
-    find $out/bin -type f -executable | xargs chmod -x
+    # Mark main executable as executable
+    chmod +x $out/bin/Lidarr.exe

    makeWrapper "${mono}/bin/mono" $out/bin/Lidarr \
      --add-flags "$out/bin/Lidarr.exe" \
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; {
    description = "A Usenet/BitTorrent music downloader";
-    homepage = https://lidarr.audio/;
+    homepage = "https://lidarr.audio/";
    license = licenses.gpl3;
    maintainers = [ maintainers.etu ];
    platforms = platforms.all;
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@ -96,10 +96,10 @@ stdenv.mkDerivation rec {
    PREFIX=$(out)
    DESTDIR=$(out)
    PERLLIB=$(out)/${perlPackages.perl.libPrefix}
-    PERL=${perlPackages.perl}/bin/perl
-    PYTHON=${python}/bin/python
-    RUBY=${ruby}/bin/ruby
-    JAVARUN=${jre}/bin/java
+    PERL=${perlPackages.perl.outPath}/bin/perl
+    PYTHON=${python.outPath}/bin/python
+    RUBY=${ruby.outPath}/bin/ruby
+    JAVARUN=${jre.outPath}/bin/java
    PLUGINUSER=munin
  '';

--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@ -1,12 +1,12 @@
 generic: {
  v42 = generic {
-    version = "4.2.5";
-    sha256 = "135bfafydmd66q97za84micymgf38s9zydp6jssrf7azik699fjd";
+    version = "4.2.6";
+    sha256 = "0r08v9ka0v8d7w133yr09vaxzl5lhbrsvbx900x15qv8lwliysv4";
  };

  v40 = generic {
-    version = "4.0.11";
-    sha256 = "02c4c82vbc27v09rci7flvwvjyb5sx0mknw0fz5i8bb23k1jbbxh";
+    version = "4.0.12";
+    sha256 = "1jlbzlz0rzcjixicdcd7xcjhfqwr82hngpazx85f40r9dy574pjw";
  };

  v30 = generic {
--- a/pkgs/servers/routinator/default.nix
+++ b/pkgs/servers/routinator/default.nix
@ -2,13 +2,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "routinator";
-  version = "0.6.0";
+  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "NLnetLabs";
    repo = pname;
    rev = "v${version}";
-    sha256 = "13xfnlaqjisi9fm1p7ydhgrh86ccbfwkxbnrv8abdx80jwb0lm15";
+    sha256 = "1knqgq8xrlvwfc3y2hki6p0zr4dblm7max37y01p3bf641gs748z";
  };

  cargoSha256 = "13sx7mbirhrd0is7gvnk0mir5qizbhrlvsn0v55ibf3bybjsb644";
--- a/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch
+++ b/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch
@ -1,12 +0,0 @@
-diff --git a/libmariadb/plugins/auth/CMakeLists.txt b/libmariadb/plugins/auth/CMakeLists.txt
-index aa599418..7a51f73b 100644
--- a/libmariadb/plugins/auth/CMakeLists.txt
-+++ b/libmariadb/plugins/auth/CMakeLists.txt
-@@ -50,6 +50,7 @@ IF(WITH_SSL)
-                         ${REF10_SOURCES}
-                         ${CRYPT_SOURCE}
-                 INCLUDES ${REF10_DIR}
-+                LIBRARIES ${ED25519_LIBS}
-                 COMPILE_OPTIONS -DMYSQL_CLIENT=1)
-   IF(MSVC)
-      # Silence conversion (integer truncantion) warnings from reference code
--- a/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch
+++ b/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch
@ -0,0 +1,12 @@
+diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
+index f7790748..995621e0 100644
+--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
+@@ -121,7 +121,6 @@ ENDIF()
+ 
+ IF(UNIX)
+   SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
+-  SET(PLUGIN_AUTH_PAM YES)
+ 
+   IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+     IF(NOT IGNORE_AIO_CHECK)
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
-, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5
+, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
 , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
 , fixDarwinDylibNames, cctools, CoreServices
 , asio, buildEnv, check, scons
@ -21,21 +21,21 @@ mariadb = server // {
 };

 common = rec { # attributes common to both builds
-  version = "10.3.17";
+  version = "10.3.18";

  src = fetchurl {
    urls = [
      "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
      "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
    ];
-    sha256 = "15vh15az16932q42y9dxpzwxldmh0x4hvzrar3f8kblsqm7ym890";
+    sha256 = "1p6yvmahnkmsz50zjzp20ak7jzbqysly5bdl51nnrngrbfl6qib9";
    name   = "mariadb-${version}.tar.gz";
  };

  nativeBuildInputs = [ cmake pkgconfig ];

  buildInputs = [
-    ncurses openssl zlib pcre jemalloc libiconv
+    ncurses openssl zlib pcre jemalloc libiconv curl
  ] ++ optionals stdenv.isLinux [ libaio systemd libkrb5 ]
    ++ optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];

@ -46,7 +46,6 @@ common = rec { # attributes common to both builds
  patches = [
    ./cmake-includedir.patch
    ./cmake-libmariadb-includedir.patch
-    ./cmake-fix-crypt-libs.patch
  ];

  cmakeFlags = [
@ -61,7 +60,7 @@ common = rec { # attributes common to both builds
    "-DINSTALL_DOCDIR=share/doc/mysql"
    "-DINSTALL_DOCREADMEDIR=share/doc/mysql"
    "-DINSTALL_INCLUDEDIR=include/mysql"
-    "-DINSTALL_LIBDIR=lib/mysql"
+    "-DINSTALL_LIBDIR=lib"
    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
    "-DINSTALL_INFODIR=share/mysql/docs"
    "-DINSTALL_MANDIR=share/man"
@ -90,7 +89,7 @@ common = rec { # attributes common to both builds
  postInstall = ''
    rm "$out"/lib/mysql/plugin/daemon_example.ini
    mkdir -p "$dev"/bin && mv "$out"/bin/{mariadb_config,mysql_config} "$dev"/bin
-    mkdir -p "$dev"/lib/mysql && mv "$out"/lib/mysql/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib/mysql
+    mkdir -p "$dev"/lib/ && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib
    mkdir -p "$dev"/lib/mysql/plugin && mv "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$dev"/lib/mysql/plugin
  '';

@ -116,6 +115,7 @@ client = stdenv.mkDerivation (common // {

  patches = common.patches ++ [
    ./cmake-plugin-includedir.patch
+    ./cmake-without-plugin-auth-pam.patch
  ];

  cmakeFlags = common.cmakeFlags ++ [
@ -132,11 +132,10 @@ client = stdenv.mkDerivation (common // {
  postInstall = common.postInstall + ''
    rm -r "$out"/share/doc
    rm "$out"/bin/{mysqltest,mytop,wsrep_sst_rsync_wan}
-    libmysqlclient_path=$(readlink -f $out/lib/mysql/libmysqlclient${libExt})
-    rm "$out"/lib/mysql/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}
-    mv "$libmysqlclient_path" "$out"/lib/mysql/libmysqlclient${libExt}
-    ln -sv libmysqlclient${libExt} "$out"/lib/mysql/libmysqlclient_r${libExt}
-
+    libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt})
+    rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}
+    mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt}
+    ln -sv libmysqlclient${libExt} "$out"/lib/libmysqlclient_r${libExt}
  '';
 });

@ -151,6 +150,7 @@ server = stdenv.mkDerivation (common // {
    xz lzo lz4 bzip2 snappy
    libxml2 boost judy libevent cracklib
  ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl
+    ++ optional stdenv.isLinux linux-pam
    ++ optional (!stdenv.isDarwin) mytopEnv;

  patches = common.patches ++ [
@ -159,7 +159,6 @@ server = stdenv.mkDerivation (common // {

  cmakeFlags = common.cmakeFlags ++ [
    "-DMYSQL_DATADIR=/var/lib/mysql"
-    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
    "-DENABLED_LOCAL_INFILE=OFF"
    "-DWITH_READLINE=ON"
    "-DWITH_EXTRA_CHARSETS=all"
@ -189,7 +188,7 @@ server = stdenv.mkDerivation (common // {
    chmod +x "$out"/bin/wsrep_sst_common
    rm "$out"/bin/mysql_client_test
    rm -r "$out"/data # Don't need testing data
-    rm "$out"/lib/mysql/{libmysqlclient${libExt},libmysqlclient_r${libExt}}
+    rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}}
    mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
  '' + optionalString withoutClient ''
    ${ # We don't build with GSSAPI on Darwin
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "pg_auto_failover";
-  version = "1.0.3";
+  version = "1.0.4";

  src = fetchFromGitHub {
    owner = "citusdata";
    repo = pname;
    rev = "v${version}";
-    sha256 = "0mggf5h6gh2mck75dmz5w63gi7d10pqs58fdp2jdpv3am75picll";
+    sha256 = "0v4fj83zifcqhihc5myh0qv2396n5kw4sa8ix6jljmp6wh036z9j";
  };

  buildInputs = [ postgresql openssl zlib readline ];
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@ -8,7 +8,7 @@

 stdenv.mkDerivation rec {
  pname = "timescaledb";
-  version = "1.4.1";
+  version = "1.4.2";

  nativeBuildInputs = [ cmake ];
  buildInputs = [ postgresql openssl ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    owner  = "timescale";
    repo   = "timescaledb";
    rev    = "refs/tags/${version}";
-    sha256 = "1gbca0fyaxjkwijdp2ah4iykwq5xabz9kkf8ak76sif4lz64y54b";
+    sha256 = "06mchpfjh4kskxq5r8b84870gl37xcqdf14n96qjb4nbyw9l8xcc";
  };

  cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" ];
--- a/pkgs/tools/filesystems/sasquatch/default.nix
+++ b/pkgs/tools/filesystems/sasquatch/default.nix
@ -0,0 +1,53 @@
+{ fetchFromGitHub
+, fetchurl
+, lz4 ? null
+, lz4Support ? false
+, lzma
+, lzo
+, stdenv
+, xz
+, zlib
+}:
+
+assert lz4Support -> (lz4 != null);
+
+let
+  patch = fetchFromGitHub {
+    owner = "devttys0";
+    repo = "sasquatch";
+    rev = "3e0cc40fc6dbe32bd3a5e6c553b3320d5d91ceed";
+    sha256 = "19lhndjv7v9w6nmszry63zh5rqii9v7wvsbpc2n6q606hyz955g2";
+  } + "/patches/patch0.txt";
+in
+stdenv.mkDerivation rec {
+  pname = "sasquatch";
+  version = "4.3";
+
+  src = fetchurl {
+    url = mirror://sourceforge/squashfs/squashfs4.3.tar.gz;
+    sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d";
+  };
+
+  buildInputs = [ lzma lzo xz zlib ]
+    ++ stdenv.lib.optional lz4Support lz4;
+
+  patches = [ patch ];
+  patchFlags = [ "-p0" ];
+
+  postPatch = ''
+    cd squashfs-tools
+  '';
+
+  installFlags = "INSTALL_DIR=\${out}/bin";
+
+  makeFlags = [ "XZ_SUPPORT=1" ]
+    ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/devttys0/sasquatch";
+    description = "Set of patches to the standard unsquashfs utility (part of squashfs-tools) that attempts to add support for as many hacked-up vendor-specific SquashFS implementations as possible";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.pamplemousse ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "fd";
-  version = "7.3.0";
+  version = "7.4.0";

  src = fetchFromGitHub {
    owner = "sharkdp";
    repo = "fd";
    rev = "v${version}";
-    sha256 = "0y4657w1pi4x9nmbv551dj00dyiv935m8ph7jlv00chwy3hrb3yi";
+    sha256 = "108p1p9bxhg4qzwfs6wqcakcvlpqw3w498jkz1vhmg6jp1mbmgdr";
  };

-  cargoSha256 = "1qqlii9693ih7pxl80v515a13jar3yayr5v7pa57x14i9syir10c";
+  cargoSha256 = "0ylanxcb1vrhvm9h3lvq8nh28362wi5hjy0pqdv5lh40pphcknnz";

  preFixup = ''
    install -Dm644 "$src/doc/fd.1" "$out/man/man1/fd.1"
--- a/pkgs/tools/misc/uhubctl/default.nix
+++ b/pkgs/tools/misc/uhubctl/default.nix
@ -3,21 +3,20 @@
 , libusb
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  pname = "uhubctl";
-  version = "unstable-2019-07-31";
+  version = "2.1.0";

  src = fetchFromGitHub {
    owner = "mvp";
    repo = "uhubctl";
-    rev = "1961aa02e9924a54a6219d16c61a0beb0d626e46";
-    sha256 = "15mvqp1xh079nqp0mynh3l1wmw4maa320pn4jr8bz7nh3knmk0n1";
+    rev = "refs/tags/v${version}";
+    sha256 = "1cgmwsf68g49k6q4jvz073bpjhg5p73kk1a4kbgkxmvx01gmbcmq";
  };

  buildInputs = [ libusb ];

-  installFlags = [ "prefix=$(out)" ];
-
+  installFlags = [ "prefix=${placeholder "out"}" ];
  meta = with stdenv.lib; {
    homepage = "https://github.com/mvp/uhubctl";
    description = "Utility to control USB power per-port on smart USB hubs";
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@ -3,11 +3,14 @@
 let wrapper = stdenv.mkDerivation rec {
  pname = "wrapper";
  version = "3.5.35";
+
  src = fetchurl {
    url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
    sha256 = "0mjyw9ays9v6lnj21pmfd3qdvd9b6rwxfmw3pg6z0kyf2jadixw2";
  };
+
  buildInputs = [ jdk ];
+
  buildPhase = ''
    export ANT_HOME=${ant}
    export JAVA_HOME=${jdk}/lib/openjdk/jre/
@ -16,6 +19,7 @@ let wrapper = stdenv.mkDerivation rec {
    sed 's/ testsuite$//' -i src/c/Makefile-linux-x86-64.make
    ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"}
  '';
+
  installPhase = ''
    mkdir -p $out/{bin,lib}
    cp bin/wrapper $out/bin/wrapper
@ -27,17 +31,22 @@ let wrapper = stdenv.mkDerivation rec {
 in

 stdenv.mkDerivation rec {
-  name = "i2p-0.9.41";
+  pname = "i2p";
+  version = "0.9.42";
+
  src = fetchurl {
-    url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "0adrj56i3pcc9ainj22akjrrvy73carz5jk29qa1h2b9q03di73b";
+    url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2";
+    sha256 = "04y71hzkdpjzbac569rhyg1zfx37j0alggbl9gnkaqfbprb2nj1h";
  };
+
  buildInputs = [ jdk ant gettext which ];
  patches = [ ./i2p.patch ];
+
  buildPhase = ''
    export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
    ant preppkg-linux-only
  '';
+
  installPhase = ''
    set -B
    mkdir -p $out/{bin,share}
@ -64,10 +73,10 @@ stdenv.mkDerivation rec {
  '';

  meta = with stdenv.lib; {
-    homepage = https://geti2p.net;
    description = "Applications and router for I2P, anonymity over the Internet";
-    maintainers = [ maintainers.joelmo ];
+    homepage = "https://geti2p.net";
    license = licenses.gpl2;
    platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = [ maintainers.joelmo ];
  };
 }
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@ -42,6 +42,7 @@ buildPythonPackage rec {
      # Irrelevant in nixpkgs
      excludes = [ "setup.py" "setup.cfg" "release/docker/*" ];
    })
+    ./pytest5.patch
  ];

  postPatch = ''
@ -54,7 +55,7 @@ buildPythonPackage rec {
  checkPhase = ''
    export HOME=$(mktemp -d)
    export LC_CTYPE=en_US.UTF-8
-    pytest -k 'not test_find_unclaimed_URLs'
+    pytest -k 'not test_find_unclaimed_URLs and not test_tcp'
  '';

  propagatedBuildInputs = [
@ -62,7 +63,7 @@ buildPythonPackage rec {
    h2 hyperframe kaitaistruct passlib
    pyasn1 pyopenssl pyparsing pyperclip
    ruamel_yaml tornado urwid brotlipy
-    sortedcontainers ldap3 wsproto
+    sortedcontainers ldap3 wsproto setuptools
  ];

  checkInputs = [
--- a/pkgs/tools/networking/mitmproxy/pytest5.patch
+++ b/pkgs/tools/networking/mitmproxy/pytest5.patch
@ -0,0 +1,31 @@
+diff --git a/test/mitmproxy/net/test_tls.py b/test/mitmproxy/net/test_tls.py
+index 489bf89f..c78472e3 100644
+--- a/test/mitmproxy/net/test_tls.py
+++ b/test/mitmproxy/net/test_tls.py
+@@ -87,14 +87,16 @@ def test_get_client_hello():
+     rfile = io.BufferedReader(io.BytesIO(
+         FULL_CLIENT_HELLO_NO_EXTENSIONS[:30]
+     ))
+-    with pytest.raises(exceptions.TlsProtocolException, message="Unexpected EOF"):
+    with pytest.raises(exceptions.TlsProtocolException):
+         tls.get_client_hello(rfile)
+        pytest.fail("Unexpected EOF")
+ 
+     rfile = io.BufferedReader(io.BytesIO(
+         b"GET /"
+     ))
+-    with pytest.raises(exceptions.TlsProtocolException, message="Expected TLS record"):
+    with pytest.raises(exceptions.TlsProtocolException):
+         tls.get_client_hello(rfile)
+        pytest.fail("Expected TLS record")
+ 
+ 
+ class TestClientHello:
+@@ -153,5 +155,6 @@ class TestClientHello:
+             b"\x01\x00\x00\x03" +  # handshake header
+             b"foo"
+         ))
+-        with pytest.raises(exceptions.TlsProtocolException, message='Cannot parse Client Hello'):
+        with pytest.raises(exceptions.TlsProtocolException):
+             tls.ClientHello.from_file(rfile)
+            pytest.fail('Cannot parse Client Hello')
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@ -13,11 +13,11 @@ with stdenv.lib;

 stdenv.mkDerivation rec {
  pname = "wireguard-tools";
-  version = "0.0.20190702";
+  version = "0.0.20190913";

  src = fetchzip {
    url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1xl4hzqrny3855s7h1k24py81gdjyfv0mhv6y528f6p0h38r89s3";
+    sha256 = "08ns5d6xbl0qylb98mml0yh0yp837a1sm3hvpra21by1dvx8k0dg";
  };

  sourceRoot = "source/src/tools";
--- a/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix
@ -1,13 +1,13 @@
 { lib, rustPlatform, fetchFromGitHub }:
 rustPlatform.buildRustPackage rec {
  pname = "nixpkgs-fmt";
-  version = "0.5.0";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "nix-community";
    repo = pname;
    rev = "v${version}";
-    sha256 = "07hnyx616dk03md00pmgpb5c2sp9w0n5l94s82arair0kpi0ncy0";
+    sha256 = "18kvsgl3kpla33dp1nbpd1kdgndfqcmlwwpjls55fp4mlczf8lcx";
  };

  cargoSha256 = "0wfx7shsdqrwbnzr2a0fnly1kd93mxbm96zjq5pzrq94lphkhqhz";
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }:
 rustPlatform.buildRustPackage rec {
  pname = "nix-du";
-  version = "0.3.0";
+  version = "unstable-2019-07-15";

  src = fetchFromGitHub {
    owner = "symphorien";
    repo = "nix-du";
-    rev = "v${version}";
-    sha256 = "1x6qpivxbn94034jfdxb97xi97fhcdv2z7llq2ccfc80mgd0gz8l";
+    rev = "e6e927c15e75f7c2e63f7f3c181dc6b257f6fd9e";
+    sha256 = "08jyp078h9jpb9qfqg5mdbq29rl8a006n94hqk3yk6gv1s57cfic";
  };
  cargoSha256 = "071gbhxbvnwi7n3zpy7bmlprzir0sl0f0pb191xg2ynw678prd7v";

--- a/pkgs/tools/package-management/nixops/azure-storage/default.nix
+++ b/pkgs/tools/package-management/nixops/azure-storage/default.nix
@ -0,0 +1,35 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, python
+, azure-common
+, futures
+, dateutil
+, requests
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  version = "0.20.3";
+  pname = "azure-storage";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb";
+  };
+
+  propagatedBuildInputs = [ azure-common dateutil requests ]
+                            ++ pkgs.lib.optionals (!isPy3k) [ futures ];
+
+  postInstall = ''
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+  '';
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
--- a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
+++ b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
@ -26,6 +26,7 @@ callPackage ./generic.nix (rec {
      azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { };
      azure-mgmt-resource = callPackage ./azure-mgmt-resource { };
      azure-mgmt-storage = callPackage ./azure-mgmt-storage { };
+      azure-storage = callPackage ./azure-storage { };
    });
  };
 })
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@ -2,13 +2,13 @@
 , kernel ? null, withDriver ? false }:
 pythonPackages.buildPythonApplication rec {
  name = "chipsec-${version}";
-  version = "1.4.0";
+  version = "1.4.1";

  src = fetchFromGitHub {
    owner = "chipsec";
    repo = "chipsec";
    rev = version;
-    sha256 = "09ipr0vls1l2wln4z3dc9vx0zp63ps3dxkwlpm9rqqbpg7qq6lrp";
+    sha256 = "043gf21zygvrzvvkwv5xxpcv3ryj5m8klkgyhq0lnh6k594qrg77";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/security/sops/default.nix
+++ b/pkgs/tools/security/sops/default.nix
@ -1,20 +1,20 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:

-buildGoPackage rec {
+buildGoModule rec {
  pname = "sops";
-  version = "3.3.1";
-
-  goPackagePath = "go.mozilla.org/sops";
+  version = "3.4.0";

  src = fetchFromGitHub {
    rev = version;
    owner = "mozilla";
    repo = pname;
-    sha256 = "0jbrz3yz6cj08h8cx6y98m8r0lpclh9367cw5apy6w3v71i3svfi";
+    sha256 = "1mrqf9xgv88v919x7gz9l1x70xwvp6cfz3zp9ip1nj2pzn6ixz3d";
  };

+  modSha256 = "13ja8nxycmdjnrnsxdd1qs06x408aqr4im127a6y433pkx2dg7gc";
+
  meta = with stdenv.lib; {
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/mozilla/sops";
    description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files";
    maintainers = [ maintainers.marsam ];
    license = licenses.mpl20;
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "vault";
-  version = "1.2.2";
+  version = "1.2.3";

  src = fetchFromGitHub {
    owner = "hashicorp";
    repo = "vault";
    rev = "v${version}";
-    sha256 = "1xljm7xmb4ldg3wx8s9kw1spffg4ywk4r1jqfa743czd2xxmqavl";
+    sha256 = "11zi12j09vi6j112a1n8f7sxwp15pbh0801bzh27ihcy01hlzdf8";
  };

-  modSha256 = "13pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q";
+  modSha256 = "10pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q";

  buildFlagsArray = [
    "-tags='vault'"
--- a/pkgs/tools/system/datefudge/default.nix
+++ b/pkgs/tools/system/datefudge/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation {
  pname = "datefudge";
-  version = "1.22";
+  version = "1.23";

  src = fetchgit {
    url = "https://salsa.debian.org/debian/datefudge.git";
-    rev = "fe27db47a0f250fb56164114fff8ae8d5af47ab6";
-    sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c";
+    rev = "090d3aace17640478f7f5119518b2f4196f62617";
+    sha256 = "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv";
  };

  patchPhase = ''
--- a/pkgs/tools/system/lshw/default.nix
+++ b/pkgs/tools/system/lshw/default.nix
@ -13,11 +13,18 @@ stdenv.mkDerivation rec {
    sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf";
  };

-  patches = [ (fetchpatch {
+  patches = [
+    (fetchpatch {
      # fix crash in scan_dmi_sysfs() when run as non-root
      url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch";
      sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3";
-  })];
+    })
+    (fetchpatch {
+      # support cross-compilation
+      url = "https://github.com/lyonel/lshw/commit/8486d25cea9b68794504fbd9e5c6e294bac6cb07.patch";
+      sha256 = "08f0wnxsq0agvsc66bhc7lxvk564ir0pp8pg3cym6a621prb9lm0";
+    })
+  ];

  nativeBuildInputs = [ pkgconfig ];

--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@ -12,12 +12,12 @@
 with stdenv.lib;

 stdenv.mkDerivation rec {
-  version = "1.17.0";
+  version = "1.17.1";
  pname = "netdata";

  src = fetchurl {
    url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz";
-    sha256 = "099xvndf5lql4ipwqhm38lpc65yicmpmkk3a7c2j4m48l3vqw9y6";
+    sha256 = "0k49ms295b9icccvknyqyqlsy911h06c7h7aql5havcx5m5jxq7w";
  };

  nativeBuildInputs = [ autoreconfHook pkgconfig ];
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -3677,6 +3677,8 @@ in

  pgf_graphics = callPackage ../tools/graphics/pgf { };

+  pgformatter = callPackage ../development/tools/pgformatter { };
+
  pgloader = callPackage ../development/tools/pgloader { };

  pigz = callPackage ../tools/compression/pigz { };
@ -5957,6 +5959,8 @@ in

  samplicator = callPackage ../tools/networking/samplicator { };

+  sasquatch = callPackage ../tools/filesystems/sasquatch { };
+
  sasview = callPackage ../applications/science/misc/sasview {};

  scallion = callPackage ../tools/security/scallion { };
@ -8355,7 +8359,9 @@ in
  rustracer = callPackage ../development/tools/rust/racer {
    inherit (darwin.apple_sdk.frameworks) Security;
  };
-  rustracerd = callPackage ../development/tools/rust/racerd { };
+  rustracerd = callPackage ../development/tools/rust/racerd {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
  rust-bindgen = callPackage ../development/tools/rust/bindgen { };
  rust-cbindgen = callPackage ../development/tools/rust/cbindgen {
    inherit (darwin.apple_sdk.frameworks) Security;
@ -9272,8 +9278,11 @@ in
  #     };
  # You can use a different directory, but whichever directory you choose
  # should be owned by user root, group nixbld with permissions 0770.
-  ccacheWrapper = makeOverridable ({ extraConfig ? "", unwrappedCC ? stdenv.cc.cc }:
-     wrapCC (ccache.links {inherit unwrappedCC extraConfig;})) {};
+  ccacheWrapper = makeOverridable ({ extraConfig ? "", cc ? stdenv.cc }:
+    cc.override { cc = ccache.links {
+      inherit extraConfig;
+      unwrappedCC = cc.cc;
+    }; }) {};
  ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper);

  cccc = callPackage ../development/tools/analysis/cccc { };
@ -19195,7 +19204,10 @@ in

  lxdvdrip = callPackage ../applications/video/lxdvdrip { };

-  handbrake = callPackage ../applications/video/handbrake { };
+  handbrake = callPackage ../applications/video/handbrake {
+    inherit (darwin.apple_sdk.frameworks) AudioToolbox Foundation VideoToolbox;
+    inherit (darwin) libobjc;
+  };

  lilyterm = callPackage ../applications/misc/lilyterm {
    inherit (gnome2) vte;
@ -21813,6 +21825,8 @@ in

  chessx = libsForQt59.callPackage ../games/chessx { };

+  chiaki = libsForQt5.callPackage ../games/chiaki { };
+
  chocolateDoom = callPackage ../games/chocolate-doom { };

  crispyDoom = callPackage ../games/crispy-doom { };
@ -22405,6 +22419,8 @@ in

  tinyfugue = callPackage ../games/tinyfugue { };

+  tome2 = callPackage ../games/tome2 { };
+
  tome4 = callPackage ../games/tome4 { };

  toppler = callPackage ../games/toppler { };
@ -24132,7 +24148,9 @@ in

  pgmanage = callPackage ../applications/misc/pgmanage { };

-  pgadmin = callPackage ../applications/misc/pgadmin { };
+  pgadmin = callPackage ../applications/misc/pgadmin {
+    openssl = openssl_1_0_2;
+  };

  pgf = pgf2;

--- a/Show More
+++ b/Show More