Merge staging-next into staging

pkgs/tools/filesystems/android-file-transfer/default.nix

@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "android-file-transfer";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "whoozle";
     repo = "android-file-transfer-linux";
     rev = "v${version}";
-    sha256 = "11d4n4ybmc25gz18nlps3v11m3y8dw5bcb817gkik5m4nvqnbcsf";
+    sha256 = "0xmnwxr649wdzsa1vf3spl387hxs4pq0rldyrsr9hz43da4v081k";
   };
 
   nativeBuildInputs = [ cmake readline pkgconfig ];

pkgs/tools/misc/lsd/default.nix

@@ -7,25 +7,24 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lsd";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "Peltoche";
     repo = pname;
     rev = version;
-    sha256 = "006fy87jrb77cpa6bywchcvq1p74vlpy151q1j4nsj8npbr02krj";
+    sha256 = "1iiczdsqw0i6cz492177z6lr8s7fikn151j8p76fmr77zk0bm6q2";
   };
 
-  cargoSha256 = "0mrvcca9y0vylcrbfxxba45v05qxd8z91vb4in88px60xah0dy3q";
+  cargoSha256 = "1r2mkpicsyihlrim3bnmscgg5rnaijpvgq8c846zqj7ly8v8qqvg";
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = ''
     installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}}
   '';
 
-  checkFlags = stdenv.lib.optionals stdenv.isDarwin [
-    "--skip meta::filetype::test::test_socket_type"
-  ];
+  # Found argument '--test-threads' which wasn't expected, or isn't valid in this context
+  doCheck = false;
 
   passthru.tests = { inherit (nixosTests) lsd; };