From a58e7f5991113709e34c5acea8a4fb010fe40d3a Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 26 Oct 2025 16:56:52 -0400
Subject: [PATCH] mpw: drop

Upstream development has moved from
https://gitlab.com/MasterPassword/MasterPassword to
https://gitlab.com/spectre.app/cli.

We package Spectre.app's CLI as `spectre-cli`.
---
 pkgs/by-name/mp/mpw/package.nix | 79 ---------------------------------
 pkgs/top-level/aliases.nix      |  1 +
 2 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 pkgs/by-name/mp/mpw/package.nix

diff --git a/pkgs/by-name/mp/mpw/package.nix b/pkgs/by-name/mp/mpw/package.nix
deleted file mode 100644
index 495b1384b873..000000000000
--- a/pkgs/by-name/mp/mpw/package.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  fetchFromGitLab,
-  json_c,
-  libsodium,
-  libxml2,
-  ncurses,
-}:
-
-let
-  rev = "22796663dcad81684ab24308d9db570f6781ba2c";
-
-in
-stdenv.mkDerivation rec {
-  name = "mpw-${version}-${builtins.substring 0 8 rev}";
-  version = "2.6";
-
-  src = fetchFromGitLab {
-    owner = "MasterPassword";
-    repo = "MasterPassword";
-    sha256 = "1f2vqacgbyam1mazawrfim8zwp38gnwf5v3xkkficsfnv789g6fw";
-    inherit rev;
-  };
-
-  sourceRoot = "${src.name}/platform-independent/c/cli";
-
-  postPatch = ''
-    rm build
-    substituteInPlace mpw-cli-tests \
-      --replace '/usr/bin/env bash' ${stdenv.shell} \
-      --replace ./mpw ./build/mpw
-  '';
-
-  cmakeFlags = [
-    "-Dmpw_version=${version}"
-    "-DBUILD_MPW_TESTS=ON"
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [
-    json_c
-    libxml2
-    libsodium
-    ncurses
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 mpw                    $out/bin/mpw
-    install -Dm644 ../mpw.completion.bash $out/share/bash-completion/completions/_mpw
-    install -Dm644 ../../../../README.md  $out/share/doc/mpw/README.md
-
-    runHook postInstall
-  '';
-
-  # Some tests are expected to fail on ARM64
-  # See: https://gitlab.com/spectre.app/cli/-/issues/27#note_962950844 (mpw is a predecessor to spectre-cli and this issue is relevant to mpw as well)
-  doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
-
-  checkPhase = ''
-    runHook preCheck
-
-    ../mpw-cli-tests
-
-    runHook postCheck
-  '';
-
-  meta = with lib; {
-    description = "Stateless password management solution";
-    mainProgram = "mpw";
-    homepage = "https://masterpasswordapp.com/";
-    license = licenses.gpl3;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3824493cd4ee..2f22eff888bc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1771,6 +1771,7 @@ mapAliases {
   mpdWithFeatures = lib.warnOnInstantiate "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08
   mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10
   mpris-discord-rpc = throw "'mpris-discord-rpc' has been renamed to 'music-discord-rpc'."; # Added 2025-09-14
+  mpw = throw "'mpw' has been removed, as upstream development has moved to Spectre, which is packaged as 'spectre-cli'"; # Added 2025-10-26
   mq-cli = throw "'mq-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   mrkd = throw "'mrkd' has been removed as it is unmaintained since 2021"; # Added 2024-12-21
   mrxvt = throw "'mrxvt' has been removed due to lack of maintainence upstream"; # Added 2025-09-25