gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2023-02-15 06:01:44 +00:00
committed by GitHub
parent cbb55edc46 1fd20e8410
commit c4fe2133de
46 changed files with 574 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/python/default.nix
+1 -1
View File
@@ -63,7 +63,7 @@
hooks = import ./hooks/default.nix;
keep = lib.extends hooks pythonPackagesFun;
extra = _: {};
optionalExtensions = cond: as: if cond then as else [];
optionalExtensions = cond: as: lib.optionals cond as;
pythonExtension = import ../../../top-level/python-packages.nix;
python2Extension = import ../../../top-level/python2-packages.nix;
extensions = lib.composeManyExtensions ([
pkgs/development/interpreters/python/python-packages-base.nix
+1 -1
View File
@@ -44,7 +44,7 @@ let
}));
# See build-setupcfg/default.nix for documentation.
buildSetupcfg = import ../../../build-support/build-setupcfg self;
buildSetupcfg = import ../../../build-support/build-setupcfg lib self;
# Check whether a derivation provides a Python module.
hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python;