ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-03-25 21:17:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve the handling of extras in two ways

Browse Source 
* Remove the parameter for requesting our own extras.  Instead expose our own
  extras in `passthru` and let the downstream code pull them in if they want.
  This is better because the parameter was non-standard and passing different
  values for it alters our derivation whereas the real package behavior is
  just that it works if you have the dependencies and doesn't if you
  don't (ie, the denotation of the derivation is the same either way).

* Un-nest (join) the Twisted extra dependencies in our dependency list.  The
  nested list seems to work _sometimes_ but I have some weak evidence that it
  doesn't work when using flakes.  Either way, the nesting is weird and we might
  as well avoid it.
This commit is contained in:
Jean-Paul Calderone 2023-03-23 08:06:02 -04:00
parent f326c61612
commit 89fe88bd5b
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
nix/tahoe-lafs.nix
View File

@ -4,8 +4,6 @@
, pythonPackages
, buildPythonPackage
, tahoe-lafs-src
, extrasNames
# control which test suites run
# may contain:
#
@ -26,13 +24,24 @@ let
pname = "tahoe-lafs";
version = "1.18.0.post1";
pickExtraDependencies = deps: extras: builtins.foldl' (accum: extra: accum ++ deps.${extra}) [] extras;
# [] -> [] -> []
#
# concatenate one list with another.
concat = a: b: a ++ b;
pythonExtraDependencies = with pythonPackages; {
tor = [ txtorcon ];
i2p = [ txi2p ];
};
# derivation -> string -> [derivation]
#
# get a list of derivations representing the dependencies of a Python
# package "extra".
extraDeps = drv: extra: drv.passthru.optional-dependencies.${extra};
# derivation -> [string] -> [derivation]
#
# get a list of derivations representing the dependencies of a list of
# Python package "extras".
extrasDeps = drv: extras: builtins.concatLists (map (extras drv) extras);
# The direct Python package dependencies of Tahoe-LAFS.
pythonPackageDependencies = with pythonPackages; [
attrs
autobahn
@ -55,14 +64,15 @@ let
six
treq
twisted
# Get the dependencies for the Twisted extras we depend on, too.
twisted.passthru.optional-dependencies.tls
twisted.passthru.optional-dependencies.conch
werkzeug
zfec
zope_interface
] ++ pickExtraDependencies pythonExtraDependencies extrasNames;
] ++ (
# Get the dependencies for the Twisted extras we depend on, too.
extrasDeps twisted [ "tls" "conch" ]
);
# The additional direct dependencies of the Tahoe-LAFS unit tests.
unitTestDependencies = with pythonPackages; [
beautifulsoup4
fixtures
@ -72,6 +82,7 @@ let
testtools
];
# The additional direct dependencies of the Tahoe-LAFS integration tests.
integrationTestDependencies = with pythonPackages; [
html5lib
paramiko
@ -80,6 +91,7 @@ let
pytest-twisted
];
# Determine which test suites to run.
doUnit = builtins.elem "unit" checks;
doIntegration = builtins.elem "integration" checks;
@ -156,6 +168,16 @@ buildPythonPackage rec {
runHook postCheck
'';
passthru = {
# Represent the dependencies of the Python package "extras" here. We
# record and expose them here but whoever depends on us needs to ask for
# them on their own.
optional-dependencies = with pythonPackages; {
tor = [ txtorcon ];
i2p = [ txi2p ];
};
};
meta = with lib; {
homepage = "https://tahoe-lafs.org/";
description = "secure, decentralized, fault-tolerant file store";