Merge master into staging-next

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

@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }:
 
 mkDerivation rec {
   pname = "android-file-transfer";

pkgs/tools/filesystems/bindfs/default.nix

@@ -1,16 +1,14 @@
 { lib, stdenv, fetchurl, fuse, pkg-config }:
 
 stdenv.mkDerivation rec {
-  version = "1.14.8";
+  version = "1.14.9";
   pname = "bindfs";
 
   src = fetchurl {
     url    = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
-    sha256 = "15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5";
+    sha256 = "0fnij365dn4ihkpfc92x63inxxwpminzffyj55krp1w02canpl5n";
   };
 
-  dontStrip = true;
-
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse ];
   postFixup = ''

pkgs/tools/filesystems/catcli/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , buildPythonApplication
 , docopt, anytree

pkgs/tools/filesystems/convoy/default.nix

@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, lvm2 }:
+{ lib, buildGoPackage, fetchFromGitHub, lvm2 }:
 
 buildGoPackage rec {
   pname = "convoy";

pkgs/tools/filesystems/gitfs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "gitfs";

pkgs/tools/filesystems/gocryptfs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , buildGoModule
 , fetchFromGitHub
 , openssl

pkgs/tools/filesystems/nixpart/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildPythonApplication, blivet }:
+{ lib, fetchurl, buildPythonApplication, blivet }:
 
 buildPythonApplication rec {
   pname = "nixpart";

pkgs/tools/filesystems/sandboxfs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , rustPlatform
 , fuse

pkgs/tools/filesystems/tmsu/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }:
+{ lib, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }:
 
 buildGoPackage rec {
   pname = "tmsu";

pkgs/tools/filesystems/ubidump/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3, makeWrapper }:
+{ lib, fetchFromGitHub, python3, makeWrapper }:
 
 python3.pkgs.buildPythonApplication rec {