Merge staging-next into staging

pkgs/by-name/le/lemminx/package.nix

@@ -2,11 +2,22 @@
 , fetchFromGitHub
 , makeWrapper
 , jre_headless
+, jre_minimal
 , maven
 , writeScript
 , lemminx
 }:
 
+let
+  jre = jre_minimal.override {
+    modules = [
+      "java.base"
+      "java.logging"
+      "java.xml"
+    ];
+    jdk = jre_headless;
+  };
+in
 maven.buildMavenPackage rec {
   pname = "lemminx";
   version = "0.27.0";
@@ -67,7 +78,7 @@ maven.buildMavenPackage rec {
     install -Dm644 org.eclipse.lemminx/target/org.eclipse.lemminx-uber.jar \
       $out/share
 
-    makeWrapper ${jre_headless}/bin/java $out/bin/lemminx \
+    makeWrapper ${jre}/bin/java $out/bin/lemminx \
       --add-flags "-jar $out/share/org.eclipse.lemminx-uber.jar"
 
     runHook postInstall

pkgs/development/coq-modules/vscoq-language-server/default.nix

@@ -3,6 +3,7 @@
 
 let ocamlPackages = coq.ocamlPackages;
     defaultVersion = with lib.versions; lib.switch coq.coq-version [
+      { case = range "8.18" "8.20"; out = "2.1.4"; }
       { case = range "8.18" "8.19"; out = "2.1.2"; }
       { case = isEq "8.18"; out = "2.0.3+coq8.18"; }
     ] null;
@@ -12,6 +13,8 @@ let ocamlPackages = coq.ocamlPackages;
       release."2.0.3+coq8.18".rev = "v2.0.3+coq8.18";
       release."2.1.2".rev = "v2.1.2";
       release."2.1.2".sha256 = "sha256-GloY68fLmIv3oiEGNWwmgKv1CMAReBuXzMTUsKOs328=";
+      release."2.1.4".rev = "v2.1.4";
+      release."2.1.4".sha256 = "sha256-Vwve1sCg5OsGmhDLlOyGCwP6A8g618IzD79vLPw/JtQ=";
       inherit location; });
     fetched = fetch (if version != null then version else defaultVersion);
 in

pkgs/development/python-modules/html-sanitizer/default.nix

@@ -4,6 +4,7 @@
   fetchFromGitHub,
   hatchling,
   lxml,
+  lxml-html-clean,
   beautifulsoup4,
   pytestCheckHook,
   pythonOlder,
@@ -27,6 +28,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     lxml
+    lxml-html-clean
     beautifulsoup4
   ];
 

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

@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+, hatch-fancy-pypi-readme
+, hatch-vcs
+, hatchling
+
+, tenacity
+, typing-extensions
+
+, anyio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "stamina";
+  version = "24.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "hynek";
+    repo = "stamina";
+    rev = version;
+    hash = "sha256-gn8kbLLj+wMPtIwnsOdKDEhBsLApkl3K6mf/bQT3qT8=";
+  };
+
+  nativeBuildInputs = [
+    hatch-fancy-pypi-readme
+    hatch-vcs
+    hatchling
+  ];
+
+  propagatedBuildInputs = [
+    tenacity
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [ "stamina" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    anyio
+  ];
+
+  meta = with lib; {
+    description = "Production-grade retries for Python";
+    homepage = "https://github.com/hynek/stamina";
+    changelog = "https://github.com/hynek/stamina/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mbalatsko ];
+  };
+}

pkgs/servers/clickhouse/default.nix

@@ -29,7 +29,7 @@ let
     else llvmPackages.stdenv).mkDerivation;
 in mkDerivation rec {
   pname = "clickhouse";
-  version = "24.3.2.23";
+  version = "24.3.5.46";
 
   src = fetchFromGitHub rec {
     owner = "ClickHouse";
@@ -37,7 +37,7 @@ in mkDerivation rec {
     rev = "v${version}-lts";
     fetchSubmodules = true;
     name = "clickhouse-${rev}.tar.gz";
-    hash = "sha256-2OdlePEFJu4k2ysSPqa3kwsPgVRIlaU1B80LmU5w0yQ=";
+    hash = "sha256-YauScK9rIR9XgUbcxSq0XBH3nRAnXL/dDr/5oWCtvGw=";
     postFetch = ''
       # delete files that make the source too big
       rm -rf $out/contrib/llvm-project/llvm/test

pkgs/tools/misc/broot/default.nix

@@ -19,16 +19,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.39.1";
+  version = "1.40.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-cKCIKyXYtDfW3UTTr6QL7Gh/bfb9aZAFRptaP2zdcxc=";
+    hash = "sha256-3KStqeT/SZa7KGFEqwGEvchMB6MSME5jPfGSPQ+xZpw=";
   };
 
-  cargoHash = "sha256-JsMgToSzvf3JcVLz5a6kygtxhrU8YSYrHrwbMRhQ1uw=";
+  cargoHash = "sha256-E1MNlmJnkV+VKHMbuTkuItIi7bG0TrmfD/8P47c+Qhc=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/top-level/python-packages.nix

@@ -14781,6 +14781,8 @@ self: super: with self; {
 
   stack-data = callPackage ../development/python-modules/stack-data { };
 
+  stamina = callPackage ../development/python-modules/stamina { };
+
   stanio = callPackage ../development/python-modules/stanio { };
 
   stanza = callPackage ../development/python-modules/stanza { };