diff --git a/pkgs/development/libraries/libgit2/1-7-2.nix b/pkgs/development/libraries/libgit2/1-7-2.nix
new file mode 100644
index 0000000000000..397e9dccb0069
--- /dev/null
+++ b/pkgs/development/libraries/libgit2/1-7-2.nix
@@ -0,0 +1,5 @@
+(import ./build-version.nix) {
+  # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib
+  version = "1.7.2";
+  hash = "sha256-fVPY/byE2/rxmv/bUykcAbmUFMlF3UZogVuTzjOXJUU=";
+}
diff --git a/pkgs/development/libraries/libgit2/1-8-1.nix b/pkgs/development/libraries/libgit2/1-8-1.nix
new file mode 100644
index 0000000000000..8d4ffc9112b34
--- /dev/null
+++ b/pkgs/development/libraries/libgit2/1-8-1.nix
@@ -0,0 +1,5 @@
+(import ./build-version.nix) {
+  # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib
+  version = "1.8.1";
+  hash = "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=";
+}
diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/build-version.nix
similarity index 90%
rename from pkgs/development/libraries/libgit2/default.nix
rename to pkgs/development/libraries/libgit2/build-version.nix
index 58212e00d89e7..ed1cad1640cd8 100644
--- a/pkgs/development/libraries/libgit2/default.nix
+++ b/pkgs/development/libraries/libgit2/build-version.nix
@@ -1,3 +1,6 @@
+{ version
+, hash
+}:
 { lib
 , stdenv
 , fetchFromGitHub
@@ -20,8 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libgit2";
-  version = "1.7.2";
-  # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib
+  inherit version;
 
   outputs = ["lib" "dev" "out"];
 
@@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "libgit2";
     repo = "libgit2";
     rev = "v${version}";
-    hash = "sha256-fVPY/byE2/rxmv/bUykcAbmUFMlF3UZogVuTzjOXJUU=";
+    inherit hash;
   };
 
   cmakeFlags = [
diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index 716f9e9778155..4dc48275a3eec 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -2,7 +2,7 @@
 , rustPlatform
 , fetchFromGitHub
 , pkg-config
-, libgit2
+, libgit2_1_8
 , openssl
 , stdenv
 , darwin
@@ -11,20 +11,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-generate";
-  version = "0.21.1";
+  version = "0.21.3";
 
   src = fetchFromGitHub {
     owner = "cargo-generate";
     repo = "cargo-generate";
     rev = "v${version}";
-    sha256 = "sha256-Pza1MK5yWpuNfaaFAJy5/Pf+t0TN1Hzc5wKcpmMpEf0=";
+    sha256 = "sha256-1F/865UgdqwfpITFhXCuL7CmducL7w0lVDyfui9UzjU=";
   };
 
-  cargoHash = "sha256-b6WfsDTAZgxA977JhdlafE+POPvMLl8Z7CzEf+L2+Us=";
+  cargoHash = "sha256-szPO1V09EThpo2N03Ll+ZJUpvjp2b+/C/sviOzFfG+k=";
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [
+  buildInputs = [ libgit2_1_8 openssl ] ++ lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 438a7e0748364..222ec42c39c97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20372,7 +20372,13 @@ with pkgs;
 
   icon-lang = callPackage ../development/interpreters/icon-lang { };
 
-  libgit2 = callPackage ../development/libraries/libgit2 {
+  # Should be flipped for version 1.8.x soon
+  libgit2 = callPackage ../development/libraries/libgit2/1-7-2.nix {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
+  # Future default version
+  libgit2_1_8 = callPackage ../development/libraries/libgit2/1-8-1.nix {
     inherit (darwin.apple_sdk.frameworks) Security;
   };