Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix

pkgs/applications/video/avxsynth/default.nix

@@ -1,43 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
-, cairo, ffmpeg_3, ffms, libjpeg, log4cpp, pango
-, avxeditSupport ? false, qt4 ? null
-}:
-
-let
-  inherit (lib) enableFeature optional;
-in
-
-stdenv.mkDerivation {
-  pname = "avxsynth";
-  version = "2015-04-07";
-
-  src = fetchFromGitHub {
-    owner = "avxsynth";
-    repo = "avxsynth";
-    rev = "80dcb7ec8d314bc158130c92803308aa8e5e9242";
-    sha256 = "0kckggvgv68b0qjdi7ms8vi97b46dl63n60qr96d2w67lf2nk87z";
-  };
-
-  configureFlags = [
-    "--enable-autocrop"
-    "--enable-framecapture"
-    "--enable-subtitle"
-    "--enable-ffms2"
-    (enableFeature avxeditSupport "avxedit")
-    "--with-jpeg=${libjpeg.out}/lib"
-  ];
-
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-
-  buildInputs = [ cairo ffmpeg_3 ffms libjpeg log4cpp pango ]
-    ++ optional avxeditSupport qt4;
-
-  meta = with lib; {
-    description = "A script system that allows advanced non-linear editing";
-    homepage = "https://github.com/avxsynth/avxsynth";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ codyopel ];
-    platforms = platforms.linux;
-    broken = true; # 2018-04-10
-  };
-}

pkgs/applications/video/clipgrab/default.nix

@@ -1,4 +1,4 @@
-{ lib, fetchurl, makeDesktopItem, ffmpeg_3
+{ lib, fetchurl, makeDesktopItem, ffmpeg
 , qmake, qttools, mkDerivation
 , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine
 }:
@@ -13,19 +13,17 @@ mkDerivation rec {
     url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
   };
 
-  buildInputs = [ ffmpeg_3 qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
+  buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
   nativeBuildInputs = [ qmake qttools ];
 
-  postPatch = lib.optionalString (ffmpeg_3 != null) ''
+  postPatch = lib.optionalString (ffmpeg != null) ''
   substituteInPlace converter_ffmpeg.cpp \
-    --replace '"ffmpeg"' '"${ffmpeg_3.bin}/bin/ffmpeg"' \
-    --replace '"ffmpeg ' '"${ffmpeg_3.bin}/bin/ffmpeg '
+    --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \
+    --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg '
   '';
 
   qmakeFlags = [ "clipgrab.pro" ];
 
-  enableParallelBuilding = true;
-
   desktopItem = makeDesktopItem rec {
     name = "clipgrab";
     exec = name;
@@ -37,9 +35,11 @@ mkDerivation rec {
   };
 
   installPhase = ''
+    runHook preInstall
     install -Dm755 clipgrab $out/bin/clipgrab
     install -Dm644 icon.png $out/share/pixmaps/clipgrab.png
     cp -r ${desktopItem}/share/applications $out/share
+    runHook postInstall
   '';
 
   meta = with lib; {

pkgs/applications/video/jftui/default.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jftui";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "Aanok";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-KyiLZuzQ0kCReUEPBf0YbmdXhw9nBfghBBsXiy9+N0E=";
+    sha256 = "sha256-/QVSywS0O+HZpwY9W3le3RK3OhCkmdLYMCGTyyBdsFw=";
   };
 
   nativeBuildInputs = [