Avoid colliding with the "extra" package in nixpkgs :/

This commit is contained in:
Jean-Paul Calderone 2023-03-13 17:02:10 -04:00
parent f59c6a3acf
commit 17a2c32e1f
2 changed files with 9 additions and 9 deletions

View File

@ -23,18 +23,18 @@ in
, pythonVersion ? "python310" # a string choosing the python derivation from
# nixpkgs to target
, extras ? [ "tor" "i2p" ] # a list of strings identifying tahoe-lafs extras,
# the dependencies of which the resulting package
# will also depend on. Include all of the runtime
# extras by default because the incremental cost of
# including them is a lot smaller than the cost of
# re-building the whole thing to add them.
, extrasNames ? [ "tor" "i2p" ] # a list of strings identifying tahoe-lafs extras,
# the dependencies of which the resulting
# package will also depend on. Include all of the
# runtime extras by default because the incremental
# cost of including them is a lot smaller than the
# cost of re-building the whole thing to add them.
}:
with pkgs.${pythonVersion}.pkgs;
callPackage ./nix/tahoe-lafs.nix {
# Select whichever package extras were requested.
inherit extras;
inherit extrasNames;
# Define the location of the Tahoe-LAFS source to be packaged. Clean up as
# many of the non-source files (eg the `.git` directory, `~` backup files,

View File

@ -1,6 +1,6 @@
{ buildPythonPackage
, tahoe-lafs-src
, extras
, extrasNames
# control how the test suite is run
, doCheck ? false
@ -99,7 +99,7 @@ let
werkzeug
zfec
zope_interface
] ++ pickExtraDependencies pythonExtraDependencies extras;
] ++ pickExtraDependencies pythonExtraDependencies extrasNames;
pythonCheckDependencies = [
beautifulsoup4