Merge pull request #109800 from claudiiii/keepassxc-update

keepassxc: 2.6.2 -> 2.6.3

authored by

Sandro and committed by
GitHub
4dffb6a7 4a77f1ee

+8 -10
+8 -10
pkgs/applications/misc/keepassx/community.nix
··· 40 40 41 41 stdenv.mkDerivation rec { 42 42 pname = "keepassxc"; 43 - version = "2.6.2"; 43 + version = "2.6.3"; 44 44 45 45 src = fetchFromGitHub { 46 46 owner = "keepassxreboot"; 47 47 repo = "keepassxc"; 48 48 rev = version; 49 - sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h"; 49 + sha256 = "1jd2mvafyn095crfs2hnfprqiy8yqsvfybwbjq8n0agapnz4bl5h"; 50 50 }; 51 51 52 52 NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ ··· 55 55 "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" 56 56 ]; 57 57 58 - postPatch = lib.optionalString stdenv.isDarwin '' 59 - substituteInPlace CMakeLists.txt \ 60 - --replace "/usr/local/bin" "../bin" \ 61 - --replace "/usr/local/share/man" "../share/man" 62 - ''; 63 58 NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; 64 59 65 60 patches = [ ··· 83 78 84 79 doCheck = true; 85 80 checkPhase = '' 81 + runHook preCheck 82 + 86 83 export LC_ALL="en_US.UTF-8" 87 84 export QT_QPA_PLATFORM=offscreen 88 85 export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" 89 86 # testcli and testgui are flaky - skip them both 90 87 make test ARGS+="-E 'testcli|testgui' --output-on-failure" 88 + 89 + runHook postCheck 91 90 ''; 92 91 93 - nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; 92 + nativeBuildInputs = [ cmake wrapQtAppsHook qttools pkg-config ]; 94 93 95 94 buildInputs = [ 96 95 asciidoctor ··· 103 102 libgpgerror 104 103 libsodium 105 104 libyubikey 106 - pkg-config 107 105 qrencode 108 106 qtbase 109 107 qtsvg ··· 124 122 description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; 125 123 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)."; 126 124 homepage = "https://keepassxc.org/"; 127 - license = licenses.gpl2; 125 + license = licenses.gpl2Plus; 128 126 maintainers = with maintainers; [ jonafato turion ]; 129 127 platforms = platforms.linux ++ platforms.darwin; 130 128 };