git.iko.soy/typeable/nixpkgs
on master help sign in
keepassxc: 2.4.0 -> 2.4.1

KeePassXC has a new release. Changelog at https://github.com/keepassxreboot/keepassxc/releases/tag/2.4.1. Additionally, some cleanup: - Alphabetize inputs for better future diffs - Drop a no-longer-relevant patch - Fixup removed and missing cmake flags - Update description to reference correct browser extension

commita3b39e2d56eb290e09285ef3a383c8928dc7f7c4 authorJon Banafato <jon@jonafato.com> dateSun 14 Apr 2019, 15:10 (8 years ago) parent0754f1b
3 files changed+54−34
pkgs/applications/misc/keepassx/community.nix+27−19 pkgs/applications/misc/keepassx/qt511.patch−15 pkgs/applications/misc/keepassx/quazip5.patch+27
pkgs/applications/misc/keepassx/community.nix+27−19
@@ -1,26 +1,29 @@
11{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools
22
33, curl
4+, glibcLocales
5+, libXi
6+, libXtst
47, libargon2
58, libgcrypt
6−, libsodium
7−, zlib
8−, libmicrohttpd
9−, libXtst
10−, qtbase
119, libgpgerror
12−, glibcLocales
10+, libmicrohttpd
11+, libsodium
1312, libyubikey
14−, yubikey-personalization
15−, libXi
16−, qtx11extras
13+, pkg-config
14+, qrencode
15+, qtbase
1716, qtmacextras
1817, qtsvg
19−, qrencode
18+, qtx11extras
19+, quazip
20+, yubikey-personalization
21+, zlib
2022
2123, withKeePassBrowser ? true
24+, withKeePassKeeShare ? true
25+, withKeePassKeeShareSecure ? true
2226, withKeePassSSHAgent ? true
23−, withKeePassHTTP ? false
2427, withKeePassNetworking ? false
2528}:
2629
@@ -28,13 +31,13 @@ with stdenv.lib;
2831
2932stdenv.mkDerivation rec {
3033 name = "keepassxc-${version}";
31− version = "2.4.0";
34+ version = "2.4.1";
3235
3336 src = fetchFromGitHub {
3437 owner = "keepassxreboot";
3538 repo = "keepassxc";
3639 rev = "${version}";
37− sha256 = "1k8s56003gym2dv6c54gxwzs20i7lf6w5g5qnr449jfmf6wvbivr";
40+ sha256 = "1cbfsfdvb4qw6yb0zl6mymdbphnb7lxbfrc5a8cjmn9w8b09kv6m";
3841 };
3942
4043 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
@@ -52,17 +55,19 @@ stdenv.mkDerivation rec {
5255
5356 patches = [
5457 ./darwin.patch
58+ ./quazip5.patch
5559 ];
5660
5761 cmakeFlags = [
5862 "-DKEEPASSXC_BUILD_TYPE=Release"
5963 "-DWITH_GUI_TESTS=ON"
6064 "-DWITH_XC_AUTOTYPE=ON"
65+ "-DWITH_XC_UPDATECHECK=OFF"
6166 "-DWITH_XC_YUBIKEY=ON"
62− "-DWITH_XC_KEESHARE=ON"
6367 ]
6468 ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON")
65− ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON")
69+ ++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON")
70+ ++ (optional withKeePassKeeShareSecure "-DWITH_XC_KEESHARE_SECURE=ON")
6671 ++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON")
6772 ++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON");
6873
@@ -87,13 +92,16 @@ stdenv.mkDerivation rec {
8792 libmicrohttpd
8893 libsodium
8994 libyubikey
95+ pkg-config
96+ qrencode
9097 qtbase
91− qtx11extras
9298 qtsvg
99+ qtx11extras
93100 yubikey-personalization
94101 zlib
95− qrencode
96− ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
102+ ]
103+ ++ stdenv.lib.optional withKeePassKeeShareSecure quazip
104+ ++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
97105
98106 postInstall = optionalString stdenv.isDarwin ''
99107 # Make it work without Qt in PATH.
@@ -103,7 +111,7 @@ stdenv.mkDerivation rec {
103111
104112 meta = {
105113 description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications";
106− longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI and via CLI. Includes optional http-interface to allow browser-integration with plugins like PassIFox (https://github.com/pfn/passifox).";
114+ longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser).";
107115 homepage = https://keepassxc.org/;
108116 license = licenses.gpl2;
109117 maintainers = with maintainers; [ s1lvester jonafato ];
pkgs/applications/misc/keepassx/qt511.patchdeleted−15
@@ -1,15 +0,0 @@
1−diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
2−index 6fd65c1a..e99275b0 100644
3−--- a/src/gui/entry/EditEntryWidget.cpp
4−+++ b/src/gui/entry/EditEntryWidget.cpp
5−@@ -29,6 +29,7 @@
6− #include <QMenu>
7− #include <QSortFilterProxyModel>
8− #include <QTemporaryFile>
9−+#include <QButtonGroup>
10− #include <QMimeData>
11− #include <QEvent>
12− #include <QColorDialog>
13−--
14−2.17.1
15−
pkgs/applications/misc/keepassx/quazip5.patchnew file+27
@@ -0,0 +1,27 @@
1+diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake
2+index 8d309181..92aa892c 100644
3+--- a/cmake/FindQuaZip.cmake
4++++ b/cmake/FindQuaZip.cmake
5+@@ -9,7 +9,6 @@ IF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
6+ SET(QUAZIP_FOUND TRUE)
7+ ELSE(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
8+ IF(Qt5Core_FOUND)
9+- set(QUAZIP_LIB_VERSION_SUFFIX 5)
10+ ENDIF()
11+ IF(WIN32)
12+ FIND_PATH(QUAZIP_LIBRARY_DIR
13+diff --git a/src/keeshare/ShareObserver.cpp b/src/keeshare/ShareObserver.cpp
14+index 33f5ed1f..5fcd9202 100644
15+--- a/src/keeshare/ShareObserver.cpp
16++++ b/src/keeshare/ShareObserver.cpp
17+@@ -46,8 +46,8 @@
18+ #include <QStringBuilder>
19+
20+ #if defined(WITH_XC_KEESHARE_SECURE)
21+-#include <quazip5/quazip.h>
22+-#include <quazip5/quazipfile.h>
23++#include <quazip/quazip.h>
24++#include <quazip/quazipfile.h>
25+ #endif
26+
27+ namespace