Merge staging-next into staging

86 files changed, 4003 insertions, 319 deletions

diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix
index 55427ccfda49..c6510f5469c0 100644
--- a/pkgs/applications/audio/jamulus/default.nix
+++ b/pkgs/applications/audio/jamulus/default.nix
@@ -3,12 +3,12 @@
 
 mkDerivation rec {
   pname = "jamulus";
-  version = "3.6.1";
+  version = "3.6.2";
   src = fetchFromGitHub {
     owner = "corrados";
     repo = "jamulus";
     rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "11rwgd2car7ziqa0vancb363m4ca94pj480jfxywd6d81139jl15";
+    sha256 = "sha256-b187Q8KXcU32C2hGFqs6R2CqWgmieq6ewQDx+elEgP4=";
   };
 
   nativeBuildInputs = [ pkg-config qmake ];
diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix
index 9ba9e070d08b..18dcef129cc2 100644
--- a/pkgs/applications/editors/emacs-modes/cedet/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, emacs, python }:
+{ lib, fetchurl, stdenv, emacs, python }:
 
 stdenv.mkDerivation rec {
   name = "cedet-1.1";
diff --git a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix
index 5eb81197c8bd..a92471a9493b 100644
--- a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation {
   name = "ess-R-object-popup-20130302";
diff --git a/pkgs/applications/editors/emacs-modes/helm-words/default.nix b/pkgs/applications/editors/emacs-modes/helm-words/default.nix
index a8a1274737a6..0678492500d6 100644
--- a/pkgs/applications/editors/emacs-modes/helm-words/default.nix
+++ b/pkgs/applications/editors/emacs-modes/helm-words/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation {
   name = "helm-words-20190917";
diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix
index 972d3b8a6f9a..3b20326d96f5 100644
--- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, emacs }:
+{ lib, stdenv, fetchurl, emacs }:
 
 # this package installs the emacs-mode which
 # resides in the hsc3 sources.
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index bc0875bcd9ee..9334a16d22d6 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -341,6 +341,7 @@ let
         # Telega has a server portion for it's network protocol
         telega = super.telega.overrideAttrs (old: {
           buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
+          nativeBuildInputs = [ external.pkg-config ];
 
           postBuild = ''
             cd source/server
diff --git a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
index dba6e10a5908..600e44eb8abe 100644
--- a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, emacs}:
+{ lib, stdenv, fetchurl, emacs }:
 
 stdenv.mkDerivation {
   name = "org-mac-link-1.2";
diff --git a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
index 815783aabea1..e14e5ed8cc23 100644
--- a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
+++ b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "perl-completion";
diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix
index 7be3b1ca3c73..deac73a194ed 100644
--- a/pkgs/applications/editors/emacs-modes/prolog/default.nix
+++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "prolog-mode";
diff --git a/pkgs/applications/editors/emacs-modes/railgun/default.nix b/pkgs/applications/editors/emacs-modes/railgun/default.nix
index 4cf4d18d8cca..240a2f29edf3 100644
--- a/pkgs/applications/editors/emacs-modes/railgun/default.nix
+++ b/pkgs/applications/editors/emacs-modes/railgun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation {
   name = "railgun-2012-10-17";
diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
index d2785ef03634..1275c51b99e3 100644
--- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
+++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, emacs}:
+{ lib, stdenv, fetchurl, emacs }:
 
 stdenv.mkDerivation {
   name = "rect-mark-1.4";
diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
index 710c33a96ec7..412ed59f2ac7 100644
--- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
+++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchgit, emacs}:
+{ lib, stdenv, fetchgit, emacs }:
 
 stdenv.mkDerivation {
   name = "sunrise-commander-6r435";
diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix
index f67efb80bf97..237c05c5fa76 100644
--- a/pkgs/applications/editors/emacs-modes/tramp/default.nix
+++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, emacs, texinfo }:
+{ lib, stdenv, fetchurl, emacs, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "tramp-2.4.2";
diff --git a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix
index 352c46718dd8..67bf7b500ff7 100644
--- a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix
+++ b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, emacs }:
+{ lib, stdenv, fetchurl, emacs }:
 
 stdenv.mkDerivation {
   name = "zeitgeist-20120221";
diff --git a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix
index deeaa8a9f156..8e60e17e7928 100644
--- a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix
+++ b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, lua5_3 }:
+{ lib, stdenv, fetchgit, lua5_3 }:
 
 stdenv.mkDerivation rec {
   pname = "quickscope-kak";
diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix
index 50cad500c955..f5ad8d947c7b 100644
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/pkgs/applications/editors/tecoc/default.nix
@@ -1,37 +1,47 @@
-{ lib, stdenv, fetchFromGitHub
-, ncurses }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, ncurses
+}:
 
 stdenv.mkDerivation rec {
-
-  pname = "tecoc-git";
-  version = "20150606";
+  pname = "tecoc";
+  version = "unstable-2020-11-03";
 
   src = fetchFromGitHub {
     owner = "blakemcbride";
     repo = "TECOC";
-    rev = "d7dffdeb1dfb812e579d6d3b518545b23e1b50cb";
-    sha256 = "11zfa73dlx71c0hmjz5n3wqcvk6082rpb4sss877nfiayisc0njj";
+    rev = "79fcb6cfd6c5f9759f6ec46aeaf86d5806b13a0b";
+    sha256 = "sha256-JooLvoh9CxLHLOXXxE7zA7R9yglr9BGUwX4nrw2/vIw=";
   };
 
   buildInputs = [ ncurses ];
 
   makefile = if stdenv.hostPlatform.isDarwin
-  	     then "makefile.osx"
-	     else if stdenv.hostPlatform.isFreeBSD
-  	     then "makefile.bsd"
-  	     else if stdenv.hostPlatform.isOpenBSD
-  	     then "makefile.bsd"
-  	     else if stdenv.hostPlatform.isWindows
-  	     then "makefile.win"
-	     else "makefile.linux"; # I think Linux is a safe default...
+             then "makefile.osx"
+             else if stdenv.hostPlatform.isFreeBSD
+             then "makefile.bsd"
+             else if stdenv.hostPlatform.isOpenBSD
+             then "makefile.bsd"
+             else if stdenv.hostPlatform.isWindows
+             then "makefile.win"
+             else "makefile.linux"; # I think Linux is a safe default...
 
   makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ];
 
+  preInstall = ''
+    install -d $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros
+  '';
+
   installPhase = ''
-    mkdir -p $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros
-    cp src/tecoc $out/bin
-    cp src/aaout.txt doc/* $out/share/doc/${pname}-${version}
-    cp lib/* lib2/* $out/lib/teco/macros
+    runHook preInstall
+    install -m755 src/tecoc $out/bin
+    install -m644 src/aaout.txt doc/* $out/share/doc/${pname}-${version}
+    install -m644 lib/* lib2/* $out/lib/teco/macros
+    runHook