mk-poetry-dep: Add pep508 evaluation to dependency selection

Poetry 1.1.0 changed the marker format in python-poetry/poetry#2361
nix-community · Oct 1, 2020 · 7a6f7f0 · 7a6f7f0
1 parent f3a057d
commit 7a6f7f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/default.nix b/default.nix
@@ -106,7 +106,7 @@ lib.makeScope pkgs.newScope (self: {
                 in
                 {
                   mkPoetryDep = self.callPackage ./mk-poetry-dep.nix {
-                    inherit pkgs lib python poetryLib;
+                    inherit pkgs lib python poetryLib evalPep508;
                   };
                   poetry = if __isBootstrap then null else poetryPkg;
                   # The canonical name is setuptools-scm

diff --git a/mk-poetry-dep.nix b/mk-poetry-dep.nix
@@ -4,6 +4,7 @@
 , python
 , buildPythonPackage
 , poetryLib
+, evalPep508
 }:
 { name
 , version
@@ -126,8 +127,9 @@ pythonPackages.callPackage
                   n: v:
                     let
                       constraints = v.python or "";
+                      pep508Markers = v.markers or "";
                     in
-                    compat constraints
+                    compat constraints && evalPep508 pep508Markers
                 )
                 dependencies
             );