colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

python310Packages.keyring: re-enable cryptography dependency (it cross compiles now)

Browse Source
This commit is contained in:
Colin
2023-08-12 08:03:16 +00:00
parent 436760a592
commit 07408813db
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
overlays/preferences.nix
View File

@@ -10,22 +10,13 @@
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(pySelf: pySuper: { (pySelf: pySuper: {
# TODO(2023/08/02): cryptography (a dependency of komikku -> keyring -> secretstorage -> cryptography) doesn't cross compile
# so disable it. can be re-enabled in next staging -> master merge.
# see:
# - <https://github.com/NixOS/nixpkgs/pull/245287/files>
# - <https://github.com/NixOS/nixpkgs/pull/244135>
keyring = (pySuper.keyring.override { keyring = (pySuper.keyring.override {
secretstorage = null; # jaraco-classes doesn't cross compile, but it looks like `keyring`
jeepney = null; # has some _temporary_ fallback logic for when jaraco-classes isn't
# separate from `cryptography`: jaraco-classes doesn't cross compile # installed (i.e. may break in future).
# but it looks like `keyring` has some _temporary_ fallback logic for
# when jaraco-classes isn't installed (i.e. may break in future).
jaraco-classes = null; jaraco-classes = null;
}).overrideAttrs (upstream: { }).overrideAttrs (upstream: {
postPatch = (upstream.postPatch or "") + '' postPatch = (upstream.postPatch or "") + ''
sed -i /SecretStorage/d setup.cfg
sed -i /jeepney/d setup.cfg
sed -i /jaraco.classes/d setup.cfg sed -i /jaraco.classes/d setup.cfg
''; '';
}); });