Merge master into staging-next

pkgs/README.md

@@ -874,7 +874,7 @@ $ nix-build -A phoronix-test-suite.tests
 Here are examples of package tests:
 
 - [Jasmin compile test](by-name/ja/jasmin/test-assemble-hello-world/default.nix)
-- [Lobster compile test](development/compilers/lobster/test-can-run-hello-world.nix)
+- [Lobster compile test](by-name/lo/lobster/test-can-run-hello-world.nix)
 - [Spacy annotation test](development/python-modules/spacy/annotation-test/default.nix)
 - [Libtorch test](development/libraries/science/math/libtorch/test/default.nix)
 - [Multiple tests for nanopb](./by-name/na/nanopb/package.nix)

pkgs/by-name/py/pyhanko-cli/package.nix

@@ -7,14 +7,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyhanko-cli";
-  version = "0.3.1";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MatthiasValvekens";
     repo = "pyhanko";
     tag = "pyhanko-cli/v${finalAttrs.version}";
-    hash = "sha256-ZBlkp6nhTKEAWxCPDq9NIoOullwWartpU3eL0QIGFpw=";
+    hash = "sha256-huOy04wY7xP1gZ5azsZYnMXLZ4MwMkLGujlgXTtjLy4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pkgs/pyhanko-cli";
@@ -46,6 +46,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   ]
   ++ (with python3Packages; [
     pytestCheckHook
+    pytest-asyncio
     pyhanko.testData
     requests-mock
     freezegun

pkgs/development/python-modules/nvidia-cutlass/default.nix

@@ -0,0 +1,76 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  cuda-bindings,
+  cuda-pathfinder,
+  networkx,
+  numpy,
+  pydot,
+  scipy,
+  treelib,
+
+  # tests
+  pytestCheckHook,
+  torch,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "nvidia-cutlass";
+  version = "4.2.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "cutlass";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-XicHeV9ni9bSOWcUJM8HrCuz61mVK1EdZ9uxNvgWmvk=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonRemoveDeps = [
+    # Replaced with the cuda-python sub-packages we actually need
+    "cuda-python"
+  ];
+  dependencies = [
+    cuda-bindings
+    cuda-pathfinder
+    networkx
+    numpy
+    pydot
+    scipy
+    treelib
+  ];
+
+  pythonImportsCheck = [
+    "cutlass_cppgen"
+    "cutlass_library"
+    "pycute"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    torch
+  ];
+
+  enabledTestPaths = [
+    "test"
+  ];
+
+  meta = {
+    description = "Python bindings for NVIDIA's CUTLASS library";
+    homepage = "https://github.com/NVIDIA/cutlass";
+    changelog = "https://github.com/NVIDIA/cutlass/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+})

pkgs/development/python-modules/pyhanko-certvalidator/default.nix

@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "pyhanko-certvalidator";
-  version = "0.29.1";
+  version = "0.31.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MatthiasValvekens";
     repo = "pyhanko";
     tag = "pyhanko-certvalidator/v${version}";
-    hash = "sha256-+576MAbtWFGaPu/HqhdeeRNHi84pLnDaMDa0e/J/CUs=";
+    hash = "sha256-mZ9u3mQ8JZIq+G1iwNQST8r7/rCWi/UW0j1xfeV9zFM=";
   };
 
   sourceRoot = "${src.name}/pkgs/pyhanko-certvalidator";

pkgs/development/python-modules/pyhanko/default.nix

@@ -38,14 +38,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyhanko";
-  version = "0.35.0";
+  version = "0.35.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MatthiasValvekens";
     repo = "pyHanko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-huOy04wY7xP1gZ5azsZYnMXLZ4MwMkLGujlgXTtjLy4=";
+    hash = "sha256-mZ9u3mQ8JZIq+G1iwNQST8r7/rCWi/UW0j1xfeV9zFM=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pkgs/pyhanko";

pkgs/development/python-modules/torch-cluster/default.nix

@@ -0,0 +1,82 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+  torch,
+
+  # buildInputs
+  pybind11,
+
+  # dependencies
+  scipy,
+
+  # tests
+  pytestCheckHook,
+
+  # passthru
+  nix-update-script,
+}:
+
+buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
+  pname = "torch-cluster";
+  version = "2.6.3-unstable-2026-03-26";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  # Last stable release is from 2023
+  # Development is still active, but nothing was properly tagged on GitHub or Pypi
+  # See: https://github.com/rusty1s/pytorch_cluster/issues/270
+  src = fetchFromGitHub {
+    owner = "rusty1s";
+    repo = "pytorch_cluster";
+    rev = "af7b9f0af6b74be1594eb3d0a1685470cbb21265";
+    hash = "sha256-2SXkk7m+feqk7uDir3Ov31TujyIUrRSEwONaiaq3Vvs=";
+  };
+
+  build-system = [
+    setuptools
+    torch
+  ];
+
+  buildInputs = [
+    pybind11
+  ];
+
+  dependencies = [
+    scipy
+  ];
+
+  pythonImportsCheck = [ "torch_cluster" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # Otherwise python imports torch_cluster from /build/source instead of $out/..., which fails when
+  # trying to load the inexistant .so artifacts.
+  preCheck = ''
+    rm -rf torch_cluster
+  '';
+
+  disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox:
+    # RuntimeError: Failed to initialize cpuinfo!
+    "test_fps"
+    "test_nearest"
+  ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "PyTorch Extension Library of Optimized Graph Cluster Algorithms";
+    homepage = "https://github.com/rusty1s/pytorch_cluster";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+})

pkgs/top-level/python-packages.nix

@@ -11439,6 +11439,8 @@ self: super: with self; {
 
   nvdlib = callPackage ../development/python-modules/nvdlib { };
 
+  nvidia-cutlass = callPackage ../development/python-modules/nvidia-cutlass { };
+
   nvidia-dlprof-pytorch-nvtx =
     callPackage ../development/python-modules/nvidia-dlprof-pytorch-nvtx
       { };
@@ -19742,6 +19744,8 @@ self: super: with self; {
 
   torch-c-dlpack-ext = callPackage ../development/python-modules/torch-c-dlpack-ext { };
 
+  torch-cluster = callPackage ../development/python-modules/torch-cluster { };
+
   torch-einops-utils = callPackage ../development/python-modules/torch-einops-utils { };
 
   torch-geometric = callPackage ../development/python-modules/torch-geometric { };