diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix
new file mode 100644
index 000000000000..4189822d268a
--- /dev/null
+++ b/pkgs/applications/version-management/git-stack/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rustPlatform
+, Security
+, testers
+, git-stack
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "git-stack";
+  version = "0.10.12";
+
+  src = fetchFromGitHub {
+    owner = "gitext-rs";
+    repo = "git-stack";
+    rev = "v${version}";
+    hash = "sha256-ghH3wmXLPzJZ4lNXFwEGKD89r7xaRMXUe9kGHm7MC4s=";
+  };
+
+  cargoHash = "sha256-5FXcReXgq5LFysPGBuYawFdkYAgRHsW+p2Ytin4+ZxI=";
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    Security
+  ];
+
+  # Many tests try to access the file system.
+  doCheck = false;
+
+  passthru.tests.version = testers.testVersion {
+    package = git-stack;
+  };
+
+  meta = with lib; {
+    description = "Stacked branch management for Git";
+    homepage = "https://github.com/gitext-rs/git-stack";
+    changelog = "https://github.com/gitext-rs/git-stack/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ stehessel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4836d6377a26..9b97a3d5345f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1923,6 +1923,10 @@ with pkgs;
 
   git-sizer = callPackage ../applications/version-management/git-sizer { };
 
+  git-stack = callPackage ../applications/version-management/git-stack {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   git-standup = callPackage ../applications/version-management/git-standup { };
 
   git-stree = callPackage ../applications/version-management/git-stree { };