Merge master into staging-next

pkgs/applications/version-management/git-and-tools/default.nix

@@ -145,7 +145,7 @@ let
 
   lab = callPackage ./lab { };
 
-  pre-commit = callPackage ./pre-commit { };
+  pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
 
   pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
 

pkgs/applications/version-management/git-and-tools/pre-commit/default.nix

@@ -1,34 +0,0 @@
-{ stdenv, python3Packages }:
-with python3Packages; buildPythonApplication rec {
-  pname = "pre-commit";
-  version = "1.18.1";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "pre_commit";
-    sha256 = "0d9ja186g41kw3gmhbi6xjvaslz6z4xis4qn1q6jabkka6jz4qhp";
-  };
-
-  propagatedBuildInputs = [
-    aspy-yaml
-    cached-property
-    cfgv
-    identify
-    nodeenv
-    six
-    toml
-    virtualenv
-    importlib-metadata
-  ] ++ stdenv.lib.optional (pythonOlder "3.7") importlib-resources
-    ++ stdenv.lib.optional (pythonOlder "3.2") futures;
-
-  # Tests fail due to a missing windll dependency
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "A framework for managing and maintaining multi-language pre-commit hooks";
-    homepage = https://pre-commit.com/;
-    license = licenses.mit;
-    maintainers = with maintainers; [ borisbabic ];
-  };
-}