Several override additions and fixes

overrides/build-systems.json

@@ -2719,6 +2719,9 @@
  "blebox-uniapi": [
  "setuptools"
  ],
+ "blendmodes": [
+ "poetry-core"
+ ],
  "bless": [
  "setuptools"
  ],
@@ -6728,6 +6731,10 @@
  "facedancer": [
  "setuptools"
  ],
+ "facexlib": [
+ "cython",
+ "setuptools-scm"
+ ],
  "factory-boy": [
  "setuptools"
  ],
@@ -6941,7 +6948,11 @@
  "setuptools"
  ],
  "ffmpy": [
- "setuptools"
+ "setuptools",
+ {
+ "buildSystem": "poetry-core",
+ "from": "0.4.0"
+ }
  ],
  "fhconfparser": [
  "poetry-core"
@@ -9180,6 +9191,9 @@
  "huey": [
  "setuptools"
  ],
+ "hug": [
+ "setuptools"
+ ],
  "huggingface-hub": [
  "setuptools"
  ],
@@ -10770,7 +10784,14 @@
  "setuptools"
  ],
  "lazy-loader": [
- "flit-core"
+ {
+ "buildSystem": "flit-core",
+ "until": "0.4"
+ },
+ {
+ "buildSystem": "setuptools",
+ "from": "0.4"
+ }
  ],
  "lazy-object-proxy": [
  "setuptools",
@@ -12085,6 +12106,9 @@
  "hatchling",
  "poetry"
  ],
+ "mkdocs-get-deps": [
+ "hatchling"
+ ],
  "mkdocs-git-authors-plugin": [
  "setuptools"
  ],
@@ -13769,6 +13793,9 @@
  "setuptools",
  "setuptools-scm"
  ],
+ "narwhals": [
+ "hatchling"
+ ],
  "nats-py": [
  "setuptools"
  ],
@@ -15478,7 +15505,14 @@
  ],
  "pdoc3": [
  "setuptools",
- "setuptools-scm"
+ "setuptools-scm",
+ {
+ "buildSystem": "setuptools-git",
+ "from": "0.5.0"
+ }
+ ],
+ "pdocs": [
+ "poetry"
  ],
  "pdunehd": [
  "setuptools"
@@ -15704,6 +15738,9 @@
  "pillow": [
  "setuptools"
  ],
+ "pillow-avif-plugin": [
+ "setuptools"
+ ],
  "pillow-heif": [
  "setuptools"
  ],
@@ -16067,6 +16104,9 @@
  "portpicker": [
  "setuptools"
  ],
+ "portray": [
+ "poetry"
+ ],
  "posix-ipc": [
  "setuptools"
  ],
@@ -20513,7 +20553,15 @@
  ],
  "pywavelets": [
  "cython",
- "setuptools"
+ "setuptools",
+ {
+ "buildSystem": "meson-python",
+ "from": "1.5.0"
+ },
+ {
+ "buildSystem": "ninja",
+ "from": "1.5.0"
+ }
  ],
  "pywayland": [
  "setuptools"
@@ -21237,6 +21285,9 @@
  "reserved": [
  "setuptools"
  ],
+ "resize-right": [
+ "setuptools"
+ ],
  "resolvelib": [
  "setuptools"
  ],
@@ -24245,6 +24296,9 @@
  "timing-asgi": [
  "poetry-core"
  ],
+ "timm": [
+ "pdm-backend"
+ ],
  "tiny-cuda-nn": [
  "setuptools"
  ],

overrides/default.nix

@@ -1498,6 +1498,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;
@@ -1982,6 +1989,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
@@ -2189,6 +2219,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 ];
@@ -4282,7 +4318,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"' ""
  '';
  });
 

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 { };

tests/mkdocs-material/default.nix

@@ -0,0 +1,9 @@
+{ poetry2nix, python3 }:
+let
+ env = poetry2nix.mkPoetryEnv {
+ python = python3;
+ pyproject = ./pyproject.toml;
+ poetrylock = ./poetry.lock;
+ };
+in
+env.python.pkgs.mkdocs-material