From 08eb9637aa545ac194a68020fbbe623f27227e7d Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@gmail.com>
Date: Tue, 17 Dec 2019 12:38:34 +0100
Subject: [PATCH] Remove default values and drop src from mkPoetryPyhon

Drp `poetrylock` and `pyproject` mandatory arguments
without default values and drops `src` from `mkPoetryPyhon`.

Fix test invocations with invalid arguments.
---
 default.nix                        | 18 ++++++++----------
 pkgs/poetry/default.nix            |  2 +-
 tests/common-pkgs-1/default.nix    |  2 +-
 tests/common-pkgs-2/default.nix    |  2 +-
 tests/manylinux/default.nix        |  2 +-
 tests/override-support/default.nix |  3 +--
 tests/trivial/default.nix          |  2 +-
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/default.nix b/default.nix
index becb2c0..5d11748 100644
--- a/default.nix
+++ b/default.nix
@@ -22,15 +22,13 @@ let
 
 
   mkPoetryPython =
-    { src
-    , poetrylock ? src + "/poetry.lock"
+    { poetrylock
     , overrides ? defaultPoetryOverrides
     , meta ? {}
     , python ? pkgs.python3
-    , ...
     }@attrs: let
-      poetryLock = readTOML poetrylock;
-      lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock;
+      lockData = readTOML poetrylock;
+      lockFiles = lib.getAttrFromPath [ "metadata" "files" ] lockData;
 
       specialAttrs = [ "poetrylock" "overrides" ];
       passedAttrs = builtins.removeAttrs attrs specialAttrs;
@@ -50,7 +48,7 @@ let
           partitions = let
             supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true;
           in
-            lib.partition supportsPythonVersion poetryLock.package;
+            lib.partition supportsPythonVersion lockData.package;
 
           compatible = partitions.right;
           incompatible = partitions.wrong;
@@ -83,8 +81,8 @@ let
 
   mkPoetryApplication =
     { src
-    , pyproject ? src + "/pyproject.toml"
-    , poetrylock ? src + "/poetry.lock"
+    , pyproject
+    , poetrylock
     , overrides ? defaultPoetryOverrides
     , meta ? {}
     , python ? pkgs.python3
@@ -94,8 +92,8 @@ let
 
       py = mkPoetryPython (
         {
-          inherit src pyproject poetrylock overrides meta python;
-        } // attrs
+          inherit poetrylock overrides meta python;
+        }
       );
 
       pyProject = readTOML pyproject;
diff --git a/pkgs/poetry/default.nix b/pkgs/poetry/default.nix
index 37356dc..fef9950 100644
--- a/pkgs/poetry/default.nix
+++ b/pkgs/poetry/default.nix
@@ -5,7 +5,7 @@ poetry2nix.mkPoetryApplication {
   inherit python;
 
   pyproject = ./pyproject.toml;
-  poetryLock = ./poetry.lock;
+  poetrylock = ./poetry.lock;
 
   src = fetchFromGitHub {
     owner = "sdispater";
diff --git a/tests/common-pkgs-1/default.nix b/tests/common-pkgs-1/default.nix
index 52672d0..7941317 100644
--- a/tests/common-pkgs-1/default.nix
+++ b/tests/common-pkgs-1/default.nix
@@ -3,6 +3,6 @@
 poetry2nix.mkPoetryApplication {
   python = python3;
   pyproject = ./pyproject.toml;
-  poetryLock = ./poetry.lock;
+  poetrylock = ./poetry.lock;
   src = lib.cleanSource ./.;
 }
diff --git a/tests/common-pkgs-2/default.nix b/tests/common-pkgs-2/default.nix
index 52672d0..7941317 100644
--- a/tests/common-pkgs-2/default.nix
+++ b/tests/common-pkgs-2/default.nix
@@ -3,6 +3,6 @@
 poetry2nix.mkPoetryApplication {
   python = python3;
   pyproject = ./pyproject.toml;
-  poetryLock = ./poetry.lock;
+  poetrylock = ./poetry.lock;
   src = lib.cleanSource ./.;
 }
diff --git a/tests/manylinux/default.nix b/tests/manylinux/default.nix
index 9700b73..7340a83 100644
--- a/tests/manylinux/default.nix
+++ b/tests/manylinux/default.nix
@@ -4,7 +4,7 @@ let
   pkg = poetry2nix.mkPoetryApplication {
     python = python3;
     pyproject = ./pyproject.toml;
-    poetryLock = ./poetry.lock;
+    poetrylock = ./poetry.lock;
     src = lib.cleanSource ./.;
   };
   p = pkg.python.withPackages (ps: [ ps.numpy ps.opencv-python ]);
diff --git a/tests/override-support/default.nix b/tests/override-support/default.nix
index 28a617c..34d894e 100644
--- a/tests/override-support/default.nix
+++ b/tests/override-support/default.nix
@@ -3,8 +3,7 @@
 let
   python = poetry2nix.mkPoetryPython {
     python = python3;
-    poetryLock = ./poetry.lock;
-    src = lib.cleanSource ./.;
+    poetrylock = ./poetry.lock;
     overrides = poetry2nix.defaultPoetryOverrides // {
       alembic = self: super: drv: drv.overrideAttrs (
         old: {
diff --git a/tests/trivial/default.nix b/tests/trivial/default.nix
index 52672d0..7941317 100644
--- a/tests/trivial/default.nix
+++ b/tests/trivial/default.nix
@@ -3,6 +3,6 @@
 poetry2nix.mkPoetryApplication {
   python = python3;
   pyproject = ./pyproject.toml;
-  poetryLock = ./poetry.lock;
+  poetrylock = ./poetry.lock;
   src = lib.cleanSource ./.;
 }