Merge master into staging-next

maintainers/maintainer-list.nix

@@ -17505,6 +17505,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";

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 ];
+  };
+})

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 {

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 = [

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 = [

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;

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 = {