diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e5af04390231..c5ed5ba62c40 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10579,6 +10579,11 @@
     githubId = 982322;
     name = "Henrik Olsson";
   };
+  henrikvtcodes = {
+    github = "henrikvtcodes";
+    githubId = 22358337;
+    name = "Henrik VT";
+  };
   henrirosten = {
     email = "henri.rosten@unikie.com";
     github = "henrirosten";
diff --git a/pkgs/by-name/st/stax/package.nix b/pkgs/by-name/st/stax/package.nix
new file mode 100644
index 000000000000..b77bd71e3590
--- /dev/null
+++ b/pkgs/by-name/st/stax/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  perl,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "stax";
+  version = "0.25.1";
+
+  src = fetchFromGitHub {
+    owner = "cesarferreira";
+    repo = "stax";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-HHunRVDoijBOcIzj0xknj2O+m+A1nmkkxu97XZcvmJw=";
+  };
+
+  nativeBuildInputs = [ perl ];
+
+  cargoHash = "sha256-cJmK5uX3HCz4own2UtXFkHdGFETjina2/UW18f/g/bA=";
+
+  doInstallCheck = true;
+  doCheck = false;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    description = "Stacked-branch workflow for Git with an interactive TUI, smart PRs, and safe undo";
+    homepage = "https://github.com/cesarferreira/stax";
+    license = lib.licenses.mit;
+    mainProgram = "stax";
+    maintainers = with lib.maintainers; [
+      henrikvtcodes
+    ];
+  };
+})