Merge master into staging-next

pkgs/tools/misc/pazi/cargo-lock.patch

@@ -1,13 +1,13 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 074b0ca..22f3bc5 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -286,7 +286,7 @@ dependencies = [
+diff --git i/Cargo.lock w/Cargo.lock
+index b39a076..03a2757 100644
+--- i/Cargo.lock
++++ w/Cargo.lock
+@@ -281,7 +281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
  
  [[package]]
  name = "pazi"
--version = "0.2.0"
-+version = "0.3.0"
+-version = "0.3.0"
++version = "0.4.0"
  dependencies = [
   "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",

pkgs/tools/misc/pazi/default.nix

@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pazi";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "euank";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1gnh6047hacavcb9bhps9d1zjns66rdbd158fw20kjp1lln5srrn";
+    sha256 = "1bbci7bvrwl7lsslf302jham1pcw32fi7nwgqyjpfjyzvnpfgndz";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
-  cargoSha256 = "15s03vwgl6562n5h9r4d5kp2r168jakn5nwnyibmrs8r5q0idmjs";
+  cargoSha256 = "0nqcp54nwv4ic5jc3cgg15rh8dgkixfgkwb5q47rv8ding4cd0j5";
 
   cargoPatches = [ ./cargo-lock.patch ];
 

pkgs/tools/misc/youtube-dl/default.nix

@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2019.10.22";
+  version = "2019.10.29";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "06wg6wpyq0fawjxjrhd7zasfjr9b6w9wsk2amiqdl712zqlq2rwb";
+    sha256 = "1lq6ycjbx07831s24yx42q6m6svas4mf02vbszw0965dbbzs7vp4";
   };
 
   nativeBuildInputs = [ makeWrapper ];