Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-03-03 06:01:37 +00:00 committed by GitHub
commit ccf0f6c517
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5,6 +5,7 @@
, cryptography , cryptography
, ed25519 , ed25519
, ecdsa , ecdsa
, gnupg
, semver , semver
, mnemonic , mnemonic
, unidecode , unidecode
@ -30,6 +31,13 @@ buildPythonPackage rec {
sha256 = "sha256-RISAy0efdatr9u4CWNRGnlffkC8ksw1NyRpJWKwqz+s="; sha256 = "sha256-RISAy0efdatr9u4CWNRGnlffkC8ksw1NyRpJWKwqz+s=";
}; };
# hardcode the path to gpgconf in the libagent library
postPatch = ''
substituteInPlace libagent/gpg/keyring.py \
--replace "util.which('gpgconf')" "'${gnupg}/bin/gpgconf'" \
--replace "'gpg-connect-agent'" "'${gnupg}/bin/gpg-connect-agent'"
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
unidecode unidecode
backports-shutil-which backports-shutil-which