From da0b044b928a1f30da5dc8dfa7011f2dc1f90a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Jul 2024 00:17:39 +0200 Subject: [PATCH 1/6] lemminx: use minimal jre --- pkgs/by-name/le/lemminx/package.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix index e4c17d6e2daf..cb7a089947b9 100644 --- a/pkgs/by-name/le/lemminx/package.nix +++ b/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 From 909fb88da418d5bf1fb28525790788b016b740b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Jul 2024 16:36:15 +0200 Subject: [PATCH 2/6] python312Packages.html-sanitizer: fix build by adding lxml-html-clean dependency --- pkgs/development/python-modules/html-sanitizer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index 5db9e10b2679..71b174c87735 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/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 ]; From cb5e3ec69dc49dc537956d29be4cb52893d78561 Mon Sep 17 00:00:00 2001 From: Maksym Balatsko Date: Tue, 16 Jul 2024 11:30:53 -0700 Subject: [PATCH 3/6] clickhouse: 24.3.2.23-lts -> 24.3.5.46-lts --- pkgs/servers/clickhouse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index db112aad6038..a236147bcc0f 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/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 From 8e8b3a0f18d3106170a69019e68c1e0aabd1c3d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 05:04:42 +0000 Subject: [PATCH 4/6] broot: 1.39.1 -> 1.40.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 10c87dde327b..76626d88d2b0 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/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 From 0a97d5315dcbca48e25e1c7011d241670b79136d Mon Sep 17 00:00:00 2001 From: Maksym Balatsko Date: Wed, 17 Jul 2024 01:44:58 -0700 Subject: [PATCH 5/6] python3Packages.stamina: init at 24.2.0 --- .../python-modules/stamina/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/stamina/default.nix diff --git a/pkgs/development/python-modules/stamina/default.nix b/pkgs/development/python-modules/stamina/default.nix new file mode 100644 index 000000000000..eb80b58254ad --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9ae5de95e7d..9dd3feb96ed2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14779,6 +14779,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 { }; From 8b7d5e1d6df034339b657eb688708c803e80afa7 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Tue, 16 Jul 2024 22:27:05 +0200 Subject: [PATCH 6/6] coqPackages.vscoq-language-server: 2.1.2 -> 2.1.4 --- pkgs/development/coq-modules/vscoq-language-server/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index 565f83da06d6..fd3a81f08c58 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/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