Merge staging-next into staging

pkgs/by-name/la/lasuite-meet-frontend/package.nix

@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "lasuite-meet-frontend";
-  version = "0.1.28";
+  version = "0.1.29";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-zB27doGkWch3e1Lc0Q3TurQeplV7vOdzJ+G+MFZI3Og=";
+    hash = "sha256-dvAPKNsj8ZnH0eLofbkE09hXL1g8YdViX8sQ/9+4L7k=";
   };
 
   sourceRoot = "source/src/frontend";
@@ -21,7 +21,7 @@ buildNpmPackage rec {
   npmDeps = fetchNpmDeps {
     inherit version src;
     sourceRoot = "source/src/frontend";
-    hash = "sha256-ajN3mDIUn8uX+xc3zZmzsFWY8Y5ss9gVeV0s5kJV3fs=";
+    hash = "sha256-ZEPzSHcp3HZ8mSoFZDUKlTi+gJ2syauJPtSFEfJnJtg=";
   };
 
   buildPhase = ''

pkgs/by-name/la/lasuite-meet/package.nix

@@ -13,14 +13,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "lasuite-meet";
-  version = "0.1.28";
+  version = "0.1.29";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-zB27doGkWch3e1Lc0Q3TurQeplV7vOdzJ+G+MFZI3Og=";
+    hash = "sha256-dvAPKNsj8ZnH0eLofbkE09hXL1g8YdViX8sQ/9+4L7k=";
   };
 
   sourceRoot = "source/src/backend";
@@ -28,8 +28,6 @@ python.pkgs.buildPythonApplication rec {
   patches = [
     # Support configuration throught environment variables for SECURE_*
     ./secure_settings.patch
-    # Add PKCE option
-    ./pkce.patch
   ];
 
   build-system = with python.pkgs; [ setuptools ];

pkgs/by-name/la/lasuite-meet/pkce.patch

@@ -1,20 +0,0 @@
---- a/meet/settings.py
-+++ b/meet/settings.py
-@@ -430,6 +430,17 @@ class Base(Configuration):
-     OIDC_RP_SCOPES = values.Value(
-         "openid email", environ_name="OIDC_RP_SCOPES", environ_prefix=None
-     )
-+    OIDC_USE_PKCE = values.BooleanValue(
-+        default=False, environ_name="OIDC_USE_PKCE", environ_prefix=None
-+    )
-+    OIDC_PKCE_CODE_CHALLENGE_METHOD = values.Value(
-+        default="S256",
-+        environ_name="OIDC_PKCE_CODE_CHALLENGE_METHOD",
-+        environ_prefix=None,
-+    )
-+    OIDC_PKCE_CODE_VERIFIER_SIZE = values.IntegerValue(
-+        default=64, environ_name="OIDC_PKCE_CODE_VERIFIER_SIZE", environ_prefix=None
-+    )
-     LOGIN_REDIRECT_URL = values.Value(
-         None, environ_name="LOGIN_REDIRECT_URL", environ_prefix=None
-     )

pkgs/by-name/ma/manifold/package.nix

@@ -7,17 +7,18 @@
   gtest,
   glm,
   tbb_2021,
+  python3Packages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "manifold";
-  version = "3.1.1";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "elalish";
     repo = "manifold";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tcEjgOU90tYnlZDedHJvnqWFDDtXGx64G80wnWz4lBI=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -41,14 +42,25 @@ stdenv.mkDerivation (finalAttrs: {
     test/manifold_test --gtest_filter=-CrossSection.RoundOffset
   '';
 
+  passthru = {
+    tbb = tbb_2021;
+    tests = {
+      python = python3Packages.manifold3d;
+    };
+  };
+
   meta = {
     description = "Geometry library for topological robustness";
     homepage = "https://github.com/elalish/manifold";
+    changelog = "https://github.com/elalish/manifold/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      hzeller
-      pca006132
-    ];
+    maintainers =
+      with lib.maintainers;
+      [
+        hzeller
+        pca006132
+      ]
+      ++ python3Packages.manifold3d.meta.maintainers;
     platforms = lib.platforms.unix;
   };
 })

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

@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "blosc2";
-  version = "3.5.0";
+  version = "3.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "python-blosc2";
     tag = "v${version}";
-    hash = "sha256-Kimcz4L7Ko4cRj9IaYuLXzmU0+3ERQXOmPXr0E9mOyA=";
+    hash = "sha256-ToPlN8OMgH6BCp0mPanfH0SUJWnrPDxVncF6pBpRhRI=";
   };
 
   nativeBuildInputs = [

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

@@ -4,6 +4,7 @@
   python,
   fetchFromGitHub,
   scikit-build-core,
+  manifold,
   cmake,
   ninja,
   nanobind,
@@ -17,16 +18,9 @@
 
 buildPythonPackage rec {
   pname = "manifold3d";
-  version = "3.1.1";
+  inherit (manifold) version src;
   pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "elalish";
-    repo = "manifold";
-    tag = "v${version}";
-    hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4=";
-  };
-
   dontUseCmakeConfigure = true;
 
   build-system = [
@@ -60,10 +54,12 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    description = "Geometry library for topological robustness";
-    homepage = "https://github.com/elalish/manifold";
-    changelog = "https://github.com/elalish/manifold/releases/tag/${src.tag}";
-    license = lib.licenses.asl20;
+    inherit (manifold.meta)
+      homepage
+      changelog
+      description
+      license
+      ;
     maintainers = with lib.maintainers; [
       pbsds
       pca006132

pkgs/tools/package-management/nix-index/default.nix

@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-index";
-  version = "0.1.8";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-index";
     rev = "v${version}";
-    hash = "sha256-r3Vg9ox953HdUp5Csxd2DYUyBe9u61fmA94PpcAZRqo=";
+    hash = "sha256-kOVmgST/D3zNOcGVu1ReuPuVrUx41iRK4rs59lqYX74=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-BKVxtd+gbCHzpnr5LZmKMUMEEZvsZMT0AdlfrLpMYpc=";
+  cargoHash = "sha256-0yrTPrxN/4TOALqpQ5GW7LXKisc8msx3DvEpg8uO+IQ=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

pkgs/top-level/python-packages.nix

@@ -8780,7 +8780,9 @@ self: super: with self; {
     callPackage ../development/python-modules/marionette-harness/manifestparser.nix
       { };
 
-  manifold3d = callPackage ../development/python-modules/manifold3d { };
+  manifold3d = callPackage ../development/python-modules/manifold3d {
+    inherit (pkgs.manifold.passthru) tbb;
+  };
 
   manim = callPackage ../development/python-modules/manim { };