commit
65266b5cc8
4 changed files with 5 additions and 5 deletions
|
@ -495,8 +495,8 @@ def conda_virtual_packages():
|
||||||
)
|
)
|
||||||
|
|
||||||
# platform.libc_ver() returns ('', '') on macOS and MACHNIX_GLIBC_VERSION is unset
|
# platform.libc_ver() returns ('', '') on macOS and MACHNIX_GLIBC_VERSION is unset
|
||||||
libc_complier, libc_version = platform.libc_ver()
|
libc_compiler, libc_version = platform.libc_ver()
|
||||||
if libc_complier == 'glibc':
|
if libc_compiler == 'glibc':
|
||||||
packages['__glibc'] = environ.get("MACHNIX_GLIBC_VERSION", libc_version)
|
packages['__glibc'] = environ.get("MACHNIX_GLIBC_VERSION", libc_version)
|
||||||
|
|
||||||
# Maximum version of CUDA supported by the display driver.
|
# Maximum version of CUDA supported by the display driver.
|
||||||
|
|
|
@ -10,7 +10,7 @@ let
|
||||||
cudaVersion ? pkgs.cudatoolkit.version, # max allowed cuda version for conda packages
|
cudaVersion ? pkgs.cudatoolkit.version, # max allowed cuda version for conda packages
|
||||||
ignoreDataOutdated ? false, # don't fail if pypi data is older than nixpkgs
|
ignoreDataOutdated ? false, # don't fail if pypi data is older than nixpkgs
|
||||||
requirements ? "", # content from a requirements.txt file
|
requirements ? "", # content from a requirements.txt file
|
||||||
requirementsExtra ? "", # add additional requirements to the packge
|
requirementsExtra ? "", # add additional requirements to the package
|
||||||
tests ? false, # Disable tests wherever possible to decrease build time.
|
tests ? false, # Disable tests wherever possible to decrease build time.
|
||||||
extras ? [],
|
extras ? [],
|
||||||
doCheck ? tests,
|
doCheck ? tests,
|
||||||
|
|
|
@ -60,7 +60,7 @@ let
|
||||||
extra_pkgs_r = filter (p: p ? rCommand) packagesExtra;
|
extra_pkgs_r = filter (p: p ? rCommand) packagesExtra;
|
||||||
extra_pkgs_other = filter (p: ! (p ? rCommand || p ? pythonModule || l.is_src p)) packagesExtra;
|
extra_pkgs_other = filter (p: ! (p ? rCommand || p ? pythonModule || l.is_src p)) packagesExtra;
|
||||||
|
|
||||||
# gather requirements of exra pkgs
|
# gather requirements of extra pkgs
|
||||||
extra_pkgs_py_reqs =
|
extra_pkgs_py_reqs =
|
||||||
map (p:
|
map (p:
|
||||||
if hasAttr "requirements" p then p.pname
|
if hasAttr "requirements" p then p.pname
|
||||||
|
|
|
@ -19,7 +19,7 @@ class ResolvedPkg(JSONEncoder):
|
||||||
is_root: bool
|
is_root: bool
|
||||||
provider_info: ProviderInfo
|
provider_info: ProviderInfo
|
||||||
extras_selected: List[str]
|
extras_selected: List[str]
|
||||||
# contains direct or indirect children wich have been diconnected due to circular deps
|
# contains direct or indirect children which have been disconnected due to circular deps
|
||||||
removed_circular_deps: Set[str] = field(default_factory=set)
|
removed_circular_deps: Set[str] = field(default_factory=set)
|
||||||
build: str = None
|
build: str = None
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue