mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
python3Packages.libagent: 0.15.0 -> 0.16.1, hardcode pinentry path (#499027)
This commit is contained in:
@@ -1,42 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
keepkey,
|
||||
setuptools,
|
||||
libagent,
|
||||
wheel,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "keepkey-agent";
|
||||
version = "0.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "keepkey_agent";
|
||||
inherit version;
|
||||
sha256 = "03779gvlx70i0nnry98i4pl1d92604ix5x6jgdfkrdgzqbh5vj27";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
keepkey
|
||||
libagent
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "keepkey_agent" ];
|
||||
|
||||
meta = {
|
||||
description = "Using KeepKey as hardware-based SSH/PGP agent";
|
||||
homepage = "https://github.com/romanz/trezor-agent";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
hkjn
|
||||
np
|
||||
mmahut
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
ledgerblue,
|
||||
setuptools,
|
||||
libagent,
|
||||
wheel,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ledger-agent";
|
||||
version = "0.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "ledger_agent";
|
||||
inherit version;
|
||||
sha256 = "03zj602m2rln9yvr08dswy56vzkbldp8b074ixwzz525dafblr92";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ledgerblue
|
||||
libagent
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Using Ledger as hardware-based SSH/PGP agent";
|
||||
homepage = "https://github.com/romanz/trezor-agent";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
hkjn
|
||||
np
|
||||
mmahut
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -6,9 +6,10 @@
|
||||
buildPythonPackage,
|
||||
setuptools,
|
||||
cryptography,
|
||||
ed25519,
|
||||
docutils,
|
||||
ecdsa,
|
||||
gnupg,
|
||||
pinentry-curses,
|
||||
semver,
|
||||
mnemonic,
|
||||
unidecode,
|
||||
@@ -18,27 +19,29 @@
|
||||
python-daemon,
|
||||
pymsgbox,
|
||||
pynacl,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
# When changing this package, please test packages {keepkey,ledger,onlykey,trezor}-agent
|
||||
# When changing this package, please test packages {onlykey,trezor}-agent
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "libagent";
|
||||
version = "0.15.0";
|
||||
version = "0.16.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanz";
|
||||
repo = "trezor-agent";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NmpFyLjLdR9r1tc06iDNH8Tc7isUelTg13mWPrQvxSc=";
|
||||
tag = "libagent/${finalAttrs.version}";
|
||||
hash = "sha256-JFHBE2o5VSJaz5yeCiXmBchm4/1gA+dZ/PRt3+WENdA=";
|
||||
};
|
||||
|
||||
# hardcode the path to gpgconf in the libagent library
|
||||
# hardcode the path to gpgconf and pinentry 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'"
|
||||
--replace "'gpg-connect-agent'" "'${gnupg}/bin/gpg-connect-agent'" \
|
||||
--replace "get_gnupg_components(sp=sp)['pinentry']" "'${(lib.getExe pinentry-curses)}'"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -53,7 +56,7 @@ buildPythonPackage rec {
|
||||
python-daemon
|
||||
pymsgbox
|
||||
ecdsa
|
||||
ed25519
|
||||
docutils
|
||||
mnemonic
|
||||
semver
|
||||
pynacl
|
||||
@@ -73,10 +76,14 @@ buildPythonPackage rec {
|
||||
"test_get_agent_sock_path"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex=libagent/(.*)" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Using hardware wallets as SSH/GPG agent";
|
||||
homepage = "https://github.com/romanz/trezor-agent";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = with lib.maintainers; [ np ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1048,7 +1048,8 @@ mapAliases {
|
||||
kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
|
||||
kdeltacht = throw "'kdeltachat' has been removed as it depended on EOL qt5 webengine and was unmaintained"; # Added 2026-04-17
|
||||
kdesvn = throw "'kdesvn' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01
|
||||
keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-27
|
||||
keepkey-agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11
|
||||
keepkey_agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11
|
||||
keydb = throw "'keydb' has been removed as it was broken, vulnerable, and unmaintained upstream"; # Added 2025-11-08
|
||||
kgraphviewer = throw "'kgraphviewer' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01
|
||||
kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27
|
||||
@@ -1095,7 +1096,8 @@ mapAliases {
|
||||
layan-kde = throw "'layan-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
|
||||
lazarus-qt = throw "'lazarus-qt' has been renamed to/replaced by 'lazarus-qt5'"; # Converted to throw 2025-10-27
|
||||
leaf = throw "'leaf' has been removed as it is unmaintained. Consider using 'fastfetch' instead"; # Added 2026-04-24
|
||||
ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-27
|
||||
ledger-agent = throw "ledger-agent has been removed because upstream dropped Ledger support"; # Added 2026-03-11
|
||||
ledger_agent = throw "ledger-agent has been removed because upstream dropped Ledger support"; # Added 2026-03-11
|
||||
lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2025-06-09
|
||||
lexical = throw "'lexical' has been removed because it was deprecated and archived upstream. Consider using 'beamPackages.expert' instead"; # Added 2026-02-24
|
||||
lfs = throw "'lfs' has been renamed to/replaced by 'dysk'"; # Converted to throw 2025-10-27
|
||||
|
||||
@@ -2556,8 +2556,6 @@ with pkgs;
|
||||
};
|
||||
kakouneUtils = callPackage ../applications/editors/kakoune/plugins/kakoune-utils.nix { };
|
||||
|
||||
keepkey-agent = with python3Packages; toPythonApplication keepkey-agent;
|
||||
|
||||
keybase = callPackage ../tools/security/keybase { };
|
||||
|
||||
kbfs = callPackage ../tools/security/keybase/kbfs.nix { };
|
||||
@@ -10429,8 +10427,6 @@ with pkgs;
|
||||
withGui = false;
|
||||
};
|
||||
|
||||
ledger-agent = with python3Packages; toPythonApplication ledger-agent;
|
||||
|
||||
napari = with python312Packages; toPythonApplication napari;
|
||||
|
||||
pycoin = with python3Packages; toPythonApplication pycoin;
|
||||
|
||||
@@ -293,7 +293,8 @@ mapAliases {
|
||||
jupyterlab_server = throw "'jupyterlab_server' has been renamed to/replaced by 'jupyterlab-server'"; # Converted to throw 2025-10-29
|
||||
kafka-python = throw "'kafka-python' has been renamed to/replaced by 'kafka-python-ng'"; # Converted to throw 2025-10-29
|
||||
Kajiki = throw "'Kajiki' has been renamed to/replaced by 'kajiki'"; # Converted to throw 2025-10-29
|
||||
keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-29
|
||||
keepkey-agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11
|
||||
keepkey_agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11
|
||||
Keras = throw "'Keras' has been renamed to/replaced by 'keras'"; # Converted to throw 2025-10-29
|
||||
keyrings-passwordstore = throw "keyrings-passwordstore has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
|
||||
kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2025-05-25
|
||||
@@ -305,7 +306,8 @@ mapAliases {
|
||||
lazy_imports = throw "'lazy_imports' has been renamed to/replaced by 'lazy-imports'"; # Converted to throw 2025-10-29
|
||||
lcov_cobertura = throw "'lcov_cobertura' has been renamed to/replaced by 'lcov-cobertura'"; # Converted to throw 2025-10-29
|
||||
ldap = throw "'ldap' has been renamed to/replaced by 'python-ldap'"; # Converted to throw 2025-10-29
|
||||
ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-29
|
||||
ledger-agent = throw "ledger-agent has been removed because upstream dropped Ledger support"; # Added 2026-03-11
|
||||
ledger_agent = throw "ledger-agent has been removed because upstream dropped Ledger support"; # Added 2026-03-11
|
||||
libarcus = throw "'libarcus' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22
|
||||
libgpiod = gpiod; # added 2026-03-30
|
||||
libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03
|
||||
|
||||
@@ -8378,8 +8378,6 @@ self: super: with self; {
|
||||
|
||||
keepkey = callPackage ../development/python-modules/keepkey { };
|
||||
|
||||
keepkey-agent = callPackage ../development/python-modules/keepkey-agent { };
|
||||
|
||||
kegtron-ble = callPackage ../development/python-modules/kegtron-ble { };
|
||||
|
||||
keke = callPackage ../development/python-modules/keke { };
|
||||
@@ -8728,8 +8726,6 @@ self: super: with self; {
|
||||
}
|
||||
)).py;
|
||||
|
||||
ledger-agent = callPackage ../development/python-modules/ledger-agent { };
|
||||
|
||||
ledger-bitcoin = callPackage ../development/python-modules/ledger-bitcoin { };
|
||||
|
||||
ledgerblue = callPackage ../development/python-modules/ledgerblue { };
|
||||
|
||||
Reference in New Issue
Block a user