diff --git a/nixos/modules/config/xdg/portals/wlr.nix b/nixos/modules/config/xdg/portals/wlr.nix index 076dbda7e37d..a5997adb803a 100644 --- a/nixos/modules/config/xdg/portals/wlr.nix +++ b/nixos/modules/config/xdg/portals/wlr.nix @@ -47,7 +47,7 @@ in exec_before = "disable_notifications.sh"; exec_after = "enable_notifications.sh"; chooser_type = "simple"; - chooser_cmd = "''${pkgs.slurp}/bin/slurp -f %o -or"; + chooser_cmd = "''${pkgs.slurp}/bin/slurp -f 'Monitor: %o' -or"; }; } ''; diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index 6c45952b8ce7..9880da94e5c2 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -103,6 +103,7 @@ in false "rocm" "cuda" + "vulkan" ] ); default = null; @@ -119,6 +120,7 @@ in - may require overriding gpu type with `services.ollama.rocmOverrideGfx` if rocm doesn't detect your AMD gpu - `"cuda"`: supported by most modern NVIDIA GPUs + - `"vulkan"`: supported by most modern GPUs on Linux ''; }; rocmOverrideGfx = lib.mkOption { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 943b72ec614f..c43a410170a4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1145,6 +1145,7 @@ in ollama = runTest ./ollama.nix; ollama-cuda = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-cuda.nix; ollama-rocm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-rocm.nix; + ollama-vulkan = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-vulkan.nix; ombi = runTest ./ombi.nix; omnom = runTest ./omnom; oncall = runTest ./web-apps/oncall.nix; diff --git a/nixos/tests/ollama-vulkan.nix b/nixos/tests/ollama-vulkan.nix new file mode 100644 index 000000000000..c4f210ad26c8 --- /dev/null +++ b/nixos/tests/ollama-vulkan.nix @@ -0,0 +1,17 @@ +{ lib, ... }: +{ + name = "ollama-vulkan"; + meta.maintainers = with lib.maintainers; [ abysssol ]; + + nodes.vulkan = + { ... }: + { + services.ollama.enable = true; + services.ollama.acceleration = "vulkan"; + }; + + testScript = '' + vulkan.wait_for_unit("multi-user.target") + vulkan.wait_for_open_port(11434) + ''; +} diff --git a/nixos/tests/prometheus/pushgateway.nix b/nixos/tests/prometheus/pushgateway.nix index 6b13447085d9..8bd78a2c3aad 100644 --- a/nixos/tests/prometheus/pushgateway.nix +++ b/nixos/tests/prometheus/pushgateway.nix @@ -56,6 +56,9 @@ + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus-pushgateway.version}\"'" ) + client.systemctl("start network-online.target") + client.wait_for_unit("network-online.target") + # Add a metric and check in Prometheus client.wait_until_succeeds( "echo 'some_metric 3.14' | curl --data-binary @- http://pushgateway:9091/metrics/job/some_job" diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 2b1207a94c8f..9da4e7c000ae 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-803feSIFyuBTyGGDH4zZ4hRGXRNN+J2y1p0C9I9qMro="; + hash = "sha256-7BHkRM9HcD5VDMCcAh2GFvGz+OSb7l/Ki3+V3v/RYSo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index e6799c37037d..f30f457c4d9c 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2025-11-08"; + version = "0-unstable-2025-11-19"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "5646e471699de213b0fd30eecc50628322b0a8e2"; - hash = "sha256-TZqqABGy2smTsIScDKb4hMAyghyN8jW6RMba1o6/nNU="; + rev = "c1581e6c3873331b93868bccd2f53f34a2316f89"; + hash = "sha256-9w2CtCQIaCBf2hwbQaMWjin0HT7ioc7vwBVMqbLJhqw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix index c84cb6f95a67..33b08d88cfb0 100644 --- a/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -32,6 +32,6 @@ buildLua rec { changelog = "https://github.com/marzzzello/mpv_thumbnail_script/releases/tag/${version}"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ thegu5 ]; }; } diff --git a/pkgs/by-name/bo/bookup/package.nix b/pkgs/by-name/bo/bookup/package.nix new file mode 100644 index 000000000000..b4e70eea3080 --- /dev/null +++ b/pkgs/by-name/bo/bookup/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + gettext, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + gtksourceview5, + webkitgtk_6_0, + discount, + sqlite, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bookup"; + version = "1.1.5"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "ilhooq"; + repo = "bookup"; + tag = "v${finalAttrs.version}"; + hash = "sha256-s2j9AQMDJaKtYyXtHDscujPv2KIvO0pnX/OnXma93Ro="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext # msgfmt + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + gtksourceview5 + webkitgtk_6_0 + discount + sqlite + ]; + + meta = { + description = "Markdown note-taking application for Gnome"; + homepage = "https://gitlab.gnome.org/ilhooq/bookup"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ zendo ]; + mainProgram = "bookup"; + }; +}) diff --git a/pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch b/pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch new file mode 100644 index 000000000000..c000d1eed8a9 --- /dev/null +++ b/pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib_ccx/hardsubx.c b/src/lib_ccx/hardsubx.c +index 20b4388..fa6b5fa 100644 +--- a/src/lib_ccx/hardsubx.c ++++ b/src/lib_ccx/hardsubx.c +@@ -125,7 +125,7 @@ int hardsubx_process_data(struct lib_hardsubx_ctx *ctx, struct lib_ccx_ctx *ctx_ + if (ctx->frame) + av_frame_free(&ctx->frame); + if (ctx->rgb_frame) + av_frame_free(&ctx->rgb_frame); +- avcodec_close(ctx->codec_ctx); ++ avcodec_free_context(&ctx->codec_ctx); + avformat_close_input(&ctx->format_ctx); + } diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix index 7d47d17201b6..ce4f958b0803 100644 --- a/pkgs/by-name/cc/ccextractor/package.nix +++ b/pkgs/by-name/cc/ccextractor/package.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./remove-default-commit-hash.patch ./remove-vendored-libraries.patch + ./fix-avcodec-close.patch ] ++ finalAttrs.cargoDeps.vendorStaging.patches; diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix index db890e335e36..adc8b7de4824 100644 --- a/pkgs/by-name/fi/fish-lsp/package.nix +++ b/pkgs/by-name/fi/fish-lsp/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "v\\d+\\.\\d+\\.\\d+(?:-\\d+)?$" + "v(\\d+\\.\\d+\\.\\d+(?:-\\d+)?)$" ]; }; diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix index 22594fac7452..60dbc9e93d1c 100644 --- a/pkgs/by-name/gd/gdu/package.nix +++ b/pkgs/by-name/gd/gdu/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "gdu"; - version = "5.31.0"; + version = "5.32.0"; src = fetchFromGitHub { owner = "dundee"; repo = "gdu"; tag = "v${finalAttrs.version}"; - hash = "sha256-MAkD4Mh7aXWc8Y4TkXH7NSDgPQugB7Gjhr4nfOr/X1U="; + hash = "sha256-E//6rO3LsGLLNrPFVi/R3njkhOI1GnM9mGI/AIcVG/Q="; }; - vendorHash = "sha256-aKhHC3sPRyi/l9BxeUgx+3TdYulb0cI9WxuPvbLoswg="; + vendorHash = "sha256-xtw7CKpXEvjpfDQ9x0coLmfTQPy+NiWfrKL8l5vFS9o="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/gl/glslviewer/package.nix b/pkgs/by-name/gl/glslviewer/package.nix index 71b4724cd8a3..69e934c20603 100644 --- a/pkgs/by-name/gl/glslviewer/package.nix +++ b/pkgs/by-name/gl/glslviewer/package.nix @@ -12,7 +12,7 @@ libXi, libXext, libGLU, - ffmpeg, + ffmpeg_7, ncurses, }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libXext libGLU ncurses - ffmpeg + ffmpeg_7 ]; cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.20" ]; diff --git a/pkgs/by-name/gn/gnome-keyring/package.nix b/pkgs/by-name/gn/gnome-keyring/package.nix index 04d0a932b299..692b78069077 100644 --- a/pkgs/by-name/gn/gnome-keyring/package.nix +++ b/pkgs/by-name/gn/gnome-keyring/package.nix @@ -90,15 +90,25 @@ stdenv.mkDerivation rec { runHook preCheck ''; - # Use wrapped gnome-keyring-daemon with cap_ipc_lock=ep - postFixup = lib.optionalString useWrappedDaemon '' - files=($out/etc/xdg/autostart/* $out/share/dbus-1/services/*) + postFixup = + # disable OnlyShowIn to allow xdg-autostart in any DE + # https://wiki.archlinux.org/title/GNOME/Keyring#Using_gnome-keyring-daemon_outside_desktop_environments_(KDE,_GNOME,_XFCE,_...) + '' + for f in "$out"/etc/xdg/autostart/*.desktop; do + [ -e "$f" ] || continue + substituteInPlace "$f" \ + --replace-fail "OnlyShowIn=" "#OnlyShowIn=" + done + '' + # Use wrapped gnome-keyring-daemon with cap_ipc_lock=ep + + lib.optionalString useWrappedDaemon '' + files=($out/etc/xdg/autostart/* $out/share/dbus-1/services/*) - for file in ''${files[*]}; do - substituteInPlace $file \ - --replace "$out/bin/gnome-keyring-daemon" "/run/wrappers/bin/gnome-keyring-daemon" - done - ''; + for file in ''${files[*]}; do + substituteInPlace $file \ + --replace "$out/bin/gnome-keyring-daemon" "/run/wrappers/bin/gnome-keyring-daemon" + done + ''; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix index 000995b1879c..fe1d47090716 100644 --- a/pkgs/by-name/gr/grpc-health-probe/package.nix +++ b/pkgs/by-name/gr/grpc-health-probe/package.nix @@ -2,26 +2,42 @@ buildGoModule, lib, fetchFromGitHub, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "grpc-health-probe"; version = "0.4.42"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-health-probe"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-/7Xxti2QOClWRo6EwHRb369+x/NeT6LHhDDyIJSHv00="; }; + tags = [ + "netgo" + ]; + + ldflags = [ + "-w" + "-X main.versionTag=${finalAttrs.version}" + ]; + vendorHash = "sha256-9NDSkfHUa6xfLByjtuDMir2UM5flaKhD6jZDa71D+0w="; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = with lib; { description = "command-line tool to perform health-checks for gRPC applications"; homepage = "https://github.com/grpc-ecosystem/grpc-health-probe"; + changelog = "https://github.com/grpc-ecosystem/grpc-health-probe/releases/tag/v${finalAttrs.version}"; license = licenses.asl20; maintainers = with maintainers; [ jpds ]; mainProgram = "grpc-health-probe"; }; -} +}) diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix index 6350cc6553aa..7e4412aa079f 100644 --- a/pkgs/by-name/hy/hyprgraphics/package.nix +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprgraphics"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprgraphics"; tag = "v${finalAttrs.version}"; - hash = "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA="; + hash = "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index 8ad3d679fd84..0a56c3f14dee 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "legcord"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "Legcord"; repo = "Legcord"; tag = "v${finalAttrs.version}"; - hash = "sha256-6egqI1JhnRc8YwzAvyy4Xg9Z9dEfG7wIbMfUgQ+4IBA="; + hash = "sha256-AHqaC0N+5grBDixP+wXAzKdOTgohgwP4HbAPEZEVXKQ="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-nobOORfhwlGEvNt+MfDKd3rXor6tJHDulz5oD1BGY4I="; + hash = "sha256-D+GPJn3qpIax+YNcLqLX71bobDdfQXyGiJ6b5PiJqC4="; }; buildPhase = '' @@ -58,6 +58,14 @@ stdenv.mkDerivation (finalAttrs: { cp ./node_modules/@vencord/venmic/prebuilds/venmic-addon-linux-x64/node-napi-v7.node ./dist/venmic-x64.node cp ./node_modules/@vencord/venmic/prebuilds/venmic-addon-linux-arm64/node-napi-v7.node ./dist/venmic-arm64.node + # Remove unnecessary koffi prebuilds, otherwise unsupported platforms + # (OpenBSD, FreeBSD, Linux musl builds) will cause autoPatchelf to not + # be able to find the required libraries and fail. + find ./node_modules/koffi/build/koffi -mindepth 1 -maxdepth 1 \ + ! -name linux_x64 \ + ! -name linux_arm64 \ + -type d -exec rm -rf {} + + # Patch venmic before putting it into the ASAR archive autoPatchelf ./dist diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index cafd77252e9c..d7c8fd8226cb 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.84"; + version = "11.86"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-nngsqOfTEv+Me6OEAX2C7U2meaDZn64sF0BwDQtXKnA="; + hash = "sha256-YFw8TC38Nmdy37Bzo6p43+Ykt9fmvtAcJmZubsFqJHE="; stripRoot = false; }; diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix index e84ae5d49b23..dde947dce87e 100644 --- a/pkgs/by-name/ne/nextvi/package.nix +++ b/pkgs/by-name/ne/nextvi/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextvi"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "kyx0r"; repo = "nextvi"; tag = finalAttrs.version; - hash = "sha256-d9YFv9Crc/0ymSXJkE3VEN+kZrHEAUv9dF5aO0swg+8="; + hash = "sha256-1bo2Cqa+d16yNQPFAYejHP838KX/sK33yxJO31o7cAc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index a386c5a81dca..2bb399e922cc 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -32,6 +32,7 @@ ollama, ollama-rocm, ollama-cuda, + ollama-vulkan, config, # one of `[ null false "rocm" "cuda" "vulkan" ]` @@ -119,6 +120,7 @@ let ] ++ lib.optionals enableVulkan [ "--suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath (map lib.getLib vulkanLibs)}'" + "--set-default OLLAMA_VULKAN : '1'" ]; wrapperArgs = builtins.concatStringsSep " " wrapperOptions; @@ -268,10 +270,11 @@ goBuild (finalAttrs: { inherit ollama; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { - inherit ollama-rocm ollama-cuda; + inherit ollama-rocm ollama-cuda ollama-vulkan; service = nixosTests.ollama; service-cuda = nixosTests.ollama-cuda; service-rocm = nixosTests.ollama-rocm; + service-vulkan = nixosTests.ollama-vulkan; }; } // lib.optionalAttrs (!enableRocm && !enableCuda) { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/pr/prometheus-pushgateway/package.nix b/pkgs/by-name/pr/prometheus-pushgateway/package.nix index ddf5cab71bb8..8144d6ca2b96 100644 --- a/pkgs/by-name/pr/prometheus-pushgateway/package.nix +++ b/pkgs/by-name/pr/prometheus-pushgateway/package.nix @@ -3,18 +3,17 @@ buildGoModule, fetchFromGitHub, nixosTests, - testers, - prometheus-pushgateway, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "pushgateway"; version = "1.11.2"; src = fetchFromGitHub { owner = "prometheus"; repo = "pushgateway"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Mc4yEd9CRfLZ4ZpcMnwQpoIXQpUerdxYD90FWRBzS20="; }; @@ -23,25 +22,28 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/prometheus/common/version.Version=${version}" - "-X github.com/prometheus/common/version.Revision=${version}" - "-X github.com/prometheus/common/version.Branch=${version}" + "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" + "-X github.com/prometheus/common/version.Revision=${finalAttrs.version}" + "-X github.com/prometheus/common/version.Branch=${finalAttrs.version}" "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" "-X github.com/prometheus/common/version.BuildDate=19700101-00:00:00" ]; passthru.tests = { inherit (nixosTests.prometheus) pushgateway; - version = testers.testVersion { - package = prometheus-pushgateway; - }; }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = with lib; { description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; mainProgram = "pushgateway"; homepage = "https://github.com/prometheus/pushgateway"; + changelog = "https://github.com/prometheus/pushgateway/releases/tag/v${finalAttrs.version}"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; }; -} +}) diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix index 31db233ddeea..53697df61cf1 100644 --- a/pkgs/by-name/qo/qovery-cli/package.nix +++ b/pkgs/by-name/qo/qovery-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "qovery-cli"; - version = "1.54.1"; + version = "1.54.2"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-JuOnJ9+dcf/QSm96FmDgeS+6TwbyKPwvgBjOfZV8r+U="; + hash = "sha256-LVU5XLo14Uh6wE2DIhuD/wYn5ZtRjkbseE/4dxy5wk0="; }; vendorHash = "sha256-1TprPzZb+Q9QcoGop6CAmnyqSU3dQ5CSAS0hsnQeWPw="; diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 3c84dea1332e..8a4df9701ca7 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.22.7"; + version = "1.22.11"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-iC0ycw+mx4K0IK4u9PmgRFXAP5chHdAPHSpbWpBE0Ko="; + hash = "sha256-vQu84qWpLyO62+FFzs60z03Cc5wsu0lNofRvb1TlmeE="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index 8c0705762c6a..c73792ab8c99 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -8,6 +8,7 @@ useMimalloc ? false, doCheck ? true, nix-update-script, + versionCheckHook, }: rustPlatform.buildRustPackage rec { @@ -55,14 +56,10 @@ rustPlatform.buildRustPackage rec { export RUST_SRC_PATH=${rustPlatform.rustLibSrc} ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - versionOutput="$($out/bin/rust-analyzer --version)" - echo "'rust-analyzer --version' returns: $versionOutput" - [[ "$versionOutput" == "rust-analyzer ${version}" ]] - runHook postInstallCheck - ''; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 10ac2ceef4de..05a2a15e1b6b 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "7.6.0"; + version = "7.7.0"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-mhzyJCgFJC3K4o5vMy71hhIqsS/L7ts9+bSL5v0RMQI="; + hash = "sha256-OjQHPxk4lH+h48HfkJmiWY6nnGZd/bhUcZPW7NkF5jg="; }; # Fix build on darwin diff --git a/pkgs/by-name/sp/sphinx-lint/package.nix b/pkgs/by-name/sp/sphinx-lint/package.nix index 3b2e3f999bad..782176439a76 100644 --- a/pkgs/by-name/sp/sphinx-lint/package.nix +++ b/pkgs/by-name/sp/sphinx-lint/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sphinx-lint"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "sphinx-lint"; tag = "v${version}"; - hash = "sha256-9xqGb/RdaySTys3gjIU0GJSqGOWXQQ/NeSRS8dmx5lg="; + hash = "sha256-Cg/14asXB1ivKSoGuLghne7kmQiXuimYTUqmdVqba6M="; }; build-system = [ diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 3538af9a24db..7f735bf46ea0 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.14.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; tag = "v${finalAttrs.version}"; - hash = "sha256-0b9gB7vHvw1wjoTxWcQOcshpuIKfcaQJeI8GCo+rvF4="; + hash = "sha256-RKWEVfrAki9ZkN3WE0SD0Hrr1lmX97nddV8Gv74MFCE="; }; - cargoHash = "sha256-ctyb/llOYBiyBwKylacpXrEp3hXix64zwHxv/E54rrM="; + cargoHash = "sha256-LISK+62cY1ZAIGLS3spF+8KvD8k0fZnIg+BuQ+25BoM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix index d4d509098bc9..b6cb3b4b9c56 100644 --- a/pkgs/by-name/tk/tkey-ssh-agent/package.nix +++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix @@ -3,18 +3,17 @@ fetchFromGitHub, buildGoModule, gitUpdater, - testers, - tkey-ssh-agent, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "tkey-ssh-agent"; version = "1.0.0"; src = fetchFromGitHub { owner = "tillitis"; repo = "tkey-ssh-agent"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Uf3VJJfZn4UYX1q79JdaOfrore+L/Mic3whzpP32JV0="; }; @@ -24,21 +23,27 @@ buildGoModule rec { "cmd/tkey-ssh-agent" ]; + ldflags = [ + "-w" + "-X main.version=${finalAttrs.version}" + ]; + passthru = { updateScript = gitUpdater { rev-prefix = "v"; }; - tests = { - tkey-ssh-agent-version = testers.testVersion { - package = tkey-ssh-agent; - }; - }; }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = with lib; { description = "SSH Agent for TKey, the flexible open hardware/software USB security key"; homepage = "https://tillitis.se/app/tkey-ssh-agent/"; + changelog = "https://github.com/tillitis/tkey-ssh-agent/releases/tag/v${finalAttrs.version}"; license = licenses.gpl2; maintainers = with maintainers; [ bbigras ]; mainProgram = "tkey-ssh-agent"; platforms = platforms.all; }; -} +}) diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index b3a42ccd952a..4c194c40dffc 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.91.0"; + version = "3.91.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-xDZmfgVENGMDpdeuWnPAKEqEr4qbu+Lrn3kMiPoQU+Y="; + hash = "sha256-knlcaV0+yB+S7Yyvq4CmkmMd4uQRhcZm96q7p7hLv7g="; }; - vendorHash = "sha256-zQ67yLN/HCshOndP/FAUOOyiQpOjyOJChkZZmFb06WM="; + vendorHash = "sha256-Qz0tKqqT3PlZFCiYxLBmHeICIx2ogOUW7rfXHadcVPg="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/wa/warpinator/package.nix b/pkgs/by-name/wa/warpinator/package.nix index effc1b047dde..9c98fd41d2a8 100644 --- a/pkgs/by-name/wa/warpinator/package.nix +++ b/pkgs/by-name/wa/warpinator/package.nix @@ -15,6 +15,7 @@ glib, gitUpdater, bubblewrap, + xapp-symbolic-icons, }: let @@ -42,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.8.10"; + version = "2.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "warpinator"; rev = version; - hash = "sha256-OSZYjCnFIHmWCwVcWP1MLmezt5HL4Njf0WMyCRmPP58="; + hash = "sha256-R6ccyZLXwxvhvRCDguxufzXfVq5tzrPEtBbXgdO6AoI="; }; nativeBuildInputs = [ @@ -89,6 +90,12 @@ stdenv.mkDerivation rec { --replace-fail 'GLib.find_program_in_path("bwrap")' "True" ''; + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ xapp-symbolic-icons ]}" + ) + ''; + passthru.updateScript = gitUpdater { ignoredVersions = "^master.*"; }; diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index ff4dcbf41924..804099463616 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "werf"; - version = "2.53.2"; + version = "2.54.0"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; tag = "v${finalAttrs.version}"; - hash = "sha256-mmny0cnMWeB3LdeO67HVFjeE1Xrj/o1DO65Fd3uMuxo="; + hash = "sha256-9ZFrfEXR3sHkcTQRZq+7vsGeIrUqSjhvBJ1pWv81rS4="; }; proxyVendor = true; - vendorHash = "sha256-dxTcRFJD8NZxb1Q0lXJxpjl4ruLs7LEyaqebNrLHaZc="; + vendorHash = "sha256-YrfOhRFB4qMuuLivwxpQ31B1zzkE6AvWzvNCqS8/yHw="; subPackages = [ "cmd/werf" ]; diff --git a/pkgs/by-name/wf/wf-recorder/package.nix b/pkgs/by-name/wf/wf-recorder/package.nix index 94957e0b341b..365b905c1b50 100644 --- a/pkgs/by-name/wf/wf-recorder/package.nix +++ b/pkgs/by-name/wf/wf-recorder/package.nix @@ -14,28 +14,19 @@ libpulseaudio, pipewire, libgbm, - fetchpatch, }: stdenv.mkDerivation rec { pname = "wf-recorder"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ammen99"; repo = "wf-recorder"; rev = "v${version}"; - hash = "sha256-7/fQOkfAw5v3irD5blJOdq88j0VBrPVQQufdt9wsACk="; + hash = "sha256-CY0pci2LNeQiojyeES5323tN3cYfS3m4pECK85fpn5I="; }; - patches = [ - # compile fixes from upstream, remove when they stop applying - (fetchpatch { - url = "https://github.com/ammen99/wf-recorder/commit/560bb92d3ddaeb31d7af77d22d01b0050b45bebe.diff"; - sha256 = "sha256-7jbX5k8dh4dWfolMkZXiERuM72zVrkarsamXnd+1YoI="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix index df0c842a65c8..db5043e00776 100644 --- a/pkgs/by-name/xi/xine-lib/package.nix +++ b/pkgs/by-name/xi/xine-lib/package.nix @@ -32,12 +32,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "xine-lib"; - version = "1.2.13-unstable-2024-06-29"; + version = "1.2.13-unstable-2025-11-03"; src = fetchhg { url = "http://hg.code.sf.net/p/xine/xine-lib-1.2"; - rev = "53845e2f6b1f3b69328de5c030c0ab27eb8f043d"; - hash = "sha256-O5lIYmNC2TpoY4QbPMsDWxNOoxdw61967Q4QG9d/+Bg="; + rev = "405a16a848927ed9861d6ac177c7e9624ecf58d1"; + hash = "sha256-Q+PcpVMgV2b+htEhTlUK63ZpuJ9Vz+dlmBhNiO8PC2A="; }; outputs = [ diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix index 6a6574937e57..3d6e7ab46e2b 100644 --- a/pkgs/by-name/yq/yq-go/package.nix +++ b/pkgs/by-name/yq/yq-go/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "yq-go"; - version = "4.48.2"; + version = "4.49.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; tag = "v${finalAttrs.version}"; - hash = "sha256-nZDC6Vj9dUjMv/NDcUtvVOKZGz1KuRlV8WsbJhWvy00="; + hash = "sha256-IZWj69NysUIsNY7/gAb/jbpZXFH3T9pZygv3MYql47Q="; }; vendorHash = "sha256-fcjHqWLDvXyALkh3TR8lOnv7McXUVtcb1VpVbMuUMtk="; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 3bc047dee5df..369142315a76 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.84.1"; + version = "3.85.0"; pyproject = true; src = fetchPypi { pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-LtKS/SkuNIfbU8Jh4oea4YMcYHqOuUe+6iDfa10k5Cs="; + hash = "sha256-WDUKqT3RZsS2e6PJR7B6LXMg0U5luS5Yc/32TQPj+T0="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/asdf-astropy/default.nix b/pkgs/development/python-modules/asdf-astropy/default.nix index 92c8ce75b908..4f3afbb2f50c 100644 --- a/pkgs/development/python-modules/asdf-astropy/default.nix +++ b/pkgs/development/python-modules/asdf-astropy/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asdf-astropy"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "astropy"; repo = "asdf-astropy"; tag = version; - hash = "sha256-CCLoG3zV34kmdGYN6RLi5u2v0RDvEqVN6VcdrX7L4uY="; + hash = "sha256-JYzC1dEnq1caNSPffWCgk7c3mgUERywP0ladS+RwEnk="; }; build-system = [ diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 23de62febb69..c7fdb0f86009 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.41.1"; + version = "1.41.2"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-dRusG/uvyg2zCzbfAjxiKtqU2mG1OjMl31SQdZ/7bG8="; + hash = "sha256-m9rGVBOCWxICZUvVYzMWpWEnEWTGEjIRrIBeYctZ8SA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 4027c4820646..c07a79849299 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.40.76"; + version = "1.41.2.post1"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-Jh1R5xoWSpOr+calx3nFZk0wfsRFDekXrZy+fCl4IiM="; + hash = "sha256-rPIUW4XFFlN4spjLkLvDoNpZ55IE5K80mdldDW0RmHw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 5cebb2e1e14e..71f90ae67c07 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "botorch"; - version = "0.16.0"; + version = "0.16.1"; pyproject = true; src = fetchFromGitHub { owner = "meta-pytorch"; repo = "botorch"; tag = "v${version}"; - hash = "sha256-XpcmWJcKaIxrM79MgjG7IF/DphTH402iltlh8ISeZ64="; + hash = "sha256-8tmNw1Qa3lXxvndljRijGNN5RMjsYlT8zFFau23yp1U="; }; build-system = [ diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix index bc0e79c3867a..1da50e8204b3 100644 --- a/pkgs/development/python-modules/copier/default.nix +++ b/pkgs/development/python-modules/copier/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "copier"; - version = "9.10.3"; + version = "9.11.0"; pyproject = true; src = fetchFromGitHub { @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm $out/tests/demo/doc/ma*ana.txt ''; - hash = "sha256-ZBRJ4FrdhtKr273D2amwA3dJhISZAORqFqoh//963Fg="; + hash = "sha256-E46OrAZHs+jVfDzwJ0+vD344O4NBHXpKpo+eGnXTIR4="; }; POETRY_DYNAMIC_VERSIONING_BYPASS = version; diff --git a/pkgs/development/python-modules/dawg-python/default.nix b/pkgs/development/python-modules/dawg-python/default.nix index 997600122d01..eab79418b8b5 100644 --- a/pkgs/development/python-modules/dawg-python/default.nix +++ b/pkgs/development/python-modules/dawg-python/default.nix @@ -17,10 +17,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "dawg_python" ]; - meta = with lib; { + meta = { description = "Pure Python reader for DAWGs created by dawgdic C++ library or DAWG Python extension"; homepage = "https://github.com/pytries/DAWG-Python"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dawg2-python/default.nix b/pkgs/development/python-modules/dawg2-python/default.nix new file mode 100644 index 000000000000..9b3775b51a16 --- /dev/null +++ b/pkgs/development/python-modules/dawg2-python/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + typing-extensions, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "dawg2-python"; + version = "0.9.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pymorphy2-fork"; + repo = "DAWG-Python"; + tag = version; + hash = "sha256-45k7QmozbMt7qYdDFRSL5JDeEtqdMHBoEXXQkLDoGfE="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dawg_python" + ]; + + meta = { + description = "Pure-python reader for DAWGs created by dawgdic C++ library or DAWG Python extension. Fork of https://github.com/pytries/DAWG-Python"; + homepage = "https://github.com/pymorphy2-fork/DAWG-Python"; + changelog = "https://github.com/pymorphy2-fork/DAWG-Python/blob/${src.tag}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index 53c5f462058d..c5a2524b03e6 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.16"; + version = "3.17"; pyproject = true; disabled = pythonOlder "3.13"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.volume"; tag = version; - hash = "sha256-xJioreloRqxIoM5h1Uh0gLkIel5XScjvMvNWtSu1dqY="; + hash = "sha256-z7DH96c0uxOOE71m+P+QGds7ZHm1/yyE2FTilZt1OdA="; }; build-system = [ diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 1eb06f0f6066..5d0043e79bb8 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.24.0"; + version = "6.24.1"; pyproject = true; src = fetchFromGitHub { owner = "elastic"; repo = "apm-agent-python"; tag = "v${version}"; - hash = "sha256-mHDUcIII1gERlGMJvXPe3Hb38wNAylfMQpeLjA1Xbuk="; + hash = "sha256-8Q2fzaIG9dghjt4T00nqffGEfPDr4DEcdeHPJqhU8fs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix index 4d507af22ac1..f8b3b054bcfa 100644 --- a/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/pkgs/development/python-modules/inkbird-ble/default.nix @@ -9,22 +9,19 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, sensor-state-data, }: buildPythonPackage rec { pname = "inkbird-ble"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "inkbird-ble"; tag = "v${version}"; - hash = "sha256-Dwp65FKtqJbgux+T3Ql09sDy6m8CCeK26aDKM3I3eJo="; + hash = "sha256-Brib9OMI6LRS3GopiOsJijY/gpvv7j47OTQN8tTcqLo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 559443bba339..5a47a4574ec3 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -11,7 +11,6 @@ poetry-core, pygments, pytestCheckHook, - pythonOlder, pytz, pyyaml, requests, @@ -19,16 +18,14 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "1.4.1"; + version = "1.5.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "coveooss"; repo = "json-schema-for-humans"; tag = "v${version}"; - hash = "sha256-TmHqKf4/zzw3kImyYvnXsYJB7sL6RRs3vGCl8+Y+4BQ="; + hash = "sha256-k4/+ijlaS/bjLcgobPcq6l4yX84WP1FwfGgYHw+iAdE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index dfcdfb02535d..9989bbeff717 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -78,8 +78,8 @@ in "sha256-r7qGUHHpjswTrauKY4XiowbZATmDFDo801XpW32mUwI="; mypy-boto3-apigateway = - buildMypyBoto3Package "apigateway" "1.41.0" - "sha256-U4Rrx/s9O+Wh6S7PvkUog6rcM4xiW8qgt6CgdmFrZWg="; + buildMypyBoto3Package "apigateway" "1.41.2" + "sha256-+pPgM67IrQXkQyB6rXxXrVo5EOZlxNFRRoExrqdLfyw="; mypy-boto3-apigatewaymanagementapi = buildMypyBoto3Package "apigatewaymanagementapi" "1.41.0" @@ -142,8 +142,8 @@ in "sha256-/hOp4fR72GY663pXVcCTcqSR+KSNzZW9RO+l1amQOxg="; mypy-boto3-athena = - buildMypyBoto3Package "athena" "1.41.0" - "sha256-93qpy/KVN4W2ronPxOAll09kRkko78qzsa+hQ0xOI9E="; + buildMypyBoto3Package "athena" "1.41.2" + "sha256-NiOxdhyaoCduSqG3/MxgUca9yrhROVTQ+JLu2PBPZHI="; mypy-boto3-auditmanager = buildMypyBoto3Package "auditmanager" "1.41.0" @@ -226,8 +226,8 @@ in "sha256-aGM7lIQdFvL7+2iQ/uPSpa9l/TlmseizBASF+06nJFM="; mypy-boto3-cloudformation = - buildMypyBoto3Package "cloudformation" "1.41.0" - "sha256-iuHl3slhnfM5R5eFiQwzX8N/Tki7CB/GseC8drzBj0M="; + buildMypyBoto3Package "cloudformation" "1.41.2" + "sha256-1gKMYZN5MDiJNiI2a9f7P1XhR4ncKR+jakJLMqLtmik="; mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.41.1" @@ -338,8 +338,8 @@ in "sha256-sQf9PZa1RxwsUx7iYT5Ynp7mH8yPTKsWUhAkGdcXIBs="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.41.1" - "sha256-h9foKpV654Ff18bTsFjTgQ4U1CFUR2QHP4bTEQJCmzM="; + buildMypyBoto3Package "connect" "1.41.2" + "sha256-P2HbAOnMUokYvW3eVLcbNbR1cQK1rb8umVc8prXRy0s="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.41.0" @@ -358,8 +358,8 @@ in "sha256-FSJZT6BbCIuE+a31a/Wr+OKYB9nKM9z6Y5IAryf3ZO8="; mypy-boto3-controltower = - buildMypyBoto3Package "controltower" "1.41.0" - "sha256-p9KnHxW5Rg+0rxB5Z+tYIfLCldcM5QtnIELrWJ4q3EQ="; + buildMypyBoto3Package "controltower" "1.41.2" + "sha256-1kYGdJKZvQsF5N828k7WWT1HiCndUQB8q4Yun5fICH8="; mypy-boto3-cur = buildMypyBoto3Package "cur" "1.41.0" @@ -446,16 +446,16 @@ in "sha256-8fFnQpctLyNEZrsKI94tcpy7XAN8+ULGsih2oihHcyg="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.41.1" - "sha256-UcvnDV+HbSEob1QYIxid5scGaLCXhuWD6Fq0v3D3ieo="; + buildMypyBoto3Package "ec2" "1.41.2" + "sha256-kypq0vZuo4Z5uX/D8EygX1nnp4qTnzaD8n2q52AhReE="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.41.0" "sha256-PXul6J8PEk8SK2lmMr/mAahpJQ6ZIWCheGGKs4SuJYY="; mypy-boto3-ecr = - buildMypyBoto3Package "ecr" "1.41.0" - "sha256-cVB8BDcAj7fGHNXPJV0x44UD4Selro2xUHC1tmg7JwQ="; + buildMypyBoto3Package "ecr" "1.41.2" + "sha256-yHCyY3+bpvH2lntEjxTyn876NY9FIbpEmsx5IbaCGSA="; mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.41.0" @@ -470,8 +470,8 @@ in "sha256-kjrdAMALicYfFFplSqH3gNeq4LcIOvrmRjZ9RFhuzwY="; mypy-boto3-eks = - buildMypyBoto3Package "eks" "1.41.0" - "sha256-tqb8w1C7IDbdFqjiiMx4i98KleitiJldqSTTvQkmmmc="; + buildMypyBoto3Package "eks" "1.41.2" + "sha256-VWOjXwEbfdKePMjnbpiXa0j/Zhoiabn80vXXHnzS+Bs="; mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.36.0" @@ -494,8 +494,8 @@ in "sha256-Qxp3B2PJ/RKE+n4gUxnalGIVqkdB8Ta/zHyJ5lvtflM="; mypy-boto3-elbv2 = - buildMypyBoto3Package "elbv2" "1.41.1" - "sha256-vDaagCc7Av5dF0dvem8QEGYD3LZALN9XH9bxWrcgicE="; + buildMypyBoto3Package "elbv2" "1.41.2" + "sha256-Q/U/pUasQ3O1FV+jH3jX14aniAuBMfZ1zvOzRNbr9X4="; mypy-boto3-emr = buildMypyBoto3Package "emr" "1.41.1" @@ -757,20 +757,20 @@ in "sha256-DsqRvDpfDRnREKRIsoZgJqJDwV0Rly/u+q90Pkgn1Go="; mypy-boto3-kinesisvideo = - buildMypyBoto3Package "kinesisvideo" "1.41.0" - "sha256-8Blino0muSOiKC2uEF0LBSfNeGH97HS8M9moxxd7Kjg="; + buildMypyBoto3Package "kinesisvideo" "1.41.2" + "sha256-oGhcPRy5FQWRdFXYf/K+3Ohlcyv8UbqaoCkUC5ME69w="; mypy-boto3-kms = - buildMypyBoto3Package "kms" "1.41.0" - "sha256-Wp0iq5lAgQwm96krIGpPzHUSHS8DbRtr+uFC15WCm6o="; + buildMypyBoto3Package "kms" "1.41.2" + "sha256-fsA7oKO4DxGEUtOaXnsOX1oqGGd3pmuqIKvB7Tlw5EY="; mypy-boto3-lakeformation = buildMypyBoto3Package "lakeformation" "1.41.1" "sha256-cj73uXbKmtsTh2l5qBv14RFAmnTgr04JLQK9EyJhjSA="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.41.0" - "sha256-ivXpG1VPK1hf6464B11caSlYN09OlnXMiQDT1HcftTE="; + buildMypyBoto3Package "lambda" "1.41.2" + "sha256-KzIcVzgnhcgxUeZot/rvXN+4zcOBsMtCE7zsdQpbs24="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.41.0" @@ -781,8 +781,8 @@ in "sha256-hZ5eMRBsb+IkTUH95+3f4nGo1X5lDrrC54xJ1he/nO4="; mypy-boto3-lexv2-models = - buildMypyBoto3Package "lexv2-models" "1.41.0" - "sha256-9J4vNxBibnyB1I+vyIVJina3tMlWCdbrtSVN789eeXU="; + buildMypyBoto3Package "lexv2-models" "1.41.2" + "sha256-1hG2i3Co2s8kbl6RE2tj0pIiGTmd8nxFAx4lmETy8r8="; mypy-boto3-lexv2-runtime = buildMypyBoto3Package "lexv2-runtime" "1.41.0" @@ -849,8 +849,8 @@ in "sha256-7qSbGMs4YI04zFpoTG0OGfVcAtHm4DsNyRXIILyqOa0="; mypy-boto3-marketplace-entitlement = - buildMypyBoto3Package "marketplace-entitlement" "1.41.0" - "sha256-KrbfCp9YCOevWWD/sSLbGKd6ApbZmW3UplMJ4gw//IQ="; + buildMypyBoto3Package "marketplace-entitlement" "1.41.2" + "sha256-anYA3v/Bdzye2q9aM5R++/RJflOSTxB0/fK1K6x94Bs="; mypy-boto3-marketplacecommerceanalytics = buildMypyBoto3Package "marketplacecommerceanalytics" "1.41.0" @@ -877,8 +877,8 @@ in "sha256-uynBhFk0Abwv36DI41tKnYZ4J9NNKogdMqvD3+goUOE="; mypy-boto3-mediapackagev2 = - buildMypyBoto3Package "mediapackagev2" "1.41.0" - "sha256-2jHaGwIsQmLNJLPOgq6WKTQc+XqklW22DP0hLGOV2UU="; + buildMypyBoto3Package "mediapackagev2" "1.41.2" + "sha256-T8lHq8A4eGMtl1bmHIslzB9yVD2dffOmGPRhJNqcXHc="; mypy-boto3-mediastore = buildMypyBoto3Package "mediastore" "1.41.0" @@ -901,8 +901,8 @@ in "sha256-cnn4QL7eeCiZWP0kcETuM+mCiz1rAmUWwq1TyZjoLXg="; mypy-boto3-meteringmarketplace = - buildMypyBoto3Package "meteringmarketplace" "1.41.0" - "sha256-BBs385Vpw868GOK19MjPVVHKvIb4lLbxVlL3h10Burk="; + buildMypyBoto3Package "meteringmarketplace" "1.41.2" + "sha256-2nsZrBYXWTidgSD2cbQpd35rzHSdMHeIpBfdlPrWLSo="; mypy-boto3-mgh = buildMypyBoto3Package "mgh" "1.41.0" @@ -985,8 +985,8 @@ in "sha256-JEuEjo0htTuDCZx2nNJK2Zq59oSUqkMf4BrNamerfVk="; mypy-boto3-organizations = - buildMypyBoto3Package "organizations" "1.41.1" - "sha256-onKCxgKRaWRKBhDTBNpUo8BrZgJolV2Exr07vjFuhp0="; + buildMypyBoto3Package "organizations" "1.41.2" + "sha256-UMEF3/xgRCMSS68sRFSx2wRVtdGaPtPg6TvKT247Loc="; mypy-boto3-osis = buildMypyBoto3Package "osis" "1.41.0" @@ -1073,8 +1073,8 @@ in "sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.41.1" - "sha256-hxpZwMRckIBguBLqkQTQNz8indzxF3bYffp6kJEo9VY="; + buildMypyBoto3Package "quicksight" "1.41.2" + "sha256-i/k6U1es+8FcpdtSfj9cm0QQvZdeS98jDzw+YlEE+xY="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.41.0" @@ -1085,24 +1085,24 @@ in "sha256-pXpULn4yTRRs/MfOCUoACGvgXt8TLQq7ZujEK1l6rZk="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.41.1" - "sha256-ctmzv5N7phsH0oMY8swFhLAtODG0swu+fhN6tsAJ3BY="; + buildMypyBoto3Package "rds" "1.41.2" + "sha256-zjERBJnhmrWTrCGhL8Kul7dH6FFo6prEkKyUWQ5e3kk="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.41.0" "sha256-4mTLPREizYhvV/hj2D64F2E/JYF21P2BYvtcLUMPmyc="; mypy-boto3-redshift = - buildMypyBoto3Package "redshift" "1.41.0" - "sha256-KedvA/5nwKm8XQu+dd+5wHd7+3TF6KFufBWdxSyFswM="; + buildMypyBoto3Package "redshift" "1.41.2" + "sha256-WimTyDBgdt6Sk1LD4RZrOzqybKJWMtUHtphgyb5SV3o="; mypy-boto3-redshift-data = buildMypyBoto3Package "redshift-data" "1.41.1" "sha256-TyG0MmalnHdViX428FiumY+oy6UohOhtxkF8BMWDGMo="; mypy-boto3-redshift-serverless = - buildMypyBoto3Package "redshift-serverless" "1.41.0" - "sha256-EbvfDJ+veFj+nKRhUohkSTWFAqv5q82sqFQKIDQNJtY="; + buildMypyBoto3Package "redshift-serverless" "1.41.2" + "sha256-hxpsKuTEZPkDx6f1ynsSCHeM46Lrdx6l+js5BUQLUys="; mypy-boto3-rekognition = buildMypyBoto3Package "rekognition" "1.41.0" @@ -1173,8 +1173,8 @@ in "sha256-Bi97uNPPzYVxPhs1OSYnQPq4HtQ11q9sZHxwRa4q7rM="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.41.1" - "sha256-RvAe5ZhwEAoZyrNti8rFolGm03+h3vaMTyLUXsCc8ok="; + buildMypyBoto3Package "sagemaker" "1.41.2" + "sha256-bZLY2ucajAvbKEpYJVVdG7GB4ft6anSVqcsLYhUg2no="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.41.0" @@ -1253,8 +1253,8 @@ in "sha256-N3TZszOzQ53Efj+9qPHZvddmrF+ABgmN8JeFA0/Dlys="; mypy-boto3-sesv2 = - buildMypyBoto3Package "sesv2" "1.41.0" - "sha256-uqt+xiIRyv3QVq+mz9Bv9PKT3GDeyickvlFEnRkrh0A="; + buildMypyBoto3Package "sesv2" "1.41.2" + "sha256-Bv3w6fex931Mtv324CUDMvpIUxLzTD8+2MPg4SQUnjs="; mypy-boto3-shield = buildMypyBoto3Package "shield" "1.41.0" @@ -1369,8 +1369,8 @@ in "sha256-pMDL5chL+drsMZu5zOlcO11Nym7hKeRcpkf1C0WwPUU="; mypy-boto3-transfer = - buildMypyBoto3Package "transfer" "1.41.0" - "sha256-M+mDl/F1/ca7eyPVrmW38xwbpUmym0SzkDpEThraYr0="; + buildMypyBoto3Package "transfer" "1.41.2" + "sha256-NHSCZ4aHjo+sc/nOTgou5lTwaXXVMtGMkgeFfzKLoJQ="; mypy-boto3-translate = buildMypyBoto3Package "translate" "1.41.0" diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix index 012d9f3186bc..286c0686e368 100644 --- a/pkgs/development/python-modules/paddleocr/default.nix +++ b/pkgs/development/python-modules/paddleocr/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "paddleocr"; - version = "3.3.1"; + version = "3.3.2"; pyproject = true; src = fetchFromGitHub { owner = "PaddlePaddle"; repo = "PaddleOCR"; tag = "v${version}"; - hash = "sha256-cXxt/SxOVDcI+00WLSySSxMDU6qSHik+MWAZ6y4wRJw="; + hash = "sha256-uNgYR9Hop/wNIDG4KQaJxn5m4tBKu5R+pfhO1aSa3iQ="; }; patches = [ diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix index 5d1d564584d7..83574f60f011 100644 --- a/pkgs/development/python-modules/pylacus/default.nix +++ b/pkgs/development/python-modules/pylacus/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pylacus"; - version = "1.19.1"; + version = "1.20.0"; pyproject = true; src = fetchFromGitHub { owner = "ail-project"; repo = "PyLacus"; tag = "v${version}"; - hash = "sha256-aOTXz/77ZeX0xiMeUIaqDrtpMvIM7Idp+3rYeXJ4bpg="; + hash = "sha256-Ody+2zBnApdZqfmS6veWxHgrjVBO3xSulbu5/Uxd2u8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pymorphy2/dicts-ru.nix b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix similarity index 72% rename from pkgs/development/python-modules/pymorphy2/dicts-ru.nix rename to pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix index 2bab523c30c1..b273ef8eef7e 100644 --- a/pkgs/development/python-modules/pymorphy2/dicts-ru.nix +++ b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix @@ -2,24 +2,34 @@ lib, fetchPypi, buildPythonPackage, + + # build-system + setuptools, }: buildPythonPackage rec { pname = "pymorphy2-dicts-ru"; version = "2.4.417127.4579844"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-eMrQOtymBQIavTh6Oy61FchRuG6UaCoe8jVKLHT8wZY="; }; + build-system = [ + setuptools + ]; + + # has no tests + doCheck = false; + pythonImportsCheck = [ "pymorphy2_dicts_ru" ]; - meta = with lib; { + meta = { description = "Russian dictionaries for pymorphy2"; homepage = "https://github.com/kmike/pymorphy2-dicts/"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pymorphy3/dicts-ru.nix b/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix similarity index 75% rename from pkgs/development/python-modules/pymorphy3/dicts-ru.nix rename to pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix index 83a91b0f6aae..c30e31b6efb8 100644 --- a/pkgs/development/python-modules/pymorphy3/dicts-ru.nix +++ b/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix @@ -2,6 +2,9 @@ lib, fetchPypi, buildPythonPackage, + + # build-system + setuptools, }: buildPythonPackage rec { @@ -14,15 +17,19 @@ buildPythonPackage rec { hash = "sha256-Oas3nUypBbr+1Q9a/Do95vlkNgV3b7yrxNMIjU7TgrA="; }; + build-system = [ + setuptools + ]; + # has no tests doCheck = false; pythonImportsCheck = [ "pymorphy3_dicts_ru" ]; - meta = with lib; { + meta = { description = "Russian dictionaries for pymorphy3"; homepage = "https://github.com/no-plagiarism/pymorphy3-dicts"; - license = licenses.mit; - maintainers = with maintainers; [ jboy ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jboy ]; }; } diff --git a/pkgs/development/python-modules/pymorphy3/dicts-uk.nix b/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix similarity index 75% rename from pkgs/development/python-modules/pymorphy3/dicts-uk.nix rename to pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix index 9a755f1559d7..0ce1254dfa37 100644 --- a/pkgs/development/python-modules/pymorphy3/dicts-uk.nix +++ b/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix @@ -2,6 +2,9 @@ lib, fetchPypi, buildPythonPackage, + + # build-system + setuptools, }: buildPythonPackage rec { @@ -14,15 +17,19 @@ buildPythonPackage rec { hash = "sha256-s5RaNBNuGTgGzeZXuicdiKYHYedRN8E9E4qNFCqNEqw="; }; + build-system = [ + setuptools + ]; + # has no tests doCheck = false; pythonImportsCheck = [ "pymorphy3_dicts_uk" ]; - meta = with lib; { + meta = { description = "Ukrainian dictionaries for pymorphy3"; homepage = "https://github.com/no-plagiarism/pymorphy3-dicts"; - license = licenses.mit; - maintainers = with maintainers; [ jboy ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jboy ]; }; } diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix index f44bd9a8f353..a2273ea72efa 100644 --- a/pkgs/development/python-modules/pymorphy3/default.nix +++ b/pkgs/development/python-modules/pymorphy3/default.nix @@ -2,44 +2,60 @@ lib, fetchFromGitHub, buildPythonPackage, - click, - dawg-python, - docopt, - pytestCheckHook, + + # build-system + setuptools, + + # dependencies + dawg2-python, pymorphy3-dicts-ru, pymorphy3-dicts-uk, + + # tests + pytestCheckHook, + click, }: buildPythonPackage rec { pname = "pymorphy3"; - version = "2.0.4"; - format = "setuptools"; + version = "2.0.6"; + pyproject = true; src = fetchFromGitHub { owner = "no-plagiarism"; repo = "pymorphy3"; tag = version; - hash = "sha256-Ula2OQ80dcGeMlXauehXnlEkHLjjm4jZn39eFNltbEA="; + hash = "sha256-5s5v6+vMCeyn/73G5uUfRtTGkkqa7RNW8/r1v3Ay4us="; }; - propagatedBuildInputs = [ - dawg-python - docopt + build-system = [ + setuptools + ]; + + dependencies = [ + dawg2-python pymorphy3-dicts-ru pymorphy3-dicts-uk ]; - optional-dependencies.CLI = [ click ]; + optional-dependencies = { + CLI = [ + click + ]; + }; - nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.CLI; + nativeCheckInputs = [ + pytestCheckHook + ] + ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "pymorphy3" ]; - meta = with lib; { + meta = { description = "Morphological analyzer/inflection engine for Russian and Ukrainian"; mainProgram = "pymorphy"; homepage = "https://github.com/no-plagiarism/pymorphy3"; - license = licenses.mit; - maintainers = with maintainers; [ jboy ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jboy ]; }; } diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix index 597c27f2b049..6d24c8c2ac60 100644 --- a/pkgs/development/python-modules/pytest-notebook/default.nix +++ b/pkgs/development/python-modules/pytest-notebook/default.nix @@ -18,7 +18,6 @@ # tests black, - coverage, ipykernel, pytest-cov-stub, pytest-regressions, @@ -39,6 +38,12 @@ buildPythonPackage rec { hash = "sha256-LoK0wb7rAbVbgyURCbSfckWvJDef3tPY+7V4YU1IBRU="; }; + postPatch = '' + # we disable the tests relying on coverage for unrelated reasons + substituteInPlace tests/test_execution.py \ + --replace-fail "from coverage import CoverageData" "" + ''; + build-system = [ flit-core ]; @@ -62,7 +67,6 @@ buildPythonPackage rec { nativeCheckInputs = [ black - coverage ipykernel pytest-cov-stub pytest-regressions diff --git a/pkgs/development/python-modules/readabilipy/default.nix b/pkgs/development/python-modules/readabilipy/default.nix index 9e2139840643..c3e1d007baec 100644 --- a/pkgs/development/python-modules/readabilipy/default.nix +++ b/pkgs/development/python-modules/readabilipy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { src = src; sourceRoot = "${src.name}/readabilipy/javascript"; - npmDepsHash = "sha256-LiPSCZamkJjivzpawG7H9IEXYjn3uzFeY2vfucyHfUo="; + npmDepsHash = "sha256-1yp80TwRbE/NcMa0qrml0TlSZJ6zwSTmj+zDjBejko8="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/development/python-modules/readabilipy/package-lock.json b/pkgs/development/python-modules/readabilipy/package-lock.json index 1ffa0f56d884..c80a78e1431d 100644 --- a/pkgs/development/python-modules/readabilipy/package-lock.json +++ b/pkgs/development/python-modules/readabilipy/package-lock.json @@ -18,23 +18,48 @@ "node": ">=14.0.0" } }, + "node_modules/@acemir/cssom": { + "version": "0.9.23", + "resolved": "https://registry.npmjs.org/@acemir/cssom/-/cssom-0.9.23.tgz", + "integrity": "sha512-2kJ1HxBKzPLbmhZpxBiTZggjtgCwKg1ma5RHShxvd6zgqhDEdEkzpiwe7jLkI2p2BrZvFCXIihdoMkl1H39VnA==", + "license": "MIT" + }, "node_modules/@asamuzakjp/css-color": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-2.8.3.tgz", - "integrity": "sha512-GIc76d9UI1hCvOATjZPyHFmE5qhRccp3/zGfMPapK3jBi+yocEzp6BBB0UnfRYP9NP4FANqUZYb0hnfs3TM3hw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.0.tgz", + "integrity": "sha512-9xiBAtLn4aNsa4mDnpovJvBn72tNEIACyvlqaNJ+ADemR+yeMJWnBudOi2qGDviJa7SwcDOU/TRh5dnET7qk0w==", "license": "MIT", "dependencies": { - "@csstools/css-calc": "^2.1.1", - "@csstools/css-color-parser": "^3.0.7", - "@csstools/css-parser-algorithms": "^3.0.4", - "@csstools/css-tokenizer": "^3.0.3", - "lru-cache": "^10.4.3" + "@csstools/css-calc": "^2.1.4", + "@csstools/css-color-parser": "^3.1.0", + "@csstools/css-parser-algorithms": "^3.0.5", + "@csstools/css-tokenizer": "^3.0.4", + "lru-cache": "^11.2.2" } }, + "node_modules/@asamuzakjp/dom-selector": { + "version": "6.7.4", + "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.7.4.tgz", + "integrity": "sha512-buQDjkm+wDPXd6c13534URWZqbz0RP5PAhXZ+LIoa5LgwInT9HVJvGIJivg75vi8I13CxDGdTnz+aY5YUJlIAA==", + "license": "MIT", + "dependencies": { + "@asamuzakjp/nwsapi": "^2.3.9", + "bidi-js": "^1.0.3", + "css-tree": "^3.1.0", + "is-potential-custom-element-name": "^1.0.1", + "lru-cache": "^11.2.2" + } + }, + "node_modules/@asamuzakjp/nwsapi": { + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/@asamuzakjp/nwsapi/-/nwsapi-2.3.9.tgz", + "integrity": "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==", + "license": "MIT" + }, "node_modules/@csstools/color-helpers": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz", - "integrity": "sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz", + "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==", "funding": [ { "type": "github", @@ -51,9 +76,9 @@ } }, "node_modules/@csstools/css-calc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz", - "integrity": "sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz", + "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==", "funding": [ { "type": "github", @@ -69,14 +94,14 @@ "node": ">=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^3.0.4", - "@csstools/css-tokenizer": "^3.0.3" + "@csstools/css-parser-algorithms": "^3.0.5", + "@csstools/css-tokenizer": "^3.0.4" } }, "node_modules/@csstools/css-color-parser": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz", - "integrity": "sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz", + "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==", "funding": [ { "type": "github", @@ -89,21 +114,21 @@ ], "license": "MIT", "dependencies": { - "@csstools/color-helpers": "^5.0.2", - "@csstools/css-calc": "^2.1.2" + "@csstools/color-helpers": "^5.1.0", + "@csstools/css-calc": "^2.1.4" }, "engines": { "node": ">=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^3.0.4", - "@csstools/css-tokenizer": "^3.0.3" + "@csstools/css-parser-algorithms": "^3.0.5", + "@csstools/css-tokenizer": "^3.0.4" } }, "node_modules/@csstools/css-parser-algorithms": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz", - "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz", + "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==", "funding": [ { "type": "github", @@ -119,13 +144,32 @@ "node": ">=18" }, "peerDependencies": { - "@csstools/css-tokenizer": "^3.0.3" + "@csstools/css-tokenizer": "^3.0.4" + } + }, + "node_modules/@csstools/css-syntax-patches-for-csstree": { + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.17.tgz", + "integrity": "sha512-LCC++2h8pLUSPY+EsZmrrJ1EOUu+5iClpEiDhhdw3zRJpPbABML/N5lmRuBHjxtKm9VnRcsUzioyD0sekFMF0A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT-0", + "engines": { + "node": ">=18" } }, "node_modules/@csstools/css-tokenizer": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz", - "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz", + "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==", "funding": [ { "type": "github", @@ -142,84 +186,76 @@ } }, "node_modules/@mozilla/readability": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@mozilla/readability/-/readability-0.5.0.tgz", - "integrity": "sha512-Z+CZ3QaosfFaTqvhQsIktyGrjFjSC0Fa4EMph4mqKnWhmyoGICsV/8QK+8HpXut6zV7zwfWwqDmEjtk1Qf6EgQ==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@mozilla/readability/-/readability-0.6.0.tgz", + "integrity": "sha512-juG5VWh4qAivzTAeMzvY9xs9HY5rAcr2E4I7tiSSCokRFi7XIZCAu92ZkSTsIj1OPceCifL3cpfteP3pDT9/QQ==", "license": "Apache-2.0", "engines": { "node": ">=14.0.0" } }, "node_modules/agent-base": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", - "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", + "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", "license": "MIT", "engines": { "node": ">= 14" } }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "license": "MIT" - }, - "node_modules/call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "node_modules/bidi-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz", + "integrity": "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==", "license": "MIT", "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" + "require-from-string": "^2.0.2" } }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "node_modules/css-tree": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz", + "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==", "license": "MIT", "dependencies": { - "delayed-stream": "~1.0.0" + "mdn-data": "2.12.2", + "source-map-js": "^1.0.1" }, "engines": { - "node": ">= 0.8" + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" } }, "node_modules/cssstyle": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.2.1.tgz", - "integrity": "sha512-9+vem03dMXG7gDmZ62uqmRiMRNtinIZ9ZyuF6BdxzfOD+FdN5hretzynkn0ReS2DO2GSw76RWHs0UmJPI2zUjw==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.3.tgz", + "integrity": "sha512-OytmFH+13/QXONJcC75QNdMtKpceNk3u8ThBjyyYjkEcy/ekBwR1mMAuNvi3gdBPW3N5TlCzQ0WZw8H0lN/bDw==", "license": "MIT", "dependencies": { - "@asamuzakjp/css-color": "^2.8.2", - "rrweb-cssom": "^0.8.0" + "@asamuzakjp/css-color": "^4.0.3", + "@csstools/css-syntax-patches-for-csstree": "^1.0.14", + "css-tree": "^3.1.0" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/data-urls": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", - "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-6.0.0.tgz", + "integrity": "sha512-BnBS08aLUM+DKamupXs3w2tJJoqU+AkaE/+6vQxi/G/DPmIZFJJp9Dkb1kM03AZx8ADehDUZgsNxju3mPXZYIA==", "license": "MIT", "dependencies": { "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.0.0" + "whatwg-url": "^15.0.0" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/debug": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", - "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -234,38 +270,15 @@ } }, "node_modules/decimal.js": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz", - "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==", + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz", + "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==", "license": "MIT" }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", + "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==", "license": "BSD-2-Clause", "engines": { "node": ">=0.12" @@ -274,163 +287,6 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, - "node_modules/es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-set-tostringtag": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", - "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.6", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/form-data": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", - "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "license": "MIT", - "dependencies": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "license": "MIT", - "dependencies": { - "has-symbols": "^1.0.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/html-encoding-sniffer": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", @@ -488,35 +344,34 @@ "license": "MIT" }, "node_modules/jsdom": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz", - "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-27.2.0.tgz", + "integrity": "sha512-454TI39PeRDW1LgpyLPyURtB4Zx1tklSr6+OFOipsxGUH1WMTvk6C65JQdrj455+DP2uJ1+veBEHTGFKWVLFoA==", "license": "MIT", "dependencies": { - "cssstyle": "^4.2.1", - "data-urls": "^5.0.0", - "decimal.js": "^10.4.3", - "form-data": "^4.0.1", + "@acemir/cssom": "^0.9.23", + "@asamuzakjp/dom-selector": "^6.7.4", + "cssstyle": "^5.3.3", + "data-urls": "^6.0.0", + "decimal.js": "^10.6.0", "html-encoding-sniffer": "^4.0.0", "http-proxy-agent": "^7.0.2", "https-proxy-agent": "^7.0.6", "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.16", - "parse5": "^7.2.1", - "rrweb-cssom": "^0.8.0", + "parse5": "^8.0.0", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^5.0.0", + "tough-cookie": "^6.0.0", "w3c-xmlserializer": "^5.0.0", - "webidl-conversions": "^7.0.0", + "webidl-conversions": "^8.0.0", "whatwg-encoding": "^3.1.1", "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.1.0", - "ws": "^8.18.0", + "whatwg-url": "^15.1.0", + "ws": "^8.18.3", "xml-name-validator": "^5.0.0" }, "engines": { - "node": ">=18" + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { "canvas": "^3.0.0" @@ -528,40 +383,19 @@ } }, "node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "license": "ISC" - }, - "node_modules/math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "license": "MIT", + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz", + "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==", + "license": "ISC", "engines": { - "node": ">= 0.4" + "node": "20 || >=22" } }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } + "node_modules/mdn-data": { + "version": "2.12.2", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz", + "integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==", + "license": "CC0-1.0" }, "node_modules/minimist": { "version": "1.2.8", @@ -578,19 +412,13 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, - "node_modules/nwsapi": { - "version": "2.2.16", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz", - "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==", - "license": "MIT" - }, "node_modules/parse5": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", - "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.0.tgz", + "integrity": "sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA==", "license": "MIT", "dependencies": { - "entities": "^4.5.0" + "entities": "^6.0.0" }, "funding": { "url": "https://github.com/inikulin/parse5?sponsor=1" @@ -605,11 +433,14 @@ "node": ">=6" } }, - "node_modules/rrweb-cssom": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", - "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==", - "license": "MIT" + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } }, "node_modules/safer-buffer": { "version": "2.1.2", @@ -629,6 +460,15 @@ "node": ">=v12.22.7" } }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -636,45 +476,45 @@ "license": "MIT" }, "node_modules/tldts": { - "version": "6.1.78", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.78.tgz", - "integrity": "sha512-fSgYrW0ITH0SR/CqKMXIruYIPpNu5aDgUp22UhYoSrnUQwc7SBqifEBFNce7AAcygUPBo6a/gbtcguWdmko4RQ==", + "version": "7.0.18", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.18.tgz", + "integrity": "sha512-lCcgTAgMxQ1JKOWrVGo6E69Ukbnx4Gc1wiYLRf6J5NN4HRYJtCby1rPF8rkQ4a6qqoFBK5dvjJ1zJ0F7VfDSvw==", "license": "MIT", "dependencies": { - "tldts-core": "^6.1.78" + "tldts-core": "^7.0.18" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.78", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.78.tgz", - "integrity": "sha512-jS0svNsB99jR6AJBmfmEWuKIgz91Haya91Z43PATaeHJ24BkMoNRb/jlaD37VYjb0mYf6gRL/HOnvS1zEnYBiw==", + "version": "7.0.18", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.18.tgz", + "integrity": "sha512-jqJC13oP4FFAahv4JT/0WTDrCF9Okv7lpKtOZUGPLiAnNbACcSg8Y8T+Z9xthOmRBqi/Sob4yi0TE0miRCvF7Q==", "license": "MIT" }, "node_modules/tough-cookie": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.1.tgz", - "integrity": "sha512-Ek7HndSVkp10hmHP9V4qZO1u+pn1RU5sI0Fw+jCU3lyvuMZcgqsNgc6CmJJZyByK4Vm/qotGRJlfgAX8q+4JiA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.0.tgz", + "integrity": "sha512-kXuRi1mtaKMrsLUxz3sQYvVl37B0Ns6MzfrtV5DvJceE9bPyspOqk9xxv7XbZWcfLWbFmm997vl83qUWVJA64w==", "license": "BSD-3-Clause", "dependencies": { - "tldts": "^6.1.32" + "tldts": "^7.0.5" }, "engines": { "node": ">=16" } }, "node_modules/tr46": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz", - "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-6.0.0.tgz", + "integrity": "sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==", "license": "MIT", "dependencies": { "punycode": "^2.3.1" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/w3c-xmlserializer": { @@ -690,12 +530,12 @@ } }, "node_modules/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.0.tgz", + "integrity": "sha512-n4W4YFyz5JzOfQeA8oN7dUYpR+MBP3PIUsn2jLjWXwK5ASUzt0Jc/A5sAUZoCYFJRGF0FBKJ+1JjN43rNdsQzA==", "license": "BSD-2-Clause", "engines": { - "node": ">=12" + "node": ">=20" } }, "node_modules/whatwg-encoding": { @@ -720,22 +560,22 @@ } }, "node_modules/whatwg-url": { - "version": "14.1.1", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.1.tgz", - "integrity": "sha512-mDGf9diDad/giZ/Sm9Xi2YcyzaFpbdLpJPr+E9fSkyQ7KpQD4SdFcugkRQYzhmfI4KeV4Qpnn2sKPdo+kmsgRQ==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-15.1.0.tgz", + "integrity": "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==", "license": "MIT", "dependencies": { - "tr46": "^5.0.0", - "webidl-conversions": "^7.0.0" + "tr46": "^6.0.0", + "webidl-conversions": "^8.0.0" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/ws": { - "version": "8.18.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz", - "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==", + "version": "8.18.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", + "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==", "license": "MIT", "engines": { "node": ">=10.0.0" diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index d4a9f4a9dc0f..53b75ddc1e0a 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.28.4"; + version = "0.29.0"; pyproject = true; src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-FZKdqEgC8nAZ7o5EhPscEC4fbUzyLrSGiMNKWobQLrY="; + hash = "sha256-f4EECEYJXLr2Tmt5BAQ0dQ1PL0h1RNd0i3eMNJ05NRA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix index 3a0b55d4cd7f..15613a2de024 100644 --- a/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -2,21 +2,18 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "types-s3transfer"; - version = "0.14.0"; + version = "0.15.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "types_s3transfer"; inherit version; - hash = "sha256-F/gAqHx+r6sENOnYdFLICcKQrpBsICTCQmHFZEeenJU="; + hash = "sha256-Q6Uj4MQ6iORH39pfT2tjvz2oUxb90mJfZQgX8rFwtfc="; }; build-system = [ setuptools ]; diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index d5d16ff3066c..772b53f12436 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "guvcview"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${finalAttrs.version}.tar.bz2"; - hash = "sha256-0q3HznYpYehTw+FrURutYVBEktEvPi634w2kovet5a8="; + hash = "sha256-ahsTSLmeedqVeg2eI3OVpUdXoJ234MCAn2wwZotp2js="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/lkrg/default.nix b/pkgs/os-specific/linux/lkrg/default.nix index 2a3c09ff5c96..734a8cef3f7f 100644 --- a/pkgs/os-specific/linux/lkrg/default.nix +++ b/pkgs/os-specific/linux/lkrg/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation (finalAttrs: { name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; pname = "lkrg"; - version = "0.9.9"; + version = "1.0.0"; src = fetchFromGitHub { owner = "lkrg-org"; repo = "lkrg"; rev = "v${finalAttrs.version}"; - hash = "sha256-dxgkEj8HGOX4AMZRNbhv3utrNjKDFpp7kZmj17Wp2HE="; + hash = "sha256-Eb0+rgbI+gbY1NjVyPLB6kZgDsYoSCxjy162GophiMI="; }; hardeningDisable = [ "pic" ]; @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { description = "LKRG Linux Kernel module"; longDescription = "LKRG performs runtime integrity checking of the Linux kernel and detection of security vulnerability exploits against the kernel."; homepage = "https://lkrg.org/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ chivay ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ chivay ]; + platforms = lib.platforms.linux; broken = kernel.kernelOlder "5.10" || isKernelRT; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eca88e602ecb..ce75607dd4eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10627,6 +10627,10 @@ with pkgs; audacious = audacious-bare.override { withPlugins = true; }; + audacity = callPackage ../by-name/au/audacity/package.nix { + ffmpeg = ffmpeg_7; + }; + bambootracker-qt6 = bambootracker.override { withQt6 = true; }; ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ee01509335e..cabddf5f36b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3517,6 +3517,8 @@ self: super: with self; { dawg-python = callPackage ../development/python-modules/dawg-python { }; + dawg2-python = callPackage ../development/python-modules/dawg2-python { }; + dazl = callPackage ../development/python-modules/dazl { }; db-dtypes = callPackage ../development/python-modules/db-dtypes { }; @@ -13746,13 +13748,13 @@ self: super: with self; { pymorphy2 = callPackage ../development/python-modules/pymorphy2 { }; - pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2/dicts-ru.nix { }; + pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2-dicts-ru { }; pymorphy3 = callPackage ../development/python-modules/pymorphy3 { }; - pymorphy3-dicts-ru = callPackage ../development/python-modules/pymorphy3/dicts-ru.nix { }; + pymorphy3-dicts-ru = callPackage ../development/python-modules/pymorphy3-dicts-ru { }; - pymorphy3-dicts-uk = callPackage ../development/python-modules/pymorphy3/dicts-uk.nix { }; + pymorphy3-dicts-uk = callPackage ../development/python-modules/pymorphy3-dicts-uk { }; pympler = callPackage ../development/python-modules/pympler { };