Merge pull request #1836 from cheriimoya/master

nix-community · Oct 28, 2024 · 4af430d · 4af430d
2 parents 498ba8d + 1153461
commit 4af430d
Show file tree

Hide file tree

Showing 6 changed files with 689 additions and 4 deletions.
diff --git a/overrides/build-systems.json b/overrides/build-systems.json
@@ -2730,6 +2730,9 @@
   "blebox-uniapi": [
     "setuptools"
   ],
+  "blendmodes": [
+    "poetry-core"
+  ],
   "bless": [
     "setuptools"
   ],
@@ -6745,6 +6748,10 @@
   "facedancer": [
     "setuptools"
   ],
+  "facexlib": [
+    "cython",
+    "setuptools-scm"
+  ],
   "factory-boy": [
     "setuptools"
   ],
@@ -6958,7 +6965,11 @@
     "setuptools"
   ],
   "ffmpy": [
-    "setuptools"
+    "setuptools",
+    {
+      "buildSystem": "poetry-core",
+      "from": "0.4.0"
+    }
   ],
   "fhconfparser": [
     "poetry-core"
@@ -9197,6 +9208,9 @@
   "huey": [
     "setuptools"
   ],
+  "hug": [
+    "setuptools"
+  ],
   "huggingface-hub": [
     "setuptools"
   ],
@@ -13799,6 +13813,9 @@
     "setuptools",
     "setuptools-scm"
   ],
+  "narwhals": [
+    "hatchling"
+  ],
   "nats-py": [
     "setuptools"
   ],
@@ -15523,7 +15540,14 @@
   ],
   "pdoc3": [
     "setuptools",
-    "setuptools-scm"
+    "setuptools-scm",
+    {
+      "buildSystem": "setuptools-git",
+      "from": "0.5.0"
+    }
+  ],
+  "pdocs": [
+    "poetry"
   ],
   "pdunehd": [
     "setuptools"
@@ -15750,6 +15774,9 @@
   "pillow": [
     "setuptools"
   ],
+  "pillow-avif-plugin": [
+    "setuptools"
+  ],
   "pillow-heif": [
     "setuptools"
   ],
@@ -16113,6 +16140,9 @@
   "portpicker": [
     "setuptools"
   ],
+  "portray": [
+    "poetry"
+  ],
   "posix-ipc": [
     "setuptools"
   ],
@@ -20585,7 +20615,15 @@
   ],
   "pywavelets": [
     "cython",
-    "setuptools"
+    "setuptools",
+    {
+      "buildSystem": "meson-python",
+      "from": "1.5.0"
+    },
+    {
+      "buildSystem": "ninja",
+      "from": "1.5.0"
+    }
   ],
   "pywayland": [
     "setuptools"
@@ -21309,6 +21347,9 @@
   "reserved": [
     "setuptools"
   ],
+  "resize-right": [
+    "setuptools"
+  ],
   "resolvelib": [
     "setuptools"
   ],
@@ -24320,6 +24361,9 @@
   "timing-asgi": [
     "poetry-core"
   ],
+  "timm": [
+    "pdm-backend"
+  ],
   "tiny-cuda-nn": [
     "setuptools"
   ],

diff --git a/overrides/default.nix b/overrides/default.nix
@@ -1503,6 +1503,13 @@ lib.composeManyExtensions [
         }
       );
 
+      mariadb = prev.mariadb.overridePythonAttrs (
+        old: {
+          nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkg-config pkgs.libmysqlclient ];
+          buildInputs = old.buildInputs or [ ] ++ [ pkgs.libmysqlclient ];
+        }
+      );
+
       markdown-it-py = prev.markdown-it-py.overridePythonAttrs (
         old: {
           propagatedBuildInputs = builtins.filter (i: i.pname != "mdit-py-plugins") old.propagatedBuildInputs;
@@ -1987,6 +1994,29 @@ lib.composeManyExtensions [
         }
       );
 
+      open-clip-torch = prev.open-clip-torch.overridePythonAttrs (
+        # The sdist from pypi doesn't contain the requirements.txt
+        old:
+        lib.optionalAttrs (!(old.src.isWheel or false)) (
+          let
+            githubHash =
+              {
+                "2.20.0" = "sha256-Ca4oi2LqleIFAGBJB7YIi4nXe2XhOP6ErDFXgXtJLxM=";
+              }.${old.version} or lib.fakeHash;
+
+            src = pkgs.fetchFromGitHub {
+              owner = "mlfoundations";
+              repo = "open_clip";
+              rev = "v${old.version}";
+              sha256 = githubHash;
+            };
+          in
+          {
+            inherit src;
+          }
+        )
+      );
+
       orjson = prev.orjson.overridePythonAttrs (
         old: lib.optionalAttrs (!(old.src.isWheel or false)) (
           let
@@ -2194,6 +2224,12 @@ lib.composeManyExtensions [
         }
       );
 
+      pillow-avif-plugin = prev.pillow-avif-plugin.overridePythonAttrs (
+        old: {
+          buildInputs = old.buildInputs or [ ] ++ [ pkgs.libavif ];
+        }
+      );
+
       pillow-heif = prev.pillow-heif.overridePythonAttrs (
         old: {
           nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkg-config ];
@@ -4293,7 +4329,7 @@ lib.composeManyExtensions [
 
       mkdocs-material = prev.mkdocs-material.overridePythonAttrs (old: {
         postPatch = old.postPatch or "" + ''
-          sed -i 's/"Framework :: MkDocs",//' pyproject.toml
+          substituteInPlace pyproject.toml --replace-warn 'filename = "requirements.txt"' ""
         '';
       });
 

diff --git a/tests/default.nix b/tests/default.nix
@@ -129,6 +129,7 @@ in
   shapely-wheel = callTest ./shapely-wheel { };
   cffi-pandas-wheel = callTest ./cffi-pandas-wheel { };
   mkdocstrings-wheel = callTest ./mkdocstrings-wheel { };
+  mkdocs-material = callTest ./mkdocs-material { };
   test-extras = callTest ./test-extras { };
   test-no-extras = callTest ./test-no-extras { };
   missing-iswheel = callTest ./missing-iswheel { };

diff --git a/tests/mkdocs-material/default.nix b/tests/mkdocs-material/default.nix
@@ -0,0 +1,14 @@
+{ poetry2nix, python3, stdenv }:
+let
+  env = poetry2nix.mkPoetryEnv {
+    python = python3;
+    pyproject = ./pyproject.toml;
+    poetrylock = ./poetry.lock;
+    overrides = poetry2nix.overrides.withDefaults (_: prev: {
+      watchdog = prev.watchdog.override {
+        preferWheel = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
+      };
+    });
+  };
+in
+env.python.pkgs.mkdocs-material