mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-02 03:06:41 +00:00
Avoid colliding with the "extra" package in nixpkgs :/
This commit is contained in:
parent
f59c6a3acf
commit
17a2c32e1f
14
default.nix
14
default.nix
@ -23,18 +23,18 @@ in
|
|||||||
, pythonVersion ? "python310" # a string choosing the python derivation from
|
, pythonVersion ? "python310" # a string choosing the python derivation from
|
||||||
# nixpkgs to target
|
# nixpkgs to target
|
||||||
|
|
||||||
, extras ? [ "tor" "i2p" ] # a list of strings identifying tahoe-lafs extras,
|
, extrasNames ? [ "tor" "i2p" ] # a list of strings identifying tahoe-lafs extras,
|
||||||
# the dependencies of which the resulting package
|
# the dependencies of which the resulting
|
||||||
# will also depend on. Include all of the runtime
|
# package will also depend on. Include all of the
|
||||||
# extras by default because the incremental cost of
|
# runtime extras by default because the incremental
|
||||||
# including them is a lot smaller than the cost of
|
# cost of including them is a lot smaller than the
|
||||||
# re-building the whole thing to add them.
|
# cost of re-building the whole thing to add them.
|
||||||
|
|
||||||
}:
|
}:
|
||||||
with pkgs.${pythonVersion}.pkgs;
|
with pkgs.${pythonVersion}.pkgs;
|
||||||
callPackage ./nix/tahoe-lafs.nix {
|
callPackage ./nix/tahoe-lafs.nix {
|
||||||
# Select whichever package extras were requested.
|
# Select whichever package extras were requested.
|
||||||
inherit extras;
|
inherit extrasNames;
|
||||||
|
|
||||||
# Define the location of the Tahoe-LAFS source to be packaged. Clean up as
|
# 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,
|
# many of the non-source files (eg the `.git` directory, `~` backup files,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ buildPythonPackage
|
{ buildPythonPackage
|
||||||
, tahoe-lafs-src
|
, tahoe-lafs-src
|
||||||
, extras
|
, extrasNames
|
||||||
|
|
||||||
# control how the test suite is run
|
# control how the test suite is run
|
||||||
, doCheck ? false
|
, doCheck ? false
|
||||||
@ -99,7 +99,7 @@ let
|
|||||||
werkzeug
|
werkzeug
|
||||||
zfec
|
zfec
|
||||||
zope_interface
|
zope_interface
|
||||||
] ++ pickExtraDependencies pythonExtraDependencies extras;
|
] ++ pickExtraDependencies pythonExtraDependencies extrasNames;
|
||||||
|
|
||||||
pythonCheckDependencies = [
|
pythonCheckDependencies = [
|
||||||
beautifulsoup4
|
beautifulsoup4
|
||||||
|
Loading…
Reference in New Issue
Block a user