Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 73d4b9c0407e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 07d622284d15
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 19, 2020

  1. keepassxc: 2.5.2 -> 2.5.4 

    + disabled testcli flaky test
    @prusnak
    prusnak committed Apr 19, 2020
    Copy the full SHA
    e353fe8 View commit details

  2. Merge pull request #85558 from prusnak/keepassxc 

    keepassxc: 2.5.2 -> 2.5.4
    @Ma27
    Ma27 authored Apr 19, 2020
    Copy the full SHA
    07d6222 View commit details
Showing with 18 additions and 6 deletions.
  1. +16 −4 pkgs/applications/misc/keepassx/community.nix
  2. +2 −2 pkgs/applications/misc/keepassx/darwin.patch
20 changes: 16 additions & 4 deletions pkgs/applications/misc/keepassx/community.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools, darwin
{ stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, makeWrapper
, qttools
, darwin

, curl
, glibcLocales
@@ -33,13 +39,13 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "keepassxc";
version = "2.5.2";
version = "2.5.4";

src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = version;
sha256 = "0z5bd17qaq7zpv96gw6qwv6rb4xx7xjq86ss6wm5zskcrraf7r7n";
sha256 = "1xih9q1pxszalc0l29fmjxwn1vrrrrbnhc8gmi8brw5sclhbs6bh";
};

NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
@@ -57,6 +63,11 @@ stdenv.mkDerivation rec {

patches = [
./darwin.patch
# use wl-copy on Wayland - can be dropped with the next version update
(fetchpatch {
url = "https://github.com/keepassxreboot/keepassxc/commit/6128e5d58294f26411160f44da91087ebe7f4b07.patch";
sha256 = "16q0h7kijqjdbskmk4ar6p3g8vcxr0bq1zrlq2bk16pk10nv4bh1";
})
];

cmakeFlags = [
@@ -79,7 +90,8 @@ stdenv.mkDerivation rec {
export LC_ALL="en_US.UTF-8"
export QT_QPA_PLATFORM=offscreen
export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
make test ARGS+="-E testgui --output-on-failure"
# testcli and testgui are flaky - skip them both
make test ARGS+="-E 'testcli|testgui' --output-on-failure"
'';

nativeBuildInputs = [ cmake wrapQtAppsHook qttools ];
4 changes: 2 additions & 2 deletions pkgs/applications/misc/keepassx/darwin.patch
View file
Original file line number Diff line number Diff line change
@@ -6,10 +6,10 @@ index 74b1a7ff..0a713a32 100644
set(PLUGIN_INSTALL_DIR ".")
set(DATA_INSTALL_DIR "share")
elseif(APPLE AND WITH_APP_BUNDLE)
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents")
set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
@@ -369,12 +370,6 @@ set(CMAKE_AUTORCC ON)

if(APPLE)