Merge staging-next into staging

Changed files
+40 -52
pkgs
by-name
la
lasuite-meet
lasuite-meet-frontend
ma
manifold
development
python-modules
blosc2
manifold3d
tools
package-management
nix-index
top-level
+3 -3
pkgs/by-name/la/lasuite-meet-frontend/package.nix
···
buildNpmPackage rec {
pname = "lasuite-meet-frontend";
-
version = "0.1.28";
src = fetchFromGitHub {
owner = "suitenumerique";
repo = "meet";
tag = "v${version}";
-
hash = "sha256-zB27doGkWch3e1Lc0Q3TurQeplV7vOdzJ+G+MFZI3Og=";
};
sourceRoot = "source/src/frontend";
···
npmDeps = fetchNpmDeps {
inherit version src;
sourceRoot = "source/src/frontend";
-
hash = "sha256-ajN3mDIUn8uX+xc3zZmzsFWY8Y5ss9gVeV0s5kJV3fs=";
};
buildPhase = ''
···
buildNpmPackage rec {
pname = "lasuite-meet-frontend";
+
version = "0.1.29";
src = fetchFromGitHub {
owner = "suitenumerique";
repo = "meet";
tag = "v${version}";
+
hash = "sha256-dvAPKNsj8ZnH0eLofbkE09hXL1g8YdViX8sQ/9+4L7k=";
};
sourceRoot = "source/src/frontend";
···
npmDeps = fetchNpmDeps {
inherit version src;
sourceRoot = "source/src/frontend";
+
hash = "sha256-ZEPzSHcp3HZ8mSoFZDUKlTi+gJ2syauJPtSFEfJnJtg=";
};
buildPhase = ''
+2 -4
pkgs/by-name/la/lasuite-meet/package.nix
···
python.pkgs.buildPythonApplication rec {
pname = "lasuite-meet";
-
version = "0.1.28";
pyproject = true;
src = fetchFromGitHub {
owner = "suitenumerique";
repo = "meet";
tag = "v${version}";
-
hash = "sha256-zB27doGkWch3e1Lc0Q3TurQeplV7vOdzJ+G+MFZI3Og=";
};
sourceRoot = "source/src/backend";
···
patches = [
# Support configuration throught environment variables for SECURE_*
./secure_settings.patch
-
# Add PKCE option
-
./pkce.patch
];
build-system = with python.pkgs; [ setuptools ];
···
python.pkgs.buildPythonApplication rec {
pname = "lasuite-meet";
+
version = "0.1.29";
pyproject = true;
src = fetchFromGitHub {
owner = "suitenumerique";
repo = "meet";
tag = "v${version}";
+
hash = "sha256-dvAPKNsj8ZnH0eLofbkE09hXL1g8YdViX8sQ/9+4L7k=";
};
sourceRoot = "source/src/backend";
···
patches = [
# Support configuration throught environment variables for SECURE_*
./secure_settings.patch
];
build-system = with python.pkgs; [ setuptools ];
-20
pkgs/by-name/la/lasuite-meet/pkce.patch
···
-
--- 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
-
)
···
+19 -7
pkgs/by-name/ma/manifold/package.nix
···
gtest,
glm,
tbb_2021,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "manifold";
-
version = "3.1.1";
src = fetchFromGitHub {
owner = "elalish";
repo = "manifold";
-
rev = "v${finalAttrs.version}";
-
hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4=";
};
nativeBuildInputs = [ cmake ];
···
test/manifold_test --gtest_filter=-CrossSection.RoundOffset
'';
meta = {
description = "Geometry library for topological robustness";
homepage = "https://github.com/elalish/manifold";
license = lib.licenses.asl20;
-
maintainers = with lib.maintainers; [
-
hzeller
-
pca006132
-
];
platforms = lib.platforms.unix;
};
})
···
gtest,
glm,
tbb_2021,
+
python3Packages,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "manifold";
+
version = "3.2.0";
src = fetchFromGitHub {
owner = "elalish";
repo = "manifold";
+
tag = "v${finalAttrs.version}";
+
hash = "sha256-tcEjgOU90tYnlZDedHJvnqWFDDtXGx64G80wnWz4lBI=";
};
nativeBuildInputs = [ cmake ];
···
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
+
]
+
++ python3Packages.manifold3d.meta.maintainers;
platforms = lib.platforms.unix;
};
})
+2 -2
pkgs/development/python-modules/blosc2/default.nix
···
buildPythonPackage rec {
pname = "blosc2";
-
version = "3.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Blosc";
repo = "python-blosc2";
tag = "v${version}";
-
hash = "sha256-Kimcz4L7Ko4cRj9IaYuLXzmU0+3ERQXOmPXr0E9mOyA=";
};
nativeBuildInputs = [
···
buildPythonPackage rec {
pname = "blosc2";
+
version = "3.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Blosc";
repo = "python-blosc2";
tag = "v${version}";
+
hash = "sha256-ToPlN8OMgH6BCp0mPanfH0SUJWnrPDxVncF6pBpRhRI=";
};
nativeBuildInputs = [
+8 -12
pkgs/development/python-modules/manifold3d/default.nix
···
python,
fetchFromGitHub,
scikit-build-core,
cmake,
ninja,
nanobind,
···
buildPythonPackage rec {
pname = "manifold3d";
-
version = "3.1.1";
pyproject = true;
-
-
src = fetchFromGitHub {
-
owner = "elalish";
-
repo = "manifold";
-
tag = "v${version}";
-
hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4=";
-
};
dontUseCmakeConfigure = true;
···
];
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;
maintainers = with lib.maintainers; [
pbsds
pca006132
···
python,
fetchFromGitHub,
scikit-build-core,
+
manifold,
cmake,
ninja,
nanobind,
···
buildPythonPackage rec {
pname = "manifold3d";
+
inherit (manifold) version src;
pyproject = true;
dontUseCmakeConfigure = true;
···
];
meta = {
+
inherit (manifold.meta)
+
homepage
+
changelog
+
description
+
license
+
;
maintainers = with lib.maintainers; [
pbsds
pca006132
+3 -3
pkgs/tools/package-management/nix-index/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "nix-index";
-
version = "0.1.8";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-index";
rev = "v${version}";
-
hash = "sha256-r3Vg9ox953HdUp5Csxd2DYUyBe9u61fmA94PpcAZRqo=";
};
useFetchCargoVendor = true;
-
cargoHash = "sha256-BKVxtd+gbCHzpnr5LZmKMUMEEZvsZMT0AdlfrLpMYpc=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
···
rustPlatform.buildRustPackage rec {
pname = "nix-index";
+
version = "0.1.9";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-index";
rev = "v${version}";
+
hash = "sha256-kOVmgST/D3zNOcGVu1ReuPuVrUx41iRK4rs59lqYX74=";
};
useFetchCargoVendor = true;
+
cargoHash = "sha256-0yrTPrxN/4TOALqpQ5GW7LXKisc8msx3DvEpg8uO+IQ=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
+3 -1
pkgs/top-level/python-packages.nix
···
callPackage ../development/python-modules/marionette-harness/manifestparser.nix
{ };
-
manifold3d = callPackage ../development/python-modules/manifold3d { };
manim = callPackage ../development/python-modules/manim { };
···
callPackage ../development/python-modules/marionette-harness/manifestparser.nix
{ };
+
manifold3d = callPackage ../development/python-modules/manifold3d {
+
inherit (pkgs.manifold.passthru) tbb;
+
};
manim = callPackage ../development/python-modules/manim { };