diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index af4c804ece9c..7cd876b19c7d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23783,6 +23783,12 @@
     githubId = 678511;
     name = "Thomas Mader";
   };
+  thornoar = {
+    email = "r.a.maksimovich@gmail.com";
+    github = "thornoar";
+    githubId = 84677666;
+    name = "Roman Maksimovich";
+  };
   thornycrackers = {
     email = "codyfh@gmail.com";
     github = "thornycrackers";
diff --git a/pkgs/by-name/ps/pshash/package.nix b/pkgs/by-name/ps/pshash/package.nix
new file mode 100644
index 000000000000..fcc3f5b74e99
--- /dev/null
+++ b/pkgs/by-name/ps/pshash/package.nix
@@ -0,0 +1,41 @@
+{
+  haskellPackages,
+  fetchFromGitHub,
+  lib,
+}:
+haskellPackages.mkDerivation rec {
+  pname = "pshash";
+  version = "0.1.14.6";
+  src = fetchFromGitHub {
+    owner = "thornoar";
+    repo = "pshash";
+    tag = "v${version}";
+    hash = "sha256-gqIdfIC8f9aF4ojHBhKOTvIr34kuTGQ5R/q1D+0c4bA=";
+  };
+
+  postPatch = ''
+    patchShebangs --build test/output.sh
+  '';
+
+  isLibrary = false;
+  isExecutable = true;
+  doCheck = true;
+
+  checkPhase = ''
+    runHook preCheck
+    test/output.sh dist/build/pshash/pshash
+    runHook postCheck
+  '';
+
+  executableHaskellDepends = with haskellPackages; [
+    base
+    containers
+    directory
+  ];
+
+  license = lib.licenses.mit;
+  description = "Functional pseudo-hash password creation tool";
+  homepage = "https://github.com/thornoar/pshash";
+  maintainers = with lib.maintainers; [ thornoar ];
+  mainProgram = "pshash";
+}