git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #92720 from claudiiii/update-keepassxc

keepassxc: 2.5.4 -> 2.6.0

commit564dec2f71c3c4dbe07bbea2f7564a521919136a authorMaximilian Bosch <maximilian@mbosch.me> dateWed 8 Jul 2020, 18:24 (6 years ago) parente0499e478e6869
1 file changed+4−7
pkgs/applications/misc/keepassx/community.nix+4−7
pkgs/applications/misc/keepassx/community.nix+4−7
@@ -6,6 +6,7 @@
66, qttools
77, darwin
88
9+, asciidoctor
910, curl
1011, glibcLocales
1112, libXi
@@ -39,13 +40,13 @@ with stdenv.lib;
3940
4041stdenv.mkDerivation rec {
4142 pname = "keepassxc";
42− version = "2.5.4";
43+ version = "2.6.0";
4344
4445 src = fetchFromGitHub {
4546 owner = "keepassxreboot";
4647 repo = "keepassxc";
4748 rev = version;
48− sha256 = "1xih9q1pxszalc0l29fmjxwn1vrrrrbnhc8gmi8brw5sclhbs6bh";
49+ sha256 = "0yi6kxnsrqirjn6hxhwym2krzf86qxf3kc6bfpkmiaggnd2kqpkp";
4950 };
5051
5152 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
@@ -63,11 +64,6 @@ stdenv.mkDerivation rec {
6364
6465 patches = [
6566 ./darwin.patch
66− # use wl-copy on Wayland - can be dropped with the next version update
67− (fetchpatch {
68− url = "https://github.com/keepassxreboot/keepassxc/commit/6128e5d58294f26411160f44da91087ebe7f4b07.patch";
69− sha256 = "16q0h7kijqjdbskmk4ar6p3g8vcxr0bq1zrlq2bk16pk10nv4bh1";
70− })
7167 ];
7268
7369 cmakeFlags = [
@@ -97,6 +93,7 @@ stdenv.mkDerivation rec {
9793 nativeBuildInputs = [ cmake wrapQtAppsHook qttools ];
9894
9995 buildInputs = [
96+ asciidoctor
10097 curl
10198 glibcLocales
10299 libXi