Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

keepassxc: 2.4.0 -> 2.4.1 #59511

Merged
merged 1 commit into from Apr 16, 2019
Merged

keepassxc: 2.4.0 -> 2.4.1 #59511

merged 1 commit into from Apr 16, 2019

Conversation

jonafato
Copy link
Contributor

Motivation for this change

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
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Member

@bobvanderlinden bobvanderlinden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was able to build and run this on NixOS, but have not tried KeeShare (nor OSX).

pkgs/applications/misc/keepassx/community.nix Show resolved Hide resolved
++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON")
++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON")
++ (optional withKeePassKeeShare "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip")
++ (optional withKeePassKeeShare "-DQUAZIP_LIBRARIES=${quazip}/lib/libquazip.so")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have not had time to test this yet. Is this compatible with OSX?

Would it be possible to 'automatically' find this using pkg-config by adding quazip to the buildInputs? It seems keepass does have such functionality: https://github.com/keepassxreboot/keepassxc/blob/b59fd6d06ad0b130c00c8afe8e003999335afd21/cmake/FindQuaZip.cmake

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to use pkg-config. That required an additional line in the patch, but it's probably cleaner overall.

@jonafato
Copy link
Contributor Author

I was able to build and run this on NixOS, but have not tried KeeShare (nor OSX).

KeeShare was already being built, I've just moved it to optional to match what KeePassXC's cmake setup supports. There was a bug in the 2.4.0 release that prevented building without this enabled.

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
@bobvanderlinden
Copy link
Member

Sounds good 👍 Works fine on OSX as well btw.

@infinisil infinisil merged commit c36b3db into NixOS:master Apr 16, 2019
@jonafato jonafato deleted the keepassxc-2.4.1 branch April 16, 2019 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants