summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlankParticle <blankparticle@gmail.com>2023-09-23 20:38:45 +0530
committerNicolas Benes <nbenes.gh@xandea.de>2023-10-02 22:23:34 +0200
commit392263f17cb85af969a1da8dd79d98ac60a0406c (patch)
tree5158587e5efad2f9334cda2a5b3a8b88c981f41c
parentmaintainers: add blankparticle to maintainer-list (diff)
downloadnixpkgs-392263f17cb85af969a1da8dd79d98ac60a0406c.tar.gz
keepassxc: 2.7.5 -> 2.7.6
(cherry picked from commit db522ccd096603be4bb3bd6fe11b6c096c85d779) Manually resolve a conflict in the meta.maintainers list.
-rw-r--r--pkgs/applications/misc/keepassxc/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix
index 5b5ed2326d88..762434ef12c1 100644
--- a/pkgs/applications/misc/keepassxc/default.nix
+++ b/pkgs/applications/misc/keepassxc/default.nix
@@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "keepassxc";
- version = "2.7.5";
+ version = "2.7.6";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = version;
- sha256 = "sha256-OBEjczUIkY3pQXJfsuNj9Bm2TIbVWEHqMSolQnSfvLE=";
+ hash = "sha256-xgrkMz7BCBxjfxHsAz/CFLv1d175LnrAJIOZMM3GmU0=";
};
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://keepassxc.org/";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ jonafato turion srapenne ];
+ maintainers = with maintainers; [ jonafato srapenne blankparticle ];
platforms = platforms.linux ++ platforms.darwin;
};
}