From 813d065adb7d28076c1649a9761777dae5e38108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 11 Feb 2025 13:56:24 -0800 Subject: [PATCH 1/7] python313Packages.shiny: fix build --- .../python-modules/shiny/default.nix | 49 ++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/shiny/default.nix b/pkgs/development/python-modules/shiny/default.nix index 30aab3785a67..07d667fcc20d 100644 --- a/pkgs/development/python-modules/shiny/default.nix +++ b/pkgs/development/python-modules/shiny/default.nix @@ -3,21 +3,34 @@ buildPythonPackage, fetchFromGitHub, setuptools, + setuptools-scm, appdirs, asgiref, click, htmltools, + libsass, linkify-it-py, markdown-it-py, mdit-py-plugins, + narwhals, + orjson, + packaging, + prompt-toolkit, python-multipart, questionary, starlette, + typing-extensions, uvicorn, watchfiles, websockets, + anthropic, + cacert, + google-generativeai, + langchain-core, + ollama, + openai, pytestCheckHook, pytest-asyncio, pytest-playwright, @@ -25,6 +38,7 @@ pytest-timeout, pytest-rerunfailures, pandas, + polars, }: buildPythonPackage rec { @@ -39,7 +53,11 @@ buildPythonPackage rec { hash = "sha256-8bo2RHuIP7X7EaOlHd+2m4XU287owchAwiqPnpjKFjI="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; + dependencies = [ appdirs asgiref @@ -48,16 +66,35 @@ buildPythonPackage rec { linkify-it-py markdown-it-py mdit-py-plugins + narwhals + orjson + packaging + prompt-toolkit python-multipart questionary + setuptools starlette + typing-extensions uvicorn watchfiles websockets ]; + optional-dependencies = { + theme = [ + libsass + # FIXME package brand-yml + ]; + }; + pythonImportsCheck = [ "shiny" ]; + nativeCheckInputs = [ + anthropic + google-generativeai + langchain-core + ollama + openai pytestCheckHook pytest-asyncio pytest-playwright @@ -65,6 +102,16 @@ buildPythonPackage rec { pytest-timeout pytest-rerunfailures pandas + polars + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + disabledTests = [ + # ValueError: A tokenizer is required to impose `token_limits` on messages + "test_chat_message_trimming" + # https://github.com/posit-dev/py-shiny/pull/1791 + "test_as_ollama_message" ]; meta = { From aad0833e9cd12ad251b657cea850afea10198f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Feb 2025 08:17:59 -0800 Subject: [PATCH 2/7] libdeltachat: 1.155.3 -> 1.155.4 Diff: https://github.com/deltachat/deltachat-core-rust/compare/refs/tags/v1.155.3...v1.155.4 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.155.4/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index f7126433bd60..ba90468edaf9 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.155.3"; + version = "1.155.4"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-UFDQj3TWfWdHT20R16+NqZ2lBxp5r1G5bHwm2cAWpqY="; + hash = "sha256-cSk3GK6jlFkZ7XckB9PKIYHyK1Yj1qoJvWDrlbRmrhw="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-Y1/33KH5cRzunzcF+3QMSArDAb3iOR62pccHDAR3pEc="; + hash = "sha256-+j6ENk6wvA3t2I2C8J2tOYJUVSS6s1Wa/8sDwGqF9Ho="; }; nativeBuildInputs = [ From fb548d93594018e170a04acd435eaf4ab11777a3 Mon Sep 17 00:00:00 2001 From: Sokhibjon Orzikulov Date: Thu, 13 Feb 2025 05:23:07 +0500 Subject: [PATCH 3/7] maintainers: add @orzklv --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b5e4bc5296aa..03c8185550b6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17469,6 +17469,13 @@ githubId = 7820716; name = "orthros"; }; + orzklv = { + email = "sakhib@orzklv.uz"; + github = "orzklv"; + githubId = 54666588; + name = "Sokhibjon Orzikulov"; + keys = [ { fingerprint = "00D2 7BC6 8707 0683 FBB9 137C 3C35 D3AF 0DA1 D6A8"; } ]; + }; osbm = { email = "osmanfbayram@gmail.com"; github = "osbm"; From 35176a500b96310b7c51db8a796370bba2b88787 Mon Sep 17 00:00:00 2001 From: Savyasachee Jha Date: Thu, 13 Feb 2025 14:04:26 +0530 Subject: [PATCH 4/7] firefly-iii: 6.2.5 -> 6.2.6 --- pkgs/by-name/fi/firefly-iii/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index 44c3313fc93f..61a56b419583 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii"; - version = "6.2.5"; + version = "6.2.6"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; tag = "v${finalAttrs.version}"; - hash = "sha256-EHxvp5L2/erFgXC9YkecWdMLP4KnTDbXzduFnED/6f0="; + hash = "sha256-JMBnlWQ1dtib3vjF9US9RAegINF+NLqgPhJIkYjZm9A="; }; buildInputs = [ php84 ]; @@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-rhN5YMlzoGFZNYCNhG3OXFnGEPpGrbVAxCg4maF5/+c="; + vendorHash = "sha256-Fpv9bqUz60ZFij3wk5h6uRfDU9uJlb/OIdcDuMyFGdo="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-PAAauxUJDDinGa2yQJmunyLMbDO2a3Whi2N7mEXyJ1s="; + hash = "sha256-k17rcJxmttLMspKiX/j0Oeo5uvFcCqhHN7kxLsod1Xc="; }; composerRepository = php84.mkComposerRepository { From dad407f42f502609c8f2c792ec7846fea09e3a3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 15:22:49 +0000 Subject: [PATCH 5/7] python312Packages.docling-parse: 3.3.0 -> 3.3.1 --- pkgs/development/python-modules/docling-parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix index b112249bd77c..b3e195b70b3e 100644 --- a/pkgs/development/python-modules/docling-parse/default.nix +++ b/pkgs/development/python-modules/docling-parse/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "docling-parse"; - version = "3.3.0"; + version = "3.3.1"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "docling-parse"; tag = "v${version}"; - hash = "sha256-huJOH/5SQoJiJp1wmJV5n07KHDZseM9XI26bfPQAxrA="; + hash = "sha256-ogizwEllgwcWMWV3+9vvd95WKUJJ9N0dpca84t1zdBo="; }; dontUseCmakeConfigure = true; From 0aedf7e299aa543b9d86cd962f8bed790507ac9e Mon Sep 17 00:00:00 2001 From: Sokhibjon Orzikulov Date: Thu, 13 Feb 2025 05:24:04 +0500 Subject: [PATCH 6/7] e-imzo: init at 4.64 e-imzo: following @nayeko 's guidances e-imzo: following @ethancedwards8 's guidances e-imzo: following @RossComputerGuy 's guidances --- pkgs/by-name/e-/e-imzo/package.nix | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/by-name/e-/e-imzo/package.nix diff --git a/pkgs/by-name/e-/e-imzo/package.nix b/pkgs/by-name/e-/e-imzo/package.nix new file mode 100644 index 000000000000..f36338c2ebad --- /dev/null +++ b/pkgs/by-name/e-/e-imzo/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenvNoCC, + fetchurl, + jre8, + curl, + ccid, + pcsclite, + pcsc-tools, + writeShellScript, +}: +let + exec = writeShellScript "e-imzo" '' + cd "$(dirname "$0")/../lib/e-imzo" + + ${jre8}/bin/java -Dsun.security.smartcardio.library=${pcsclite.lib}/lib/libpcsclite.${stdenvNoCC.hostPlatform.extensions.sharedLibrary} -jar E-IMZO.jar + + exit 0 + ''; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "e-imzo"; + version = "4.64"; + + src = fetchurl { + url = "https://dls.yt.uz/E-IMZO-v${finalAttrs.version}.tar.gz"; + hash = "sha256-ej99PJrO9ufJ8+VlC/HpfvS/bGBtKqUWcsRyiZRlU4c="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/lib/e-imzo + install -m 755 -d $out/lib/e-imzo + install -m 644 ./E-IMZO.jar $out/lib/e-imzo/ + install -m 644 ./E-IMZO.pem $out/lib/e-imzo/ + install -m 644 ./truststore.jks $out/lib/e-imzo/ + cp -r ./lib $out/lib/e-imzo/ + + install -m 755 "${exec}" $out/bin/e-imzo + + runHook postInstall + ''; + + meta = { + description = "For uzbek state web identity proving & key signing"; + mainProgram = "e-imzo"; + platforms = with lib.platforms; linux ++ darwin; + homepage = "https://e-imzo.soliq.uz"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + maintainers = with lib.maintainers; [ orzklv ]; + }; +}) From 34f95a47f44e8110a204a475593437be4337d221 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 16:46:15 +0000 Subject: [PATCH 7/7] python312Packages.docling-core: 2.17.2 -> 2.18.1 --- pkgs/development/python-modules/docling-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index 0d44b51b7634..b5d80274de60 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "docling-core"; - version = "2.17.2"; + version = "2.18.1"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-JO6WI2juehO825QOO0FkD58OigEoLGOZAnPBOD4b1tI="; + hash = "sha256-ymFBR+nz/zq6EFgCbSQPfZDQ/Gk8QeJrkeVQ7KZ9bmo="; }; build-system = [