Merge commit '1233c8d9e9bc463899ed6a8cf0232e6bf36475ee'

3 files changed, 41 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix
index e7199543ad74..0797d75a8377 100644
--- a/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix
@@ -82,6 +82,8 @@ let
 
   git-hub = callPackage ./git-hub { };
 
+  git-ignore = callPackage ./git-ignore { };
+
   git-imerge = callPackage ./git-imerge { };
 
   git-octopus = callPackage ./git-octopus { };
diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
new file mode 100644
index 000000000000..9edcf4c3ac47
--- /dev/null
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "git-ignore-${version}";
+  version = "0.2.0";
+
+  cargoSha256 = "1fqfy8lnvpn5sd3l73x2p359zq4303vsrdgw3aphvy6580yjb84d";
+
+  src = fetchFromGitHub {
+    owner = "sondr3";
+    repo = "git-ignore";
+    rev = "v${version}";
+    sha256 = "1nihh5inh46r8jg9z7d6g9gqfyhrznmkn15nmzpbnzf0653dl629";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ openssl ]
+  ++ stdenv.lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Quickly and easily fetch .gitignore templates from gitignore.io";
+    homepage = https://github.com/sondr3/git-ignore;
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = [ maintainers.sondr3 ];
+  };
+}
diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
index 331b020d8ca7..b5edd256256b 100644
--- a/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
@@ -1,11 +1,12 @@
 { stdenv, python3Packages }:
 with python3Packages; buildPythonApplication rec {
-  pname = "pre_commit";
-  version = "1.11.1";
+  pname = "pre-commit";
+  version = "1.14.2";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "1kjrq8z78b6aqhyyw07dlwf6cqls88kik6f5l07hs71fj5ddvs9w";
+    inherit version;
+    pname = "pre_commit";
+    sha256 = "010fwih91gbc20hm2hmkyicm2a2xwrjjg4r4wv24x3n7zn4abdrc";
   };
 
   propagatedBuildInputs = [
@@ -17,7 +18,9 @@ with python3Packages; buildPythonApplication rec {
     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;