Merge pull request #1810 from cpcloud/try-pytest-runner-removal

nix-community · Sep 28, 2024 · 9beb3e5 · 9beb3e5
2 parents 6d8507d + 526722f
commit 9beb3e5
Show file tree

Hide file tree

Showing 60 changed files with 5,179 additions and 4,509 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/overrides/build-systems.json b/overrides/build-systems.json
@@ -1052,6 +1052,9 @@
     "cython_0",
     "setuptools"
   ],
+  "apache-flink": [
+    "setuptools"
+  ],
   "apache-flink-libraries": [
     "setuptools"
   ],
@@ -5869,6 +5872,7 @@
     "setuptools"
   ],
   "docopt-ng": [
+    "pdm-backend",
     "setuptools"
   ],
   "docplex": [
@@ -15474,6 +15478,9 @@
     "hatchling",
     "setuptools"
   ],
+  "pemja": [
+    "setuptools"
+  ],
   "pencompy": [
     "setuptools"
   ],
@@ -24019,6 +24026,9 @@
     "poetry-core",
     "setuptools"
   ],
+  "textual-serve": [
+    "hatchling"
+  ],
   "textual-textarea": [
     "poetry-core",
     "setuptools"

diff --git a/overrides/default.nix b/overrides/default.nix
@@ -1670,7 +1670,7 @@ lib.composeManyExtensions [
               { }
               {
                 mpi = {
-                  mpicc = "${pkgs.mpi.dev}/bin/mpicc";
+                  mpicc = "${lib.getDev pkgs.mpi}/bin/mpicc";
                 };
               };
           };
@@ -1863,6 +1863,8 @@ lib.composeManyExtensions [
         ];
         buildInputs = old.buildInputs or [ ] ++ [
           pkgs.libusb1
+          pkgs.xorg.libXfixes
+          pkgs.xorg.libXxf86vm
         ] ++ lib.optionals stdenv.isLinux [
           pkgs.udev
         ] ++ lib.optionals (lib.versionAtLeast prev.open3d.version "0.16.0" && !pkgs.mesa.meta.broken) [
@@ -2251,6 +2253,33 @@ lib.composeManyExtensions [
         }
       );
 
+      pemja = prev.pemja.overridePythonAttrs (old: {
+        buildInputs = old.buildInputs or [ ] ++ [ pkgs.openjdk17_headless ];
+      });
+
+      pycrdt =
+        let
+          hashes = {
+            "0.9.11" = "sha256-qKrYCkSP8f/oQytfc1xvBX6gt26D3Z/5bbzKPO0e0tQ=";
+          };
+        in
+        prev.pycrdt.overridePythonAttrs (old: {
+          cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
+            inherit (old) src;
+            name = "${old.pname}-${old.version}";
+            sha256 = hashes.${old.version};
+          };
+
+          buildInputs = old.buildInputs or [ ] ++ lib.optionals stdenv.isDarwin [
+            pkgs.libiconv
+          ];
+
+          nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
+            pkgs.rustPlatform.cargoSetupHook
+            pkgs.rustPlatform.maturinBuildHook
+          ];
+        });
+
       pycurl = prev.pycurl.overridePythonAttrs (
         old: {
           buildInputs = old.buildInputs or [ ] ++ [ pkgs.curl ];
@@ -3887,7 +3916,7 @@ lib.composeManyExtensions [
 
           getCargoHash = version: {
             "0.24.0".outputHashes = {
-             "notify-6.1.1" = "sha256-lT3R5ZQpjx52NVMEKTTQI90EWT16YnbqphqvZmNpw/I=";
+              "notify-6.1.1" = "sha256-lT3R5ZQpjx52NVMEKTTQI90EWT16YnbqphqvZmNpw/I=";
             };
             "0.23.0" = "sha256-m7XFpbujWFmDNSDydY3ec6b+AGgrfo3+TTbRN7te8bY=";
             "0.22.0" = "sha256-pl5BBOxrxvPvBJTnTqvWNFecoJwfyuAs4xZEgmg+T+w=";

diff --git a/tests/aiopath/poetry.lock b/tests/aiopath/poetry.lock
diff --git a/tests/aiopath/pyproject.toml b/tests/aiopath/pyproject.toml
@@ -8,7 +8,8 @@ authors = ["Your Name <[email protected]>"]
 python = "^3.8"
 aiopath = [
   { version = "0.5.12", python = ">=3.7,<3.10" },
-  { version = ">0.5.12,<0.7", python = ">=3.10,<3.11" }
+  { version = ">=0.6,<0.7", python = ">=3.10,<3.11" },
+  { version = ">=0.7,<1", python = ">=3.12,<4" },
 ]
 
 [build-system]