diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index 3bbf2067f6ce..79e5145319f7 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "RooVeterinaryInc"; name = "roo-cline"; - version = "3.25.16"; - hash = "sha256-ybyv3bbMrCSHJN6oH82LpJQFZLJ0QWCsBV7F6Qz/DEI="; + version = "3.27.0"; + hash = "sha256-Lkn0yoe/Oy3bbhIWf+qj0pNYTQHDiFfNRSFHSGAqPVc="; }; passthru.updateScript = vscode-extension-update-script { }; diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 22a805042ff9..c56113252d9d 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -95,7 +95,10 @@ let vulkanSupport = !stdenv.hostPlatform.isDarwin; python3 = python3Packages.python; - pyPkgsOpenusd = python3Packages.openusd.override { withOsl = false; }; + pyPkgsOpenusd = python3Packages.openusd.override (old: { + opensubdiv = old.opensubdiv.override { inherit cudaSupport; }; + withOsl = false; + }); libdecor' = libdecor.overrideAttrs (old: { # Blender uses private APIs, need to patch to expose them diff --git a/pkgs/by-name/fi/fiddler-everywhere/package.nix b/pkgs/by-name/fi/fiddler-everywhere/package.nix index ec334cb05ed2..bdfac5e09e92 100644 --- a/pkgs/by-name/fi/fiddler-everywhere/package.nix +++ b/pkgs/by-name/fi/fiddler-everywhere/package.nix @@ -8,11 +8,11 @@ let pname = "fiddler-everywhere"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage"; - hash = "sha256-Sv8xlyAas3NCRY5ZL1fOXuAG8PjP3ovm7Q7wWRq1jmU="; + hash = "sha256-M1SMWtIdgYpC+cwrN8Z6T+7tj4y07hho3akuy9j/l98="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix index 2a54671b5f2f..ee3ad8d23303 100644 --- a/pkgs/by-name/fl/flare-signal/package.nix +++ b/pkgs/by-name/fl/flare-signal/package.nix @@ -1,7 +1,9 @@ { lib, stdenv, + fetchFromGitHub, fetchFromGitLab, + runCommand, cargo, meson, ninja, @@ -14,31 +16,60 @@ gtksourceview5, rustPlatform, rustc, - appstream-glib, + yq, + appstream, blueprint-compiler, desktop-file-utils, wrapGAppsHook4, }: +let + presage = fetchFromGitHub { + owner = "whisperfish"; + repo = "presage"; + # match with commit from Cargo.toml + rev = "123c1f926e359c21b34d099279ee8a92462ce96d"; + hash = "sha256-qKpPbK5ToFnWucujDlV8qxeT+XrRGYYnm7jp8UOXgZ0="; + }; +in + stdenv.mkDerivation (finalAttrs: { pname = "flare"; - version = "0.16.3"; + # NOTE: also update presage commit + version = "0.17.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = "flare"; tag = finalAttrs.version; - hash = "sha256-uUEeARhKhI6SvzZHLAvDgBjOxw82Yp88c6U0cHeRKoc="; + hash = "sha256-Zdzs9ZLvrI5rGhC1K0SLPsv/xMtJEu5vFRnH3+z/keA="; }; - cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) pname version src; - hash = "sha256-bQiQrl+yqKDGFXN7VfS7VEWKAcT1LtoRZjWq/BwHgKw="; - }; + cargoDeps = + let + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-XBUpFQy68qwrKgsKi5TeoakalNLTqolv6z5YfyiaEZI="; + }; + in + # Replace with simpler solution: + # https://github.com/NixOS/nixpkgs/pull/432651#discussion_r2312796706 + # depending on sqlx release and update in flare-signal + runCommand "${finalAttrs.pname}-${finalAttrs.version}-vendor-patched" { inherit cargoDeps; } + # https://github.com/flathub/de.schmidhuberj.Flare/commit/b1352087beaf299569c798bc69e31660712853db + # bash + '' + mkdir $out + find $cargoDeps -maxdepth 1 -exec sh -c "ln -s {} $out/\$(basename {})" \; + rm $out/presage-store-sqlite-* + cp -r $cargoDeps/presage-store-sqlite-* $out + chmod +w $out/presage-store-sqlite-* + ln -s ${presage}/.sqlx $out/presage-store-sqlite-* + ''; nativeBuildInputs = [ - appstream-glib # for appstream-util + appstream # for appstream-util blueprint-compiler desktop-file-utils # for update-desktop-database meson @@ -48,8 +79,25 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook cargo rustc + # yq contains tomlq + yq ]; + postPatch = '' + cargoPresageRev="$(tomlq -r '.dependencies.presage.rev' Cargo.toml)" + actualPresageRev="${presage.rev}" + if [ "$cargoPresageRev" != "$actualPresageRev" ]; then + echo "" + echo "fetchFromGitHub presage revision does not match revision specified in Cargo.toml" + echo "consider replacing fetchFromGitHub's revision with revision specified in Cargo.toml" + echo "" + echo " fetchFromGitHub = ''${actualPresageRev}" + echo " Cargo.toml = ''${cargoPresageRev}" + echo "" + exit 1 + fi + ''; + buildInputs = [ gtksourceview5 libadwaita diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 00378e4af71d..c1c0adee1937 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-Qp8JHHLzuqVEf+k4w3jncbjN3s4IETAIHpcr0fc6wmw="; + hash = "sha256-hN7Dj31t1Kh9m4Ou/yBALqEKVlKB0++Qu1H5UEiIUzs="; }; - cargoHash = "sha256-uYGKRRcGcZSLJVV0/PwWlrnmdVezbJzU3+p6Mq8VFz8="; + cargoHash = "sha256-gMSEaXoHK6hrZ2zrHOZkRgve66Zg1gshB3KqUjfxtnI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 875c28575f46..03d9bb5ba14f 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "lazygit"; - version = "0.54.2"; + version = "0.55.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazygit"; tag = "v${version}"; - hash = "sha256-LfSTbnSyRT1vdrEOs9Ur+0cGAz/pUUEVm8HhfE9VaYo="; + hash = "sha256-gx9l7MHWQGnLsD+L+SM+KzBgU8RLtpZG+66pPyerZW4="; }; vendorHash = null; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index d7f236d48efc..d3c7be446db8 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,10 +7,10 @@ let pname = "lmstudio"; - version_aarch64-darwin = "0.3.24-6"; - hash_aarch64-darwin = "sha256-1SNiyxpjEaxzlIcotgNiCW3LLIqRI55jTKzj2T9PtNs="; - version_x86_64-linux = "0.3.24-6"; - hash_x86_64-linux = "sha256-TjfrNPr8xRUOmRRx2rLJEh3D/kV3OOfqgRTVstOd6AE="; + version_aarch64-darwin = "0.3.25-2"; + hash_aarch64-darwin = "sha256-tbV7b59+98hf0eqkciGz0Zihx8I0+I+Y7gg+sg5fMqc="; + version_x86_64-linux = "0.3.25-2"; + hash_x86_64-linux = "sha256-5KYZpQt0Y7oRIkXZ5Nyv2FkCl0T+KHsoC1zL4TjbcN4="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; diff --git a/pkgs/by-name/pe/perfect_dark/package.nix b/pkgs/by-name/pe/perfect_dark/package.nix index e393d6083504..3d2976c808e2 100644 --- a/pkgs/by-name/pe/perfect_dark/package.nix +++ b/pkgs/by-name/pe/perfect_dark/package.nix @@ -2,12 +2,13 @@ lib, stdenv, fetchFromGitHub, - SDL2, + sdl2-compat, cmake, libGL, pkg-config, python3, zlib, + unstableGitUpdater, romID ? "ntsc-final", }: let @@ -27,14 +28,20 @@ stdenv.mkDerivation (finalAttrs: { owner = "fgsfdsfgs"; repo = "perfect_dark"; rev = "bb4fcffeb5dc382fce4c609897a2e82590d7d709"; - hash = "sha256-XLmAjwEzz4fPpHuk3IBmhhDfiuudwMTnYgVe6Wcfdsg="; + hash = "sha256-naWE+oWgvrd4CSoBm6W4em60baTWn4uSnKbWh8WKPDM="; + + postFetch = '' + pushd $out + rm tools/gzip + rm -r tools/mkrom + popd + ''; }; enableParallelBuilding = true; # Fails to build if not set: hardeningDisable = [ "format" ]; - hardeningEnable = [ "pie" ]; cmakeFlags = [ (lib.cmakeFeature "ROMID" romID) @@ -47,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - SDL2 + sdl2-compat libGL zlib ]; @@ -72,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { ''; preConfigure = '' - patchShebangs --build . + patchShebangs --build tools/assetmgr ''; installPhase = '' @@ -91,6 +98,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + }; + meta = { description = "Modern cross-platform port of Perfect Dark"; longDescription = '' @@ -114,8 +125,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ # perfect_dark, khrplatform.h, port/fast3d mit - # Vendored source code and binaries of 'gzip'. - gpl3Plus # Derivative work of "Perfect Dark" © 2000 Rare Ltd. unfree ]; diff --git a/pkgs/by-name/qu/qucs-s/package.nix b/pkgs/by-name/qu/qucs-s/package.nix index 8445b2081fe2..7196354b1176 100644 --- a/pkgs/by-name/qu/qucs-s/package.nix +++ b/pkgs/by-name/qu/qucs-s/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qucs-s"; - version = "25.1.2"; + version = "25.2.0"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucs_s"; tag = finalAttrs.version; - hash = "sha256-+xPhHmuogNuolmMFcUAP2hMfJh1D+O4DrPkcuR6+mR8="; + hash = "sha256-U5XLjWKOXNjgYtlccNsPT1nUnEGi3NhkJ36jan2OSAw="; }; postPatch = '' diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index f3b71d78a597..8688e9f2f2f0 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "25.2.2"; + version = "25.2.3"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-aISbPpSgqXHmGt5H1t5AcWos+iCKgAOAl+BExYFrdAs="; + sha256 = "sha256-gVz4ek/hj3/Djiv9ckcs1D8hBHlgydH4s32r/qqHQGw="; }; in buildGoModule rec { @@ -20,7 +20,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-izVae+BsyTT0QA/Fx7e3oxtyGisM41znDOZJchLNor8="; + vendorHash = "sha256-a3dEfu7bpjanOOWg3EMXpAOllrsEAFQhV86OMe0lP2o="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix index c01ee22ee0d9..d34e314a5412 100644 --- a/pkgs/by-name/ri/rime-wanxiang/package.nix +++ b/pkgs/by-name/ri/rime-wanxiang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-wanxiang"; - version = "11.3.1"; + version = "12.0.2"; src = fetchFromGitHub { owner = "amzxyz"; repo = "rime_wanxiang"; tag = "v" + finalAttrs.version; - hash = "sha256-tCQ2mPOw7meA7ex7e4BgVco86MNNtxsSC9L6oaVebo4="; + hash = "sha256-tWpcoO8gEuais/4s8S3zrxjmop6NHZOQwcIo6V4OuCs="; }; installPhase = '' diff --git a/pkgs/by-name/sp/sparkle/package.nix b/pkgs/by-name/sp/sparkle/package.nix index 6476c9022b39..991b035763a6 100644 --- a/pkgs/by-name/sp/sparkle/package.nix +++ b/pkgs/by-name/sp/sparkle/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sparkle"; - version = "1.6.10"; + version = "1.6.11"; src = let @@ -40,8 +40,8 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://github.com/xishang0128/sparkle/releases/download/${finalAttrs.version}/sparkle-linux-${finalAttrs.version}-${arch}.deb"; hash = selectSystem { - x86_64-linux = "sha256-07hgkZi3WVBz0pLo871tfzV5uUlAx8hizaDshpo5eOg="; - aarch64-linux = "sha256-N/oEer06zhn23/p6jQaZ8pCkE9F8dzIHL5n7kvHP8X0="; + x86_64-linux = "sha256-AB+W0JC3NyT8oYHNShr6TtiUk8XBq+QW5yxhlSSL6DE="; + aarch64-linux = "sha256-uFVzO+ce3+QvZZT0xnppixLmWuy19fGP28+0vVBnZq0="; }; }; diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix index c1556a9d2105..7bf292ce1f21 100644 --- a/pkgs/by-name/ta/taze/package.nix +++ b/pkgs/by-name/ta/taze/package.nix @@ -13,19 +13,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taze"; - version = "19.3.0"; + version = "19.5.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "taze"; tag = "v${finalAttrs.version}"; - hash = "sha256-sgQHXaa8mPpmFgYfAVksjokuCvuYnT9blJRWG/tXdA8="; + hash = "sha256-TJ/gyqGTaaRYgx9EMFhFmzWAFrNRnESk6AvBZtQ+24k="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-Wb19IIh9SKc0/Uvh3Tq0SlxU5Yd5ivn493uiPUtXKbk="; + hash = "sha256-kTXW/KYI1ao7zIyIphMPxjfuo7RrEnmXXEK7yTRWO+U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/ventoy/package.nix b/pkgs/by-name/ve/ventoy/package.nix index 78c325ca66ed..f54f24e64c63 100644 --- a/pkgs/by-name/ve/ventoy/package.nix +++ b/pkgs/by-name/ve/ventoy/package.nix @@ -59,11 +59,11 @@ stdenv.mkDerivation (finalAttrs: { "ventoy" + optionalString (defaultGuiType == "gtk3") "-gtk3" + optionalString (defaultGuiType == "qt5") "-qt5"; - version = "1.1.05"; + version = "1.1.07"; src = fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${finalAttrs.version}/ventoy-${finalAttrs.version}-linux.tar.gz"; - hash = "sha256-M3nJmJA1nc/1Wqt/ezKG+HyYjR2i/WFuap4wX7Ch3p4="; + hash = "sha256-T/q85GiwPWNXzl9FlOIJcU0VCdBl2hApOAltrWZUw24="; }; patches = [ diff --git a/pkgs/by-name/wa/wapiti/package.nix b/pkgs/by-name/wa/wapiti/package.nix index 086df21bd12a..ad536e558efc 100644 --- a/pkgs/by-name/wa/wapiti/package.nix +++ b/pkgs/by-name/wa/wapiti/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, python3Packages, - fetchpatch, versionCheckHook, writableTmpDirAsHomeHook, nix-update-script, @@ -11,26 +10,16 @@ python3Packages.buildPythonApplication rec { pname = "wapiti"; - version = "3.2.4"; + version = "3.2.5"; pyproject = true; src = fetchFromGitHub { owner = "wapiti-scanner"; repo = "wapiti"; tag = version; - hash = "sha256-97RYJKCk3oY715mgkFNstrrhWc1Q7jZqktqt7l8uzGs="; + hash = "sha256-Sof7ZaCeIJ6Hsut0uK9yPcunXArexpzIbSbksZpHqVU="; }; - patches = [ - # Fixes: - # TypeError: AsyncClient.__init__() got an unexpected keyword argument 'proxies' - (fetchpatch { - name = "fix-wappalyzer-warnings"; - url = "https://github.com/wapiti-scanner/wapiti/commit/77fe140f8ad4d2fb266f1b49285479f6af25d6b7.patch"; - hash = "sha256-Htkpr+67V0bp4u8HbMP+yTZ4rlIWDadLZxLDSruDbZY="; - }) - ]; - pythonRelaxDeps = true; build-system = with python3Packages; [ setuptools ]; @@ -147,6 +136,10 @@ python3Packages.buildPythonApplication rec { "test_persister_upload" # Requires creating a socket to an external URL "test_attack_unifi" + # AssertionError + "test_comment_in_noscript_context" + "test_noscript_context" + "test_title_context" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/fast-query-parsers/default.nix b/pkgs/development/python-modules/fast-query-parsers/default.nix new file mode 100644 index 000000000000..971a38394137 --- /dev/null +++ b/pkgs/development/python-modules/fast-query-parsers/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + cargo, + fetchFromGitHub, + poetry-core, + pytestCheckHook, + rustc, + rustPlatform, +}: + +buildPythonPackage rec { + pname = "fast-query-parsers"; + version = "1.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "litestar-org"; + repo = "fast-query-parsers"; + tag = "v${version}"; + hash = "sha256-08xL0sOmUzsZYtM1thYUV93bj9ERr3LaVrW46zBrzeE="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-kp5bCmHYMS/e8eM6HrRw0JlVaxwPscFGDLQ0PX4ZIC4="; + }; + + build-system = [ + cargo + poetry-core + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "fast_query_parsers" ]; + + meta = { + description = "Ultra-fast query string and url-encoded form-data parsers"; + homepage = "https://github.com/litestar-org/fast-query-parsers"; + changelog = "https://github.com/litestar-org/fast-query-parsers/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/litestar/default.nix b/pkgs/development/python-modules/litestar/default.nix index ed087bbc005d..f8c95329e9b5 100644 --- a/pkgs/development/python-modules/litestar/default.nix +++ b/pkgs/development/python-modules/litestar/default.nix @@ -7,37 +7,55 @@ hatchling, # dependencies + annotated-types, anyio, asyncpg, + attrs, + brotli, click, cryptography, fsspec, httpx, jinja2, + jsbeautifier, litestar-htmx, mako, + minijinja, + fast-query-parsers, msgspec, multidict, + multipart, picologging, polyfactory, + piccolo, + prometheus-client, psutil, + opentelemetry-instrumentation-asgi, psycopg, + pydantic-extra-types, + pydantic, + email-validator, + pyjwt, pyyaml, redis, - rich, rich-click, + rich, + structlog, time-machine, - trio, typing-extensions, + uvicorn, + valkey, # tests - pytestCheckHook, - pytest-lazy-fixtures, - pytest-xdist, - pytest-mock, + httpx-sse, pytest-asyncio, - pytest-timeout, + pytest-lazy-fixtures, + pytest-mock, pytest-rerunfailures, + pytest-timeout, + pytest-xdist, + pytestCheckHook, + trio, versionCheckHook, }: @@ -53,61 +71,100 @@ buildPythonPackage rec { hash = "sha256-67O/NxPBBLa1QfH1o9laOAQEin8jRA8SkcV7QEzCjI0="; }; - build-system = [ - hatchling - ]; + build-system = [ hatchling ]; dependencies = [ anyio asyncpg click - cryptography + fast-query-parsers fsspec httpx - jinja2 litestar-htmx - mako msgspec multidict - picologging + multipart polyfactory psutil - psycopg pyyaml - redis rich rich-click - time-machine - trio typing-extensions ]; + optional-dependencies = { + annotated-types = [ annotated-types ]; + attrs = [ attrs ]; + brotli = [ brotli ]; + cli = [ + jsbeautifier + uvicorn + ]; + cryptography = [ cryptography ]; + htmx = [ litestar-htmx ]; + jinja = [ jinja2 ]; + jwt = [ + cryptography + pyjwt + ]; + mako = [ mako ]; + minijinja = [ minijinja ]; + opentelemetry = [ opentelemetry-instrumentation-asgi ]; + piccolo = [ piccolo ]; + picologging = [ picologging ]; + polyfactory = [ polyfactory ]; + prometheus = [ prometheus-client ]; + pydantic = [ + pydantic + email-validator + pydantic-extra-types + ]; + redis = [ redis ] ++ redis.optional-dependencies.hiredis; + # sqlalchemy = [ advanced-alchemy ]; + structlog = [ structlog ]; + valkey = [ valkey ] ++ valkey.optional-dependencies.libvalkey; + yaml = [ pyyaml ]; + }; + nativeCheckInputs = [ - pytestCheckHook - pytest-lazy-fixtures - pytest-xdist - pytest-mock + httpx-sse pytest-asyncio - pytest-timeout + pytest-lazy-fixtures + pytest-mock pytest-rerunfailures + pytest-timeout + pytest-xdist + pytestCheckHook + time-machine + trio versionCheckHook ]; + versionCheckProgramArg = "version"; __darwinAllowLocalNetworking = true; + preCheck = '' + export PATH=$out/bin:$PATH + ''; + enabledTestPaths = [ - # Follow github CI + # Follow GitHub CI "docs/examples/" ]; + disabledTests = [ + # StartupError + "test_subprocess_async_client" + ]; + meta = { - homepage = "https://litestar.dev/"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ bot-wxt1221 ]; - changelog = "https://github.com/litestar-org/litestar/releases/tag/${src.tag}"; description = "Production-ready, Light, Flexible and Extensible ASGI API framework"; + homepage = "https://litestar.dev/"; + changelog = "https://github.com/litestar-org/litestar/releases/tag/${src.tag}"; license = lib.licenses.mit; mainProgram = "litestar"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/piccolo/default.nix b/pkgs/development/python-modules/piccolo/default.nix new file mode 100644 index 000000000000..94b0802bb192 --- /dev/null +++ b/pkgs/development/python-modules/piccolo/default.nix @@ -0,0 +1,106 @@ +{ + lib, + aiosqlite, + asyncpg, + black, + buildPythonPackage, + colorama, + email-validator, + fetchFromGitHub, + httpx, + inflection, + jinja2, + orjson, + postgresql, + postgresqlTestHook, + pydantic, + pytestCheckHook, + python-dateutil, + setuptools, + targ, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "piccolo"; + version = "1.28.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "piccolo-orm"; + repo = "piccolo"; + tag = version; + hash = "sha256-5VzcMLPf12E+IEOaTUrxHl0W9r7NPUY542qOanrjG4w="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + black + colorama + inflection + jinja2 + pydantic + targ + typing-extensions + ]; + + optional-dependencies = { + orjson = [ orjson ]; + postgres = [ asyncpg ]; + sqlite = [ aiosqlite ]; + }; + + nativeCheckInputs = [ + email-validator + httpx + postgresql + postgresqlTestHook + pytestCheckHook + python-dateutil + ] + ++ lib.flatten (builtins.attrValues optional-dependencies); + + pythonImportsCheck = [ "piccolo" ]; + + disabledTests = [ + # Timing issues + "TestMigrations" + "TestForwardsBackwards" + "TestMigrationManager" + "TestTableStorage" + "TestGraph" + "TestDumpLoad" + "test_add_column" + "test_altering_table_in_schema" + "test_auto_all" + "test_auto" + "test_clean" + "test_column_name_correct" + "test_create_table" + "test_get_table_classes" + "test_integer_to_bigint" + "test_integer_to_varchar" + "test_lazy_reference_to_app" + "test_lazy_table_reference" + "test_new" + "test_on_conflict" + "test_psql" + "test_run" + "test_set_digits" + "test_set_length" + "test_set_null" + "test_shared" + "test_show_all" + "test_warn_if_are_conflicting_objects" + "test_warn_if_is_conflicting" + ]; + + meta = { + description = "ORM and query builder which supports asyncio"; + homepage = "https://github.com/piccolo-orm/piccolo"; + changelog = "https://github.com/piccolo-orm/piccolo/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/targ/default.nix b/pkgs/development/python-modules/targ/default.nix new file mode 100644 index 000000000000..1e56fa49d012 --- /dev/null +++ b/pkgs/development/python-modules/targ/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + colorama, + docstring-parser, + fetchFromGitHub, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "targ"; + version = "0.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "piccolo-orm"; + repo = "targ"; + tag = version; + hash = "sha256-myQe8Gpnx5CqKnYNK0PZ2P7o+eVWKLInjyTaZd30WxU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + colorama + docstring-parser + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "targ" ]; + + meta = { + description = "Python CLI using type hints and docstrings"; + homepage = "https://github.com/piccolo-orm/targ/"; + changelog = "https://github.com/piccolo-orm/targ/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 6f94a76e928b..9a5ada4dc0f3 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -2,26 +2,27 @@ lib, authlib, buildPythonPackage, + deprecation, + fastapi, fetchFromGitHub, - grpcio, + flask, grpcio-health-checking, grpcio-tools, + grpcio, + h5py, httpx, + litestar, + numpy, + pandas, + polars, pydantic, + pytest-asyncio, + pytest-httpserver, + pytestCheckHook, pythonOlder, requests, setuptools-scm, validators, - pytestCheckHook, - numpy, - pytest-httpserver, - pandas, - polars, - h5py, - litestar, - pytest-asyncio, - flask, - fastapi, }: buildPythonPackage rec { @@ -48,19 +49,20 @@ buildPythonPackage rec { dependencies = [ authlib - grpcio + deprecation + fastapi flask + grpcio grpcio-health-checking grpcio-tools h5py httpx - pydantic - numpy litestar - fastapi - polars - requests + numpy pandas + polars + pydantic + requests validators ]; @@ -80,11 +82,15 @@ buildPythonPackage rec { disabledTests = [ # Need network - "test_bearer_token" "test_auth_header_with_catchall_proxy" + "test_bearer_token" + "test_client_with_extra_options" + "test_integration_config" + "test_refresh_async" + "test_refresh_of_refresh_async" + "test_refresh_of_refresh" "test_token_refresh_timeout" "test_with_simple_auth_no_oidc_via_api_key" - "test_client_with_extra_options" ]; enabledTestPaths = [ diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 3a42ab4f15aa..f96b8a6aaceb 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -186,7 +186,8 @@ let hasDeniedNonSourceProvenance = attrs: hasNonSourceProvenance attrs && !allowNonSource && !allowNonSourcePredicate attrs; - showLicenseOrSourceType = value: toString (map (v: v.shortName or "unknown") (toList value)); + showLicenseOrSourceType = + value: toString (map (v: v.shortName or v.fullName or "unknown") (toList value)); showLicense = showLicenseOrSourceType; showSourceType = showLicenseOrSourceType; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1945020e298..16531c8737ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5011,6 +5011,8 @@ self: super: with self; { fast-histogram = callPackage ../development/python-modules/fast-histogram { }; + fast-query-parsers = callPackage ../development/python-modules/fast-query-parsers { }; + fast-simplification = callPackage ../development/python-modules/fast-simplification { }; fastai = callPackage ../development/python-modules/fastai { }; @@ -11662,6 +11664,8 @@ self: super: with self; { piccata = callPackage ../development/python-modules/piccata { }; + piccolo = callPackage ../development/python-modules/piccolo { }; + piccolo-theme = callPackage ../development/python-modules/piccolo-theme { }; pick = callPackage ../development/python-modules/pick { }; @@ -17912,6 +17916,8 @@ self: super: with self; { tapsaff = callPackage ../development/python-modules/tapsaff { }; + targ = callPackage ../development/python-modules/targ { }; + tasklib = callPackage ../development/python-modules/tasklib { }; taskw = callPackage ../development/python-modules/taskw { };