diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix index 9664f170f761..7e839cfc5d01 100644 --- a/pkgs/by-name/ke/keepassxc/package.nix +++ b/pkgs/by-name/ke/keepassxc/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, cmake, libsForQt5, @@ -38,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keepassxc"; - version = "2.7.10"; + version = "2.7.11"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; tag = finalAttrs.version; - hash = "sha256-FBoqCYNM/leN+w4aV0AJMx/G0bjHbI9KVWrnmq3NfaI="; + hash = "sha256-Hec3RBC/f0GV6ZBniy+BjMAkABlg111mShrQv0aYm6g="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ @@ -57,13 +56,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./darwin.patch - # Fixes a static_cast related compilation issue by converting to dynamic cast. - # Will be included in next release > 2.7.10 and can be dropped on bump. - (fetchpatch2 { - name = "fix-botan-3.10.patch"; - url = "https://github.com/keepassxreboot/keepassxc/commit/fedcbf60c5c0dc7c3602c49a984d53a45c154c73.patch"; - hash = "sha256-UntT7/LDjslyqHqt5gJjzC/vMw/RVZLNj2ZxzBPL9xI="; - }) ]; cmakeFlags = [ @@ -196,6 +188,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "keepassxc"; maintainers = with lib.maintainers; [ sigmasquadron + ryand56 ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; };