Add projectDir parameter

Turns
```
poetry2nix.mkPoetryEnv {
    pyproject = ./pyproject.toml;
    poetrylock = ./poetry.lock;
    pwd = ./.;
    python = python3;
}
```

into
```
poetry2nix.mkPoetryEnv {
    projectDir = ./.;
    python = python3;
}
```
This commit is contained in:
adisbladis 2020-02-25 14:40:36 +00:00
parent e416555959
commit 9dae5620ea
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7

View file

@ -29,12 +29,13 @@ let
Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile.
*/
mkPoetryPackages =
{ pyproject
, poetrylock
{ projectDir ? null
, pyproject ? projectDir + "/pyproject.toml"
, poetrylock ? projectDir + "/poetry.lock"
, overrides ? [ defaultPoetryOverrides ]
, meta ? {}
, python ? pkgs.python3
, pwd ? null
, pwd ? projectDir
}@attrs: let
poetryPkg = poetry.override { inherit python; };
@ -135,11 +136,12 @@ let
poetry2nix.mkPoetryEnv { poetrylock = ./poetry.lock; python = python3; }
*/
mkPoetryEnv =
{ pyproject
, poetrylock
{ projectDir ? null
, pyproject ? projectDir + "/pyproject.toml"
, poetrylock ? projectDir + "/poetry.lock"
, overrides ? [ defaultPoetryOverrides ]
, meta ? {}
, pwd ? null
, pwd ? projectDir
, python ? pkgs.python3
}:
let
@ -154,12 +156,13 @@ let
/* Creates a Python application from pyproject.toml and poetry.lock */
mkPoetryApplication =
{ src
, pyproject
, poetrylock
, projectDir ? null
, pyproject ? projectDir + "/pyproject.toml"
, poetrylock ? projectDir + "/poetry.lock"
, overrides ? [ defaultPoetryOverrides ]
, meta ? {}
, python ? pkgs.python3
, pwd ? null
, pwd ? projectDir
, ...
}@attrs: let
poetryPython = mkPoetryPackages {