Merge pull request #1659 from l0b0/fix/matplotlib-3-9

nix-community · May 25, 2024 · 262b233 · 262b233
2 parents 090792e + a7c192e
commit 262b233
Show file tree

Hide file tree

Showing 6 changed files with 545 additions and 8 deletions.
diff --git a/overrides/build-systems.json b/overrides/build-systems.json
@@ -11486,7 +11486,14 @@
   "matplotlib": [
     "oldest-supported-numpy",
     "setuptools",
-    "setuptools-scm"
+    {
+      "buildSystem": "setuptools-scm",
+      "from": "3.5.0"
+    },
+    {
+      "buildSystem": "meson-python",
+      "from": "3.9.0"
+    }
   ],
   "matplotlib-inline": [
     "setuptools"

diff --git a/overrides/default.nix b/overrides/default.nix
@@ -1544,6 +1544,7 @@ lib.composeManyExtensions [
           inherit (pkgs) tk tcl wayland qhull;
           inherit (pkgs.xorg) libX11;
           inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
+          mpl39 = lib.versionAtLeast prev.matplotlib.version "3.9.0";
         in
         {
           XDG_RUNTIME_DIR = "/tmp";
@@ -1558,7 +1559,7 @@ lib.composeManyExtensions [
             final.pybind11
           ];
 
-          propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [
+          propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [
             final.certifi
             pkgs.libpng
             pkgs.freetype
@@ -1569,10 +1570,17 @@ lib.composeManyExtensions [
             ++ lib.optionals enableQt [ final.pyqt5 ]
           ;
 
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
+          dontUseMesonConfigure = mpl39;
+
+          nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
             pkg-config
-          ] ++ lib.optionals (lib.versionAtLeast prev.matplotlib.version "3.5.0") [
-            final.setuptools-scm
+          ];
+
+          mesonFlags = lib.optionals mpl39 [
+            "-Dsystem-freetype=true"
+            "-Dsystem-qhull=true"
+            # broken for linux in matplotlib 3.9.0
+            "-Db_lto=false"
           ];
 
           # Clang doesn't understand -fno-strict-overflow, and matplotlib builds with -Werror
@@ -1599,14 +1607,17 @@ lib.composeManyExtensions [
               substituteInPlace src/_c_internal_utils.c \
                 --replace libX11.so.6 ${libX11}/lib/libX11.so.6 \
                 --replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0
-            '' +
-            # avoid matplotlib trying to download dependencies
             ''
+            + lib.optionalString mpl39
+              ''
+                patchShebangs .
+              ''
+            # avoid matplotlib trying to download dependencies
+            + ''
               echo "[libs]
               system_freetype=true
               system_qhull=true" > mplsetup.cfg
             '';
-
         }
       );
 

diff --git a/tests/default.nix b/tests/default.nix
@@ -130,6 +130,7 @@ in
   wheel-wheel = callTest ./wheel-wheel { };
   fancycompleter-wheel = callTest ./fancycompleter-wheel { };
   matplotlib-3-7 = callTest ./matplotlib-3-7 { };
+  matplotlib-3-9 = callTest ./matplotlib-3-9 { };
   rfc3986-validator = callTest ./rfc3986-validator { };
   virtualenv-pre-20-18 = callTest ./virtualenv-pre-20-18 { };
   virtualenv-post-20-18 = callTest ./virtualenv-post-20-18 { };

diff --git a/tests/matplotlib-3-9/default.nix b/tests/matplotlib-3-9/default.nix
@@ -0,0 +1,10 @@
+{ poetry2nix, runCommand }:
+let
+  env = poetry2nix.mkPoetryEnv {
+    projectDir = ./.;
+  };
+in
+runCommand "matplotlib-3-9-test" { } ''
+  ${env}/bin/python -c 'import matplotlib'
+  touch $out
+''