summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabián Heredia Montiel <303897+fabianhjr@users.noreply.github.com>2023-10-03 16:12:18 -0600
committerGitHub <noreply@github.com>2023-10-03 16:12:18 -0600
commit9f08b30f7b9d7c26a5afe97edb788bf445664ad1 (patch)
treed9811367fdeea51fc69b40a725ead329610d8882
parentMerge pull request #258859 from NixOS/backport-258525-to-release-23.05 (diff)
parentkeepassxc: 2.7.5 -> 2.7.6 (diff)
downloadnixpkgs-9f08b30f7b9d7c26a5afe97edb788bf445664ad1.tar.gz
Merge pull request #258653 from panicgh/keepassxc-23.05
[23.05] keepassxc: 2.7.4 -> 2.7.6
-rw-r--r--maintainers/maintainer-list.nix9
-rw-r--r--pkgs/applications/misc/keepassxc/default.nix6
2 files changed, 12 insertions, 3 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 385160949d28..f03802649d27 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2120,6 +2120,15 @@
github = "blaggacao";
githubId = 7548295;
};
+ blankparticle = {
+ name = "BlankParticle";
+ email = "blankparticle@gmail.com";
+ github = "BlankParticle";
+ githubId = 130567419;
+ keys = [{
+ fingerprint = "1757 64C3 7065 AA8D 614D 41C9 0ACE 126D 7B35 9261";
+ }];
+ };
blanky0230 = {
email = "blanky0230@gmail.com";
github = "blanky0230";
diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix
index 3c74b6e91751..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.4";
+ version = "2.7.6";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = version;
- sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s=";
+ 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;
};
}