Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2020-04-13 20:26:21 +02:00
commit fc58cb5bd2
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
63 changed files with 762 additions and 461 deletions

View file

@ -12,7 +12,7 @@
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
@ -119,7 +119,7 @@ human.")
(define-public keepassxc
(package
(name "keepassxc")
(version "2.5.3")
(version "2.5.4")
(source
(origin
(method url-fetch)
@ -127,7 +127,7 @@ human.")
"/releases/download/" version "/keepassxc-"
version "-src.tar.xz"))
(sha256
(base32 "1sx647mp1xikig50p9bb6vxv18ymdfj3wkxj6qfdr1zfcv7gn005"))))
(base32 "0jndssyvpl8bc5i2q3d6kq1ppynchxx9nvp1qhd2pc0qqc0hhpm5"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DWITH_XC_ALL=YES"
@ -846,8 +846,8 @@ winner of the 2015 Password Hashing Competition.")
("python-pytest-mock" ,python-pytest-mock)))
(home-page "https://github.com/languitar/pass-git-helper")
(synopsis "Git credential helper interfacing with pass")
(description "pass-git-helper is a git credential helper which allows to
use pass, the standard unix password manager, as the credential backend for
(description "pass-git-helper is a git credential helper which
uses pass, the standard unix password manager, as the credential backend for
your git repositories. This is achieved by explicitly defining mappings
between hosts and entries in the password store.")
(license license:lgpl3+)))