yogsototh/mach-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

throw proper error if pkgs are passed to mkPython or buildPy...

Browse source
This commit is contained in:
DavHau 2020-10-11 11:22:43 +07:00
parent b2aede9aa2
commit a24c33fb80
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
default.nix
View file

@ -170,7 +170,9 @@ rec {
buildPythonApplication = __buildPython "buildPythonApplication";
__buildPython = with builtins; func: args:
if isString args || isPath args || pkgs.lib.isDerivation args then
if args ? pkgs then
throw "${func} does not accept 'pkgs' anymore. 'pkgs' need to be specified when importing mach-nix"
else if isString args || isPath args || pkgs.lib.isDerivation args then
_buildPython func { src = args; }
else
_buildPython func args;
@ -247,7 +249,13 @@ rec {
# (High level API) generates a python environment with minimal user effort
mkPython = args: if builtins.isList args then _mkPython { extra_pkgs = args; } else _mkPython args;
mkPython = args:
if args ? pkgs then
throw "mkPython does not accept 'pkgs' anymore. 'pkgs' need to be specified when importing mach-nix"
else if builtins.isList args then
_mkPython { extra_pkgs = args; }
else
_mkPython args;
_mkPython =
{