Merge pull request #216748 from winterqt/drop-keepassx

keepassx{,2}: drop

nixos/doc/manual/release-notes/rl-2305.section.md

@@ -78,6 +78,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories.
 
+- `keepassx` and `keepassx2` have been removed, due to upstream [stopping development](https://www.keepassx.org/index.html%3Fp=636.html). Consider [KeePassXC](https://keepassxc.org) as a maintained alternative.
+
 - The `services.kubo.settings` option is now no longer stateful. If you changed any of the options in `services.kubo.settings` in the past and then removed them from your NixOS configuration again, those changes are still in your Kubo configuration file but will now be reset to the default. If you're unsure, you may want to make a backup of your configuration file (probably /var/lib/ipfs/config) and compare after the update.
 
 - The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services.

pkgs/applications/misc/keepassx/2.0.nix

@@ -1,22 +0,0 @@
-{ lib, stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }:
-
-stdenv.mkDerivation rec {
-  pname = "keepassx2";
-  version = "2.0.3";
-
-  src = fetchurl {
-    url = "https://www.keepassx.org/releases/${version}/keepassx-${version}.tar.gz";
-    sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ libgcrypt qt4 xorg.libXtst ];
-
-  meta = {
-    description = "Qt password manager compatible with its Win32 and Pocket PC versions";
-    homepage = "https://www.keepassx.org/";
-    license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ qknight ];
-    platforms = with lib.platforms; linux;
-  };
-}

pkgs/applications/misc/keepassx/default.nix

@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }:
-
-stdenv.mkDerivation rec {
-  pname = "keepassx";
-  version = "0.4.4";
-
-  src = fetchurl {
-    url = "https://www.keepassx.org/releases/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry";
-  };
-
-  patches = [ ./random.patch ];
-
-  buildInputs = [ bzip2 qt4 libX11 xorgproto libXtst ];
-
-  nativeBuildInputs = [ qmake4Hook ];
-
-  meta = {
-    description = "Qt password manager compatible with its Win32 and Pocket PC versions";
-    homepage = "https://www.keepassx.org/";
-    license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ qknight ];
-    platforms = with lib.platforms; linux;
-  };
-}

pkgs/applications/misc/keepassx/random.patch

@@ -1,13 +0,0 @@
---- a/src/lib/random.cpp	2014-01-21 21:15:55.829312723 +0000
-+++ b/src/lib/random.cpp	2014-01-21 21:16:36.752535839 +0000
-@@ -28,6 +28,10 @@
- 	#include <wincrypt.h>
- 	#include <QSysInfo>
- #endif
-+#ifndef Q_WS_WIN
-+	#include <sys/types.h>
-+	#include <unistd.h>
-+#endif
- 
- #include <QCryptographicHash>
- #include <QCursor>

pkgs/top-level/aliases.nix

@@ -729,8 +729,10 @@ mapAliases ({
   kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16
   kdiff3-qt5 = throw "'kdiff3-qt5' has been renamed to/replaced by 'kdiff3'"; # Converted to throw 2022-02-22
   keepass-keefox = throw "'keepass-keefox' has been renamed to/replaced by 'keepass-keepassrpc'"; # Converted to throw 2022-02-22
+  keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17
   keepassx-community = throw "'keepassx-community' has been renamed to/replaced by 'keepassxc'"; # Converted to throw 2022-02-22
   keepassx-reboot = throw "'keepassx-reboot' has been renamed to/replaced by 'keepassx-community'"; # Converted to throw 2022-02-22
+  keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17
   keepassx2-http = throw "'keepassx2-http' has been renamed to/replaced by 'keepassx-reboot'"; # Converted to throw 2022-02-22
   keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01
   kerberos = libkrb5; # moved from top-level 2021-03-14

pkgs/top-level/all-packages.nix

@@ -29302,9 +29302,7 @@ with pkgs;
 
   karlender = callPackage ../applications/office/karlender { };
 
-  keepassx = callPackage ../applications/misc/keepassx { };
-  keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
-  keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix {
+  keepassxc = libsForQt5.callPackage ../applications/misc/keepassxc {
     inherit (darwin.apple_sdk_11_0.frameworks) LocalAuthentication;
     stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };