From ebccb33b4eb60a07e667332665181ba9ad352615 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 21 Oct 2026 15:05:50 +0200 Subject: ... --- overlays/keepassxc/database-open-dialog.patch | 129 -------------------------- overlays/keepassxc/default.nix | 113 ---------------------- 2 files changed, 242 deletions(-) delete mode 100644 overlays/keepassxc/database-open-dialog.patch delete mode 100644 overlays/keepassxc/default.nix (limited to 'overlays/keepassxc') diff --git a/overlays/keepassxc/database-open-dialog.patch b/overlays/keepassxc/database-open-dialog.patch deleted file mode 100644 index dff84846..00000000 --- a/overlays/keepassxc/database-open-dialog.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp -index 60412b5a..c0497d91 100644 ---- a/src/browser/BrowserService.cpp -+++ b/src/browser/BrowserService.cpp -@@ -249,7 +249,7 @@ QJsonObject BrowserService::createNewGroup(const QString& groupName) - return result; - } - -- auto dialogResult = MessageBox::warning(m_currentDatabaseWidget, -+ auto dialogResult = MessageBox::warning(nullptr, - tr("KeePassXC - Create a new group"), - tr("A request for creating a new group \"%1\" has been received.\n" - "Do you want to create this group?\n") -@@ -422,7 +422,7 @@ QList BrowserService::confirmEntries(QList& entriesToConfirm, - - m_dialogActive = true; - updateWindowState(); -- BrowserAccessControlDialog accessControlDialog(m_currentDatabaseWidget); -+ BrowserAccessControlDialog accessControlDialog{}; - - connect(m_currentDatabaseWidget, SIGNAL(databaseLockRequested()), &accessControlDialog, SLOT(reject())); - -@@ -512,7 +512,7 @@ QString BrowserService::storeKey(const QString& key) - QString id; - - do { -- QInputDialog keyDialog(m_currentDatabaseWidget); -+ QInputDialog keyDialog{}; - connect(m_currentDatabaseWidget, SIGNAL(databaseLockRequested()), &keyDialog, SLOT(reject())); - keyDialog.setWindowTitle(tr("KeePassXC - New key association request")); - keyDialog.setLabelText(tr("You have received an association request for the following database:\n%1\n\n" -@@ -535,7 +535,7 @@ QString BrowserService::storeKey(const QString& key) - - contains = db->metadata()->customData()->contains(CustomData::BrowserKeyPrefix + id); - if (contains) { -- dialogResult = MessageBox::warning(m_currentDatabaseWidget, -+ dialogResult = MessageBox::warning(nullptr, - tr("KeePassXC - Overwrite existing key?"), - tr("A shared encryption key with the name \"%1\" " - "already exists.\nDo you want to overwrite it?") -@@ -595,7 +595,7 @@ QJsonObject BrowserService::showPasskeysRegisterPrompt(const QJsonObject& public - const auto existingEntries = getPasskeyEntriesWithUserHandle(rpId, userId, keyList); - - raiseWindow(); -- BrowserPasskeysConfirmationDialog confirmDialog(m_currentDatabaseWidget); -+ BrowserPasskeysConfirmationDialog confirmDialog{}; - confirmDialog.registerCredential(username, rpId, existingEntries, timeout); - - auto dialogResult = confirmDialog.exec(); -@@ -612,7 +612,7 @@ QJsonObject BrowserService::showPasskeysRegisterPrompt(const QJsonObject& public - // If no entry is selected, show the import dialog for manual entry selection - auto selectedEntry = confirmDialog.getSelectedEntry(); - if (!selectedEntry) { -- PasskeyImporter passkeyImporter(m_currentDatabaseWidget); -+ PasskeyImporter passkeyImporter{}; - const auto result = passkeyImporter.showImportDialog(db, - nullptr, - origin, -@@ -683,7 +683,7 @@ QJsonObject BrowserService::showPasskeysAuthenticationPrompt(const QJsonObject& - const auto timeout = publicKeyOptions["timeout"].toInt(); - - raiseWindow(); -- BrowserPasskeysConfirmationDialog confirmDialog(m_currentDatabaseWidget); -+ BrowserPasskeysConfirmationDialog confirmDialog{}; - confirmDialog.authenticateCredential(entries, rpId, timeout); - auto dialogResult = confirmDialog.exec(); - if (dialogResult == QDialog::Accepted) { -@@ -760,7 +760,7 @@ void BrowserService::addPasskeyToEntry(Entry* entry, - - // Ask confirmation if entry already contains a Passkey - if (entry->hasPasskey()) { -- if (MessageBox::question(m_currentDatabaseWidget, -+ if (MessageBox::question(nullptr, - tr("KeePassXC - Update passkey"), - tr("Entry already has a passkey.\nDo you want to overwrite the passkey in %1 - %2?") - .arg(entry->title(), passkeyUtils()->getUsernameFromEntry(entry)), -@@ -873,7 +873,7 @@ bool BrowserService::updateEntry(const EntryParameters& entryParameters, const Q - MessageBox::Button dialogResult = MessageBox::No; - if (!browserSettings()->alwaysAllowUpdate()) { - raiseWindow(); -- dialogResult = MessageBox::question(m_currentDatabaseWidget, -+ dialogResult = MessageBox::question(nullptr, - tr("KeePassXC - Update Entry"), - tr("Do you want to update the information in %1 - %2?") - .arg(QUrl(entryParameters.siteUrl).host(), username), -@@ -909,7 +909,7 @@ bool BrowserService::deleteEntry(const QString& uuid) - return false; - } - -- auto dialogResult = MessageBox::warning(m_currentDatabaseWidget, -+ auto dialogResult = MessageBox::warning(nullptr, - tr("KeePassXC - Delete entry"), - tr("A request for deleting entry \"%1\" has been received.\n" - "Do you want to delete the entry?\n") -@@ -1536,7 +1536,7 @@ QSharedPointer BrowserService::selectedDatabase() - } - } - -- BrowserEntrySaveDialog browserEntrySaveDialog(m_currentDatabaseWidget); -+ BrowserEntrySaveDialog browserEntrySaveDialog{}; - int openDatabaseCount = browserEntrySaveDialog.setItems(databaseWidgets, m_currentDatabaseWidget); - if (openDatabaseCount > 1) { - int res = browserEntrySaveDialog.exec(); -diff --git a/src/fdosecrets/objects/Prompt.cpp b/src/fdosecrets/objects/Prompt.cpp -index e89cd499..347c98b8 100644 ---- a/src/fdosecrets/objects/Prompt.cpp -+++ b/src/fdosecrets/objects/Prompt.cpp -@@ -313,7 +313,7 @@ namespace FdoSecrets - if (!entries.isEmpty()) { - QString app = tr("%1 (PID: %2)").arg(client->name()).arg(client->pid()); - auto ac = new AccessControlDialog( -- findWindow(m_windowId), entries, app, client->processInfo(), AuthOption::Remember); -+ nullptr, entries, app, client->processInfo(), AuthOption::Remember); - connect(ac, &AccessControlDialog::finished, this, &UnlockPrompt::itemUnlockFinished); - connect(ac, &AccessControlDialog::finished, ac, &AccessControlDialog::deleteLater); - ac->open(); -diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp -index 805d4eab..4836199e 100644 ---- a/src/gui/DatabaseTabWidget.cpp -+++ b/src/gui/DatabaseTabWidget.cpp -@@ -41,7 +41,7 @@ DatabaseTabWidget::DatabaseTabWidget(QWidget* parent) - : QTabWidget(parent) - , m_dbWidgetStateSync(new DatabaseWidgetStateSync(this)) - , m_dbWidgetPendingLock(nullptr) -- , m_databaseOpenDialog(new DatabaseOpenDialog(this)) -+ , m_databaseOpenDialog(new DatabaseOpenDialog()) - , m_databaseOpenInProgress(false) - { - auto* tabBar = new QTabBar(this); diff --git a/overlays/keepassxc/default.nix b/overlays/keepassxc/default.nix deleted file mode 100644 index 325f1aa4..00000000 --- a/overlays/keepassxc/default.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ final, prev, flakeInputs, ... }: -{ - keepassxc = final.stdenv.mkDerivation (finalAttrs: { - pname = "keepassxc"; - version = "2.8.0-beta1"; - - src = final.fetchFromGitHub { - owner = "keepassxreboot"; - repo = "keepassxc"; - tag = finalAttrs.version; - hash = "sha256-fksThYmGZed66zxGDxlS2SHQzJYRf+T9AuZPbaNZV5Y="; - }; - - env = - final.lib.optionalAttrs final.stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = toString [ - "-Wno-old-style-cast" - "-Wno-error" - "-D__BIG_ENDIAN__=${if final.stdenv.hostPlatform.isBigEndian then "1" else "0"}" - ]; - }; - - # Upstream develops against a build of PCSC from Xcode. - # The types are incompatible with nixpkgs pcsclite. - # https://github.com/NixOS/nixpkgs/issues/520227 - postPatch = '' - substituteInPlace src/keys/drivers/YubiKeyInterfacePCSC.cpp \ - --replace-fail "typedef uint32_t RETVAL;" "typedef int32_t RETVAL;" - ''; - - cmakeFlags = [ - (final.lib.cmakeFeature "KEEPASSXC_BUILD_TYPE" "Release") - (final.lib.cmakeBool "WITH_GUI_TESTS" true) - (final.lib.cmakeBool "WITH_XC_UPDATECHECK" false) - (final.lib.cmakeBool "WITH_XC_X11" false) - (final.lib.cmakeBool "WITH_XC_BROWSER" true) - (final.lib.cmakeBool "WITH_XC_BROWSER_PASSKEYS" true) - (final.lib.cmakeBool "WITH_XC_KEESHARE" true) - (final.lib.cmakeBool "WITH_XC_NETWORKING" true) - (final.lib.cmakeBool "WITH_XC_SSHAGENT" true) - (final.lib.cmakeBool "WITH_XC_FDOSECRETS" true) - (final.lib.cmakeBool "WITH_XC_YUBIKEY" true) - ]; - - doCheck = true; - checkPhase = - let - disabledTests = final.lib.concatStringsSep "|" ( - [ - # flaky - "testcli" - "testgui" - ] - ); - in - '' - runHook preCheck - - export LC_ALL="en_US.UTF-8" - export QT_QPA_PLATFORM=offscreen - export QT_PLUGIN_PATH="${final.qt6.qtbase}/${final.qt6.qtbase.qtPluginPrefix}" - - make test ARGS+="-E '${disabledTests}' --output-on-failure" - - runHook postCheck - ''; - - nativeBuildInputs = with final; [ - asciidoctor - cmake - qt6.wrapQtAppsHook - qt6.qttools - pkg-config - wrapGAppsHook3 - ]; - - dontWrapGApps = true; - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - postInstall = final.lib.concatLines [ - # See https://github.com/keepassxreboot/keepassxc/blob/cd7a53abbbb81e468efb33eb56eefc12739969b8/src/browser/NativeMessageInstaller.cpp#L317 - # See https://github.com/keepassxreboot/keepassxc/blob/cd7a53abbbb81e468efb33eb56eefc12739969b8/utils/keepassxc-snap-helper.sh#L48-L58 - '' - mkdir -p "$out/lib/mozilla/native-messaging-hosts" - substituteAll "${toString (flakeInputs.nixpkgs) + "/pkgs/by-name/ke/keepassxc/firefox-native-messaging-host.json"}" "$out/lib/mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json" - - mkdir -p "$out/etc/chromium/native-messaging-hosts" - substituteAll "${toString (flakeInputs.nixpkgs) + "/pkgs/by-name/ke/keepassxc/chromium-native-messaging-host.json"}" "$out/etc/chromium/native-messaging-hosts/org.keepassxc.keepassxc_browser.json" - '' - ]; - - buildInputs = with final; [ - botan3 - curl - libxi - libxtst - libargon2 - qt6.qtbase - qt6.qtsvg - minizip - pcsclite - qrencode - readline - zlib - libusb1 - keyutils - ]; - - meta.mainProgram = "keepassxc"; - }); -} -- cgit v1.2.3