Merge master into staging-next

pkgs/misc/deepspeech/default.nix

@@ -1,34 +0,0 @@
-{ stdenv, lib, fetchurl, autoPatchelfHook }:
-
-stdenv.mkDerivation rec {
-  pname = "deepspeech";
-  version = "0.9.3";
-
-  src = fetchurl {
-    url = "https://github.com/mozilla/DeepSpeech/releases/download/v${version}/native_client.amd64.cpu.linux.tar.xz";
-    sha256 = "1qy2gspprcxi76jk06ljp028xl0wkk1m3mqaxyf5qbhhfbvvpfap";
-  };
-  setSourceRoot = "sourceRoot=`pwd`";
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-  ];
-
-  buildInputs = [
-    stdenv.cc.cc.lib
-  ];
-
-  installPhase = ''
-    install -D deepspeech $out/bin/deepspeech
-    install -D deepspeech.h $out/include/deepspeech.h
-    install -D libdeepspeech.so $out/lib/libdeepspeech.so
-  '';
-
-  meta = with lib; {
-    homepage = https://github.com/mozilla/DeepSpeech;
-    description = "Open source embedded (offline, on-device) speech-to-text engine, which can run in real time on broad range of devices";
-    license = licenses.mpl20;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ rvolosatovs ];
-  };
-}

pkgs/misc/screensavers/betterlockscreen/default.nix

@@ -5,19 +5,17 @@
 
 stdenv.mkDerivation rec {
   pname = "betterlockscreen";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "pavanjadhaw";
     repo = "betterlockscreen";
     rev = version;
-    sha256 = "0jc8ifb69shmd0avx6vny4m1w5dfxkkf5vnm7qcrmc8yflb0s3z6";
+    sha256 = "14vkgdzw7mprjsvmhm3aav8gds73ngn2xxij4syq7l1mhk701wak";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
-  patches = [ ./replace-i3lock.patch ];
-
   installPhase =
     let
       PATH =

pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch

@@ -1,12 +0,0 @@
---- a/betterlockscreen
-+++ b/betterlockscreen
-@@ -76,7 +76,7 @@ prelock() {
- lock() {
- 	#$1 image path
- 
--	i3lock \
-+	i3lock-color \
- 		-t -i "$1" \
- 		--timepos='x+110:h-70' \
- 		--datepos='x+43:h-45' \
-