buildPythonApplication support

This effects python-inconsistent-interpreters because we can no longer assume there to be a drv.pythonModule attribute.
jtojnar · Jul 12, 2022 · f26c376 · f26c376
1 parent e2f5723
commit f26c376
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 4 deletions.
diff --git a/lib/default.nix b/lib/default.nix
@@ -107,6 +107,7 @@ rec {
       lib.genAttrs pythonPackageSetNames (pythonName:
         prev.${pythonName}.override (oldOverrides: {
           packageOverrides = lib.composeExtensions (oldOverrides.packageOverrides or idOverlay) (final: prev: {
+            buildPythonApplication = wrapFunctionWithChecks prev.buildPythonApplication check;
             buildPythonPackage = wrapFunctionWithChecks prev.buildPythonPackage check;
           });
         })

diff --git a/overlays/python-inconsistent-interpreters.nix b/overlays/python-inconsistent-interpreters.nix
@@ -9,21 +9,28 @@ let
       checkInputs = drvArgs.checkInputs or [];
       runtimeInputs = checkInputs ++ propagatedBuildInputs;
       inputPythonInterpreters = map (p: p.pythonModule) (builtins.filter (p: p ? pythonModule) runtimeInputs);
-      allPythonInterpreters = lib.unique (inputPythonInterpreters ++ [ drv.pythonModule ]);
+      allPythonInterpreters = lib.unique (inputPythonInterpreters ++ lib.optionals (drv ? pythonModule) [ drv.pythonModule ]);
     in
       lib.singleton {
         name = "python-inconsistent-interpreters";
         cond = builtins.length allPythonInterpreters > 1;
         msg =
           let
             allPythonNames = map (p: p.name) allPythonInterpreters;
-            sources = [
-              "buildPythonPackage"
+            sources = if drv ? pythonModule
+            then [ "buildPythonPackage"
             ] ++ lib.optionals (builtins.any (p: p.pythonModule or drv.pythonModule != drv.pythonModule) propagatedBuildInputs) [
               "propagatedBuildInputs"
             ] ++ lib.optionals (builtins.any (p: p.pythonModule or drv.pythonModule != drv.pythonModule) checkInputs) [
               "checkInputs"
+            ]
+            else [ "buildPythonApplication"
+            ] ++ lib.optionals (builtins.length (lib.unique(map (p: p.pythonModule) propagatedBuildInputs)) > 1) [
+              "propagatedBuildInputs"
+            ] ++ lib.optionals (builtins.length (lib.unique(map (p: p.pythonModule) checkInputs)) > 1) [
+              "checkInputs"
             ];
+
           in ''
             Between ${lib.concatStringsSep " and " sources}, this derivation seems
             to be simultaneously trying to use packages from multiple different Python package sets.

diff --git a/run-tests.py b/run-tests.py
@@ -280,11 +280,13 @@ def __iter__(self):
         yield make_test_rule(
             'python-unsupported-platforms',
             [
-                'platforms-all'
+                'platforms-all',
+                "build-python-application-platforms-all",
             ],
             [
                 'platforms-linux',
                 'unspecified',
+                "build-python-application-platforms-linux",
             ]
         )
 
@@ -302,9 +304,11 @@ def __iter__(self):
             [
                 "mixed-1",
                 "mixed-2",
+                "build-python-application-mixed",
             ],
             [
                 "normal",
+                "build-python-application-normal",
             ],
         )
 

diff --git a/tests/python-inconsistent-interpreters/build-python-application-mixed.nix b/tests/python-inconsistent-interpreters/build-python-application-mixed.nix
@@ -0,0 +1,13 @@
+{ buildPythonApplication
+, python37Packages
+, python39Packages
+}:
+
+buildPythonApplication rec {
+  name = "package";
+
+  propagatedBuildInputs = [
+    python37Packages.numpy
+    python39Packages.scipy
+  ];
+}
diff --git a/tests/python-inconsistent-interpreters/build-python-application-normal.nix b/tests/python-inconsistent-interpreters/build-python-application-normal.nix
@@ -0,0 +1,13 @@
+{ buildPythonApplication
+, numpy
+, scipy
+}:
+
+buildPythonApplication rec {
+  name = "package";
+
+  propagatedBuildInputs = [
+    numpy
+    scipy
+  ];
+}
diff --git a/tests/python-inconsistent-interpreters/default.nix b/tests/python-inconsistent-interpreters/default.nix
@@ -5,7 +5,9 @@
   # positive cases
   mixed-1 = callPackage ./mixed-1.nix { };
   mixed-2 = callPackage ./mixed-2.nix { };
+  build-python-application-mixed = callPackage ./build-python-application-mixed.nix { };
 
   # negative cases
   normal = callPackage ./normal.nix { };
+  build-python-application-normal = callPackage ./build-python-application-normal.nix { };
 }
diff --git a/tests/python-unsupported-platforms/build-python-application-platforms-all.nix b/tests/python-unsupported-platforms/build-python-application-platforms-all.nix
@@ -0,0 +1,12 @@
+{ lib
+, buildPythonApplication
+}:
+
+buildPythonApplication rec {
+  pname = "package";
+  version = "0.1.0";
+
+  meta = with lib; {
+    platforms = platforms.all;
+  };
+}
diff --git a/tests/python-unsupported-platforms/build-python-application-platforms-linux.nix b/tests/python-unsupported-platforms/build-python-application-platforms-linux.nix
@@ -0,0 +1,12 @@
+{ lib
+, buildPythonApplication
+}:
+
+buildPythonApplication rec {
+  pname = "package";
+  version = "0.1.0";
+
+  meta = with lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/tests/python-unsupported-platforms/default.nix b/tests/python-unsupported-platforms/default.nix
@@ -4,8 +4,10 @@
 {
   # positive cases
   platforms-all = callPackage ./platforms-all.nix { };
+  build-python-application-platforms-all = callPackage ./build-python-application-platforms-all.nix { };
 
   # negative cases
   platforms-linux = callPackage ./platforms-linux.nix { };
   unspecified = callPackage ./unspecified.nix { };
+  build-python-application-platforms-linux = callPackage ./build-python-application-platforms-linux.nix { };
 }