diff --git a/nixos/modules/services/networking/knot-resolver.nix b/nixos/modules/services/networking/knot-resolver.nix index d943b29b5b73..4aa8d47f110a 100644 --- a/nixos/modules/services/networking/knot-resolver.nix +++ b/nixos/modules/services/networking/knot-resolver.nix @@ -10,17 +10,17 @@ let configFile = pkgs.callPackage ( { runCommandLocal, - remarshal_0_17, + remarshal, stdenv, }: runCommandLocal "knot-resolver.yaml" { - nativeBuildInputs = [ remarshal_0_17 ]; + nativeBuildInputs = [ remarshal ]; value = builtins.toJSON cfg.settings; passAsFile = [ "value" ]; } '' - json2yaml "$valuePath" "$out" + remarshal --from json --to yaml-1.1 "$valuePath" "$out" ${ # We skip validation if the build platform cannot execute # the binary targeting the host platform. lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/nixos/modules/services/web-apps/tabbyapi.nix b/nixos/modules/services/web-apps/tabbyapi.nix index a955afe463b5..7c357b15551f 100644 --- a/nixos/modules/services/web-apps/tabbyapi.nix +++ b/nixos/modules/services/web-apps/tabbyapi.nix @@ -35,12 +35,14 @@ in type = lib.types.str; default = "127.0.0.1"; description = "The IP to host on. Use 0.0.0.0 to expose on all network adapters."; + example = "0.0.0.0"; }; port = lib.mkOption { type = lib.types.port; default = 5000; description = "The port to host on."; + example = 8080; }; disable_auth = lib.mkOption { @@ -58,10 +60,34 @@ in description = "Disable fetching external content in response to requests, such as images from URLs."; }; + send_tracebacks = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Send tracebacks over the API. + NOTE: Only enable this for debug purposes. + ''; + }; + api_servers = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ "OAI" ]; description = "Select API servers to enable. Possible values: OAI, Kobold."; + example = [ + "OAI" + "Kobold" + ]; + }; + + sse_ping_interval = lib.mkOption { + type = lib.types.ints.unsigned; + default = 15; + description = '' + Seconds between SSE keep-alive pings on streaming responses. + Pings are SSE comments, ignored by compliant clients, and prevent + connections from dropping during long prefills. Set to 0 to disable. + ''; + example = 0; }; }; @@ -72,6 +98,12 @@ in description = "Enable prompt logging."; }; + log_generation_params = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable generation parameter logging."; + }; + log_requests = lib.mkOption { type = lib.types.bool; default = false; @@ -141,6 +173,15 @@ in ''; }; + use_dummy_models = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Sends dummy model names when the models endpoint is queried. + Enable this if the client is looking for specific OAI models. + ''; + }; + model_name = lib.mkOption { type = lib.types.nullOr lib.types.str; default = null; @@ -151,6 +192,20 @@ in example = "Qwen3_5-9B"; }; + use_as_default = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Names of args to use as a fallback for API load requests. + For example, if you always want cache_mode to be Q4 instead of only on the + initial model load, add "cache_mode" to this list. + ''; + example = [ + "max_seq_len" + "cache_mode" + ]; + }; + max_seq_len = lib.mkOption { type = lib.types.nullOr lib.types.int; default = null; @@ -158,6 +213,22 @@ in Max sequence length (default: min(max_position_embeddings, cache_size)). Set to -1 to fetch from the model's config.json. ''; + example = 32768; + }; + + cache_size = lib.mkOption { + type = lib.types.nullOr ( + lib.types.addCheck lib.types.ints.positive (n: lib.mod n 256 == 0) + // { + description = "positive integer, multiple of 256"; + } + ); + default = null; + description = '' + Size of the key/value cache to allocate, in tokens (default: 4096). + Must be a multiple of 256. + ''; + example = 32768; }; cache_mode = lib.mkOption { @@ -168,6 +239,7 @@ in Specify the pair k_bits,v_bits where k_bits and v_bits are integers from 2-8 (e.g. '8,8'). The legacy values 'FP16', 'Q8', 'Q6', 'Q4' are also accepted. ''; + example = "8,8"; }; tensor_parallel = lib.mkOption { @@ -185,6 +257,111 @@ in description = "Automatically allocate resources to GPUs. Not parsed for single GPU users."; }; + autosplit_reserve = lib.mkOption { + type = lib.types.listOf lib.types.number; + default = [ 96 ]; + description = '' + Reserve VRAM used for autosplit loading, as a list of MB per GPU + (default: 96 MB on GPU 0). + ''; + example = [ + 96 + 96 + ]; + }; + + gpu_split = lib.mkOption { + type = lib.types.listOf lib.types.number; + default = [ ]; + description = '' + List of VRAM sizes to split between GPUs, in GB. + Used with tensor parallelism. + ''; + example = [ + 16 + 24 + ]; + }; + + cpu_moe_offload_layers = lib.mkOption { + type = lib.types.ints.unsigned; + default = 0; + description = '' + Number of mixture-of-expert layers to offload to CPU inference. + Only affects MoE models. Set a large value such as 999 to offload all layers. + ''; + example = 999; + }; + + rope_scale = lib.mkOption { + type = lib.types.nullOr lib.types.number; + default = 1.0; + description = '' + Rope scale, same as compress_pos_emb. + Use if the model was trained on long context with rope. + Set to null to pull the value from the model. + + NOTE: If a model has YaRN rope scaling, it will automatically be enabled by + ExLlama and the rope_scale and rope_alpha settings won't apply. + ''; + example = 4.0; + }; + + rope_alpha = lib.mkOption { + type = lib.types.nullOr (lib.types.either lib.types.number (lib.types.enum [ "auto" ])); + default = null; + description = '' + Rope alpha, same as alpha_value. Set to "auto" to auto-calculate. + Leaving this null will either pull from the model or auto-calculate. + ''; + example = "auto"; + }; + + chunk_size = lib.mkOption { + type = lib.types.ints.positive; + default = 2048; + description = '' + Chunk size for prompt ingestion. + A lower value reduces VRAM usage but decreases ingestion speed. + NOTE: Effects vary depending on the model. An ideal value is between 512 and 4096. + ''; + example = 512; + }; + + output_chunking = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Use output chunking. Instead of allocating cache space for the entire completion + at once, allocate in chunks as needed. Used by EXL3 models only. + ''; + }; + + max_batch_size = lib.mkOption { + type = lib.types.nullOr lib.types.ints.positive; + default = null; + description = '' + Set the maximum number of generation jobs that can run concurrently. + The default maximum batch size for transformer architectures is 32. Recurrent + models with linear or sliding attention use more VRAM to support larger batches, + so the default value is reduced to 4. If you do not require concurrency at all, + you can reduce it further to minimize VRAM overhead. + ''; + example = 1; + }; + + prompt_template = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + Set the prompt template for this model. + If null, attempts to look for the model's chat template. + If a model contains multiple templates in its tokenizer_config.json, + set this to the name of the template you want to use. + NOTE: Only works with chat completion message lists! + ''; + }; + dummy_model_names = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ "gpt-3.5-turbo" ]; @@ -192,6 +369,10 @@ in A list of fake model names that are sent via the /v1/models endpoint. Also used as bypasses for strict mode if inline_model_loading is true. ''; + example = [ + "gpt-3.5-turbo" + "gpt-4" + ]; }; vision = lib.mkOption { @@ -200,6 +381,34 @@ in description = "Enables vision support if the model supports it."; }; + template_vars_default = lib.mkOption { + type = lib.types.attrsOf lib.types.anything; + default = { }; + description = '' + Default chat template variables. Merged into the template variables of every + chat completion request; values sent by the client (template_vars / + chat_template_kwargs, or the top-level reasoning_effort field) take precedence. + Use for model-specific reasoning knobs. + ''; + example = { + enable_thinking = true; + }; + }; + + template_vars_force = lib.mkOption { + type = lib.types.attrsOf lib.types.anything; + default = { }; + description = '' + Forced chat template variables. Like template_vars_default, but these override + any values sent by the client. + Replaces the deprecated force_enable_thinking option, which is still accepted + as an alias for { enable_thinking = true; }. + ''; + example = { + reasoning_effort = "high"; + }; + }; + reasoning = lib.mkOption { type = lib.types.bool; default = false; @@ -220,7 +429,243 @@ in default = ""; description = "The end token for reasoning content."; }; + + start_in_reasoning = lib.mkOption { + type = lib.types.enum [ + "auto" + "always" + "never" + ]; + default = "auto"; + description = '' + Whether generation starts inside a reasoning block. + "auto" guesses by scanning the end of the templated prompt for an unclosed + reasoning start token. + ''; + example = "always"; + }; + + tool_calls_in_reasoning = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Parse tool calls that occur inside reasoning content. + If false, tool call tags inside a reasoning block are treated as plain + reasoning text. + ''; + }; + + tool_format = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + Tool format, e.g. "qwen3_coder". See upstream docs for supported formats. + If null, tool calls from the model will not be parsed by the server. + ''; + example = "qwen3_coder"; + }; + + harmony = lib.mkOption { + type = lib.types.nullOr lib.types.bool; + default = null; + description = '' + Parse responses in the Harmony message format (gpt-oss models). + Auto-detected from the model's special tokens when null; set to true or false + to override. Setting tool_format to "harmony" is equivalent to setting this to + true. When active, supersedes the reasoning and tool format settings. + ''; + }; }; + + draft_model = { + draft_mode = lib.mkOption { + type = lib.types.enum [ + "model" + "disabled" + "mtp" + "ngram" + ]; + default = "model"; + description = '' + Drafting mode for exllamav3. + In "model" mode, drafting is disabled if no draft_model_name is provided. + ''; + example = "ngram"; + }; + + draft_model_dir = lib.mkOption { + type = lib.types.str; + default = "models"; + description = "Directory to look for draft models. Relative to the state directory."; + example = "drafts"; + }; + + draft_model_name = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + An initial draft model to load. + Ensure the model is in the draft model directory. + ''; + example = "Qwen3-0.6B-exl3"; + }; + + draft_rope_scale = lib.mkOption { + type = lib.types.nullOr lib.types.number; + default = 1.0; + description = '' + Rope scale for draft models, same as compress_pos_emb. + Use if the draft model was trained on long context with rope. + ''; + example = 4.0; + }; + + draft_rope_alpha = lib.mkOption { + type = lib.types.nullOr lib.types.number; + default = null; + description = '' + Rope alpha for draft models, same as alpha_value. + Leaving this null will either pull from the model or auto-calculate. + ''; + example = 2.0; + }; + + draft_cache_mode = lib.mkOption { + type = lib.types.enum [ + "FP16" + "Q8" + "Q6" + "Q4" + ]; + default = "FP16"; + description = '' + Cache mode for draft models to save VRAM. + Unlike the model's cache_mode, this does not accept a k_bits,v_bits pair. + ''; + example = "Q8"; + }; + + draft_gpu_split = lib.mkOption { + type = lib.types.listOf lib.types.number; + default = [ ]; + description = '' + List of VRAM sizes to split between GPUs, in GB. + If this is empty, the draft model is autosplit. + ''; + example = [ + 2 + 2 + ]; + }; + + draft_num_tokens = lib.mkOption { + type = lib.types.nullOr lib.types.ints.positive; + default = null; + description = '' + Number of tokens to draft per iteration (default: draft model default). + Recurrent (linear or sliding attention) models use more VRAM for longer drafts. + This overhead multiplies with the max batch size, so for models with long drafts + (e.g. DFlash with 15 tokens by default) shorter drafts may be preferable. + ''; + example = 4; + }; + + dynamic_draft = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Adjust number of draft tokens dynamically based on observed acceptance rates. + Ceiling is given by draft_num_tokens. + ''; + }; + + ngram_match_min = lib.mkOption { + type = lib.types.ints.positive; + default = 2; + description = '' + Minimum match length for exllamav3 n-gram drafting. + Only used when draft_mode is "ngram". + ''; + example = 3; + }; + }; + + sampling = { + override_preset = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + Select a sampler override preset, found in the sampler-overrides folder. + This overrides default fallbacks for sampler values that are passed to the API. + NOTE: "safe_defaults" is noob friendly and provides fallbacks for frontends that + don't send sampling parameters. Leave this null for any advanced usage. + ''; + example = "safe_defaults"; + }; + }; + + lora = { + lora_dir = lib.mkOption { + type = lib.types.str; + default = "loras"; + description = "Directory to look for LoRAs. Relative to the state directory."; + }; + + loras = lib.mkOption { + type = lib.types.listOf ( + lib.types.submodule { + options = { + name = lib.mkOption { + type = lib.types.str; + description = "Name of the LoRA directory inside lora_dir."; + }; + + scaling = lib.mkOption { + type = lib.types.number; + default = 1.0; + description = "Scaling factor for this LoRA."; + }; + }; + } + ); + default = [ ]; + description = "List of LoRAs to load and associated scaling factors."; + example = [ + { + name = "lora1"; + scaling = 1.0; + } + ]; + }; + }; + + memory = { + sysmem_recurrent_cache = lib.mkOption { + type = lib.types.ints.unsigned; + default = 4096; + description = "Max size of recurrent cache in system memory, in MB."; + example = 8192; + }; + + sysmem_kv_cache = lib.mkOption { + type = lib.types.ints.unsigned; + default = 0; + description = "Size of system memory second-tier key/value cache, in MB."; + example = 4096; + }; + + cuda_malloc_async = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Use the cudaMallocAsync backend in Torch. + Enabling this is generally preferable, but it may cause issues with certain + workloads. Try disabling it if you experience intermittent OoM errors. If false, + Torch will use the allocator defined by the system environment. + ''; + }; + }; + }; }; }; @@ -236,6 +681,14 @@ in services.tabbyapi.package = pkgs.pkgsCuda.tabbyapi; ''; } + { + assertion = !(cfg.settings.model ? force_enable_thinking); + message = '' + services.tabbyapi.settings.model.force_enable_thinking is deprecated upstream. + Use template_vars_force instead: + services.tabbyapi.settings.model.template_vars_force.enable_thinking = true; + ''; + } ]; networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.network.port diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 08ab6bec05a1..ea395f307647 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -206,6 +206,7 @@ let if [ -z "${toString (pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform)}" ]; then # Make sure that the patchelf'ed binaries still work. echo "testing patched programs..." + set -x $out/bin/ash -c 'echo hello world' | grep "hello world" $out/bin/mount -V 2>&1 | grep -q "mount from util-linux" $out/bin/blkid -V 2>&1 | grep -q 'libblkid' @@ -218,6 +219,7 @@ let ''} ${config.boot.initrd.extraUtilsCommandsTest} + set +x fi ''; # */ diff --git a/nixos/tests/web-apps/dashy.nix b/nixos/tests/web-apps/dashy.nix index d83c14d3294f..d54b08d60b3a 100644 --- a/nixos/tests/web-apps/dashy.nix +++ b/nixos/tests/web-apps/dashy.nix @@ -18,7 +18,7 @@ let ]; }; - customSettingsYaml = (pkgs.formats.yaml_1_1 { }).generate "custom-conf.yaml" customSettings; + customSettingsYaml = (pkgs.formats.yaml_1_2 { }).generate "custom-conf.yaml" customSettings; in { name = "dashy"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b92e5abea499..d4dcf8a7c136 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1174,8 +1174,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.24.29"; - hash = "sha256-E/B1YiTc2RR/dh3QpYTO/bgzFldYQfuM/tZ650nJYJA="; + version = "3.24.39"; + hash = "sha256-r1XkER09s+38uCbUxK9MM5bHRNp3UnMj6VJCHUMZM1Q="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; @@ -1760,8 +1760,8 @@ let mktplcRef = { name = "foam-vscode"; publisher = "foam"; - version = "0.44.4"; - hash = "sha256-YMNYT/QDcg25fG2fidbFOU41RBIk/l49Se5ca4AyMe8="; + version = "0.44.5"; + hash = "sha256-MiQ1Ze0vW0JCfmKVFe6eAWBbHhZqDKtRhhiQMkBgRe4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3b4038913926..2d172e847f87 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -36,13 +36,13 @@ "vendorHash": "sha256-Ii0NfdkAxD9CGKUOzg1T9r0LsNajHBTfEY9GNBxxngc=" }, "akamai_akamai": { - "hash": "sha256-AYvC8s8OKwlwF8eDoCsuOhOanCwbn/5u/vGumee6FNg=", + "hash": "sha256-XGTdfOUr3Nb2vV49aGZThuae/n9KrM3NZ8A0P/LrSXg=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v10.3.0", + "rev": "v10.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-031RZo1EqWrt79NvdrrZ9FW/E+mfwkGmr7wyMYX4SHg=" + "vendorHash": "sha256-DTPaRkNWitoriOE0G+RctMIHAdSPK4wq410a+XxLnOY=" }, "aliyun_alicloud": { "hash": "sha256-es2ti8tSgShwUWYtZ7OEff88LLiAnK4B/Hq9PaNEEOc=", @@ -535,11 +535,11 @@ "vendorHash": null }, "hashicorp_azurerm": { - "hash": "sha256-M8Kq0lVbPtob2g8j8k4OJenAz8f5jjSobf192TrpSEg=", + "hash": "sha256-iskhDSt6pjQjdiqhlVd7PmOewTduOxRL9KWPoIHKLLU=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v4.81.0", + "rev": "v5.0.1", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index aacea71aedf9..73c8763b5de5 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -105,11 +105,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { pname = "weechat"; - version = "4.9.5"; + version = "4.10.0"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-OzlGEE5kU20GAjcKMOVd1aMBzI/0IBhP8KEBkm2tHRY="; + hash = "sha256-w6fnxqVAHd6aRtAmT6RKowMsqYqoZBDEVNPeXGlQXFQ="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index d4a785417e24..bd3751b5d19d 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "docker-compose"; - version = "5.3.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; tag = "v${version}"; - hash = "sha256-UNORlxZ/b4Jrp9v8pbsxTt8PrYq1/u4AjBU8+pfuG1k="; + hash = "sha256-BLApJ1RWI2nUM3EDFLWBPwIbT+wUUCqxCRjc7QlkFd4="; }; - vendorHash = "sha256-Ug6/hpuHgJ2CAUX87/+Tt3cHm4AbJF9oznx61kTVKI4="; + vendorHash = "sha256-NCHNe+aLNsJNtKdgQxyL6cMuu9XxA5ycleHf9gToEks="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix index 74b57dd395e6..c165932cf0b4 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix @@ -7,7 +7,7 @@ mkHyprlandPlugin (finalAttrs: { pluginName = "hypr-darkwindow"; - version = "0.56.0"; + version = "0.56.1"; src = fetchFromGitHub { owner = "micha4w"; diff --git a/pkgs/build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh b/pkgs/build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh deleted file mode 100755 index 376a7abfe41c..000000000000 --- a/pkgs/build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh +++ /dev/null @@ -1,49 +0,0 @@ -#! @shell@ -# shellcheck shell=bash - -set -eu -o pipefail +o posix -shopt -s nullglob - -if (( "${NIX_DEBUG:-0}" >= 7 )); then - set -x -fi - -source @signingUtils@ - -extraAfter=() -extraBefore=() -params=("$@") - -input= - -pprev= -prev= -for p in \ - ${extraBefore+"${extraBefore[@]}"} \ - ${params+"${params[@]}"} \ - ${extraAfter+"${extraAfter[@]}"} -do - if [ "$pprev" != "-change" ] && [[ "$prev" != -* ]] && [[ "$p" != -* ]]; then - input="$p" - fi - pprev="$prev" - prev="$p" -done - -# Optionally print debug info. -if (( "${NIX_DEBUG:-0}" >= 1 )); then - # Old bash workaround, see above. - echo "extra flags before to @prog@:" >&2 - printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 - echo "original flags to @prog@:" >&2 - printf " %q\n" ${params+"${params[@]}"} >&2 - echo "extra flags after to @prog@:" >&2 - printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 -fi - -@prog@ \ - ${extraBefore+"${extraBefore[@]}"} \ - ${params+"${params[@]}"} \ - ${extraAfter+"${extraAfter[@]}"} - -sign "$input" diff --git a/pkgs/build-support/bintools-wrapper/darwin-strip-wrapper.sh b/pkgs/build-support/bintools-wrapper/darwin-strip-wrapper.sh deleted file mode 100755 index a67699547a6f..000000000000 --- a/pkgs/build-support/bintools-wrapper/darwin-strip-wrapper.sh +++ /dev/null @@ -1,78 +0,0 @@ -#! @shell@ -# shellcheck shell=bash - -set -eu -o pipefail +o posix -shopt -s nullglob - -if (( "${NIX_DEBUG:-0}" >= 7 )); then - set -x -fi - -source @signingUtils@ - -extraAfter=() -extraBefore=() -params=("$@") - -output= -inputs=() - -restAreFiles= -prev= -for p in \ - ${extraBefore+"${extraBefore[@]}"} \ - ${params+"${params[@]}"} \ - ${extraAfter+"${extraAfter[@]}"} -do - if [ "$restAreFiles" ]; then - inputs+=("$p") - else - case "$prev" in - -s|-R|-d|-arch) - # Unrelated arguments with values - ;; - -o) - # Explicit output - output="$p" - ;; - *) - # Any other orgument either takes no value, or is a file. - if [[ "$p" != -* ]]; then - inputs+=("$p") - fi - ;; - esac - - if [ "$p" == - ]; then - restAreFiles=1 - fi - fi - - prev="$p" -done - -# Optionally print debug info. -if (( "${NIX_DEBUG:-0}" >= 1 )); then - # Old bash workaround, see above. - echo "extra flags before to @prog@:" >&2 - printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 - echo "original flags to @prog@:" >&2 - printf " %q\n" ${params+"${params[@]}"} >&2 - echo "extra flags after to @prog@:" >&2 - printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 -fi - -@prog@ \ - ${extraBefore+"${extraBefore[@]}"} \ - ${params+"${params[@]}"} \ - ${extraAfter+"${extraAfter[@]}"} - -if [ "$output" ]; then - # Single explicit output - signIfRequired "$output" -else - # Multiple inputs, rewritten in place - for input in "${inputs[@]}"; do - signIfRequired "$input" - done -fi diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index e39681865ab2..996aaa01e9af 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -477,7 +477,11 @@ recurseIntoAttrs { yaml = expectDataEqual { file = writeYAML "data.yaml" { hello = "world"; }; - expected = "hello: world\n"; + expected = '' + %YAML 1.1 + --- + hello: world + ''; }; }; diff --git a/pkgs/by-name/ac/actual-server/missing-hashes.json b/pkgs/by-name/ac/actual-server/missing-hashes.json index 9b2f64c6f2bb..891b358c55cb 100644 --- a/pkgs/by-name/ac/actual-server/missing-hashes.json +++ b/pkgs/by-name/ac/actual-server/missing-hashes.json @@ -1,56 +1,56 @@ { "@esbuild/aix-ppc64@npm:0.25.12": "b2cc7e0cd348bc315907f6ce090ee545d4157a19fc44327ff0262ba9296f0fad19c57dd679b1b526a0a18f34f1971b128e15b41bca794c74a9b2c32238fdd537", - "@esbuild/aix-ppc64@npm:0.27.2": "9c18cc2e4a03339a55013aac05b4a3fc4b77e75715dc252d034aa3d43b754abc053a7601b95e31249f4b6e69b68db2f5e6cb04b0ed619f825f2f70daff1a78d7", + "@esbuild/aix-ppc64@npm:0.28.1": "98a9325bec976ebe1cbbf2441fdbe895b36733919b9df7d62e7b73a1e199810affeac17d172cc5cf61196c9b1ede8073ca5d088ca52b14800b76f49bacc480b3", "@esbuild/android-arm64@npm:0.25.12": "f770937988ec42e289277abc03800ccf88902684dbda3013a8ab274bb9eca36d35619a75f0f0510e225bdb4c7cf9a426218c7d2641a98fed74287a52d60d8865", - "@esbuild/android-arm64@npm:0.27.2": "a318fc9ffcdad7fda8bb521af8b17f73d93d9a94b4cca9301fbf72cf3f5a6e945edd589a47388de70f3e9582655dcf5b5bb928a11e306368fae4a9106d5143d2", + "@esbuild/android-arm64@npm:0.28.1": "ec3e3c62bc684a09393ca10a0f64b166938f66e4b1972f6db63bf55463bf039736549d9808e50996eb0fedea70744b466aeb816c44e78f2b5d232aeb9929e3ac", "@esbuild/android-arm@npm:0.25.12": "7a5d507aa717d85470c595e11f3c03fbf4f0bffdd10d30f49e1a3f14c2553191f156b214eacd6911fa36719faef23c28be7d88ac876ec300995987964ea16e99", - "@esbuild/android-arm@npm:0.27.2": "01114275e096b9177ad2496730087ee081d6e65a75bc087457b527c5baac5a8ccb362435f45232532bf6f97de95e1790dbce127d55abd5e4152c7214682bf4d3", + "@esbuild/android-arm@npm:0.28.1": "cda56884826ac2aa5dd3be5df9e89834df3b46515cf14099ddfc5bcfc80122d4f8d74b3831a0ac447d87dda73ae90fba49dc4e352b11240c2b055cdca69a0a02", "@esbuild/android-x64@npm:0.25.12": "cd459b0433b0541bae9ffafd274c57529125719a5b78f4ee92aa9f8a1f54b002a18d889bee19084a503c114412269ef4e740d21b4a2de811ec2a076e96b35f48", - "@esbuild/android-x64@npm:0.27.2": "e92c5b6919081a14c8882f1167cf90b4e4bba745ad6e9a23428f85a1cd5e79dfa3f1d2fc943686b237e4cd09fac52ad3b3791deab6a0419ee10859284d3834aa", + "@esbuild/android-x64@npm:0.28.1": "7f2ba14ba06fd3f2faff467e6fceb2466cd44d1d6039ae1c01f24336a5a1ad0f9c3721000331ded3f250587e4be5e7194d68dd33c55339dc26e1200e13e16d2d", "@esbuild/darwin-arm64@npm:0.25.12": "067f4588b9b64c93742c4a8cec35282dd076583006ce8089aae3095fcae5b606a2f60d86caf0527be6009be234178fb83d360af82698e2017a6f9fb9345e084d", - "@esbuild/darwin-arm64@npm:0.27.2": "5e99db5037167bad4a095fc445b94a2ce02357870ed58b79e13ae6bc09b5cb33d7e03f925492df940f9e0ad685a889f02beec1431d8fbf4c7ced55b2f48f5659", + "@esbuild/darwin-arm64@npm:0.28.1": "9798bd013921f8dc5126eb12eba4ddfce9198d11eba6ae844f66d25919d5d26be2aa46b4da8d442ad0e7673e88b2f3d9e505d71692cd030bda9a7b762921c05d", "@esbuild/darwin-x64@npm:0.25.12": "c29947d07adacadcb29092860b69d1b668d9c5abfaf525e2a7f3ece61c3f4e72a95c1c66ad0e80fbf31d01210ae4e8330d4ae6d9c6c9ad2b8aa159eb115f9a8d", - "@esbuild/darwin-x64@npm:0.27.2": "87f2fbc4cf11724ef805b17cbdc7b0a9498332bc4b61d55e110ecc3b09bc488b88c0bd140ea48924e9c97a2063cf7e440fef13dd56e415c46799619d61086910", + "@esbuild/darwin-x64@npm:0.28.1": "aaddefac25e025e309c71dc5c7074d8c295f44779e41add06dbf65d48b2a6a72b579266748e7f0ab3b2be1ed07be8d541e954f75dda2a2992f36f4c805d91fe1", "@esbuild/freebsd-arm64@npm:0.25.12": "c51691aeb04e41c554a59cbb5ab8d917446f352aeec70e3d5a7f25409e9115ff2db930589052df3e7d60f03eff4c298bda89db62f2408d1a49b6a70e69c5d4a0", - "@esbuild/freebsd-arm64@npm:0.27.2": "1ffa23243b913e377a5b09fd97ad9f089be3695aafdd893b60bb7f9be479256d8b7546f0bc96c4e61133fe7aeeaf95a8e941e82a65d99008ff82c99bdec85eee", + "@esbuild/freebsd-arm64@npm:0.28.1": "a325b7833f978b62bf25157ea5a951e29b9b0a1db9665ee52498644c9b250977ab6f21c049137d0a271bb0442b3e6d6148c257bace84476196b46570ce837d62", "@esbuild/freebsd-x64@npm:0.25.12": "9b84c48176350811690751c34d1513005290641923a161f96cb433cbcbb8c072ecb92cef39ba641f48032071f74c6119e5f081b5788242109426c54f3ef1a01e", - "@esbuild/freebsd-x64@npm:0.27.2": "44f744b289cf9e115b0adfac1905818d756dfced14213bf144d9016d96f67575ef2a55526f76e29ee775fcfec7274ba3a5e6833f35ed79a4592d3f5eac278267", + "@esbuild/freebsd-x64@npm:0.28.1": "f092ddacd0bc715f443b62382dd8ba8f85d272f62caa47f603e85b9c5b14fef67c610523006ca88cae19e2829fe41a2a0ae92b7c158ef1038c714552dea57554", "@esbuild/linux-arm64@npm:0.25.12": "1e9cc29569890f5944e7dbe2e597eb19d76e85fe07aef6253129b16800ccb5b33a79cea17873d7debdf681d34adf77e06ae99742fe06cab095f3db441b741b1e", - "@esbuild/linux-arm64@npm:0.27.2": "2b037d74eaff4e9b5a6076760ede873320707636a3495939687cdd0c2c7150883111273bc0a8663fa305c42f439f4748b5ad7f15a1a1ea9fa7db575d9faf2d1b", + "@esbuild/linux-arm64@npm:0.28.1": "bfda225d3101bb3ed5a74f979d50564a17ccf3799ad65fb968c5b15c9ceb9077c105a9bb5763d42f33f1917ac709e5779cd2112e5420188963568e80ac8439f8", "@esbuild/linux-arm@npm:0.25.12": "fcf091d6a51834c9a942ee33b568342990c7fa29d2ff338ce628a41bc415696d09bca7ef502c2b04518973010f73ab3d13e37096030db9c8d393ab29408f104b", - "@esbuild/linux-arm@npm:0.27.2": "28cfc3a9ca11fc899649e7a706fb4b2ee57999bd92e86c23726b3ed0f832732411dd0aa3e2bcdb4105759f83bc4e5adc98dc195aaafce736c910db4e43694702", + "@esbuild/linux-arm@npm:0.28.1": "b440cf89adf6dd1079bcf7d9aa915f70f467002bbb69bda21f4a3d160c9ae93bc6d8eb73b2831c8607fb1527d8ada288d907440e36969cb60000e4df85b7c549", "@esbuild/linux-ia32@npm:0.25.12": "ccd563c3189e5f651b479dd80d3bebd9d5c4747ce7448bb80266c804c3141eb3514b8c70445d77301899c54c1ff8c74614f8423704fde475a5c67efe86713235", - "@esbuild/linux-ia32@npm:0.27.2": "ac6cc92b9be2ec6d9d483c53fc973e6381765b784a2e1b71fa93ea0cf976344c2e3e0bfda0140b0829b3ec4304d9b886692b2891e68c17d2121066d06e67f0ac", + "@esbuild/linux-ia32@npm:0.28.1": "4329d81cf06331e537c8ebb571a9d4ca968811bee7c7cb4f975b8343c9f7649a8b2b9902b0974be0e2224656b1a0d21f3b191304db8cec52d006b80061faf4c2", "@esbuild/linux-loong64@npm:0.25.12": "6df2710d99d84006ad8151a9ca26861dbb97524a15e61f56eb1a5a76786865ad03be838fe3d414a72b239262364964528f3136c2965b3c442c7ed85090b145c4", - "@esbuild/linux-loong64@npm:0.27.2": "625f5b6c2218a3acb2cff8f7f02a53ca89d13925f8932260ddad01595c6907beda4a79e4b767b1101f5971049f88d3ec6ab29cf565b4d61d9b0d7277e2cb578d", + "@esbuild/linux-loong64@npm:0.28.1": "76b4d0f2cf716576181065e3fd2d6ffa9b0d0c39987e8d3d1b8d1e8aaa2563779cd4f861c881e3e7a9302f2d03d5543b8f726a99603e6aa754c8154772d0f434", "@esbuild/linux-mips64el@npm:0.25.12": "883bd8c4afd70b8e372db8a6bdb429d419ae30253a63987ff824994958d8431b6e51ead05e6372b2a233e025ea57f6f65b04ebaff8308e39acf54bfa73a5cae2", - "@esbuild/linux-mips64el@npm:0.27.2": "0c62692cb3a297b37212dfde52a861861843a716f6b3bdb73da49ba249a4c001b989ea61dc4540c430fac59ce2f8fc45035cdfac80172c5ddaf1b9df8471aecf", + "@esbuild/linux-mips64el@npm:0.28.1": "59825a73d04187818c6fb53b22e2915a4c0e6c8fee9017d75dcafbdc66699f2765377faf801495d69952230935557f58360481a7edd78073816270aa8bd0cbee", "@esbuild/linux-ppc64@npm:0.25.12": "71f8544a3b99b4c95d49604b66d144e9617ae9925914c1bd5bc6731d15d4e48e7f8e9bffd85835e1c93a88c3537b53f3e99b500e4dd2533af9483055b02f9d38", - "@esbuild/linux-ppc64@npm:0.27.2": "b804d2dd0a6a85fe1c731828c725731a55ab120d2cc16941d560b2e9af5c2ec51586914ce26a84a326a9d46fa61eb8bb1f843953fe29ddd43b3f3099c491b5ff", + "@esbuild/linux-ppc64@npm:0.28.1": "3186d54b33d9b4849d6fe4fa2aeed4966a4117f9a27bf2d59f07f3ea651a9724a2eb9aaaf98813aac6dc726710a337bfc2472dd714262894fabf498a369fbd74", "@esbuild/linux-riscv64@npm:0.25.12": "fe8048262c5c6a040c047a9b7ab8547b0e7a32ce50f622ea8dadc3ec22065676efbc9b36896ca96959f77839757319633a2d05af5f2de7b32389a03b80f027f1", - "@esbuild/linux-riscv64@npm:0.27.2": "03e67e7207a83801363e3637f9a35fb6224ed4dc23bbf6eca41904fc42f5a6806e1e591666bf48dbf62eba97d41ff4355413b14dcb2339007b22c693374c49f6", + "@esbuild/linux-riscv64@npm:0.28.1": "f01572cf6398b466d44bfa68dbc5f56a37b74e645673198f7ba157d215ccba35ea46e220a2526008d5679cef47a4368dd46480d4ba4c7330a491d215fe3f649f", "@esbuild/linux-s390x@npm:0.25.12": "e5c023be1dfd75c915453763f944db8ab3da4f60a00c2b0e6f3b9349bc6c51e5ac5ce928db56e8f316e910213adf2172efd1b37abe070f6cda0c28583d770bab", - "@esbuild/linux-s390x@npm:0.27.2": "eb24b9c0a4a1492e4ff34a87933f6a3b348739c12f864b408144efdf949871c1fbb02a1cca741bfa11fd08aebe585d046fd3311b462ce4c795e3064ba3912469", + "@esbuild/linux-s390x@npm:0.28.1": "aad20d457c0441d7bf2f6c8dbe74297d4c3a3c90cf709a971a4a19b2c70497bf91ac4a80fa6168ccf6063eb284ea0f41f2293283e8351348369af551ffe6f3cf", "@esbuild/linux-x64@npm:0.25.12": "8b2c7f5e00c40058f5c150df267cd303eae5907822f196902cd8e64af70475e800a7f132ac6388aa2b77b877d6314147e67f3fb67d97c867adccd54a2a6caaf6", - "@esbuild/linux-x64@npm:0.27.2": "ed1542f203329521fb1f308696c76ba59ed4a4616a24e21bf4820685362bba209d5c44c2f4e66c88dc7b7399df9ace625454d4829ee529d076ccaf61566e11cf", + "@esbuild/linux-x64@npm:0.28.1": "d361ac73388af397803dc26242265c8f00fce91d9dd587b04d230c686294585c541f43dee706e23f8d56754e3a3da653b00b3f55855182d60deabc024acf19f7", "@esbuild/netbsd-arm64@npm:0.25.12": "19bc5a1295697aa8787929472323494302d117ea1e592f17cfae443525c1e5917a5f77e6582fc1ec9de3a11a9e296bc12749c6b12cde0aab10695b5c25f29f73", - "@esbuild/netbsd-arm64@npm:0.27.2": "576dd082047077b9cc41fbeffd728821a4f3b80969c1d2d6c274301122c6de2050f484fd4e946777527b8a15bd2a5ac54f85ca7ab95ea72b5345177e6a888687", + "@esbuild/netbsd-arm64@npm:0.28.1": "73e2d620958bcb61367849046397dee40dbd9bd6d0d4172bb87ef90ad644ed16e48386debd1ef0323648358fc617c0d8fae58be984774a2e8622712c7ab7f04b", "@esbuild/netbsd-x64@npm:0.25.12": "8eb2ff51aa39b43a021e4b51411789b6299fd0dc38b3896719684333e32fd42ed4508ab67dcc88435631e5333573a4848dbfeec12569de46c2318dcdb39ad3ab", - "@esbuild/netbsd-x64@npm:0.27.2": "f8994af3e2ff3c9a91e874e58698b66e6f8d4e72dbc0aaf749b74a79420954146ed053359b0a4c213918582cee187d8a371737a33cfb93e624b4d091e5a6c240", + "@esbuild/netbsd-x64@npm:0.28.1": "663a35913d3d3a2f566d31ec00477954cc570f386d56a5ffffa1d7bb58bccfbe241780fc429c2e41463cef5d1d422ca02fe174df970932b46d225ff0bd333b65", "@esbuild/openbsd-arm64@npm:0.25.12": "5ff26a012d0d35673bc3800d28f284a62c310801a68c55b2d1ed8a7e09ef7568117fb8ab2d7ec7a6e7d73ce6a9e05150ee07335fc6447ba98658469b9da1cb2e", - "@esbuild/openbsd-arm64@npm:0.27.2": "f710da24beeb747ef3a11b9d99085a14f5c929f942fd9d9a05b7806d5ff1b85631bfa506eb7a6aed9fd01ec99bf91f24736f9f0e0eb6b7c0019fe0dddd2e615c", + "@esbuild/openbsd-arm64@npm:0.28.1": "8add19644eca9a23cefc2a109644df802c626cc3460adef6f030ce72d1fcb127a4ff2b14a21cb51bbd68ec5a652f0bd7105c1a0d76a30f44fbf822c010096cd9", "@esbuild/openbsd-x64@npm:0.25.12": "41dce65493548bc0dc411a6175e9fb109a93bbbf370ef444d1459698226ad2a3096ab7edd420c27eb3d15e6bbd0bc79357bd7c0a59c5527ace0fefac181638f8", - "@esbuild/openbsd-x64@npm:0.27.2": "62670fbe1f609c5362df7b45968ded512a0860e2ad8a4715a89993abfa2f9f08a28f1294c7857d80e6d3f713639a71d291c06a961b331de67ad350032d1b8e96", + "@esbuild/openbsd-x64@npm:0.28.1": "ad12be1ed38cc61410aa6210f88b8aa8dc3e6ee717dce32dba6e7cbaa57414af6e5314e7cdf9baa4affafe2d6a88e230d361a0ddadf76d06070b63bbf0a97cb2", "@esbuild/openharmony-arm64@npm:0.25.12": "b3e0502067e760e5b92d3180e20372cbb2dba8267fbb56206d50bdeccd8895feb408020b98c3f17054eea0f1fba365385850cb91d1f79a25dfa3751032278825", - "@esbuild/openharmony-arm64@npm:0.27.2": "e279efdc18301add96ea791ba9ef117cae05346688cd521fd225a60ad166add4bc995af985058e3b6ab9e65a7c49a79108a294d6aa26a1d1685ad0db194e2c56", + "@esbuild/openharmony-arm64@npm:0.28.1": "5ecd637058887c8458ebc7e95c67adee2397ebd8e5f6c302c17816eeb77963b1feeaff4e3f7823c0d85f0fc10771caa96175e2f0909b00e60ca5d90d22690a15", "@esbuild/sunos-x64@npm:0.25.12": "50ed9767e00ff74a1d98d94c5fe6027bc5e9e095a64735d1d0676ec72adc4b15b0095e97f5ac71602f2c5fcdcf3e9f6cfe005315e998d9d3e12ca93a2076b639", - "@esbuild/sunos-x64@npm:0.27.2": "7234302321d36576b5a9f027915417cddc195a67b19cdfb50e69c337ee0dd63a88be6b72d7ef299cd569d1af62e54774303d52d3d6b5e5858db975241ae467d6", + "@esbuild/sunos-x64@npm:0.28.1": "e3286191315e30471e9cc176281a5d7acf5b877a95ea2868195024548a984e08b0214ea90e504e5bb5c595f9d3da9a5b961b52f79988702036b59233378580c4", "@esbuild/win32-arm64@npm:0.25.12": "4969d20da28a0c783ada6116724f51a542fad81dab043c4f6f9b7c8f4a68be558f03beb29d75bd550ab6e63f720535ebacb9ce1760099be7a63d4e1ec8351e2b", - "@esbuild/win32-arm64@npm:0.27.2": "36620fddf79da3e8e527ef8331436929fa7a0b23c9b591af8f8573d80ed9c4ef45b24c6fa0abbb01d187dec497efa6c9d9d397d575afc1f28477e9ca16a48d73", + "@esbuild/win32-arm64@npm:0.28.1": "55e83fa2b63511bc3d2138ff84091b452936072b5b8e24405a5669f04355263b3f452861c13fc0c01ad80ebeb0df069da0318631386c9d66cda8ccbeca0fa82e", "@esbuild/win32-ia32@npm:0.25.12": "60ce7d21c5e01c8b0c8c2c4660ff6d890a32b1acf09f5499f950a86bc5c6da17eee760c6bb7a720a0429f7633bbb38b2db517e444408d8a6ff6fc76157310980", - "@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f", + "@esbuild/win32-ia32@npm:0.28.1": "dcd2579f97b8b5217e807d3a069461635ff6c1f13bc6e678fb0e385db4bf569afbbfe9f54ee512f0e120c6cc2689889725b8e2efdb17e3bb1603cffb58a4b6b3", "@esbuild/win32-x64@npm:0.25.12": "bbdc69d57d85a6b8af85731c0979186aba54eb34c8d1de5eab4aa1d8fd45e3b38b5426c287cedf43228bb0794a741d9b2c55284c7db7d79335bc33dc389e7bb3", - "@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2", + "@esbuild/win32-x64@npm:0.28.1": "1d7e7661663e2b0d814550e461fd06b814b3ac1ffda1e84468da3b7c29a1ad8a6067a8b7dcf6e66e38918b43a440c6302052f1bdb40c48a6d49a82c616e12f2d", "@node-rs/jieba-android-arm-eabi@npm:1.10.4": "60a55caf33f914d1b6b2947c88ea5fa9a58a84d2bedfccb8639162991b9092ec86964b64979c0ca0cf0d5e5be2766236a612b67ea03b3b3c4ec4d608dde2475a", "@node-rs/jieba-android-arm64@npm:1.10.4": "e54d5d1c8fab348ef86c1e0aaf4aea8e2e52924ac1c4bed6ef76588b7446122c332b593e4b471b3268eae4386ab991e9eb0337962b8f17bd2dafa1baf1b7c755", "@node-rs/jieba-darwin-arm64@npm:1.10.4": "6ec6503fd063d03c0284210b869e31b8db306777ae7acca8be3a9fa979f57cb7729a35723eda3c76ed6366e7b4022c4b9c5f350ff65cd82925f381965640999c", @@ -66,127 +66,108 @@ "@node-rs/jieba-win32-ia32-msvc@npm:1.10.4": "38deadbf93c6ffb410a880f8938034635e2ca755b956b7cf0b751f287dbfb4b5e58a492f532f23b30e77a7b3889467055c4d9be4d76df8c4416d97f96c242f93", "@node-rs/jieba-win32-x64-msvc@npm:1.10.4": "073b499e19d211f416a604a791c7a29c99552b328d0565d8381258a49682f87014274eebdaafcc9477238a2fd555b0e18fedccb45a49715ad3332958c6f43905", "@oxc-parser/binding-android-arm-eabi@npm:0.127.0": "e7fd819437dbd74cf322c152800bf88bf791e181c6c95e027f709e8447bdad718abe8cd6281dfc8abdadc54201a63040d44ec9c08931dc06f2671656fa9bdbac", - "@oxc-parser/binding-android-arm-eabi@npm:0.135.0": "a47a390b49484c5f235298caf5a1392e7c2394e39fd08c320574902c85684ed53ac0e8303e273cf387f023c47ecd24afed6b5f7bb961bcf7c88d56a5f470ad52", + "@oxc-parser/binding-android-arm-eabi@npm:0.137.0": "f342139ec2520c580bc2156433217f23a832fa8e12815fc59628821dc929ab22e122ed5b088abc094f913ee10ba171fc69150ae0663ec8dcb669b07e7d37c7df", "@oxc-parser/binding-android-arm64@npm:0.127.0": "2eee0c6fca35fe0119d0870e2f97e1bb6deab419c5f50216a3c449047597639312e7b60485bf8a21c5268049d54296757c3c52583dacd2503e8f4d669dafddce", - "@oxc-parser/binding-android-arm64@npm:0.135.0": "09662b6d3753b2f3fbdad4396ae6b33be036062c238347412d9c7f1edfd2cad310358f8969ddb1347c70978161bcae661def6ee832d6242010167143d464367d", + "@oxc-parser/binding-android-arm64@npm:0.137.0": "2f1a26cb5936fedf20511c8680726f788858c979eeddada8fa449aad1f52635f51bff777f0d58e7f56bdd3650af0fedaae6610a16d207b088f7c10bf1c50559b", "@oxc-parser/binding-darwin-arm64@npm:0.127.0": "1da8651d064bafe012ef049d8b79cadb923246a0ef3e58b90cdc98eb40a11af4bc23d64606ee292a8c0edcb1e70a6057322c8aa52a9d7a5d640697917bed262f", - "@oxc-parser/binding-darwin-arm64@npm:0.135.0": "67589e5ca2b81b03250dd6723b80fa84b5c0ad66d13b7f7a1f5d6eac075a957f5214b85f01147c1eb01c1f35488e5e9ab92c43748d2ab9b852150de64f0abb31", + "@oxc-parser/binding-darwin-arm64@npm:0.137.0": "594845efface3dc87b81f96929ef723d544caefedcd033cc98eabb5211ccb6ce201ccecc16315940c02f7a5ee3720fcb0ee966045c4b658643aa48b112c3db1a", "@oxc-parser/binding-darwin-x64@npm:0.127.0": "0c56f6bd4b853643b5827579b98a0786bdb3bffaa7dd3486f9b24c3f2f2d5357956ad9e9de79803ccc183293f54710360fcc85255dae0db70ddb36345d1c8cfb", - "@oxc-parser/binding-darwin-x64@npm:0.135.0": "bfec48010a9cc9d9ac66b8e33f40e68592945eb2d4a26a017f8d0e17a9ccd336602ed7c9f160ce630b9c23d13ccb84daa4a781fe00092a3804bbaf0247f3124f", + "@oxc-parser/binding-darwin-x64@npm:0.137.0": "e6e7d0a82e6f6d63e5cc5a28d28cb78abe97c184735d6b74ff427e9c5145838e9ff51231f45c9deb214884e067c39c0aa2beef8d6a72f151c98e1c354dea71c1", "@oxc-parser/binding-freebsd-x64@npm:0.127.0": "94ed852d51f194a573b17a1f91a962f8fb200cda46e1d5adc14d0e6c5f8d3d941521f596d5ebd5addff7002eb0983924ea36d0120618340b01e1a0830147883e", - "@oxc-parser/binding-freebsd-x64@npm:0.135.0": "b4401dc37384b237002cdaae6dd49cd1472bd6bd6385af66c3fa0b951da2bb2bb70b01f734ec06ade2bc8b129eb540764e80309e9842b2f8f1115b73712b1b74", + "@oxc-parser/binding-freebsd-x64@npm:0.137.0": "6f2afd209f63ef68c2197917b2a1acd60ad670e0787c727d97b39368fe7bec10bcd4b198d8acc762ae475a3dd3adea68be17935f7c359fe763de3dd9f3e26292", "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.127.0": "bdef00b9048e6ed29c8ebea9eb6b4a155bdf08d2eaf7dee2634fd3a456db7c3faedd3d9c0e51bf040caac86a01b1fb9b224447ba435324e5e35b10341ca40294", - "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.135.0": "2e3c4132e91ffa76f54f721ca0ae18d24529f5bf3886dc2737ee10b4bf47d0bd954187a3d68c861754ea339b0fe4384861cb6b42e681f8255c1b7d7d487fbb35", + "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.137.0": "4ac0a561d10012c7c80f35bc30dbc99815db7fcd9790b25dc6f3e4f6e08b4a5a1708e764f04b5782687f5804a6449e49005ca463e60ffb8e44bc34a2041f4cf4", "@oxc-parser/binding-linux-arm-musleabihf@npm:0.127.0": "4574976e4dc88000417299adfe886a527e5ad65e307d7ccb527371d74e7c39bcdb647802047853557e0be92a270096d520bd36af4ea152b675bd27ae701b4ef2", - "@oxc-parser/binding-linux-arm-musleabihf@npm:0.135.0": "6c21ba9e714d0c7af7c835bb574c20cf19eb7a82469a8c123c703a1ca04afb883d6dc87fc5a217f6e69b23fb7e5ecdd18b23c81195bec3e4f9a1654c31be91e1", + "@oxc-parser/binding-linux-arm-musleabihf@npm:0.137.0": "a25c63205293be06f7da4f6d06421c0610bae3d12f2d38ff9498c77af4aa1431ed4b7184241ab726b135bb3da8b3e23dfa93785306e304fcb7c14085b8e183b8", "@oxc-parser/binding-linux-arm64-gnu@npm:0.127.0": "66aa5cacd1aec33b65f09d13fb32376ee297211cf1ba93c03f274e98a24f1ea41563fa73f3241c43af7813e301f11f65fe4cd759eb05efcca64955457d71bcb9", - "@oxc-parser/binding-linux-arm64-gnu@npm:0.135.0": "f840e428a5afe3b3a18077c1e22210483aa67c0f2e7675471c2829eb8d2ecdea8082e4459b0e3219616c9f760fb5e15e4687a1455b8f4ce1b7807026e9c0bc65", + "@oxc-parser/binding-linux-arm64-gnu@npm:0.137.0": "a5a75336a211b76a413f2def44880af3f235006664ef2f1423efdf9d39228e1fd81ae8dd83b0555dd68e725a124c7a066dabdb75f5e1ed0839e22362ce86d74d", "@oxc-parser/binding-linux-arm64-musl@npm:0.127.0": "8e7146df02d2d2efb7549301ab0c31ac06cf779561db874c8c3b3fa1f2dc2cabbc8cb31e544da8128605a128c688399ada59000ff670bb03e5ff709156df0091", - "@oxc-parser/binding-linux-arm64-musl@npm:0.135.0": "86fe9381f2cdb52f81345fd3152e00b76fce57e41383277bf5071cb2eabf389dc17c4de91ca695eec1eba00a6cc2f63664332f9a4ba58e0187362b0b669e2d8b", + "@oxc-parser/binding-linux-arm64-musl@npm:0.137.0": "c2352091b8edd81a787dd691d361f8d6de9cf96b58bd1bcf361c8a5f396ac0a10abc980de7f8aab35aaffddecf4f742b9ca9d735db6707ad76c9b0746341e09a", "@oxc-parser/binding-linux-ppc64-gnu@npm:0.127.0": "c0986057e6787120cc7f60f67ae61563b2873cbccb038ec880f969a43e7e7007c375971d1775b3694485d40e3216d5845f966c8f719fe87c5abcebe40149ee07", - "@oxc-parser/binding-linux-ppc64-gnu@npm:0.135.0": "50fc74f6aec424d34654ea2a553ffdf5bb765dc36ff05fee078bb063ac39defaba595c484c689a27d04312f0b0504a032067c6243a4ea4137cd4aeed74b7d636", + "@oxc-parser/binding-linux-ppc64-gnu@npm:0.137.0": "5fc0f1975eeaed85a07b2eb98974587d8da31326c3f137cde3675b71784b1708f2b058597a01371a3f47aa88f3384395eb7be47ed61bc28ecf6867b8d7bdaebb", "@oxc-parser/binding-linux-riscv64-gnu@npm:0.127.0": "a4b39d58ce024a967a34cdf9af53c85ee8cad9f9bc7503eb7436a00428c80da6e30a383a224237e4b37d05d40ab2136c3f9ed532220bddff5203361a04234672", - "@oxc-parser/binding-linux-riscv64-gnu@npm:0.135.0": "410920d4cf238c469de0f5410893372caff906e178de243aca65302be9a248c6930c59c62151a09edc4b8303b097d16431ec9c9a42d0a040fd4b8085f7f3a98a", + "@oxc-parser/binding-linux-riscv64-gnu@npm:0.137.0": "da09b3c91dcd3549f8350974882df24f0bfa043f6001f4497277f21fc585698c2b637068cec25aae59af619b53a4d2026c49f8ca2379d7fe3fa7b7f4ec3c0bd6", "@oxc-parser/binding-linux-riscv64-musl@npm:0.127.0": "1c1345817a5830c8b896e5283dd99caae5f6af03da50a14adb7a2060057ee6cc279cbdc665622f67234d2a84047672c2742288fa5a52359323a78fd1aa065740", - "@oxc-parser/binding-linux-riscv64-musl@npm:0.135.0": "823e9f54ea425644ea12a95cc427ddfaa369027f6a2019a4fcffa7dc9eb6baf0f3c1589d3da60518c3429cdf752d427670ee938f9553366fb153522e316c0581", + "@oxc-parser/binding-linux-riscv64-musl@npm:0.137.0": "5d8f3df301a79cfa57b5ecab5eebd7601e3e8c0ec982e8e71e8c1a83f8f05e7a50725c47b92aee623719d25eeead168e2344cd69beee0e93a7d96b46a6068b06", "@oxc-parser/binding-linux-s390x-gnu@npm:0.127.0": "d70bc89961b303494e8dc574b3ee4c64563e1217f32e60d9823bbe51421d19d713097607e12d588659b8ed79258b196b1809e085db52f6b3831613f64d9324d5", - "@oxc-parser/binding-linux-s390x-gnu@npm:0.135.0": "2057e3b0a9397dbae5266704d0e1312d9f771c06602fc9c32952e15a8218cb7a1b1e8e2a1a4ad29a71f8975c8f922304bbf7d1bb00c9b8aa1a34c2fc6b80214a", + "@oxc-parser/binding-linux-s390x-gnu@npm:0.137.0": "2a264e87ee624616472a9930d2a1173a2576f3fba85690adeccf5c32d93df840eb917f148d002474702258f9d2f93aeee097446b0cdabd1ab422f7e5cd16e31d", "@oxc-parser/binding-linux-x64-gnu@npm:0.127.0": "481f7a1f8757c987f578a75e8325a1bed03e89b8942455a6fe574b9d8adcb4079b7659fc9e58a000887dd0f5c4740ae2ac44269707e0a3d205cbceddcc75549c", - "@oxc-parser/binding-linux-x64-gnu@npm:0.135.0": "49b0e1e7b6f88cc5f4be698f6837209b0d6bb833ed7d35b0ff0e29a54c65ae65a821173945737fc1521cf27f8142b42f2a09794c5831630da84b414de272959d", + "@oxc-parser/binding-linux-x64-gnu@npm:0.137.0": "a780f2f589c9987edc681c02040dbb91125e759a4cef22c56258618607d51a0ef2b1e7e678fe44f08c9adc382573ecfeef23a56ebf12e7074b12149d013cbd13", "@oxc-parser/binding-linux-x64-musl@npm:0.127.0": "6d16c6827c1ad4a275357717ffafbe3a3e59607f63ceeb6f36cbeecdc0aba6071d4ce6aadb5f9c7b8f77d2520f13388663d967ceb26ff93089aa117bf686889e", - "@oxc-parser/binding-linux-x64-musl@npm:0.135.0": "c1e44c559a5a49bd95ad15221b11f08756492bc70987d4492afa63f68874f8c5ec8dbcea84acdda655d96c9d60370954f68977d712f15ca59422591f47c61fe5", + "@oxc-parser/binding-linux-x64-musl@npm:0.137.0": "a5a8c2c33a61ab7b3fe4492ae4507c707f656e783cd184956c09d807545030275a2602ef6b6a0e32a8892550e5379080938f58ef71a705d55cca614e5d8bbcc0", "@oxc-parser/binding-openharmony-arm64@npm:0.127.0": "cbf640b4c9a7a491a7d8a5d2585842da84d306a23565ec6f079d845bdf3893cf9f1fe50e22e6d26e9ab98f8231606e49fb94aa346407eedf680d92716142ef4e", - "@oxc-parser/binding-openharmony-arm64@npm:0.135.0": "12364a2ce9c3adf119b85df4c922a83b220ca64f5fc77ed1c9504a1fb685b145edc67c46b3f9136d81b3b977552ff3dcd5262620a2a1579f54c7f9529ffcb35c", + "@oxc-parser/binding-openharmony-arm64@npm:0.137.0": "2c680e2eb62cfbda8262e99ddff0703fe9c1475018b902733e11d55fb6773b2f54e0fbab895ff3d305dbd228a57e03a94bc4e9c585f242575dac2766a2843920", "@oxc-parser/binding-wasm32-wasi@npm:0.127.0": "44cee540065e94ef484565a29cad59077cc065ac882cde5da8bfff3fc96e012f284f6c2cdaa5da62a646639850a7326a876bef4b8d402f1e50401b062bfe1426", - "@oxc-parser/binding-wasm32-wasi@npm:0.135.0": "6e67ad18fddbec5666a795596a56cee518726bd1b02c5e3158191a7503e697831c4cf4f53424230ce0a589b73203e89604e2ae55b06e3e021cf3e882f6938602", + "@oxc-parser/binding-wasm32-wasi@npm:0.137.0": "83d44e5b24c26dc4ba63d07935b531f526778ae7f420bcfc8836268b6a05802945eba12706750c0244dd4a660670d27f72ac3d66a8a95fb418ab8b65838333a8", "@oxc-parser/binding-win32-arm64-msvc@npm:0.127.0": "998315e47c7ae648d512530e84cd248d6f74e3921573e1e9b14a73b70b3848d826e52fbe28022c7596fec02b055731a9a480b60a89c5e6f6f38dfbf13ec03524", - "@oxc-parser/binding-win32-arm64-msvc@npm:0.135.0": "9b15a6109561fdd52a199c87c2808687494ad0848f6fab777dd1ad8f07103b2a8fa430344891bc572931b967820a6ebdf63d122ad45bd3cf87064992d84ea3ee", + "@oxc-parser/binding-win32-arm64-msvc@npm:0.137.0": "b484dd6f3763b9b35139c2ce0a20aba5cd61c41ad982c8ebf64f2813408516ca48931e36442015d6c4f215567fd57c48991c53a722a27e8637e13a9e4c0a9d15", "@oxc-parser/binding-win32-ia32-msvc@npm:0.127.0": "d78eef92eb0203a7bb38cacaebb1364dd9c285365ffa204c29062e6f850e519be66b72b6d4cf9899084645906b8b9026d2957c6dab4bc2a20ba70c1e9790c3d9", - "@oxc-parser/binding-win32-ia32-msvc@npm:0.135.0": "fb5f6271f619fb6606070fed933dbc6bd58564d5c89ee53e54dce6a5107c360c4490c786b1a39ebcfa0e405546496e2371348a81377c2ad16cc03864dc9328f0", + "@oxc-parser/binding-win32-ia32-msvc@npm:0.137.0": "ae6b21ce2eeb05b6dc2a47b61160aea2bea430fd5eae30be5b1c84b8fb29ecc430e60b2185281fa7ad3200c2f898f2d61561e1e38c2c7e3ab460650e3405d52a", "@oxc-parser/binding-win32-x64-msvc@npm:0.127.0": "ab53173be7f2202ca31dbdbeb990b46983e8a2b8a7c643a8242d3e9d32f627160ca7f35dbb2c0a3d7b2709e7c94176239501712e5929835f5c758324655918c4", - "@oxc-parser/binding-win32-x64-msvc@npm:0.135.0": "ea5bdb283739cce9acba051f52aea7df8eb73fcd1e9ba8d7bedff31af101bf07398726e722930ef268781983a6e010914ef33f4fe540ba47ebd1c2d6cc7a0cd6", - "@oxc-resolver/binding-android-arm-eabi@npm:11.20.0": "869d3813513bae96b2f33c3acb13a2cd0af94c929b668f1bfab7380fa1610db28c66b6ef1859012d80ef81ebccdef3f8b65cfcb98002812eec8e20fac62714c1", + "@oxc-parser/binding-win32-x64-msvc@npm:0.137.0": "e925380b7dbd977f8c25d11c65dfb1832a82b7868f1170e43d1fcc00cc1fc3c5e64eaa8c21940a0c58f3984eb2e0e447aac58bb9cc26e3bcc28116ce4ef8fd06", "@oxc-resolver/binding-android-arm-eabi@npm:11.21.3": "7753c5536f77492993647d75ecf63997fc2c28cc0f19526f714d187c326f28fcbdc41356cd0558b889fb5e002957e66ee4d9584b84a135f0ecb5b83a64077404", - "@oxc-resolver/binding-android-arm64@npm:11.20.0": "7fc6c58c43b0d45b3d1c5bea9c6da3c42efc1a33c1e5ec928f2abc4c745b6a2a0a1875fa785c97a99a59f7bdc81db9977870f47a5530075cef2ed398ba23687a", "@oxc-resolver/binding-android-arm64@npm:11.21.3": "2283884a7140ad0fa625eaecaf1f7b3f89a5c605d2ba38f66336772f3acbd6035f437ee1b338fa22119fb79792f03a67a046c81d6affe0b3b397de6c19b03406", - "@oxc-resolver/binding-darwin-arm64@npm:11.20.0": "bbb1080d8ae8cc92ecc5c8bcf323c807ff00203cf1fdad7b8c66792445d270e6427f5795dd2bf54482a7fb72801e52eb8bb5ee861c052b27bb8ee845e7b5d1ae", "@oxc-resolver/binding-darwin-arm64@npm:11.21.3": "aef8175b317e31d7f07dc67382be8deb44a4380aa8f905b4db80b6d919d91612aebd7f67a55fd65183c82d23af183c447254c2828a2529b673e49a2f18521060", - "@oxc-resolver/binding-darwin-x64@npm:11.20.0": "c470e8d3ace09e87ddba732d4c26b8066c00b5e3db235afeb01331ccfe369b2736ffee349db4d5141063ff3bf578839e4f22a08facd49d214874f789736334ea", "@oxc-resolver/binding-darwin-x64@npm:11.21.3": "fd7f96fa2e7e29e3a9e73394e79a988b2ba91243e193d379aff8cdbf0a2f2f3222b9ff4226b5dbcac6ccb401541e9899262ed1e4418bc69de980d63acaaec82c", - "@oxc-resolver/binding-freebsd-x64@npm:11.20.0": "433c3692f2b8b67e787af9f24172c579a100863644896d4676ca58f32211e8d5a519a4e516c2eaab4dcbc4e7b6f384bb0b8e8bb044e2805a4e773e14d56d96fc", "@oxc-resolver/binding-freebsd-x64@npm:11.21.3": "67f3c8791ee8d202c9c9bddc45ff82af26d10f8718dc70090525faa6083c04d78aaadedc1b19e71757c0c38f2010d9f9ce5c40ced3a43cd6c6b6aaa4b671858b", - "@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.20.0": "71c57f90a16796a231184fec52caac9b6e7e22c39c81af9fbcf408a430c30852cefbd8658f7f523626bb43314ff300c92fe1080d994c9e90da4a3e21b271a5b7", "@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.21.3": "343434f09025f7f7f80c26bb1e6b34ee5704c9d81e7e5582cab8a18055887fa2e6a7c1d560cea3aee8cfd18180f65d622510186ebfdc0a270842c6290252c935", - "@oxc-resolver/binding-linux-arm-musleabihf@npm:11.20.0": "76efe95e9b857d3207d8c711077eb2b60a919ade7e1778aa82463beaeac638fe4a002116f234aa0edec8f4fb7399bacb9b6f89ea4b490d2ae801e93973481638", "@oxc-resolver/binding-linux-arm-musleabihf@npm:11.21.3": "0680fed46aa5db6e8339e2436ad7382493bb701bb4d5481f6cf3056e0a6571ea3682b11e1c990ff24900c6418d3ac424ace2b0a43a660e33f32bbd9b0b6f56d9", - "@oxc-resolver/binding-linux-arm64-gnu@npm:11.20.0": "7650a239e45f488e1598296572c1050ca8e2278731bbb571a92f70cd524fe760a47ae3272c6fec65170c408789dccdbb0f1974064d11a17a27e08fffc00a7517", "@oxc-resolver/binding-linux-arm64-gnu@npm:11.21.3": "664db26300f8fdcb5de559b883a59517e725e46c9a018c9de187bd360e4229be11d86ed942d214c8110c0c7c3fa6ed35b3c832dc07b12eeca11eb6ddcade59a4", - "@oxc-resolver/binding-linux-arm64-musl@npm:11.20.0": "1729fb7810c9a9a118ee5ebc49006491969c0785300808d6869c331cc2ea054fe2e49e0d7e9e433e6e12baefd20cd8b60cba5b29f1ac92192a20f7620493788a", "@oxc-resolver/binding-linux-arm64-musl@npm:11.21.3": "20c8322222a1ffd162b9ebcc390bc6de3705e0f3efef259b87d21e502cf448911da289e0eaeb49aa1173c6e86580c06e824e711c7ada637a055e01095329dbe3", - "@oxc-resolver/binding-linux-ppc64-gnu@npm:11.20.0": "607683f3bed552b1ac4b83fed81b4bc9dcae0b9b58c863573c95e791261ecffb13625b557c6c9e1bef3da5c1df79f041f5a7c8f93aed43b4b3ca1df33755ba6e", "@oxc-resolver/binding-linux-ppc64-gnu@npm:11.21.3": "5962128b365fba91c53dbe0d0c2898d48357d86799d9286255ddf23756480963ad51db5e1fa9acfabcfe30c742c37800450ad46d7b150b040f7caf4e54d6825c", - "@oxc-resolver/binding-linux-riscv64-gnu@npm:11.20.0": "4a58183ecbccb76355582482dc052a8e92f25de4811f5d574c3d6b5169443d403d18f74e3f1373da0aa211b854072ed9ca765124f669a53ab1e8599d257b27dc", "@oxc-resolver/binding-linux-riscv64-gnu@npm:11.21.3": "cfc933789d035737e6ade6b229c4a09a6e35370c9f4b6b7f0f6631074fda83dce9739a918a904beec14eee874ff400e79d3c9003c4a9b733a30bf19122702ae8", - "@oxc-resolver/binding-linux-riscv64-musl@npm:11.20.0": "0d1e8bcc0c077f01305fa0f85d462a10d4bb09b25f3de8c077acfd6bae8f898989087b7b451a6b05978bcc8cf386fd5453074cc3c64e08b8465fdd99b795e131", "@oxc-resolver/binding-linux-riscv64-musl@npm:11.21.3": "c2c3e4632a75307aa1c818e154713d993a862cc117ac6f498a80b713dd03558d90b6425650a38ff403e8a0bdab04632524777e4d5449b9c58c9557cae095533b", - "@oxc-resolver/binding-linux-s390x-gnu@npm:11.20.0": "4e81f672700db7c5f33c583f04851c62dcc5826c2ad7a366794e3aae21e4a1e4655dae0f563660a9883084da98f5998650b5fe3e1bb10b0d1817670d2060bb22", "@oxc-resolver/binding-linux-s390x-gnu@npm:11.21.3": "034fb6020a70acbdec5ace9230fdfd8fe29f58767493884ebe8beb2f261a78cfa908fc2da9e52db1547c9d6535e9093d073a5b47ccecf61660faee90230d3875", - "@oxc-resolver/binding-linux-x64-gnu@npm:11.20.0": "9bcc10d91d411e1e3c22c8c5502edea1e95043101da2c1e28d06b046368055bd0524a51f16976003d453f0962626cabb232def1a94737e43ace6767ce06cb189", "@oxc-resolver/binding-linux-x64-gnu@npm:11.21.3": "095e91519ad47c8fd190d3b7429a34f89d45044ed61e5356ddcdcfd3366ef8581dc5ce6c84daefe0acfb48bc6860853c46d04906095617a3a9d68e0459ef6d70", - "@oxc-resolver/binding-linux-x64-musl@npm:11.20.0": "89daa69818f1c7d6fbe53402589ef81b76e52d46d3fd45bf4f7139930a7bb2e3f9506017fa32baf22c30cc308737a57858777c00fd0f882fd6911f2a9ef90467", "@oxc-resolver/binding-linux-x64-musl@npm:11.21.3": "855a3c0b7bd5fe86f6544d7a6780009f0513229d38c38f59c09087771c01b03c14380f168e8f4f45619ce1a93cab669096b06b1029ba7c3881c16bd85777a0f1", - "@oxc-resolver/binding-openharmony-arm64@npm:11.20.0": "d6e3767f86b203e07b51fe1750b29a2c7b7a9fb3ef73c5bc4f1f1e2991374d53ae1705e81c035cc48955bf47a24911e5f36d50ed45e43d318ae010345e00f8cf", "@oxc-resolver/binding-openharmony-arm64@npm:11.21.3": "bb4ae4c1904799c5c522ab391d192ed6ae99d3c2589c885dad31a056a87e22391e3f83d7336c23aef87d43a26fe9fa823126048c15b5038382d0748f3c937891", - "@oxc-resolver/binding-wasm32-wasi@npm:11.20.0": "f748fd1c0e8c8ce47b4773e1fd93ea2386e0d605ee099e0a665637b4113dea286d2786a00b74958671c657c243fe1e7811ad798ff64baa899fe4347240718838", "@oxc-resolver/binding-wasm32-wasi@npm:11.21.3": "58838221e4b4218454e2106d064734aee24a704f6cba39fd936762ab4d4a3a832c075e75ee617172bd5c61f55208793c36d4c73b94eda66ef08566a712bce719", - "@oxc-resolver/binding-win32-arm64-msvc@npm:11.20.0": "58cbeb0cf65845ab163a7bd53b6aea93e1d9a600028b87e018bf6a5bfd55756fcca88a961c9ef6e588c11d8bcfe8690347dd5e263f36a7336e4f034ac97dfbdd", "@oxc-resolver/binding-win32-arm64-msvc@npm:11.21.3": "c3f631b772bcc242a32d4206172f9a8ade522fe957d6fdad5525f172b7ffad9e65bb92ed81b881f8b2a709a57ad55dc63d2caa4ddc0d791ab9f66bd9d8b6aa33", - "@oxc-resolver/binding-win32-x64-msvc@npm:11.20.0": "7b0973006a664c089a9feb7ccf9224a2d6a91c38e9e83e8e874bfd3ab1bc3e9d81c16bf68238455ee576a78441865e88f20d31439d538bfc916bd773ac6a98c8", "@oxc-resolver/binding-win32-x64-msvc@npm:11.21.3": "499b5ae8adcc42957aeaca8068721dcc2d728940cd07bbe00a0d4bbebcebda88b1d36f7e28bc0f452747d06404bc7e3fc7c48a8f02a0ae42abb981e6d86807e5", - "@oxfmt/binding-android-arm-eabi@npm:0.44.0": "f2b29210336a7a06da7b20dd7b793b3e5f0fb1785af1deb7ecce7a8360a694d20998cec5cdfa6ef97cf6d3ed964f7771c32ace3c762b091e4ff716663d153f40", - "@oxfmt/binding-android-arm64@npm:0.44.0": "08581f63c72281f9abb02c8414803eb352c2b0b59d6a16ad525ae14c1f94cadec7986cfa3f1caf1f1ef6f35811c18f070b409fb087878c413d740d4da271373b", - "@oxfmt/binding-darwin-arm64@npm:0.44.0": "e77c7798f60ac34847d861e7e26973c434d00de3ba8bcc789a9658bd55173dce42fbe2db7fa33535f77a6f3d806f95ed18a177ca1fd24035298aeec7d76ae5c0", - "@oxfmt/binding-darwin-x64@npm:0.44.0": "8f2932eaf568c807e9f0a1b246eb43fa84d17ec904423b44b07f494bd7dd2fb77a467d2e6a983d9bcaa072950b52b9bc34d4d1a91491514251532edee0873b0b", - "@oxfmt/binding-freebsd-x64@npm:0.44.0": "2554102821657a66f606cee2ddd283d14a0de691fb016817221ced0be39fc5af7dfe23886ea0bb4079cab48aa56beb4be7d34d38863518c48eef6fd0c64a315d", - "@oxfmt/binding-linux-arm-gnueabihf@npm:0.44.0": "cd24da3e57c6757b07ed5e13d3e3293790ecc1c2f198356d16f3cf58b221ec7901417c275a51cf9464faf533aa6a99aaa1b9ff845f2ceb71699e6939c49b2d90", - "@oxfmt/binding-linux-arm-musleabihf@npm:0.44.0": "5980bd7834eb040c5e0e7551d0032e17c73d446253af017c7f7053a0672d51f0346d03b6530979c6f6f6f8564cde6a11ac329c48338c16bee73d188bb7692649", - "@oxfmt/binding-linux-arm64-gnu@npm:0.44.0": "0b79af84e92ce7200d524e04e48e59276580552763a62b05d247066f0a788729db94fd985c81b92348d794a5f654e686a17542b228b4a5ac0776c30a786abafa", - "@oxfmt/binding-linux-arm64-musl@npm:0.44.0": "1a281d213b7f02f6e28519b2ce7a4bd5c9b540c0c37f2c3b9b786cd616fa91e134b5a17d3da593f311e7b272d5534fa913af40829463987ddf2dc70fcda63cfd", - "@oxfmt/binding-linux-ppc64-gnu@npm:0.44.0": "b0a0d63384eeb33fed63d353b292db5ef1dac113b692455b36f462d97f66b8d719a07b71affe63f6f555856d1261c24eccccadc72f04f720b7470321aaacc67e", - "@oxfmt/binding-linux-riscv64-gnu@npm:0.44.0": "b005497fedfde005c8165a646d4b7faf35c63242458166c130d7e15e6eb8c285cfc9907cf44885c05f4976d99366064ce13eadf2d6c7867b75f9ad28765720f0", - "@oxfmt/binding-linux-riscv64-musl@npm:0.44.0": "2f95d5cfdbba63b9e74158ce9c64262f1be28a2483c961f7e376d27c43fc582ded2a2358d459b1f503100c766b5207e7e77fa2e27e69f2a3975ddb75bc9d93b2", - "@oxfmt/binding-linux-s390x-gnu@npm:0.44.0": "bfd75043bd870f1b5142966383d7256f3fc596e6ce2de4365e964efc0c6f716f222d9dfccdaa901e2b55edfe24a6ef83a2ea70ad2b79c31da1c9507d157504ec", - "@oxfmt/binding-linux-x64-gnu@npm:0.44.0": "4039e8c3027499baafd8da1e612c6fe01d0ce86c7993064c133e879c64355f02f9d9f951388919610264fd33c2917fb6535bb0c72e3b222cd3bdc4bf4beb8471", - "@oxfmt/binding-linux-x64-musl@npm:0.44.0": "7dd406f8d19af090cc6c42aa9d420a5d074c15a0a214cfadb9c3c6a6f7588eddb38a91595371b0d9d247635ec7d130e349e93edec7be759888b702b4a8405919", - "@oxfmt/binding-openharmony-arm64@npm:0.44.0": "5b9078488871e85d57a5af8eae390dba125f37a5ec1e1d120ee34d1d9b368f6b5715f26d3fcb3adbbc1d2f06cc928e3f73103f116f0323fa02d0f5305621e7d3", - "@oxfmt/binding-win32-arm64-msvc@npm:0.44.0": "d9aa3808de1a6e910e463235674cad17f90f015883bd1a74bdf9a1eb17b9ff0733f39f4d0a3af9b005fd55ec5584393fd1a6effb2858bd677aa205a2b8ed153c", - "@oxfmt/binding-win32-ia32-msvc@npm:0.44.0": "b441cb9974a64d1e6dbca885000aaa76e36e6bf99020bd7172238b60c165587de737c6715259b19ac982bb5f3d008a1cf7088f8be06e4343c4acac7702da88f3", - "@oxfmt/binding-win32-x64-msvc@npm:0.44.0": "35e4722f8594092dde9b5ee51693766928205c7bbab44e25710584ac13ae71460bf3dfe34d7222eba5d24d8bfb58700cf551873bea876858c1cb3fdb355f9945", - "@oxlint-tsgolint/darwin-arm64@npm:0.23.0": "ab24b6a39b1f7f92307de7bbd84246836599f53da25ec45c7b35159dd7c5ec8cdd3cdfa3b73b8a0ea9a85d64af267be093232f633aafa184739b9822c14fdd95", - "@oxlint-tsgolint/darwin-x64@npm:0.23.0": "1ac3825249c7b7af11a3d854a98067cdeb37aba2ae63220861e5a4afb15fa01d3e5b565d9f726810d1d7ee04441917ac10b94180e2d2346c8969a3f16a11adff", - "@oxlint-tsgolint/linux-arm64@npm:0.23.0": "fac741be0b6ab3ba0b815cf1d0b37e0c878c374618d1baa19672780ecab79fe5f3dc993d6f70aa9cbf2aa5266fade4278563931d1d5d6a2c55d31fc9871010db", - "@oxlint-tsgolint/linux-x64@npm:0.23.0": "bb5fd89a2aeb1c859ae0f97ae81039616f95ac92e04efd88dd378703d88264117b935bcc824a25942b32f83bd05884103c02b1ea5bb91252df815327f8c42bea", - "@oxlint-tsgolint/win32-arm64@npm:0.23.0": "20bfa7f5a28d31ae3fae61c0cdb713c3c47854c7c9aafddf2881520902b2e66a5e0fbe617669b07e6fa613cd78af8a3b11378d02a927193933b3fbfb5cdb32e8", - "@oxlint-tsgolint/win32-x64@npm:0.23.0": "245a0c1cfb78a81dea25975397ad2634c74e9fcbc53206482e3f81d244620c865da7025375952a64a06bef590fc558fe33ecedb1db5d54a15d76ab5765091b22", - "@oxlint/binding-android-arm-eabi@npm:1.69.0": "e8cffa63f160db2a14c8bf5c715b51abbd84b8c0adc400b1ad21bb9db2bb0900ae1e0ddd77f81d99838ae1515dd4df4a7d0de37f429f11f6269ac2db1ceb1441", - "@oxlint/binding-android-arm64@npm:1.69.0": "5f3802330b9968ab061541f7b92080a06ce454eff6683ce224ea290d4decc1dcec3c809e8984bbb598e6c1f10ca532479f900d13b9627152cb43401526095eef", - "@oxlint/binding-darwin-arm64@npm:1.69.0": "04f32a6f25736a2a4543a213aeeeb0bc7ecbbeb030489fd2f52fdfe330aa245a1806e124e15c8ec9fb86d75f73545a46d3425d43cb1c7720e9bc5c23542c94e5", - "@oxlint/binding-darwin-x64@npm:1.69.0": "a788cb404b79772d825c46ee7730e97985ed39585d8434b48b249d02c8a2a44e2873d19f7b4d4da12a6abd4a2cd7a0120b385c87146437ec043a260743704187", - "@oxlint/binding-freebsd-x64@npm:1.69.0": "2bc52185fb3af1ace5dbba6eb1717a14631bd3981733fd10aa36e5d8fe825f0685cfda1ddfe477a63a530a95344fa6fa4e0e94ca1aea00feb19fb13f5fc687bc", - "@oxlint/binding-linux-arm-gnueabihf@npm:1.69.0": "06605e4dc6514100109bc66e6ab478c4d5d926d4238e712910837d05f423ae1d25eaa9f5cbf329f38dfa5e07d7031916c1e4345995efa2a4dd26a5a80ee97f99", - "@oxlint/binding-linux-arm-musleabihf@npm:1.69.0": "670147842e6d0eea03543f7b8e8bfd291876c597839eecb237493c37e21e14aea623e956e600e0766922f168cbb7fadbf7042e2aff381172baf8906a6e5ab75e", - "@oxlint/binding-linux-arm64-gnu@npm:1.69.0": "efb547265545d058acd31fd7e40d18f4e888da8b9a386f7f37f1179cc651da0db5c7ff4cbab1099b58656dbceaf3f6de951f97aba6cd206042df615a0efbfd34", - "@oxlint/binding-linux-arm64-musl@npm:1.69.0": "78d8e8b8bccc8c7a8e0afcd049f6705bc25b66a5d8fc509ea8be27f21f8ba6ecc683f87a7c468365d29c9ab41ba4471d0c453f98a4e581f06c09c4ae374766b0", - "@oxlint/binding-linux-ppc64-gnu@npm:1.69.0": "b5e8a95793baf3f83f291fcedd01538e672e557e7ddcf8057211e64276a53dc7081756c2b873610cb348fcf2a6efc1d751e518def65eee36277b92c294e33852", - "@oxlint/binding-linux-riscv64-gnu@npm:1.69.0": "5227ec211e9944530b9b05bd54ef36f7de9270f39018214ebc3832ced03617b84dd3086f588ac25e45a6e06bd21066a303ad207f8b6611592a144f9c09364115", - "@oxlint/binding-linux-riscv64-musl@npm:1.69.0": "45ac0756d43fdfdd9a4ae68ebc9c15385198f011d661db07b66552ae752a99f9bdc5b4efd00891c423bf5fe66de94088fe23c02427f44f6917ad9180a3bfa846", - "@oxlint/binding-linux-s390x-gnu@npm:1.69.0": "83f31f3a9a43c6a15b8e0a1008313d541db5357a2efa411f1e164362aaa79c468fba2e561c159edde35ebdd9d52137bde01ab40a18f48fccd9eaba573b659fe1", - "@oxlint/binding-linux-x64-gnu@npm:1.69.0": "7ca4469f595966587e967c23aa8cc54e330455ae6da4430888d8760972644469b8d4c2d74e092b923799b95a0b7149a38107b2473bb22741b9065fdd8bc7c72b", - "@oxlint/binding-linux-x64-musl@npm:1.69.0": "ab396a701dc3fd87e2ace55e97da092f5679b9721276a611d1e0843cf4d782cb25fe67392a2b1b59013f88ca6748a9c4b26ba5fe09a5cfba24d5c1b56ea895e2", - "@oxlint/binding-openharmony-arm64@npm:1.69.0": "987e1e3e1e42e41afc3e62744b674a13bc467f1683e41d40429d773fb5faea275ae74c12891186b4869de5315e51960be13c9a98ce8d044e1666a09505204cd8", - "@oxlint/binding-win32-arm64-msvc@npm:1.69.0": "d409472b8aa3784a18e79aa4d98b2acad9e6c483629a902f34acb47895b5fa36de31438dc880b6509fe815a0103a321b72729267698a7f29c14f10d4e8abf027", - "@oxlint/binding-win32-ia32-msvc@npm:1.69.0": "13b7b5702b644031e106d452f837dcd0aae4da21c6b1c770567886ed64fa834fbf9819e853fe61b9c582c2e726eaf7d4d666520c681e4fc10b8391a3fe10f3b1", - "@oxlint/binding-win32-x64-msvc@npm:1.69.0": "d25bc3ba61e59ab530e6d056727b0e805a4cadf22176ba383a851455bf0a08408ecf8ae51641ed0d0b78984fd8e1f52c06d56d386263f60c4667a1989d6e3db0", + "@oxfmt/binding-android-arm-eabi@npm:0.59.0": "274770e77d4ccbe3968273c67ca1a057dfb7fbcbc32b00b7fdb87f1b16446f3feff3987076686df74d23df665eff14738feb97c6cc80f7d9bb32a7227e71a05b", + "@oxfmt/binding-android-arm64@npm:0.59.0": "c40e75a874dfcfb7e3963e2ea6ea042c299149b2c0d362573b777649118d90dd5d41141393a397d09d02f92f5c5e1f336610ed2bae75e055265865b9e184bffc", + "@oxfmt/binding-darwin-arm64@npm:0.59.0": "a0c24b4915513578dd45e33cf67932ca7833b131651c516607580e59e1e28eb4a66587815f6d9364390d83ab62f3762074ea0fcac926fa5f3f6897dba775b067", + "@oxfmt/binding-darwin-x64@npm:0.59.0": "5fabe903fb686672814924a0055f99ee31e0cbf5af38c7a54acf6c87156134e79d2429cab6c9762dc2103ada79fca0de6a7eed0b211345afa0067e0b42dfc4bd", + "@oxfmt/binding-freebsd-x64@npm:0.59.0": "1925f899717fe00b3c8abd47a5941c4e18318d03d4426250a1db89f83d90f907b420dc5e726cb6231602095bee5f8887f23a9689b9d587557918c1ae5e4a4f10", + "@oxfmt/binding-linux-arm-gnueabihf@npm:0.59.0": "9ac9e43e1c0fe9dd235a3317c20ae801f189975bfedc777e58b626cc0ed1eaa304a9e40426dbbc705d2cddd678bad4f544fc98dfcbc985fd95d5ce2c2f849855", + "@oxfmt/binding-linux-arm-musleabihf@npm:0.59.0": "937fd4947da8ed47896a7f9a54c473ed2896c2827b12ba53ba128d51d794fe3de0b4597b0ee241045e3edafc5072fef799b9eac89beda4c8350ff23805a08953", + "@oxfmt/binding-linux-arm64-gnu@npm:0.59.0": "66302fba3dec6326dd4a89451df68433243eccaec95c84b7e5febb81c2adbc799f0341365e544bc7e8990dd0a8849259bc4a6d28e798a6baab63466d1c1357b1", + "@oxfmt/binding-linux-arm64-musl@npm:0.59.0": "a179611bb77a0cbebce3b23c4e89938c9b1a7101a246a04ed1f453e553ddbd83170dd910c17a890e4f5e86d76b374345c6a6516655b96e0f79ff157152db18f0", + "@oxfmt/binding-linux-ppc64-gnu@npm:0.59.0": "60d4f351ac682c8690f00d90ab66ec3d1ee9d602be8534d04fe45b6de18ade84a1e70b135d6ddfdff66698537bd1a098d455befda57f7ca79f8e1275ea839e5d", + "@oxfmt/binding-linux-riscv64-gnu@npm:0.59.0": "454d6e7e9e8d9c671f342d023bb6637b5561db9730e9f1eab462372dcb9e890a498445ae35d830b9fd3969e17f2ce631808d731b94d23294f992d4c347dd0444", + "@oxfmt/binding-linux-riscv64-musl@npm:0.59.0": "dc5aa5a68a0a68a5cbc36088a644ad9864f1b0bed590b90899fb33e7f317de45924ca2f78663640f38990da5d18912b92d1b8e06bc50680d4d7cec635ac264fc", + "@oxfmt/binding-linux-s390x-gnu@npm:0.59.0": "0bcb65749cd773526827756225c27b594b547198c1698d45e44d96505bcce9514494f241744a99442f3a93c6c16cc8b8914b96411fbe4544131fa5187dbdd2e4", + "@oxfmt/binding-linux-x64-gnu@npm:0.59.0": "3b2a149397e3f5fa4f9484c4133ca40774ac15572db4d4c965a81984427696c23f8f6f5528ef2aed41b9399042d3681a6715ebf2c9721c3d9461931acab81ec2", + "@oxfmt/binding-linux-x64-musl@npm:0.59.0": "96243112a669df1f3bf4c6bae35f1177ec34647248fbc6ac05824ef248bf7c91afe7f9286fe6516250b98bc21ed774dd94b693231610f03d25f5b837982ea46f", + "@oxfmt/binding-openharmony-arm64@npm:0.59.0": "b46711e002021b1d084fe39e58e595a5e96227d0cb159fe90882d4e617b36c865d923540e95826d8fb5e5eddc85608831c489123dec89693c6c3a61dca024cea", + "@oxfmt/binding-win32-arm64-msvc@npm:0.59.0": "d68c0ccc0e732aacdf4629b80e03932b631e8823ea786371845904966d1176e4618d5884efb3975e50a2947cf71affcc32bf9c5f724ca1037e9b53f6a05f49cd", + "@oxfmt/binding-win32-ia32-msvc@npm:0.59.0": "9826350b30e74e33a315c5519bbda75a2cabd9e755ccb55fbb135f8da20e69025a73d2765dd8d904e9ebf4c450f25987b6f58244c94d517ea319bb0c31f0f64b", + "@oxfmt/binding-win32-x64-msvc@npm:0.59.0": "7fe0c79db93e7c7803e23f825e7345d41d52bf99e547d4d9a07aac37e2a5195607e53cab01b41caf021fbcdf07520682635c8fabcae109a9265264734cabb261", + "@oxlint-tsgolint/darwin-arm64@npm:0.25.0": "83b52c8c64b8c882b7aa929d0914d0c7b4410a7941ebec285348d47c2bebc97e2cd030bf5e08112aa9f78b2a4ea14586fef4ebe101cc6ba4ca57b947b86322cd", + "@oxlint-tsgolint/darwin-x64@npm:0.25.0": "fecec162da157de118bf296bb97932bd45754dd79f5037fa9f2b241445f6f9120b16c791e8314092db87f5ae4e16babdc342ad781a215a71d85d53117c1f14cc", + "@oxlint-tsgolint/linux-arm64@npm:0.25.0": "1a378105438d2bea43dec541e099292adc36ed34ad5e5ee3e55fb0aad6e9b3e5b9615b052df2d86fde221926ac05a6d36db9a50a02343d5407f71465abbd3324", + "@oxlint-tsgolint/linux-x64@npm:0.25.0": "5f5bd9fef645621435625516bd72427f9e02880994054e8e9f96d1d902a23c9c14699f35f7967fcc578204fe3cff3116a802e84bce02e9b76c3a396306ed811a", + "@oxlint-tsgolint/win32-arm64@npm:0.25.0": "be98b033f36b9622d3aa7b60b98e8c6882281fdb74e6ffbebb7646d9d3b13bfa02b1a9ecdeb4db0bf0fc1a0be26d5775abf6752f11d76c419ec0e5a2a4fca7d7", + "@oxlint-tsgolint/win32-x64@npm:0.25.0": "da8c552a511f0726c67d0ba086f61b02eff78106804cfb5b61cfd1d5e2850130b936bec73a301a17c6b61318aede46f1b678ed18b837bf7f18bdee1681e98cd3", + "@oxlint/binding-android-arm-eabi@npm:1.74.0": "5339a97e25147107130dc819ea19104c80f3b01c80b8cb582af47fbb2e225457c3b02c4be2840ed7eca5528bc93d235f262ccf20530e002fe83a7705537cd484", + "@oxlint/binding-android-arm64@npm:1.74.0": "e4eed40ac885f0b34dad8506440f35b268669dd56dc79bf3b82bd6820228bdfb4ba5f94491f3f06c75fb0afd4c1c55484b6130d6b8263c9b9f5baf61dc378789", + "@oxlint/binding-darwin-arm64@npm:1.74.0": "6fa89df6c6a007355ef5a75cc0ea72274f77d35ac2afc82300f69765883b0f75dbdf8894811364873072add9cd828ad390482645c150ad5682381ce18e3a8b97", + "@oxlint/binding-darwin-x64@npm:1.74.0": "1269bffbdb92619b7f66e38ca4d4e32ad1a05f2cd4c12f42d788d60a7fde958c51bb64ed2d0eb131906733c22b510d09553c57f5d17bb3369b9005cd044af6ec", + "@oxlint/binding-freebsd-x64@npm:1.74.0": "65c2fee37c1aabce691417ac75c9cc9b85cedb0c04d82a05f11d8491adb18a6746165c3f6e08c993afa7a37d133f9241afed41238d27d11f30082817836c237e", + "@oxlint/binding-linux-arm-gnueabihf@npm:1.74.0": "c18c5251cc48949ad9b048f253a8bc9181e219166198f3b4562c6ee093513c8df8c416615abf8d33c6b948153eb9a72c83080bfe9e3ef586b4d955b178a29021", + "@oxlint/binding-linux-arm-musleabihf@npm:1.74.0": "7cec8299a32b3e3cbe4490cd3ebf39f5076e3c7f9da6892505fc07576e348e99332658c3ec7ed5813441b2c533d76e0b86853b47736221556624952261b0e8f5", + "@oxlint/binding-linux-arm64-gnu@npm:1.74.0": "71b427f9b44a06b34c9eb2936d61a74241a07bd2ea55d44cf140056f1c3302968fcfc65052a2b5958778e92ad8d42a6f5ca0bbde86ae04a77390fdee53b6cc99", + "@oxlint/binding-linux-arm64-musl@npm:1.74.0": "fbda414282d79f18e72905aa06c596beea6e3af1e2628e769902c39103f4e9142c25d93edc3818200f691be30f387a0c3bfead3db7cb413028f739e4e61f6107", + "@oxlint/binding-linux-ppc64-gnu@npm:1.74.0": "01249871a7fccd3f63fd6e3dfd21d7c5d80c70b720a8eca1f7e2c8e37607e027d9e6580e92ff3faa0aa49e0f6b4554d4db6c0d8184f6d7e310579c16f939d39e", + "@oxlint/binding-linux-riscv64-gnu@npm:1.74.0": "f8e84c1afb3e5de6cbc4a8b5f6cd08bd1461f9bc3bd97c39ed5232c848e8a02e069214d2c7dd7c1b8f2f034a7630da1770c6293bebb13509b6328508eee21ae2", + "@oxlint/binding-linux-riscv64-musl@npm:1.74.0": "649a14bd44ac81a301a0151ac5e40244a3eda01d2cb4aa0c9e1a74164acaaed83b4175a0007e5f01b0190a0d55ee200f192f67d88b9de128e49414fd9b59a8ea", + "@oxlint/binding-linux-s390x-gnu@npm:1.74.0": "64e4da1e5a8d3953c37bd433193179321f620f5c05a160ec23ffbd61dc98668f8341085d256196c12c7887da23f7d64d9e3d39b68ad3c1fcdb117b37b65728ec", + "@oxlint/binding-linux-x64-gnu@npm:1.74.0": "9f094c5d0ea8051f97187ad05cedbd09bdddb35bb120628907261aab676b81823dff7d0e546b256fd140617e76fb76fa2d4aed7a195b26535df0cc8524899c2e", + "@oxlint/binding-linux-x64-musl@npm:1.74.0": "1cfe7ec31d60a5ff119b7ca48d6593121efb87f2cd67a0704e453efd2129d3713a2c326cbbbcef7906ef3c6936ee643cd790aeffda2ee1ed597555ff26e3b99e", + "@oxlint/binding-openharmony-arm64@npm:1.74.0": "5ff5cb27fb7b913b3cfe5ef33657dfd63c696a4bf057413b99d046ee11199e70cd0471fd8340e6b4ece4cad3ed89227ef2425a410480a7d6368a5ca290cee380", + "@oxlint/binding-win32-arm64-msvc@npm:1.74.0": "4d18d720886b114c8fa4758163d5a87f0f74344e00dabce3c045144452690db164dd578664435878ef311c60ac82023a571851c2f0d651ff6b6ad3aef033d6eb", + "@oxlint/binding-win32-ia32-msvc@npm:1.74.0": "497d52c8887095007ae14866c3e9e734c637b5b8ead69cd87f7eacd9d06c0d2dc07e465db5140eedc646528f4bd25995afd8127fc5c1e8d471728619c83677f8", + "@oxlint/binding-win32-x64-msvc@npm:1.74.0": "a0c87d5cea9a33d470a20f84d457b8d24e91fea00dc7d998475bc4469ecc2ea9df14c7b1cfaf9136d4dbca6460c8506d545d9ac7ad66a4ae400c80d59d50cede", "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141", "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea", "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134", @@ -200,36 +181,36 @@ "@parcel/watcher-win32-arm64@npm:2.5.1": "0f467a731cf9403b8bc7d35418d991596cf5e7898029796b4c769bcbb38cd07ae6ec05ef0f19298e5f11e73ec5198bc474d79b056bdfbaea513525725103d7dd", "@parcel/watcher-win32-ia32@npm:2.5.1": "9ab5f3e9849a6077c8c2aba7bdf9030dea38f0ab9180792ecd30094520cddf16f3b68006f666845b86c5ef0e05c648364475c9ba151e0269561891ca3e276667", "@parcel/watcher-win32-x64@npm:2.5.1": "e588d87d5b892484d252ac8e1ec3f4bf7a664d91f0d03dd93764be8db2c35f81879275908dcbec42b0e43bc99c7afdfd29fe687ec022bb2c8c4bc7edd29eaa15", - "@rolldown/binding-android-arm64@npm:1.0.3": "c73fbb421576421485f0d0f708df38938addbf48a237f08e8a4a46bad876cadf445c74c93008b3cea8c1be07a32a390a6067b0220aa838912b6a530f53f1338b", - "@rolldown/binding-android-arm64@npm:1.1.1": "7a6a6682dbccfa55cdc8653d1a1e92bdca1970616acb347dad8ff5f2495fb4ad8d1f7f5fce064ecfd72fa0df72dc10fadd962bf500a1a5c399d1c9dcbae2b749", - "@rolldown/binding-darwin-arm64@npm:1.0.3": "f140da4f3132f341a3f9c79e98d3baa6cac0034cbf4980b44ac37c67c523114feadacb5be451262923a0426c6523f5ba6f207d7fbdf4e95ac978add1ad829f96", - "@rolldown/binding-darwin-arm64@npm:1.1.1": "4aea3a7c56af47fd7e128f2e1038a83c3a6dab6ac6db181b30a9815b40bf8a2ffd676f43dfa690cd08092ca0d0c922705e3be98c0f81819cae9223bb7b64435c", - "@rolldown/binding-darwin-x64@npm:1.0.3": "ff7845f382344709fc166f7f87bea55eccf3400c2e3d7d70889c5be72640cfa7f7e2880893f8687776254cace09076767bb95ac7ed816547495e7d894f747651", - "@rolldown/binding-darwin-x64@npm:1.1.1": "c01c865bcf09162e3ab1c5c9bfaa461307b687708e1fda46c763ade305b4fcb79691501173670d12010c247bb671cb9682a6449c658d24b6e0388fa5a9bb65b0", - "@rolldown/binding-freebsd-x64@npm:1.0.3": "d6c401dfa68b6840a9a56e879198267ce8406f16108679caf6e6eb709c8ee0f2641c55d250b51ce47097000626c604bee7e7e2d9e2d70f71109b38e35fe4b836", - "@rolldown/binding-freebsd-x64@npm:1.1.1": "32fcac299ac43b09dfc17e478e7d0b13af742ef38dda5c4b41a5289c0b54479aca8e1c17982a8e5aa9f9a8ee8650bd145c0ac0f71ff3e19409063edb5d3504ef", - "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.3": "8843aad46237e6a0569196eb605e29afaaf449c06ca4ed1a02e8083c86264f7cc940b085aafe6349f2011b2a44f6dfa8d58b55803e09561f12ea110bd3cb53ff", - "@rolldown/binding-linux-arm-gnueabihf@npm:1.1.1": "b9354e847db640142a757470c3017253ec4f8ce65cf118bfe2e437fea5f30aaea98d7e416d04a8c8a2763f777fe20e982dfa2dc4cba2d498de050d03b7141515", - "@rolldown/binding-linux-arm64-gnu@npm:1.0.3": "dc34425af444478f539854b02683b14ceef88520634a1dfefbc12c6a2c403c9879c8697ff87188aef199d692508d1109d69f545d6cc3414bd409202fd7f5ca1c", - "@rolldown/binding-linux-arm64-gnu@npm:1.1.1": "7dfcf379e0a37fc31a5ec908be9a7821d58f5f93bc7a7d2c0209eb4c7908e4f0e1b6c3ec65619ce60b779019f3a75eafa61558667fd7e101cbeea20d143b6476", - "@rolldown/binding-linux-arm64-musl@npm:1.0.3": "f04750497d329d71e17b86cacbc64cc78c7bf8eea0653f40a12f6b07e0baf70054feb8418538937ebb7e909f3b8a730f34e06370d6dc9188a4ea00fd3a947545", - "@rolldown/binding-linux-arm64-musl@npm:1.1.1": "b558ea9c6a420be7ad757ee05c77c86107915930396b100ae6b687fc4a4aac2cb01603c8678674472f98d1c3c96a025f930b61ba8921065f2770a0b1bc3a1ef9", - "@rolldown/binding-linux-ppc64-gnu@npm:1.0.3": "289963b6842c40d2a30457d6da2b824ecf4e502ae85e3ca7f48c45071b94a0759e327df7687b6930e418c71f7e6716ba43d061dcb9ff30e330708b4031b521eb", - "@rolldown/binding-linux-ppc64-gnu@npm:1.1.1": "f3269b611a8fe5b940ba9e233216f699fe5e04663cb51bd7ae6b2e6f2a3da00368851e9c4b159b2c52b029fc194768365afb808d85262fe97d3c819c988737b9", - "@rolldown/binding-linux-s390x-gnu@npm:1.0.3": "df6ef349cc8a8b8a6089726627f0c0db089ea57a4980bed6fae5e0246cdbbd2dbfa4e322ad90493a685ad895b21dfd982ebbebee159a7e50e873eabdc52fca8a", - "@rolldown/binding-linux-s390x-gnu@npm:1.1.1": "d6e516087d3dadbc14aa5e603985acb5db40f30968238d7c331a6165880f5851f4969bda1f7e8100f119d90bf6172d26f3f1987a68c7a471552be569000e6deb", - "@rolldown/binding-linux-x64-gnu@npm:1.0.3": "5d8faa3524898d23161a79ba6ad6fdeac8774c1a15c876a0eaadce582bcc584ec463ac8c2d685de509d04098202b67c8dfad515fcf0a614542af2b4260909597", - "@rolldown/binding-linux-x64-gnu@npm:1.1.1": "1126f59382a45e2b25754f9f834b66fb0cbba08b6cdc3fe88d63cfae56c7b753a995483c834326645963705f196fa710e9d1a2f5af7eaff6cfb39bd4afb0decf", - "@rolldown/binding-linux-x64-musl@npm:1.0.3": "a0cbdbba526790dd69f8de7810a90ee944f4a920f01326cff331702527b4dbf1377afd1dd9d65ded169f12fb3a1f0ec6d77c931a27e03cafcab453b2bfd3c317", - "@rolldown/binding-linux-x64-musl@npm:1.1.1": "6733c08cde69e0c471fb61d1ea9a128063da40612a1f028da325949800c9d1ea49bdae7eacbffb5fe95bbe1a651fef6f3f2466774e639a0016ad04bec3296f7c", - "@rolldown/binding-openharmony-arm64@npm:1.0.3": "ab0ca503f2b342e25f466dc65bd35d509ff629996086f480fefdfc7e54c0958d8f51daf51204a485f3c23b1405c824387524dd83a634f5a1304bf0c4722e0995", - "@rolldown/binding-openharmony-arm64@npm:1.1.1": "b977df43a86cd2a84a02cc857da9449b6ad1d98b59b6a951efce880672eef4f4d41547e71fc180d33d7cb452c40ee999d882a66568ffceba693342d3cea51dce", - "@rolldown/binding-wasm32-wasi@npm:1.0.3": "f540fdaebd7747dc436271fb8e22a60d08deac0b125e02f63cf0fd29cc0d228969d6ee6d49e150d9fd4f8bcd24795c116f86949bedce3cff505402ab2f4455a2", - "@rolldown/binding-wasm32-wasi@npm:1.1.1": "8d2b40ee92ccd7bb368cf73469825a36d00f0fd29b47fd895699efb1a1ecdb616f9459076e99b4c2d5f9e5ecf3f072405b8f2488c4392505749beef57f6ba4ef", - "@rolldown/binding-win32-arm64-msvc@npm:1.0.3": "b85acf5cd1065ae5260ebd43586eea6dca66675b8346fe42a14c3a95e46943f290684b36cf359c0f01c38256558e819c74571945c13adfcbdc6238ef018ad877", - "@rolldown/binding-win32-arm64-msvc@npm:1.1.1": "d3b31389f7354b0589fb7b1b2d4aabc76508ae6ac85648567792b32c66d80a683ced8ee02af9165f3fcfe0fa094996f69f3a1ea37c2d1d5b404c0f83ca890934", - "@rolldown/binding-win32-x64-msvc@npm:1.0.3": "d76ebc4fb315deddce845b82eaa07eedf88bb5f9500fa50d241805055dea593ddfcbd762d59116f35ecd6b4bcef3dba5e513180e8d9301486eac272904ce91cf", - "@rolldown/binding-win32-x64-msvc@npm:1.1.1": "6e7cea53c2d7c5d14479dad8b1dfb29d761ac4a1eee34e4a0afaef470afa7e8aeb4442f127b25ca5763597902d3a26e21f431d6676d5d45088b0ae8c47e56ccf", + "@rolldown/binding-android-arm64@npm:1.1.5": "c3922a72e09e0230ab7b395bf573dd1eb9fada069b45118bdafe3c558ad8a3f90dffd214bf6710c9b73d9485a98aeaa133a755a3862652c6cbbfa0394c86c2ef", + "@rolldown/binding-android-arm64@npm:1.2.0": "ff8fc14f88216c2b7e701ff34abc72fd7940a8973eec13cf51dade2a18c19fd1278b5c1bda8949b7a7861f3f743e86e69ec2c56adf70ac481b1a735467a5f66a", + "@rolldown/binding-darwin-arm64@npm:1.1.5": "50842b58a4103e84e72a5e009a9232e8943c8e0cd1fd061bac1376fd173f22d6545ff2fdebdc1b9cdec0943e84d3e8ccbd94aa629fce2e9a7dc5212ef8e8b23b", + "@rolldown/binding-darwin-arm64@npm:1.2.0": "a446a643950faa2f376fb4212dde3cdf302c3ac5fc18f67e60981be4d9b01563afba2208639c349c0f9fae71c1e48b2630384c96dfbd5e9b96b5a0ca43ce08da", + "@rolldown/binding-darwin-x64@npm:1.1.5": "0ad12792b186ea8088ef4a275e43c76ef1217a6d57a0f86c5bc50f7279735e713e5e02173a77b7be313d307fad6b4ca733ee9ad691c7882497d57211010bb469", + "@rolldown/binding-darwin-x64@npm:1.2.0": "24a7e1453390691f6c123019a69147bb88cb9bc569dc6b51f39212ff7263098560abc4bbc44afb8eac37a03e2c3bbd9f25478541e2ed230c887e747c089cda6b", + "@rolldown/binding-freebsd-x64@npm:1.1.5": "bb8f54069382fa58d621be517373d7ab860eccd70bc6a8eebde90c97ef2615532d9f0eaf2f203ed87541ec8c85ee1c735c22f68c861c37ecb762f2991207a80e", + "@rolldown/binding-freebsd-x64@npm:1.2.0": "063da8483f1ff3c78888ea6fa186225df4bd3d6420c99c03b353436c2e6b69bcc3d5863f63c3460ce24668bc2da19af5181fa8ba3dd9929df9150a7780f3318c", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.1.5": "8b806cfbdcbb134a1f223d3d5a8e770452cefe84c3f9d43b1605e2775eaf60260c18f1ff66b2f1c7f30d88481fdbcfd41c2ed0ecc5f9e5cebca70064ded263e0", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.2.0": "2d1da49fc7de8b63df25b0e6a1016d53602f93db1deb2903784f75fb6b1701048f710e304313ff931792ba12c22206df756cb85ef596a6f8a2a732d6af85f522", + "@rolldown/binding-linux-arm64-gnu@npm:1.1.5": "bef8dba97e612afb18218f0b8c341b687ba17b4e241f8575d7c42e94cabdeb89c52881e6dab668b329b4267ccaf45cc64ccf65f57a5cdbb4af5e0cc6a561d09a", + "@rolldown/binding-linux-arm64-gnu@npm:1.2.0": "f897abd7551543f835145cffaa329362f64b71dab40861aa03037b188151fb939aa10f0f9bb34f91c178b1011459746be400b7604368cba1dbd5918af52f63b0", + "@rolldown/binding-linux-arm64-musl@npm:1.1.5": "e4bc793d61823160c6ae9c7f8eda2b4f4e002b1115607037285902ea4215d51e07787166087abd73d2bcc0034a3d1e225eb8821afcb90a8093cfb14ff88ed925", + "@rolldown/binding-linux-arm64-musl@npm:1.2.0": "eb9b31cbf7dbc3a034193b76e96f526b609983740cec5db26fc0374cc746551dc5ca5987d56664d0711ed77a5f8ed0264584e8631e8546afba492b2eeb603a50", + "@rolldown/binding-linux-ppc64-gnu@npm:1.1.5": "fe0ad9df136998bb3331505bf61b434414e51cbd9c012c1eabd8d698e5dd253889052a26f144b7297810d0e61113cac7d2e1d23cee3eec47c2d92ba68a4dd9b7", + "@rolldown/binding-linux-ppc64-gnu@npm:1.2.0": "c5ec77089e53948030cec2bb97cd2eae47e1a0fa1761dfc4c934ff500d62d7ad592fb49033d4cd28774cef7ccc5990dee141bf95c1dfa02199c5bc2c2c470d0e", + "@rolldown/binding-linux-s390x-gnu@npm:1.1.5": "859fb9809f9c5cb05cd31e08337a7e9f1c98e4a8a0b2500a52e284412f49dc725b19a29f2ddc3d6d682cb614d2b54049545560026eeb6091e07a83539bc777b7", + "@rolldown/binding-linux-s390x-gnu@npm:1.2.0": "e3552f555dfe4f940a0ee6fc3561d2f8401ae3958dff08a3244fc29c9da16e8b25a45cebc1ca6aa73cee822faf321cecc206eb3c83f6a15af2ba0cc422501690", + "@rolldown/binding-linux-x64-gnu@npm:1.1.5": "4bda45d9446e6227c59fab2b72930d34a5dcc0443ac779d4f50bdd3773fe031cc6df82a8f583d592dde0c01311eaf8362073cf547398591786bfa9167be42f53", + "@rolldown/binding-linux-x64-gnu@npm:1.2.0": "d0dc9e49efbc9fce585c405825c3d3565a5e6f1bf87ce1d2f404b9e1a752304bf333ccec503f57c4336656626d1e34a92d91999fe09c6e9cefbbdd543b084354", + "@rolldown/binding-linux-x64-musl@npm:1.1.5": "80edebc0dfe8126b0eb591e215f88e90521dd9ee92232ab8c53647796eeb9b5108bfdafaf9b3d4ac28a1dd3d1bd7257891b29b9fab0ef98908f5920832592a2e", + "@rolldown/binding-linux-x64-musl@npm:1.2.0": "2dd11b2034f34e77ae191c97d92d31c1ac0938cb8c6688c635792ea1298d77cf5e68eaf848962dabd97d983e2e1cecfb7f7d9be721aea9f90c064aa9e6793820", + "@rolldown/binding-openharmony-arm64@npm:1.1.5": "e2fae6cfe4d453ca6caac1a2246fe1024eb369d2310666cab5afe9745a5afc3cffd2a0310be8c8256bb2953df811c5e0a4870dd27a8b7c1167312136deceec31", + "@rolldown/binding-openharmony-arm64@npm:1.2.0": "9d1d4a478cbd3fda636877a061bc84dda6690c73a4f767562d9a9cf7739cd086b68c9b9ff4587bc3c75edcb93cfcb7125946e436190d72e81991489eb672ce01", + "@rolldown/binding-wasm32-wasi@npm:1.1.5": "76b5952fff32a964a5e2f2a470e2562e641736e5f726fbdbe26ec3344816526c19681fda0a4b8b730be4e802513aac9c8f5a167698211ace023bfaa553be6a93", + "@rolldown/binding-wasm32-wasi@npm:1.2.0": "edd735c6924cb47b3ccb91a50412b8e86f12a756846c9c700f9e9d72f48f39b54d5be64e96002f6ecafb5c7626e27f7ac399446b62e0d09ef7fdef62ed14e049", + "@rolldown/binding-win32-arm64-msvc@npm:1.1.5": "027bc08bc246800ba24405b173ab9240e6e42b8f128ac21d45eb544aa628eb136306d9f7b7c46e66d186bf70da6aec10e0f7ab6865e578790285ce58ea738dbf", + "@rolldown/binding-win32-arm64-msvc@npm:1.2.0": "4c4e753bdfdd6e2dc054d4ac8654602c7db46c967b7c9e90e01bb14352b16bd3cf155dcaf517fd4c825e3ab786eaba3b098a3d68449d19466fe863af52bbc791", + "@rolldown/binding-win32-x64-msvc@npm:1.1.5": "57e762d5ddf73df7eb146544d6b9fc809b4297338e4de1560fddccb117a785ebea82d3bce6fced522a38e90ba57eae47fc3deffc18cd6eca65efffb71491f829", + "@rolldown/binding-win32-x64-msvc@npm:1.2.0": "36e63cf5f0782ed48e9cf452bef7e6c0e3d06ef2a4bf752581e3c02013d65eecd9241f9dad2a71e901c5a52b4ea57ffcbb0d500007c9bc9c326e7774816ff5e5", "@rollup/rollup-android-arm-eabi@npm:4.61.1": "fd5cd7af9a2046adba5537f304ce3655cbe260ef5b362ac618223c0bbe1a28751077daf86c087cb5b3955ab19881ac2a79ead2f3e5122b284f43ff9228db2124", "@rollup/rollup-android-arm64@npm:4.61.1": "be6b2f5f56f41e540ebb73640ca0d370e530d54bf0c18920e22ec5f6671780d3c6a4235d2257b06189aefd6e26962aeb93f8c4a2fc94f9b3dd4ca2137f40cd68", "@rollup/rollup-darwin-arm64@npm:4.61.1": "29ccb594a4430bdc3ea218d1bdb46f88e1a905a54be392149fb362041c6970a916a6dfc87205933fd7eb4ef28be59b1e5404e6bae668722437c09e84a31a7392", diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix index d0d4ebb7270e..ed081679146a 100644 --- a/pkgs/by-name/ac/actual-server/package.nix +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -15,13 +15,13 @@ let nodejs = nodejs_22; yarn-berry = yarn-berry_4.override { inherit nodejs; }; - version = "26.7.0"; + version = "26.8.0"; src = fetchFromGitHub { name = "actualbudget-actual-source"; owner = "actualbudget"; repo = "actual"; tag = "v${version}"; - hash = "sha256-KePWt08rAhLZUrgyN7tdFUQXR/5y0TvakReji4eMwxg="; + hash = "sha256-AHifM1g0SAb3NzvCq1J5FVhWcA0wU/WufCFxnOjYpc8="; }; translations = fetchFromGitHub { name = "actualbudget-translations-source"; @@ -29,8 +29,8 @@ let repo = "translations"; # Note to updaters: this repo is not tagged, so just update this to the Git # tip at the time the update is performed. - rev = "c26df422b50745085191721b1f078664daac947d"; - hash = "sha256-u3EVA8J0VCLPafidGHhDiySB2fQdibntN+6FfErQi70="; + rev = "f5a3541768632052e2e2039f977e3dc608ef0b60"; + hash = "sha256-NTEStwU6UzbrGpYoEosbwstoQAXvZYqgK2HCF6Jf6Ak="; }; in @@ -41,12 +41,6 @@ stdenv.mkDerivation (finalAttrs: { ]; sourceRoot = "${src.name}/"; - patches = [ - # Remove after upstream updates to Yarn 4.14 - # https://github.com/actualbudget/actual/blob/master/package.json#L123 - ./yarn-4.14-support.patch - ]; - nativeBuildInputs = [ yarn-berry nodejs @@ -71,6 +65,9 @@ stdenv.mkDerivation (finalAttrs: { __darwinAllowLocalNetworking = true; postPatch = '' + # We bring our own yarn + sed -i '/yarnPath:/d' .yarnrc.yml + ln -sv ../../../${translations.name} ./packages/desktop-client/locale patchShebangs --build ./bin ./packages/*/bin @@ -114,8 +111,8 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes patches; - hash = "sha256-eZxQAf2AfNd+0wrSEmE9kg5XWdqhE3Dlf6OGc1bZhXA="; + inherit (finalAttrs) src missingHashes; + hash = "sha256-wYBRDhf1lu1xiNdWh7jXM2Ecimj/aETI863G0PlFLRU="; }; pname = "actual-server"; diff --git a/pkgs/by-name/ac/actual-server/yarn-4.14-support.patch b/pkgs/by-name/ac/actual-server/yarn-4.14-support.patch deleted file mode 100644 index 36a538d849e4..000000000000 --- a/pkgs/by-name/ac/actual-server/yarn-4.14-support.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/.yarnrc.yml b/.yarnrc.yml -index 597597bbc..0ff5d2399 100644 ---- a/.yarnrc.yml -+++ b/.yarnrc.yml -@@ -6,11 +6,12 @@ enableTransparentWorkspaces: false - - nodeLinker: node-modules - --yarnPath: .yarn/releases/yarn-4.13.0.cjs -+approvedGitRepositories: -+ - "**" - - # Secure default: don't run postinstall scripts. - # If a new package requires them, add it to dependenciesMeta in package.json. --enableScripts: false -+enableScripts: true - - # Supply-chain defense: don't install package versions published less than 3 - # days ago, giving the community time to catch compromised releases. Trusted -diff --git a/yarn.lock b/yarn.lock -index 479cebb2c..9d78fba85 100644 ---- a/yarn.lock -+++ b/yarn.lock -@@ -2,7 +2,7 @@ - # Manual changes might be lost - proceed with caution! - - __metadata: -- version: 8 -+ version: 9 - cacheKey: 10 - - "7zip-bin@npm:~5.2.0": diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index cef4597e0a37..cacad509d7e8 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -6,14 +6,9 @@ nix-update-script, stdenv, - # nativeBuildInputs - doxygen, - cmake, - graphviz, - pkg-config, - # buildInputs fmt, + jrl-cmakemodules, mimalloc, # propagatedBuildInputs @@ -57,15 +52,11 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - doxygen - cmake - graphviz - pkg-config - ]; + nativeBuildInputs = jrl-cmakemodules.docsNativeBuildInputs; buildInputs = [ fmt + jrl-cmakemodules mimalloc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -82,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { gbenchmark ]; - cmakeFlags = [ + cmakeFlags = jrl-cmakemodules.docsCmakeFlags ++ [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false) (lib.cmakeBool "BUILD_WITH_PINOCCHIO_SUPPORT" true) (lib.cmakeBool "BUILD_CROCODDYL_COMPAT" true) diff --git a/pkgs/by-name/ar/arity/package.nix b/pkgs/by-name/ar/arity/package.nix new file mode 100644 index 000000000000..89c88c7d0c5e --- /dev/null +++ b/pkgs/by-name/ar/arity/package.nix @@ -0,0 +1,53 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "arity"; + version = "0.13.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jolars"; + repo = "arity"; + tag = "v${finalAttrs.version}"; + hash = "sha256-PveNcJisds0obKzUDzZ409kinWvhFO8qpvwCzhfdla8="; + }; + + cargoHash = "sha256-7Mvw9reJFmBPs8Ksn/mbSbeizdT8GhwvXT06NMlCXxc="; + + nativeBuildInputs = [ + installShellFiles + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + postInstall = '' + installShellCompletion --cmd arity \ + --bash target/completions/arity.bash \ + --fish target/completions/arity.fish \ + --zsh target/completions/_arity + + installManPage target/man/* + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Language server, formatter, and linter for R"; + homepage = "https://arity.cc"; + changelog = "https://github.com/jolars/arity/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jolars ]; + mainProgram = "arity"; + }; +}) diff --git a/pkgs/by-name/au/aurulent-sans/package.nix b/pkgs/by-name/au/aurulent-sans/package.nix index 6ffa590a1c8f..62d438afb654 100644 --- a/pkgs/by-name/au/aurulent-sans/package.nix +++ b/pkgs/by-name/au/aurulent-sans/package.nix @@ -2,33 +2,31 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "aurulent-sans"; version = "0.1"; + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitHub { owner = "deepfire"; repo = "hartke-aurulent-sans"; - rev = "${pname}-${version}"; + tag = "aurulent-sans-${finalAttrs.version}"; hash = "sha256-M/duhgqxXZJq5su9FrsGjZdm+wtO5B5meoDomde+GwY="; }; - installPhase = '' - runHook preInstall - - install -Dm644 *.otf -t $out/share/fonts - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Aurulent Sans"; - longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font."; + longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font"; homepage = "http://delubrum.org/"; maintainers = with lib.maintainers; [ pancaek ]; license = lib.licenses.ofl; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ba/bats/package.nix b/pkgs/by-name/ba/bats/package.nix index 64b2dea84c7a..b3f58b58499d 100644 --- a/pkgs/by-name/ba/bats/package.nix +++ b/pkgs/by-name/ba/bats/package.nix @@ -29,13 +29,13 @@ resholve.mkDerivation (finalAttrs: { pname = "bats"; - version = "1.12.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-core"; rev = "v${finalAttrs.version}"; - hash = "sha256-5VCkOzyaUOBW+HVVHDkH9oCWDI/MJW6yrLTQG60Ralk="; + hash = "sha256-pUuSjXxMCFLlsTvErgerHLnaQmcA9eXuKZKRkuOGJ8k="; }; patchPhase = '' diff --git a/pkgs/by-name/be/bearer/package.nix b/pkgs/by-name/be/bearer/package.nix index 05d5868f7520..e2e03a508ac7 100644 --- a/pkgs/by-name/be/bearer/package.nix +++ b/pkgs/by-name/be/bearer/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "bearer"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; tag = "v${finalAttrs.version}"; - hash = "sha256-oYlW9sVyoJXOqcGLcF65c+QsTNquz0Ij1HnMjAbnZZI="; + hash = "sha256-OUsy3DDuo1ptTtbIOEOhqfG4wlaVu1ZSKJqt9h2ZRI0="; }; - vendorHash = "sha256-Y32HdEk+9fftDP4cttn6r3GMq3YqeyXpsRaU5ApkGa4="; + vendorHash = "sha256-PTyozkuRlD/VCqPqbDfdhMYHH1z3+S1X6ykPg/xP680="; subPackages = [ "cmd/bearer" ]; diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix index 8f4e6d278c1a..2f55746ae16e 100644 --- a/pkgs/by-name/bo/bottom/package.nix +++ b/pkgs/by-name/bo/bottom/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "bottom"; - version = "0.14.6"; + version = "0.14.7"; src = fetchFromGitHub { owner = "ClementTsang"; repo = "bottom"; tag = finalAttrs.version; - hash = "sha256-52aUYfFm72nSG7bAlwa18kMu13i+c4myl2QfaA2YZmw="; + hash = "sha256-EXbj/T3wt4gph1FZ71iK0rdRZMewY3EHpOMWsCFUnc0="; }; - cargoHash = "sha256-N+dfYORAdWAg5qUrFEgXbiRtYJpcvV1AcbLR5WiD0QI="; + cargoHash = "sha256-2Erh+pgZPZEmvFAtWNPqKVkQx3/hznC82M5a36cWfZY="; nativeBuildInputs = [ autoAddDriverRunpath diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix index 5f0ed6d9cde3..a4cf210527ef 100644 --- a/pkgs/by-name/ca/cargo-semver-checks/package.nix +++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-semver-checks"; - version = "0.49.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = "cargo-semver-checks"; tag = "v${finalAttrs.version}"; - hash = "sha256-dTfcpUVR3zDtNLTKG/Oj1dxVEzLuCYR3tFlCIapYJp8="; + hash = "sha256-tXUEWla7dUjx7eaNzKyHNg59LXr8LP+jXxkexR3vSdk="; }; - cargoHash = "sha256-VZxaEwQqHt8LKXp/SzOUAxT6e8jvCnS7OlyxTI1rg6c="; + cargoHash = "sha256-rc3F104atiV+KecsNtThfFwe80jyKOFLHKn53Nhm++w="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/co/coal/package.nix b/pkgs/by-name/co/coal/package.nix index eceb6312814b..98d764680a91 100644 --- a/pkgs/by-name/co/coal/package.nix +++ b/pkgs/by-name/co/coal/package.nix @@ -2,14 +2,11 @@ lib, stdenv, fetchFromGitHub, - cmake, - doxygen, boost, eigen, jrl-cmakemodules, assimp, octomap, - pkg-config, qhull, zlib, }: @@ -27,15 +24,14 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - doxygen - pkg-config + nativeBuildInputs = jrl-cmakemodules.docsNativeBuildInputs; + + buildInputs = [ + jrl-cmakemodules ]; propagatedBuildInputs = [ assimp - jrl-cmakemodules octomap qhull zlib @@ -43,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { eigen ]; - cmakeFlags = [ + cmakeFlags = jrl-cmakemodules.docsCmakeFlags ++ [ (lib.cmakeBool "COAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL" true) (lib.cmakeBool "COAL_HAS_QHULL" true) (lib.cmakeBool "INSTALL_DOCUMENTATION" true) diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix index da6255b7b1e1..d66f2c857466 100644 --- a/pkgs/by-name/cr/crocoddyl/package.nix +++ b/pkgs/by-name/cr/crocoddyl/package.nix @@ -1,16 +1,15 @@ { blas, - cmake, - doxygen, example-robot-data, + jrl-cmakemodules, fetchFromGitHub, + fontconfig, ffmpeg, ipopt, lapack, llvmPackages, lib, pinocchio, - pkg-config, stdenv, withMultithread ? true, @@ -34,11 +33,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - doxygen - pkg-config - ]; + nativeBuildInputs = jrl-cmakemodules.docsNativeBuildInputs; propagatedBuildInputs = [ blas @@ -48,7 +43,10 @@ stdenv.mkDerivation (finalAttrs: { pinocchio ]; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && withMultithread) [ + buildInputs = [ + jrl-cmakemodules + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && withMultithread) [ llvmPackages.openmp ]; @@ -56,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg ]; - cmakeFlags = [ + cmakeFlags = jrl-cmakemodules.docsCmakeFlags ++ [ (lib.cmakeBool "INSTALL_DOCUMENTATION" true) (lib.cmakeBool "BUILD_EXAMPLES" false) (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false) @@ -74,6 +72,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + meta = { description = "Crocoddyl optimal control library"; homepage = "https://github.com/loco-3d/crocoddyl"; diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix index 70f4ce154563..a01e848d696a 100644 --- a/pkgs/by-name/da/dashy-ui/package.nix +++ b/pkgs/by-name/da/dashy-ui/package.nix @@ -11,7 +11,7 @@ nixosTests, nodejs_24, nodejs-slim_24, - remarshal_0_17, + remarshal, nix-update-script, settings ? { }, }: @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { yarnBuildHook nodejs_24 # For yaml conversion - remarshal_0_17 + remarshal ]; doDist = false; meta = { diff --git a/pkgs/by-name/dr/dr14_tmeter/package.nix b/pkgs/by-name/dr/dr14_tmeter/package.nix index 921b920cc613..27696128cbec 100644 --- a/pkgs/by-name/dr/dr14_tmeter/package.nix +++ b/pkgs/by-name/dr/dr14_tmeter/package.nix @@ -2,22 +2,29 @@ lib, fetchFromGitHub, python3Packages, - pkgs, + flac, + vorbis-tools, + ffmpeg, + faad2, + lame, }: python3Packages.buildPythonApplication { pname = "dr14_tmeter"; version = "1.0.16-unstable-2025-09-27"; - format = "setuptools"; + pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "hboetes"; repo = "dr14_t.meter"; rev = "f9d62f60c30d9404d4c4b644931e76049332310c"; - sha256 = "sha256-3z9Gi32aG6Tk9UHpfT1VqmBZpFJrlKB+NZFu3CH+18U="; + hash = "sha256-3z9Gi32aG6Tk9UHpfT1VqmBZpFJrlKB+NZFu3CH+18U="; }; - propagatedBuildInputs = with pkgs; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = [ python3Packages.numpy python3Packages.mutagen flac diff --git a/pkgs/by-name/ei/eiquadprog/package.nix b/pkgs/by-name/ei/eiquadprog/package.nix index d454b9c1ba42..145c9051b8d4 100644 --- a/pkgs/by-name/ei/eiquadprog/package.nix +++ b/pkgs/by-name/ei/eiquadprog/package.nix @@ -1,12 +1,9 @@ { boost, - cmake, - doxygen, eigen, fetchFromGitHub, jrl-cmakemodules, lib, - pkg-config, stdenv, }: @@ -26,12 +23,10 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - nativeBuildInputs = [ - cmake - doxygen - pkg-config - jrl-cmakemodules - ]; + cmakeFlags = jrl-cmakemodules.docsCmakeFlags; + + nativeBuildInputs = jrl-cmakemodules.docsNativeBuildInputs; + buildInputs = [ jrl-cmakemodules ]; propagatedBuildInputs = [ eigen ]; checkInputs = [ boost ]; diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix index d9a84112c608..c88c990dd961 100644 --- a/pkgs/by-name/ex/example-robot-data/package.nix +++ b/pkgs/by-name/ex/example-robot-data/package.nix @@ -1,10 +1,7 @@ { - cmake, - doxygen, fetchFromGitHub, lib, jrl-cmakemodules, - pkg-config, stdenv, }: @@ -26,17 +23,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - doxygen - pkg-config - ]; + nativeBuildInputs = jrl-cmakemodules.docsNativeBuildInputs; - propagatedBuildInputs = [ + buildInputs = [ jrl-cmakemodules ]; - cmakeFlags = [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false) ]; + cmakeFlags = jrl-cmakemodules.docsCmakeFlags ++ [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false) ]; doCheck = true; diff --git a/pkgs/by-name/fa/faiss/package.nix b/pkgs/by-name/fa/faiss/package.nix index 6d219a8eae52..934f801fba54 100644 --- a/pkgs/by-name/fa/faiss/package.nix +++ b/pkgs/by-name/fa/faiss/package.nix @@ -42,7 +42,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "faiss"; - version = "1.14.3"; + version = "1.15.0"; __structuredAttrs = true; strictDeps = true; @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookresearch"; repo = "faiss"; tag = "v${finalAttrs.version}"; - hash = "sha256-lIyb+T3tvCqfIqUJ6KtubnLWYTlOt5Cz51mZmDW+AYo="; + hash = "sha256-cP13HRNa17KL5ZE6if8QmoyKQBLf8ckAa0bOaioEOgE="; }; nativeBuildInputs = [ @@ -83,6 +83,11 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "FAISS_ENABLE_GPU" cudaSupport) (lib.cmakeBool "FAISS_ENABLE_PYTHON" pythonSupport) (lib.cmakeFeature "FAISS_OPT_LEVEL" optLevel) + + # NOTE The `metal` command-line utility used to build the Metal kernels is not open-source. + # To build mlx with Metal support in Nix, you'd need to use one of the sandbox escape + # hatches which let you interact with a native install of Xcode, such as `composeXcodeWrapper` + (lib.cmakeBool "FAISS_ENABLE_METAL" false) ] ++ lib.optionals cudaSupport [ (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString) diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix index 6493f8d92fbd..cef2e4d43aa0 100644 --- a/pkgs/by-name/fa/famistudio/package.nix +++ b/pkgs/by-name/fa/famistudio/package.nix @@ -30,13 +30,13 @@ let in buildDotnetModule (finalAttrs: { pname = "famistudio"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "BleuBleu"; repo = "FamiStudio"; tag = finalAttrs.version; - hash = "sha256-VbE9wdO//rAEtxHtol/4hHd9tw4berdncMjIXZvOIYE="; + hash = "sha256-KWICbVN2930hn3gHF2Wo/s941+yhNFy5zqV74MVoDcM="; }; postPatch = diff --git a/pkgs/by-name/fa/fatou/package.nix b/pkgs/by-name/fa/fatou/package.nix new file mode 100644 index 000000000000..9e6fd85c7b18 --- /dev/null +++ b/pkgs/by-name/fa/fatou/package.nix @@ -0,0 +1,53 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "fatou"; + version = "0.6.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jolars"; + repo = "fatou"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lbMT9CQV/nEfjxfnnpRDPhWmSbyD1nESp797hkWE1iA="; + }; + + cargoHash = "sha256-FOID5+PfNFFCCl5zG7NwZRwAg4KjuByjhtXRC5QUBW4="; + + nativeBuildInputs = [ + installShellFiles + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + postInstall = '' + installShellCompletion --cmd fatou \ + --bash target/completions/fatou.bash \ + --fish target/completions/fatou.fish \ + --zsh target/completions/_fatou + + installManPage target/man/* + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Language server, formatter, and linter for Julia"; + homepage = "https://fatou.dev/"; + changelog = "https://github.com/jolars/fatou/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jolars ]; + mainProgram = "fatou"; + }; +}) diff --git a/pkgs/by-name/fe/feishu-cli/package.nix b/pkgs/by-name/fe/feishu-cli/package.nix index 2b6b44c8209a..8bbdd285cf31 100644 --- a/pkgs/by-name/fe/feishu-cli/package.nix +++ b/pkgs/by-name/fe/feishu-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "feishu-cli"; - version = "1.37.1"; + version = "1.38.3"; src = fetchFromGitHub { owner = "riba2534"; repo = "feishu-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-d6hOSDjkfdIBv9T/UzRuksjKnOh0Dl4/HyBdzGSzork="; + hash = "sha256-wLPR7uet73JUOgXqneNAPy3Rk3/WMSnIa6zIQUXEcic="; }; - vendorHash = "sha256-vRefU38o9Q4Q96aXoUXUggcRsfQePjlUrSsNERJH3YU="; + vendorHash = "sha256-JhrcuZ/FyvtUfsSq6YoYHNMjqFU/+FhxgCJ5bPtyYD8="; subPackages = [ "." ]; diff --git a/pkgs/by-name/fl/flux9s/package.nix b/pkgs/by-name/fl/flux9s/package.nix index 394d996e5249..790c73a0a3d9 100644 --- a/pkgs/by-name/fl/flux9s/package.nix +++ b/pkgs/by-name/fl/flux9s/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "flux9s"; - version = "0.12.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "dgunzy"; repo = "flux9s"; tag = "v${finalAttrs.version}"; - hash = "sha256-kwUoA5NTjJjCI3aUgpFOcDpRZbDEPCTzzsk7TxVn6K4="; + hash = "sha256-DpXTWnFjQ023cWEe46Qu+m200vVNnraSq7RNVcr9GxM="; }; - cargoHash = "sha256-5UOaIbaAlBufB4BJ+ZX82xaKTQ4qDDRZWaweM8d2AOY="; + cargoHash = "sha256-R3dEHn6XY+6q6kZcp43T/ASGiEIqvtlORRJ9VOgW9f0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gh/ghqr/package.nix b/pkgs/by-name/gh/ghqr/package.nix index 898a07dd9cf7..74d92433e817 100644 --- a/pkgs/by-name/gh/ghqr/package.nix +++ b/pkgs/by-name/gh/ghqr/package.nix @@ -10,17 +10,17 @@ buildGoModule (finalAttrs: { pname = "ghqr"; - version = "0.5.1"; + version = "0.6.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "microsoft"; repo = "ghqr"; tag = "v.${finalAttrs.version}"; - hash = "sha256-cyXuBP/Uj9UdvwoV/rKWUNts44DoKnHAeOD5dzBqZBM="; + hash = "sha256-rfYocQRAC+0VEn9Zlh5idhHSgvb+FyK1ZRe9ICBlXuk="; }; - vendorHash = "sha256-R/jo2Stwt9gZkJg9WfWSBTn/+3oravtE6+yh287MjDQ="; + vendorHash = "sha256-y0xTK9RYBXAY3P8ddQD9ktwxkNRkFqYirL7voMBk1UI="; ldflags = [ "-s" diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index 26246b46aa86..4ccfc4385d78 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -29,14 +29,14 @@ let in python3Packages.buildPythonApplication (finalAttrs: { pname = "harlequin"; - version = "2.5.2"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "tconbeer"; repo = "harlequin"; tag = "v${finalAttrs.version}"; - hash = "sha256-ea8fR+tsur/tIQwfUS88HvjCADv8VgEjHD7JnR44Twk="; + hash = "sha256-jZGQ6t6djiKK9B+R8TYMPwXKkLPk7Z+dXuUcVQuZMfU="; }; pythonRelaxDeps = [ @@ -90,6 +90,7 @@ python3Packages.buildPythonApplication (finalAttrs: { nativeCheckInputs = with python3Packages; [ pytest-asyncio + pytest-xdist pytestCheckHook versionCheckHook writableTmpDirAsHomeHook @@ -117,7 +118,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "SQL IDE for Your Terminal"; homepage = "https://harlequin.sh"; - changelog = "https://github.com/tconbeer/harlequin/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/tconbeer/harlequin/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; mainProgram = "harlequin"; maintainers = with lib.maintainers; [ pcboy ]; diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix index c4fa3bfaed21..98f58b379f3a 100644 --- a/pkgs/by-name/he/heimdall-proxy/package.nix +++ b/pkgs/by-name/he/heimdall-proxy/package.nix @@ -4,7 +4,7 @@ lib, }: let - version = "0.17.18"; + version = "0.17.19"; in buildGoModule { pname = "heimdall-proxy"; @@ -15,10 +15,10 @@ buildGoModule { owner = "dadrus"; repo = "heimdall"; tag = "v${version}"; - hash = "sha256-XNcUn/Xr1zYEfURX1POwGdSZqdmPTA8SqRzP+4qNECE="; + hash = "sha256-O1qqME2k2SggvYPlqX61wQn9yeh8skqe9Fjsc/GhUPc="; }; - vendorHash = "sha256-r2IpMllA8EDCGwz91qXhsRR2LoTqRbxPXfN6PIJWvqk="; + vendorHash = "sha256-85Aty7bCV7sq4CDAk7CCGQuD18P1Uj1AMO191k+YAHY="; tags = [ "sqlite" ]; diff --git a/pkgs/by-name/jr/jrl-cmakemodules-scripts/package.nix b/pkgs/by-name/jr/jrl-cmakemodules-scripts/package.nix new file mode 100644 index 000000000000..2bce816b5831 --- /dev/null +++ b/pkgs/by-name/jr/jrl-cmakemodules-scripts/package.nix @@ -0,0 +1,35 @@ +{ + jrl-cmakemodules, + python3Packages, +}: +python3Packages.buildPythonApplication (finalAttrs: { + inherit (jrl-cmakemodules) version src; + + pname = "jrl-cmakemodules-scripts"; + pyproject = true; + + sourceRoot = "${finalAttrs.src.name}/v2/scripts"; + + build-system = [ python3Packages.setuptools ]; + + dependencies = [ + python3Packages.cmake-parser + python3Packages.packaging + python3Packages.rich + python3Packages.ruamel-yaml + python3Packages.tomlkit + ]; + + nativeCheckInputs = [ + python3Packages.pytest-mock + python3Packages.pytestCheckHook + ]; + + __structuredAttrs = true; + strictDeps = true; + + meta = jrl-cmakemodules.meta // { + description = "Release scripting tools for JRL CMake modules"; + mainProgram = "jrl-release"; + }; +}) diff --git a/pkgs/by-name/jr/jrl-cmakemodules/package.nix b/pkgs/by-name/jr/jrl-cmakemodules/package.nix index 43bbda66f170..47a037752c74 100644 --- a/pkgs/by-name/jr/jrl-cmakemodules/package.nix +++ b/pkgs/by-name/jr/jrl-cmakemodules/package.nix @@ -4,8 +4,32 @@ fetchFromGitHub, nix-update-script, cmake, + + # docs + doxygen, + graphviz, + ghostscript, + pdf2svg, + pkg-config, + texliveBasic, + writableTmpDirAsHomeHook, + + # tests + catch2_3, + matio, + python3Packages, + simde, + suitesparse, }: +let + doxygenTexlive = texliveBasic.withPackages (ps: [ + ps.newunicodechar + ps.stmaryrd + ps.xcolor + ]); +in + stdenv.mkDerivation (finalAttrs: { pname = "jrl-cmakemodules"; version = "2.1.0"; @@ -19,7 +43,43 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - passthru.updateScript = nix-update-script { }; + cmakeFlags = [ + (lib.cmakeBool "JRL_CMAKEMODULES_GENERATE_API_DOC" true) + (lib.cmakeBool "JRL_CMAKEMODULES_BUILD_TESTS" finalAttrs.doCheck) + ]; + + doCheck = true; + + checkInputs = [ + catch2_3 + matio + python3Packages.boost + python3Packages.nanobind + python3Packages.numpy + python3Packages.pytest + simde + suitesparse + ]; + + passthru = { + updateScript = nix-update-script { }; + docsNativeBuildInputs = [ + cmake + doxygen + doxygenTexlive + graphviz + ghostscript + pdf2svg + pkg-config + writableTmpDirAsHomeHook + ]; + docsCmakeFlags = [ + (lib.cmakeFeature "DOXYGEN_FORMULA_FONTSIZE" "13") + (lib.cmakeFeature "DOXYGEN_HTML_FORMULA_FORMAT" "svg") + (lib.cmakeFeature "DOXYGEN_HTML_OUTPUT" "doxygen-html") + (lib.cmakeBool "DOXYGEN_USE_MATHJAX" false) + ]; + }; meta = { description = "CMake utility toolbox"; diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix index 55d4e20cbc2a..3cb1de13e404 100644 --- a/pkgs/by-name/ka/karakeep/package.nix +++ b/pkgs/by-name/ka/karakeep/package.nix @@ -11,20 +11,20 @@ python3, srcOnly, removeReferencesTo, - pnpm_9, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "karakeep"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "karakeep-app"; repo = "karakeep"; tag = "cli/v${finalAttrs.version}"; - hash = "sha256-P88DQi0T7tmBH7cjs8/Hz77bU0oG7u67XPoLsdePNhI="; + hash = "sha256-WL4M2rpbIDUTUUCuw2T5tG4VCMGZaLsWq+BCAQBa2Sc="; }; patches = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs node-gyp pnpmConfigHook - pnpm_9 + pnpm_11 ]; buildInputs = [ @@ -58,9 +58,9 @@ stdenv.mkDerivation (finalAttrs: { src patches ; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-aT4JPx3iYw4kw8GHXKWMnelSVT0q2S3PK8DgSCQCyKQ="; + pnpm = pnpm_11; + fetcherVersion = 4; + hash = "sha256-JhD1soZj8l6ZVtTOSZc1lMfWfi3R0PU/SsVHEvr50PI="; }; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/ka/karakeep/patches/cache-from-env-not-nix-store.patch b/pkgs/by-name/ka/karakeep/patches/cache-from-env-not-nix-store.patch index cdae13c94a2e..6366280c44e0 100644 --- a/pkgs/by-name/ka/karakeep/patches/cache-from-env-not-nix-store.patch +++ b/pkgs/by-name/ka/karakeep/patches/cache-from-env-not-nix-store.patch @@ -5,10 +5,10 @@ index cba8876..c3d7c43 100644 @@ -495,7 +495,8 @@ class ImageOptimizerCache { ]); } - constructor({ distDir, nextConfig }){ -- this.cacheDir = (0, _path.join)(distDir, 'cache', 'images'); + constructor({ distDir, nextConfig, cacheHandler }){ +- this.cacheDir = (0, _path.join)(/* turbopackIgnore: true */ distDir, 'cache', 'images'); + const cacheDir = process.env['NEXT_CACHE_DIR'] || (0, _path.join)(distDir, 'cache'); + this.cacheDir = (0, _path.join)(cacheDir, 'images'); this.nextConfig = nextConfig; - } - async get(cacheKey) { + this.cacheHandler = cacheHandler; + // Eagerly start LRU initialization for filesystem cache diff --git a/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch b/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch index b9e5609b33f0..10e0e7d3d3cf 100644 --- a/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch +++ b/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch @@ -5,6 +5,6 @@ requirement. --- --- a/package.json +++ b/package.json -@@ -40 +40 @@ -- "packageManager": "pnpm@9.15.9", -+ "packageManager": "pnpm", +@@ -41 +41 @@ +- "packageManager": "pnpm@11.2.1" ++ "packageManager": "pnpm" diff --git a/pkgs/by-name/ls/lstk/package.nix b/pkgs/by-name/ls/lstk/package.nix index 7a3609d407b2..0be3aa2ea982 100644 --- a/pkgs/by-name/ls/lstk/package.nix +++ b/pkgs/by-name/ls/lstk/package.nix @@ -7,7 +7,7 @@ }: buildGoModule (finalAttrs: { pname = "lstk"; - version = "0.18.0"; + version = "0.20.1"; __structuredAttrs = true; @@ -15,10 +15,10 @@ buildGoModule (finalAttrs: { owner = "localstack"; repo = "lstk"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-ukmz27Bq4yrJ0oNIwwG4dyy1nLrFLL8KNEJjnihvTEU="; + sha256 = "sha256-PL6Xqq1S4RDm0Uj5Am9UiJJJ8Q/nWszuyRXkW+Y9cCE="; }; - vendorHash = "sha256-hia/DjlnvnjuJvTE52Twr61bDFR9Oz/gFpp94FY3pYc="; + vendorHash = "sha256-WiWMOudPoS3qOMs+m/pz9VYZ9OPRn3IWHxAMC6eBjtg="; excludedPackages = "test/integration"; diff --git a/pkgs/by-name/ma/marelle/package.nix b/pkgs/by-name/ma/marelle/package.nix new file mode 100644 index 000000000000..86677a1b0302 --- /dev/null +++ b/pkgs/by-name/ma/marelle/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenvNoCC, + fetchFromGitLab, + installFonts, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "marelle"; + version = "1.004"; + + outputs = [ + "out" + "webfont" + ]; + + src = fetchFromGitLab { + domain = "forge.apps.education.fr"; + owner = "marelle"; + repo = "marelle.forge.apps.education.fr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-BNUNHQ7Vjh34CPMd+YG2aVc1ttg65LUKH0ToJ1VAw2U="; + }; + + # public/fonts/ duplicates fonts/webfonts/ + postPatch = '' + rm -rf public/fonts + ''; + + nativeBuildInputs = [ + installFonts + ]; + + strictDeps = true; + __structuredAttrs = true; + + meta = { + description = "Cursive font for teaching handwritting in primary school"; + homepage = "https://marelle.forge.apps.education.fr"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix index bd3ac880fd01..66c702dd4a70 100644 --- a/pkgs/by-name/mi/mim-solvers/package.nix +++ b/pkgs/by-name/mi/mim-solvers/package.nix @@ -1,12 +1,10 @@ { - cmake, crocoddyl, ctestCheckHook, fetchFromGitHub, - fetchpatch, + jrl-cmakemodules, lib, llvmPackages, - pkg-config, proxsuite, stdenv, nix-update-script, @@ -23,21 +21,19 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-t21zzUo+Oiqvr3lYN9v1lCeoki3I1FWPqo3gWzM6Kdw="; }; - nativeBuildInputs = [ - cmake - pkg-config - ]; + nativeBuildInputs = jrl-cmakemodules.docsNativeBuildInputs; - buildInputs = lib.optional ( - stdenv.hostPlatform.isDarwin && crocoddyl.withMultithread - ) llvmPackages.openmp; + buildInputs = [ + jrl-cmakemodules + ] + ++ lib.optional (stdenv.hostPlatform.isDarwin && crocoddyl.withMultithread) llvmPackages.openmp; propagatedBuildInputs = [ crocoddyl proxsuite ]; - cmakeFlags = [ + cmakeFlags = jrl-cmakemodules.docsCmakeFlags ++ [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false) (lib.cmakeBool "BUILD_WITH_PROXSUITE" true) (lib.cmakeBool "BUILD_WITH_MULTITHREADS" crocoddyl.withMultithread) diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index a1789c333cfc..cb0ef2d742cb 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -52,7 +52,7 @@ let pname = "mongodb-compass"; - version = "1.49.10"; + version = "1.49.12"; selectSystem = attrs: @@ -66,8 +66,8 @@ let } }"; hash = selectSystem { - x86_64-linux = "sha256-faD8sIbnho5urBWE0btcmD7tXT8eQCNyJYzpIyI+bA4="; - aarch64-darwin = "sha256-HGOJPYC4+CgLQQ3BNUTNZUln5oqPkC8ewHft99LCZQ8="; + x86_64-linux = "sha256-syuoNZ2MmPHgTi55HioqkYQzS1LsbzcgdWoFeM+z2Rg="; + aarch64-darwin = "sha256-BY5EUWJdPg4OJ7+ehCb/H8dIAoJVYlJnNcSPp0r/XfA="; }; }; @@ -119,13 +119,16 @@ in stdenv.mkDerivation (finalAttrs: { inherit pname version src; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - dpkg - wrapGAppsHook3 - patchelf - ]; + __structuredAttrs = true; + strictDeps = true; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; + nativeBuildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + dpkg + wrapGAppsHook3 + patchelf + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; dontUnpack = stdenv.hostPlatform.isLinux; dontFixup = stdenv.hostPlatform.isDarwin; @@ -156,7 +159,8 @@ stdenv.mkDerivation (finalAttrs: { patchelf --set-rpath ${rpath}:$out/lib/mongodb-compass "$file" || true done - wrapGAppsHook $out/bin/mongodb-compass + gappsWrapperArgsHook + wrapGApp "$out/bin/mongodb-compass" ''; installPhase = '' @@ -185,6 +189,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "GUI for MongoDB"; homepage = "https://github.com/mongodb-js/compass"; + changelog = "https://github.com/mongodb-js/compass/releases/tag/v${finalAttrs.version}"; license = lib.licenses.sspl; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "mongodb-compass"; diff --git a/pkgs/by-name/mp/mpv/scripts/videoclip.nix b/pkgs/by-name/mp/mpv/scripts/videoclip.nix index ee75757f57e8..88f245f97540 100644 --- a/pkgs/by-name/mp/mpv/scripts/videoclip.nix +++ b/pkgs/by-name/mp/mpv/scripts/videoclip.nix @@ -1,38 +1,37 @@ { lib, - fetchFromGitHub, - curl, - xclip, - wl-clipboard, - stdenv, buildLua, - unstableGitUpdater, + fetchFromGitHub, + gitUpdater, + stdenv, + curl, + wl-clipboard, + xclip, }: -buildLua { +buildLua (finalAttrs: { pname = "videoclip"; - version = "0.2-unstable-2026-07-07"; + version = "26.7.30.0"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "videoclip"; - rev = "979bae398da7ccd70cb2fb305c371b7af9259b10"; - hash = "sha256-k3fxSeAjRZg4J5x5IQhKGYtUqfBE4heR1KNurGTElGs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-4ptnF3/L3U0CDucYcd8/O5EN1mUtnor+iXLRXbiC7os="; }; - patchPhase = '' - substituteInPlace platform.lua \ - --replace \'curl\' \'${lib.getExe curl}\' \ + postPatch = '' + substituteInPlace videoclip/platform.lua \ + --replace-fail "'curl'" "'${lib.getExe curl}'" '' + lib.optionalString stdenv.hostPlatform.isLinux '' - --replace xclip ${lib.getExe xclip} \ - --replace wl-copy ${lib.getExe' wl-clipboard "wl-copy"} + substituteInPlace videoclip/platform.lua \ + --replace-fail '"wl-copy' '"${lib.getExe' wl-clipboard "wl-copy"}' \ + --replace-fail '"xclip' '"${lib.getExe xclip}' ''; - scriptPath = "."; - passthru.scriptName = "videoclip"; - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; + scriptPath = "videoclip"; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = { description = "Easily create videoclips with mpv"; @@ -41,4 +40,4 @@ buildLua { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ BatteredBunny ]; }; -} +}) diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix index aa47f549cb5c..708f39c7333d 100644 --- a/pkgs/by-name/mt/mtail/package.nix +++ b/pkgs/by-name/mt/mtail/package.nix @@ -9,6 +9,7 @@ buildGoModule (finalAttrs: { pname = "mtail"; version = "3.4.6"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "jaqx0r"; diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index fbc2880c0a4b..0829e6516e15 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "namespace-cli"; - version = "0.0.550"; + version = "0.0.551"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ek6+s10KvZhPoHGBpw2k3ARBpwi1hbyChieyAxF1ac4="; + hash = "sha256-utBatGjHNLTT+hdYde5NIZmD7c+oS9zFl9dCyrtMx2s="; }; - vendorHash = "sha256-hOt0ItxXUcinp8+/XiHq18kRz2heVmHKpWhNP0i4a+Y="; + vendorHash = "sha256-1MjkgJvn2u2zcO6lMAHdEbiGVp24D3Gv98GQZxGk27Y="; subPackages = [ "cmd/nsc" diff --git a/pkgs/by-name/nd/ndcurves/package.nix b/pkgs/by-name/nd/ndcurves/package.nix index ddd3895bc4ad..42407d74e08d 100644 --- a/pkgs/by-name/nd/ndcurves/package.nix +++ b/pkgs/by-name/nd/ndcurves/package.nix @@ -29,34 +29,32 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - doxygen - pkg-config - ] - ++ lib.optionals pythonSupport [ - python3Packages.python - python3Packages.pythonImportsCheckHook - ]; - propagatedBuildInputs = [ - jrl-cmakemodules - ] - ++ lib.optionals pythonSupport [ - python3Packages.eigenpy - python3Packages.pinocchio - ] - ++ lib.optional (!pythonSupport) pinocchio; + buildInputs = [ jrl-cmakemodules ]; + nativeBuildInputs = + jrl-cmakemodules.docsNativeBuildInputs + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; + propagatedBuildInputs = + lib.optionals pythonSupport [ + python3Packages.eigenpy + python3Packages.pinocchio + ] + ++ lib.optional (!pythonSupport) pinocchio; - cmakeFlags = [ - (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) - (lib.cmakeBool "CURVES_WITH_PINOCCHIO_SUPPORT" true) - ] - ++ lib.optional stdenv.hostPlatform.isAarch64 ( - lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'curves_tests|python-curves'" - ) - ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ( - lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test-so3-smooth'" - ); + cmakeFlags = + jrl-cmakemodules.docsCmakeFlags + ++ [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "CURVES_WITH_PINOCCHIO_SUPPORT" true) + ] + ++ lib.optional stdenv.hostPlatform.isAarch64 ( + lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'curves_tests|python-curves'" + ) + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ( + lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test-so3-smooth'" + ); doCheck = true; diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix index 839f3307e9ea..6b8f0460e2db 100644 --- a/pkgs/by-name/ne/newsflash/package.nix +++ b/pkgs/by-name/ne/newsflash/package.nix @@ -29,18 +29,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "5.2.4"; + version = "5.2.5"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; tag = "v.${finalAttrs.version}"; - hash = "sha256-8Gs87eqcs/7SWNlv4pI4Y78bZb/gGhx0DtPzyZhe1Ew="; + hash = "sha256-oii3/VIV0zivHz/ZscVtJVvPm4SSlzpR+o6t0cS8JO8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-rklPsg9rYXkC29kSyST4JrrsPlL7FEx+wOuFypqWc7I="; + hash = "sha256-hR0rfOOLTVt8FuTG0RT80iO8Tt4UwMZwk/VYsBAoLBw="; }; postPatch = '' diff --git a/pkgs/by-name/no/nocturne/package.nix b/pkgs/by-name/no/nocturne/package.nix index d7cc8945c3a5..ff6726c8f738 100644 --- a/pkgs/by-name/no/nocturne/package.nix +++ b/pkgs/by-name/no/nocturne/package.nix @@ -16,6 +16,8 @@ python3, python3Packages, libadwaita, + libportal, + libportal-gtk4, gobject-introspection, libsecret, gst_all_1, @@ -31,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nocturne"; - version = "1.4.2"; + version = "1.5.1"; src = fetchFromGitHub { owner = "Jeffser"; repo = "Nocturne"; tag = finalAttrs.version; - hash = "sha256-q2jN1X/2Iayzqf+2d1roQ9dbZKGqWy3sXC78lKXLzPM="; + hash = "sha256-83RvrMFUmBUmeObz2u+ScNrT8hb9y02xxWiFqYGnAEU="; }; __structuredAttrs = true; @@ -63,6 +65,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk4 libadwaita + libportal + libportal-gtk4 libsecret python3 glib-networking diff --git a/pkgs/by-name/nx/nxv/package.nix b/pkgs/by-name/nx/nxv/package.nix index af4ed4d0ad6e..a9daa1fac9a1 100644 --- a/pkgs/by-name/nx/nxv/package.nix +++ b/pkgs/by-name/nx/nxv/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nxv"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "utensils"; repo = "nxv"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ym30QiImry+3Io933SFQw5q6Lyl5p8nuidQhrXHSv54="; + hash = "sha256-tjVhLHn2FH4QQ5ynLEiB2nJTmpu4viho2Sf+mc7YWX8="; }; - cargoHash = "sha256-syAlYsXPxMUIyPNankujiVD3lXaAgGmr5v585ysxIWI="; + cargoHash = "sha256-Gx45+hiRByQc/OcHlJ7L4G+xh/IZHWipslQ3Xv5+fHE="; # Tests use mockito which needs to bind to localhost __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index ed35ab136096..2647a436ec1b 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -23,25 +23,25 @@ # runs without an external linter, which leaves `jsPlugins` configs inert. stdenv.mkDerivation (finalAttrs: { pname = "oxlint"; - version = "1.75.0"; + version = "1.76.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxlint_v${finalAttrs.version}"; - hash = "sha256-pKnIgGlIajq/VCAafvOY6KCkNOd/D2ozU9FM3EARVH8="; + hash = "sha256-uXkAD4+B8ghUbti1ts1RO+Jc0wQlpovl6+JzZA1JaRk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-zY8Rgw75mRK7i0mFjsWF3sbqsR9T8Ce4JlptHldd5oM="; + hash = "sha256-eZAJdMDC09nE9n2Arh72ZZUQjmMFdA68rPCmH2tSx2w="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-dBFsEaurRYGxet6kRF6M1LjSlBu3zU33Ul5vjcH2MWQ="; + hash = "sha256-WZ4eYwQNeDF55ax3mW5swKafCDeYG5rWPPzJk5f+H1k="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/by-name/ph/phira-unwrapped/package.nix b/pkgs/by-name/ph/phira-unwrapped/package.nix index 1daece210526..d8abd2388a71 100644 --- a/pkgs/by-name/ph/phira-unwrapped/package.nix +++ b/pkgs/by-name/ph/phira-unwrapped/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "phira-unwrapped"; - version = "0.7.1"; + version = "0.8.0"; __structuredAttrs = true; strictDeps = true; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "TeamFlos"; repo = "phira"; tag = "v${finalAttrs.version}"; - hash = "sha256-bn1vRxL4O32Txna3RqafOzXISziDiL//S8NwiIK5c4M="; + hash = "sha256-/ziX3rkHs38BKNQU8Q9NJC51ArJbs/HBSKN7BIozCBY="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ./assets.patch ]; - cargoHash = "sha256-a+bQ5d9n18jrsgnqygBlMKWlu7KPU5tbQQSXRXE5zWY="; + cargoHash = "sha256-R4JljAElhxT88Ar1cvBlv0qSquyrvia7Rbygr9NSxwY="; # The developer put assets necessary for this test in gitignore, so it cannot run. checkFlags = [ "--skip=test_parse_chart" ]; @@ -74,6 +74,8 @@ rustPlatform.buildRustPackage (finalAttrs: { install -Dm644 assets/icon.png $out/share/icons/hicolor/128x128/apps/phira.png ''; + passthru.updateScript = ./update.sh; + meta = { description = "Rhythm game with custom charts and multiplayer"; homepage = "https://github.com/TeamFlos/phira"; diff --git a/pkgs/by-name/ph/phira-unwrapped/update.sh b/pkgs/by-name/ph/phira-unwrapped/update.sh new file mode 100755 index 000000000000..a02de512be38 --- /dev/null +++ b/pkgs/by-name/ph/phira-unwrapped/update.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix-update nix gnused -i bash + +set -euo pipefail + +old_version="$(nix-instantiate --eval --raw -A phira-unwrapped.version)" +nix-update phira-unwrapped +version="$(nix-instantiate --eval --raw -A phira-unwrapped.version)" +if [[ "$old_version" == "$version" ]]; then + exit 0 +fi + +file="$(nix-instantiate --eval --raw -A phira.meta.position | cut -d : -f 1)" +hash="$(nix-prefetch-url --unpack "https://github.com/TeamFlos/phira/releases/download/v$version/Phira-windows-x86_64-v$version.zip")" +hash="$(nix-hash --to-sri --type sha256 "$hash")" +sed -i "s|hash = \".*\";|hash = \"$hash\";|" "$file" diff --git a/pkgs/by-name/ph/phira/package.nix b/pkgs/by-name/ph/phira/package.nix index 590eac607de1..ccbe8e8244fd 100644 --- a/pkgs/by-name/ph/phira/package.nix +++ b/pkgs/by-name/ph/phira/package.nix @@ -12,7 +12,7 @@ # A derivation or a path that contains a dir `assets`. overrideAssets ? fetchzip { url = "https://github.com/TeamFlos/phira/releases/download/v${phira-unwrapped.version}/Phira-windows-x86_64-v${phira-unwrapped.version}.zip"; - hash = "sha256-p0+o7q42caHqVWnHtgknYaCIJemG/9fNKF7pqTnRGE4="; + hash = "sha256-1/FBg1i8O83yusEAFlXiYWyabv04n1qkXwLgWaw8sTc="; stripRoot = false; meta.license = lib.licenses.unfree; }, @@ -54,6 +54,9 @@ symlinkJoin { passthru.assets = overrideAssets; - meta = phira-unwrapped.meta; + meta = phira-unwrapped.meta // { + # trick meta.position + description = phira-unwrapped.meta.description; + }; } diff --git a/pkgs/by-name/pi/pinnacle/package.nix b/pkgs/by-name/pi/pinnacle/package.nix index 3e42a9c08ed8..8c944589fd22 100644 --- a/pkgs/by-name/pi/pinnacle/package.nix +++ b/pkgs/by-name/pi/pinnacle/package.nix @@ -13,7 +13,7 @@ mesa, xwayland, libinput, - libdisplay-info, + libdisplay-info_0_3, git, libgbm, rustc, @@ -44,6 +44,10 @@ let license = lib.licenses.gpl3; mainProgram = "pinnacle"; platforms = lib.platforms.linux; + badPlatforms = [ + # tests fail https://hydra.nixos.org/build/337493260 + "aarch64-linux" + ]; maintainers = with lib.maintainers; [ cassandracomar ]; }; @@ -96,7 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: { libinput mesa xwayland - libdisplay-info + libdisplay-info_0_3 libgbm lua5_4 diff --git a/pkgs/by-name/pi/pinocchio/package.nix b/pkgs/by-name/pi/pinocchio/package.nix index 66de2a0d5466..842951d1f6a5 100644 --- a/pkgs/by-name/pi/pinocchio/package.nix +++ b/pkgs/by-name/pi/pinocchio/package.nix @@ -5,10 +5,8 @@ nix-update-script, stdenv, - # nativeBuildInputs - cmake, - doxygen, - pkg-config, + # buildInputs + jrl-cmakemodules, # propagatedBuildInputs boost, @@ -16,7 +14,6 @@ coal, console-bridge, eigen, - jrl-cmakemodules, urdfdom, # nativeCheckInputs @@ -52,10 +49,10 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - doxygen - pkg-config + nativeBuildInputs = jrl-cmakemodules.docsNativeBuildInputs; + + buildInputs = [ + jrl-cmakemodules ]; propagatedBuildInputs = [ @@ -63,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: { coal console-bridge eigen - jrl-cmakemodules urdfdom ] ++ lib.optionals collisionSupport [ coal ] @@ -88,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { "test-cpp-algorithm-utils-force" ]; - cmakeFlags = [ + cmakeFlags = jrl-cmakemodules.docsCmakeFlags ++ [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false) (lib.cmakeBool "BUILD_WITH_CASADI_SUPPORT" casadiSupport) (lib.cmakeBool "BUILD_WITH_COLLISION_SUPPORT" collisionSupport) diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index 4c0516b67752..666c8e5eb248 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -7,15 +7,12 @@ pythonSupport ? false, python3Packages, - # nativeBuildInputs - cmake, - doxygen, - graphviz, + # buildInputs + jrl-cmakemodules, # propagatedBuildInputs cereal, eigen, - jrl-cmakemodules, simde, # nativeCheckInputs @@ -46,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { "out" ]; - cmakeFlags = [ + cmakeFlags = jrl-cmakemodules.docsCmakeFlags ++ [ (lib.cmakeBool "BUILD_DOCUMENTATION" true) (lib.cmakeBool "INSTALL_DOCUMENTATION" true) (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) @@ -54,20 +51,18 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - doxygen - graphviz - ] - ++ lib.optionals pythonSupport [ - python3Packages.python - python3Packages.pythonImportsCheckHook - ]; + nativeBuildInputs = + jrl-cmakemodules.docsNativeBuildInputs + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; + + buildInputs = [ jrl-cmakemodules ]; propagatedBuildInputs = [ cereal eigen - jrl-cmakemodules simde ] ++ lib.optionals pythonSupport [ python3Packages.nanobind ]; diff --git a/pkgs/by-name/pr/proxysql/btree-cstdint.patch b/pkgs/by-name/pr/proxysql/btree-cstdint.patch new file mode 100644 index 000000000000..c5eae1c371d2 --- /dev/null +++ b/pkgs/by-name/pr/proxysql/btree-cstdint.patch @@ -0,0 +1,16 @@ +The vendored copy of Google's cpp-btree relies on being pulled in +transitively. libstdc++ 15 no longer does so, which makes uint8_t/uint16_t +undeclared, and the resulting fallback to int trips the kNodeValues +COMPILE_ASSERT with a "1 << 32" shift. + +diff --git a/include/btree.h b/include/btree.h +--- a/include/btree.h ++++ b/include/btree.h +@@ -104,6 +104,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/pkgs/by-name/pr/proxysql/makefiles.patch b/pkgs/by-name/pr/proxysql/makefiles.patch index 17facc6744c1..bc47db822b4a 100644 --- a/pkgs/by-name/pr/proxysql/makefiles.patch +++ b/pkgs/by-name/pr/proxysql/makefiles.patch @@ -151,7 +151,7 @@ index 87d2a20e..505e069a 100644 cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch - cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include . -+ cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include . ++ cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_C_FLAGS=-std=gnu17 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include . ifeq ($(PROXYDEBUG),1) cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch else ifeq ($(USEVALGRIND),1) diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix index 852c812b6d66..e31b2d20537d 100644 --- a/pkgs/by-name/pr/proxysql/package.nix +++ b/pkgs/by-name/pr/proxysql/package.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./makefiles.patch ./dont-phone-home.patch + ./btree-cstdint.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index a0de1bc728d9..7f6b49aca436 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "reindeer"; - version = "2026.05.04.00"; + version = "2026.07.27.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${finalAttrs.version}"; - hash = "sha256-m27zMZbDv/2bXhb16rFxUUokEn0bxyrhpxlOSZvVcfk="; + hash = "sha256-8/AtBZzjC5NSashMtEjCasZU53GqZTkoAhWytoIweGU="; }; - cargoHash = "sha256-nJU9ClYxRkAfFkOq1V7k34pjdqJntDr3gJekUibq304="; + cargoHash = "sha256-MB/TQnOB96x86uAQJNt6IiTUmy74Dom4xtqWGga6GkA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/remarshal_0_17/package.nix b/pkgs/by-name/re/remarshal_0_17/package.nix deleted file mode 100644 index a4109bad5238..000000000000 --- a/pkgs/by-name/re/remarshal_0_17/package.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - python3Packages, - fetchFromGitHub, - fetchPypi, - fetchpatch, -}: - -let - packageOverrides = self: super: { - tomlkit = super.tomlkit.overridePythonAttrs (oldAttrs: rec { - version = "0.12.5"; - src = fetchPypi { - pname = "tomlkit"; - inherit version; - hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw="; - }; - patches = [ - (fetchpatch { - url = "https://github.com/python-poetry/tomlkit/commit/05d9be1c2b2a95a4eb3a53d999f1483dd7abae5a.patch"; - hash = "sha256-9pLGxcGHs+XoKrqlh7Q0dyc07XrK7J6u2T7Kvfd0ICc="; - excludes = [ ".github/workflows/tests.yml" ]; - }) - ]; - }); - }; - python = python3Packages.python.override (old: { - self = python3Packages.python; - packageOverrides = lib.composeExtensions (old.packageOverrides or (_: _: { })) packageOverrides; - }); - pythonPackages = python.pkgs; -in -pythonPackages.buildPythonApplication (finalAttrs: { - pname = "remarshal"; - version = "0.17.1"; # last version with YAML 1.1 support, do not update - pyproject = true; - - __structuredAttrs = true; - - src = fetchFromGitHub { - owner = "remarshal-project"; - repo = "remarshal"; - tag = "v${finalAttrs.version}"; - hash = "sha256-2WxMh5P/8NvElymnMU3JzQU0P4DMXFF6j15OxLaS+VA="; - }; - - pythonRemoveDeps = [ "pytest" ]; - - build-system = [ pythonPackages.poetry-core ]; - - dependencies = with pythonPackages; [ - cbor2 - colorama - python-dateutil - pyyaml - rich-argparse - ruamel-yaml - tomlkit - u-msgpack-python - ]; - - pythonRelaxDeps = [ "cbor2" ]; - - nativeCheckInputs = [ pythonPackages.pytestCheckHook ]; - - # nixpkgs-update: no auto update - - meta = { - changelog = "https://github.com/remarshal-project/remarshal/releases/tag/${finalAttrs.src.tag}"; - description = "Convert between TOML, YAML and JSON"; - license = lib.licenses.mit; - homepage = "https://github.com/remarshal-project/remarshal"; - maintainers = with lib.maintainers; [ hexa ]; - mainProgram = "remarshal"; - }; -}) diff --git a/pkgs/by-name/re/remote-touchpad/package.nix b/pkgs/by-name/re/remote-touchpad/package.nix index 1547b7284454..3e91a903bf33 100644 --- a/pkgs/by-name/re/remote-touchpad/package.nix +++ b/pkgs/by-name/re/remote-touchpad/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "remote-touchpad"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "unrud"; repo = "remote-touchpad"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-9K/AdkfpQbXPDIwai3h98G4lo4p8c/yTLxirhbo03U4="; + sha256 = "sha256-Erflr02yv6RT6vF9/WKMO7h0lEr2NMPinK7bj/SPMvI="; }; buildInputs = [ @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { ]; tags = [ "portal,x11" ]; - vendorHash = "sha256-nkzvE59H7adyzveXYFI1NVwIh8chBRrVZZKfLY0fEaw="; + vendorHash = "sha256-9e8mfGpR7HtpB+Fca69pKQH52FZciOnpsD/bi1JW4q0="; meta = { description = "Control mouse and keyboard from the web browser of a smartphone"; diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix index 6bb7a8add975..3e2d35c0886e 100644 --- a/pkgs/by-name/ru/rusty-psn/package.nix +++ b/pkgs/by-name/ru/rusty-psn/package.nix @@ -24,16 +24,16 @@ rustPlatform.buildRustPackage rec { pname = "rusty-psn"; - version = "0.5.10"; + version = "0.6.0"; src = fetchFromGitHub { owner = "RainbowCookie32"; repo = "rusty-psn"; tag = "v${version}"; - hash = "sha256-3sy3PBiV7ioRnYwI2vF6lGVj3Q/Ls6GmENyGePCgQ3k="; + hash = "sha256-xdhNwKWJ2DjwKAPCeW26Ccl7oCmWdlNoAdZQKcDU8Ew="; }; - cargoHash = "sha256-orsCExYx9ZGtda13mmFk7665WFwZ7E7rr5wEcDxc+vY="; + cargoHash = "sha256-Kf/+5u1zPLNCFhT+IDvFWnrG4TfcjzJjaTw8w0vyfi0="; # Tests require network access doCheck = false; diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index 10a039fe384d..3d9b5bf7e359 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "satty"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "Satty-org"; repo = "Satty"; rev = "v${finalAttrs.version}"; - hash = "sha256-pD91+MbieZ5/YoUR0lcKnJ9bA1fn7I97NbnIwm/kL7E="; + hash = "sha256-76J4ZlBKeow2sWs1SeSkE8R2fKRTFD+B+7Vx3nbbQxY="; }; - cargoHash = "sha256-Oavfb2Jp9WO0eaT5TqRwSxU3+rm9lBxwuWTWnc2CnZ0="; + cargoHash = "sha256-R8I8eZ8vy6w1DGNrkP9Os2tAOIetqXCyn0cxWpk9F+w="; # Generate shell completions and man file buildFeatures = [ "ci-release" ]; diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index 7a33b4b6e8f5..638b85e58b4d 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -18,7 +18,7 @@ assert lib.assertMsg ( ) "Dynamic linking to cronet-go is only available on Linux."; buildGoModule (finalAttrs: { pname = "sing-box"; - version = "1.13.15"; + version = "1.13.16"; __structuredAttrs = true; @@ -27,10 +27,10 @@ buildGoModule (finalAttrs: { owner = "SagerNet"; repo = "sing-box"; tag = "v${finalAttrs.version}"; - hash = "sha256-YkbF5+smzP+AQ161xvTBO01ZIB3PonHVM0l5DVRSnFs="; + hash = "sha256-GAIU0SRvxU92E40zCkMsiSPuIEIUZM5vORN2u2XIhqs="; }; - vendorHash = "sha256-HIMKtolVXbmyV1vmXXAt3O/2NTp4HwzhUWChs8I4+cs="; + vendorHash = "sha256-ZUEpYfgb/iflImVCdLIgUzfp4QY9ho1gYkIAJV1tXrg="; tags = [ "with_gvisor" diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 88adb201f72a..cdf2d7e714ec 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -34,20 +34,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.7.1"; + version = "3.7.3"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; tag = "v${finalAttrs.version}"; - hash = "sha256-K31h2noDpTn7vCXj16K2dxRPww5z+HC/nA4Gn5MAVms="; + hash = "sha256-7Uoo8vYaci8ROk5pqs14dNrU3q7UsadDXyw1mW8Mx5I="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-fZLVqrWTWUHo6BhixB6+krXaM7WCiZpusHA8T2SicgQ="; + vendorHash = "sha256-weg5MRidW8JId13Ug1VaVgaIcJqydGBR/EquFOS3QO4="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -70,6 +70,9 @@ stdenv.mkDerivation (finalAttrs: { "-X 'github.com/siyuan-note/siyuan/kernel/util.Mode=prod'" ]; tags = [ "fts5" ]; + + # filepath.ToSlash does not convert Windows path separators on Unix. + checkFlags = [ "-skip=^TestSyObjectBase/windows_backslash$" ]; }; nativeBuildInputs = [ @@ -95,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ; inherit pnpm; fetcherVersion = 4; - hash = "sha256-1QIGx0Zm6v4FIR1EYgXQzmBMZBa9Bi24vouT1K6v9EQ="; + hash = "sha256-i7llORlVU1CCmyVCvJr7xCQffTmbmIA9rT68Raqg5y8="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/sv/svelte-check/package.nix b/pkgs/by-name/sv/svelte-check/package.nix index c2db29dcf953..e7f8db77482c 100644 --- a/pkgs/by-name/sv/svelte-check/package.nix +++ b/pkgs/by-name/sv/svelte-check/package.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "svelte-check"; - version = "4.3.1"; + version = "4.7.4"; src = fetchFromGitHub { owner = "sveltejs"; repo = "language-tools"; - tag = "svelte-check-${finalAttrs.version}"; - hash = "sha256-+KDl7tTyXo6QMQpMGA4hSChDaPrfqfVKJXGunTlo9Rg="; + tag = "svelte-check@${finalAttrs.version}"; + hash = "sha256-fjJp+4XAwUPZV8kVvgHnb1LVJbamzrboS3Taax1Vwvs="; }; pnpmWorkspaces = [ "svelte-check..." ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ; inherit pnpm; fetcherVersion = 3; - hash = "sha256-43AIkVzpcq/Y+QO2k7pkr6CN340idXJEpie0gVdxra8="; + hash = "sha256-lzphyVC1fpT5EFIuVz7ZMAiSLeyXhjSuOpAqSklh6QU="; }; nativeBuildInputs = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { extraArgs = [ "--use-github-releases" "--version-regex" - "svelte-check-(.*)" + "svelte-check@(.*)" ]; }; diff --git a/pkgs/by-name/ta/tabbyapi/package.nix b/pkgs/by-name/ta/tabbyapi/package.nix index 2ecf9cb6b700..e6eed91c61ff 100644 --- a/pkgs/by-name/ta/tabbyapi/package.nix +++ b/pkgs/by-name/ta/tabbyapi/package.nix @@ -7,14 +7,14 @@ }: python3Packages.buildPythonApplication { pname = "tabbyapi"; - version = "0-unstable-2026-07-18"; + version = "0-unstable-2026-07-31"; pyproject = true; src = fetchFromGitHub { owner = "theroyallab"; repo = "tabbyAPI"; - rev = "0158fb48d76546a6475d1d63f6cd5b90932d1d11"; - hash = "sha256-Bkpx3MyZg7Np5zXAsq8mgxdAFsHUZhy2NZ93XSLbJgk="; + rev = "29680f496b57e3ed1a496c580677d2d67ac729b8"; + hash = "sha256-eB8Q4iVlNCrgHHWutuhxzD+bQfC5Yx3z2rSCCSFsrL4="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/tc/tclint/package.nix b/pkgs/by-name/tc/tclint/package.nix index b602814a48fe..e8a00d71aa9a 100644 --- a/pkgs/by-name/tc/tclint/package.nix +++ b/pkgs/by-name/tc/tclint/package.nix @@ -16,14 +16,15 @@ let in pythonPackages.buildPythonApplication (finalAttrs: { pname = "tclint"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "nmoroze"; repo = "tclint"; tag = "v${finalAttrs.version}"; - hash = "sha256-HEmNdDq8xeGHCLJRvGGa13KaX7iLyyNkv3nYcJsZjrw="; + hash = "sha256-+ev/zqZwgW80XmVs8T+Ji37aJMOpr/1QyLAeHJES13Y="; }; build-system = with pythonPackages; [ @@ -53,7 +54,6 @@ pythonPackages.buildPythonApplication (finalAttrs: { pythonPackages.pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; disabledTestPaths = [ # Fails to find lsprotocol in the sandbox, even when added to nativeCheckInputs diff --git a/pkgs/by-name/ts/tsid/package.nix b/pkgs/by-name/ts/tsid/package.nix index ec43fc9c74f2..a9167ce1a6d5 100644 --- a/pkgs/by-name/ts/tsid/package.nix +++ b/pkgs/by-name/ts/tsid/package.nix @@ -1,11 +1,9 @@ { - cmake, - doxygen, eiquadprog, fetchFromGitHub, + jrl-cmakemodules, lib, osqp-eigen, - pkg-config, pinocchio, proxsuite, stdenv, @@ -22,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-f/SecQfEmrlelVR5584KIHFwwrp5Cy2aBMKI/rxuPmc="; }; - cmakeFlags = [ + cmakeFlags = jrl-cmakemodules.docsCmakeFlags ++ [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false) (lib.cmakeBool "BUILD_WITH_OSQP" true) (lib.cmakeBool "BUILD_WITH_PROXQP" true) @@ -34,10 +32,10 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - nativeBuildInputs = [ - doxygen - cmake - pkg-config + nativeBuildInputs = jrl-cmakemodules.docsNativeBuildInputs; + + buildInputs = [ + jrl-cmakemodules ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index b8416afee457..b8ebc992f44a 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.18.3"; + version = "8.18.4"; outputs = [ "bin" @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libvips"; repo = "libvips"; tag = "v${finalAttrs.version}"; - hash = "sha256-P8qjbCcpWNgKthZrXd+GykfPoU2x6avMNoYX1I+YE+k="; + hash = "sha256-qSXNXqNXZZFLFOIn24FLB8LNS7JiBdxFI2mRu0oICHM="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix index 774b715dc419..a85db571265d 100644 --- a/pkgs/by-name/wo/wofi-power-menu/package.nix +++ b/pkgs/by-name/wo/wofi-power-menu/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wofi-power-menu"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "szaffarano"; repo = "wofi-power-menu"; tag = "v${finalAttrs.version}"; - hash = "sha256-5dhwDfWL0pP28rgbS5eoOARrXDZVTF6EDNimcfcjH3Y="; + hash = "sha256-5aWlTtFlflj1Ts0NU/afP9dp3+G6Vqgp220YD3q9sps="; }; - cargoHash = "sha256-Avful4JlhYrdHpzWfseCmmx5jxuOJxEA2Yl6dfkJpXs="; + cargoHash = "sha256-wTDam0bBFss1DqdJNQ+lFwJUmVCQaIYtgC2wIMFO6sk="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix index 6c8266fdd4b2..63b562acb99f 100644 --- a/pkgs/by-name/zu/zuban/package.nix +++ b/pkgs/by-name/zu/zuban/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zuban"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "zubanls"; repo = "zuban"; tag = "v${finalAttrs.version}"; - hash = "sha256-g06iHdbKb/uZkGkbX7fHB0MMDbuYYnGodQAEPvA18KA="; + hash = "sha256-06NECIV6f1kFspWMMOQ4C+t83ESwv8CVuoShH4G0VyU="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/zuban"; - cargoHash = "sha256-bfiWuig9ySkbJ/2CL4jGlNYn/YvVClB3Eg0cq8dKi3E="; + cargoHash = "sha256-m5d5Q/fv3yAlUT8ILaA54uQe6FVrKFk5YGXX97ln1p0="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/development/ocaml-modules/aeneas/default.nix b/pkgs/development/ocaml-modules/aeneas/default.nix index 13e23a8839e4..7fe508b5a6d1 100644 --- a/pkgs/development/ocaml-modules/aeneas/default.nix +++ b/pkgs/development/ocaml-modules/aeneas/default.nix @@ -18,7 +18,7 @@ buildDunePackage (finalAttrs: { pname = "aeneas"; # Keep aeneas and charon in sync - version = "${charon.version}-bc2eb6f"; + version = "${charon.version}-daa85d7"; __structuredAttrs = true; minimalOCamlVersion = "5.1"; @@ -27,7 +27,7 @@ buildDunePackage (finalAttrs: { owner = "AeneasVerif"; repo = "aeneas"; tag = "nightly-${finalAttrs.version}"; - hash = "sha256-V5+3pPpDhcrRGA9kmYmod3/pScwfYZEj6MJKsuhbROk="; + hash = "sha256-NuJi6a99GzS/SLvM4wGUTBN4Td2XqD4Ei61eCR8zHWs="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/development/ocaml-modules/charon/default.nix b/pkgs/development/ocaml-modules/charon/default.nix index b3dbaf0c2ade..7cda2d16bbd4 100644 --- a/pkgs/development/ocaml-modules/charon/default.nix +++ b/pkgs/development/ocaml-modules/charon/default.nix @@ -16,14 +16,14 @@ buildDunePackage (finalAttrs: { pname = "charon"; - version = "2026.07.16"; + version = "2026.08.03"; __structuredAttrs = true; src = fetchFromGitHub { owner = "AeneasVerif"; repo = "charon"; tag = "nightly-${finalAttrs.version}"; - hash = "sha256-n0dY7T8HMbNPTibD53Vpd4ZS/0KNqEfazPJJxy4Uk3g="; + hash = "sha256-ecRxops1EdgTulggQDA2yCFxjMp1LNnF5EEWTIsyIZw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index a3c834e0e751..7675694f7d25 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -79,13 +79,23 @@ buildPythonPackage (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/sdks/python"; + patches = [ + # Beam's dataframe module references DataFrame.first/last/bool/applymap, all removed in + # pandas 3. Their `with_docs_from` decorators do getattr at import, crashing frames.py (which + # then never registers the deferred types). Guard them behind hasattr like the neighboring + # ffill/bfill aliases. Upstream caps pandas < 2.4, so this is nixpkgs-local. + ./pandas-3-compat.patch + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "distlib==0.4.2" "distlib" \ --replace-fail "cython>=3.2.5,<4" "cython" \ + --replace-fail "numpy>=1.14.3,<2.5.0" "numpy" \ --replace-fail "==" ">=" substituteInPlace setup.py \ + --replace-fail "numpy>=1.14.3,<2.5.0" "numpy" \ --replace-fail " copy_tests_from_docs()" "" ''; @@ -94,6 +104,7 @@ buildPythonPackage (finalAttrs: { "envoy-data-plane" "httplib2" "jsonpickle" + "numpy" "objsize" "protobuf" "pyarrow" @@ -238,6 +249,12 @@ buildPythonPackage (finalAttrs: { # grpc_status:14, grpc_message:"Cancelling all calls"}" # Upstream issue https://github.com/apache/beam/issues/33851 "apache_beam/runners/portability/portable_runner_test.py" + + # Pandas 3 behavioral changes in Beam's dataframe module (upstream caps pandas < 2.4): + # the doctests compare against pandas-version-specific output and the taxiride example + # relies on DataFrame APIs removed in pandas 3. + "apache_beam/dataframe/doctests_test.py" + "apache_beam/examples/dataframe/taxiride_test.py" ] ++ lib.optionals (pythonAtLeast "3.13") [ # > instruction = ofs_table[pc] @@ -307,6 +324,28 @@ buildPythonPackage (finalAttrs: { # AssertionError: False is not true "test_samples_all_with_both_experiments" + + # ValueError: buffer source array is read-only (Cython coder over a read-only numpy buffer) + "test_coders_microbenchmark" + + # Pandas 3 behavioral changes in Beam's dataframe module (upstream caps pandas < 2.4). + # groupby() no longer accepts the removed `axis` argument: + "test_groupby_apply" + "test_groupby_sum_mean" + "test_scalar" + # (only surface on Python 3.13, but same groupby() `axis` root cause) + "test_dataframes_with_grouped_index" + "test_dataframes_with_multi_index" + "test_dataframes_with_multi_index_get_result" + # read_csv attribute/dtype differences: + "test_csv_splitter_00_defaults" + "test_csv_splitter_01_header" + "test_csv_splitter_05_names_and_header" + "test_csv_splitter_06_skip_blank_lines" + "test_csv_splitter_07_skip_blank_lines" + "test_csv_splitter_08_comment" + # nan instead of None for missing values: + "test_convert_with_none" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # PermissionError: [Errno 13] Permission denied: '/tmp/...' diff --git a/pkgs/development/python-modules/apache-beam/pandas-3-compat.patch b/pkgs/development/python-modules/apache-beam/pandas-3-compat.patch new file mode 100644 index 000000000000..b15907528659 --- /dev/null +++ b/pkgs/development/python-modules/apache-beam/pandas-3-compat.patch @@ -0,0 +1,169 @@ +--- a/apache_beam/dataframe/frames.py ++++ b/apache_beam/dataframe/frames.py +@@ -335,35 +335,37 @@ + if hasattr(pd.DataFrame, 'pad'): + pad = _fillna_alias('pad') + +- @frame_base.with_docs_from(pd.DataFrame) +- def first(self, offset): +- per_partition = expressions.ComputedExpression( +- 'first-per-partition', lambda df: df.sort_index().first(offset=offset), +- [self._expr], +- preserves_partition_by=partitionings.Arbitrary(), +- requires_partition_by=partitionings.Arbitrary()) +- with expressions.allow_non_parallel_operations(True): +- return frame_base.DeferredFrame.wrap( +- expressions.ComputedExpression( +- 'first', lambda df: df.sort_index().first(offset=offset), +- [per_partition], +- preserves_partition_by=partitionings.Arbitrary(), +- requires_partition_by=partitionings.Singleton())) ++ if hasattr(pd.DataFrame, 'first'): ++ @frame_base.with_docs_from(pd.DataFrame) ++ def first(self, offset): ++ per_partition = expressions.ComputedExpression( ++ 'first-per-partition', lambda df: df.sort_index().first(offset=offset), ++ [self._expr], ++ preserves_partition_by=partitionings.Arbitrary(), ++ requires_partition_by=partitionings.Arbitrary()) ++ with expressions.allow_non_parallel_operations(True): ++ return frame_base.DeferredFrame.wrap( ++ expressions.ComputedExpression( ++ 'first', lambda df: df.sort_index().first(offset=offset), ++ [per_partition], ++ preserves_partition_by=partitionings.Arbitrary(), ++ requires_partition_by=partitionings.Singleton())) + +- @frame_base.with_docs_from(pd.DataFrame) +- def last(self, offset): +- per_partition = expressions.ComputedExpression( +- 'last-per-partition', lambda df: df.sort_index().last(offset=offset), +- [self._expr], +- preserves_partition_by=partitionings.Arbitrary(), +- requires_partition_by=partitionings.Arbitrary()) +- with expressions.allow_non_parallel_operations(True): +- return frame_base.DeferredFrame.wrap( +- expressions.ComputedExpression( +- 'last', lambda df: df.sort_index().last(offset=offset), +- [per_partition], +- preserves_partition_by=partitionings.Arbitrary(), +- requires_partition_by=partitionings.Singleton())) ++ if hasattr(pd.DataFrame, 'last'): ++ @frame_base.with_docs_from(pd.DataFrame) ++ def last(self, offset): ++ per_partition = expressions.ComputedExpression( ++ 'last-per-partition', lambda df: df.sort_index().last(offset=offset), ++ [self._expr], ++ preserves_partition_by=partitionings.Arbitrary(), ++ requires_partition_by=partitionings.Arbitrary()) ++ with expressions.allow_non_parallel_operations(True): ++ return frame_base.DeferredFrame.wrap( ++ expressions.ComputedExpression( ++ 'last', lambda df: df.sort_index().last(offset=offset), ++ [per_partition], ++ preserves_partition_by=partitionings.Arbitrary(), ++ requires_partition_by=partitionings.Singleton())) + + @frame_base.with_docs_from(pd.DataFrame) + @frame_base.args_to_kwargs(pd.DataFrame) +@@ -798,27 +800,28 @@ + requires_partition_by=partitionings.Singleton(), + preserves_partition_by=partitionings.Singleton())) + +- @frame_base.with_docs_from(pd.DataFrame) +- def bool(self): +- # TODO: Documentation about DeferredScalar +- # Will throw if any partition has >1 element +- bools = expressions.ComputedExpression( +- 'get_bools', +- # Wrap scalar results in a Series for easier concatenation later +- lambda df: pd.Series([], dtype=bool) +- if df.empty else pd.Series([df.bool()]), +- [self._expr], +- requires_partition_by=partitionings.Arbitrary(), +- preserves_partition_by=partitionings.Singleton()) ++ if hasattr(pd.DataFrame, 'bool'): ++ @frame_base.with_docs_from(pd.DataFrame) ++ def bool(self): ++ # TODO: Documentation about DeferredScalar ++ # Will throw if any partition has >1 element ++ bools = expressions.ComputedExpression( ++ 'get_bools', ++ # Wrap scalar results in a Series for easier concatenation later ++ lambda df: pd.Series([], dtype=bool) ++ if df.empty else pd.Series([df.bool()]), ++ [self._expr], ++ requires_partition_by=partitionings.Arbitrary(), ++ preserves_partition_by=partitionings.Singleton()) + +- with expressions.allow_non_parallel_operations(True): +- # Will throw if overall dataset has != 1 element +- return frame_base.DeferredFrame.wrap( +- expressions.ComputedExpression( +- 'combine_all_bools', lambda bools: bools.bool(), [bools], +- proxy=bool(), +- requires_partition_by=partitionings.Singleton(), +- preserves_partition_by=partitionings.Singleton())) ++ with expressions.allow_non_parallel_operations(True): ++ # Will throw if overall dataset has != 1 element ++ return frame_base.DeferredFrame.wrap( ++ expressions.ComputedExpression( ++ 'combine_all_bools', lambda bools: bools.bool(), [bools], ++ proxy=bool(), ++ requires_partition_by=partitionings.Singleton(), ++ preserves_partition_by=partitionings.Singleton())) + + @frame_base.with_docs_from(pd.DataFrame) + def equals(self, other): +@@ -2932,7 +2935,8 @@ + + agg = aggregate + +- applymap = frame_base._elementwise_method('applymap', base=pd.DataFrame) ++ if hasattr(pd.DataFrame, 'applymap'): ++ applymap = frame_base._elementwise_method('applymap', base=pd.DataFrame) + if PD_VERSION >= (2, 1): + map = frame_base._elementwise_method('map', base=pd.DataFrame) + add_prefix = frame_base._elementwise_method('add_prefix', base=pd.DataFrame) +@@ -4414,18 +4418,19 @@ + + return self.apply(apply_fn).droplevel(self._grouping_columns) + +- @property # type: ignore +- @frame_base.with_docs_from(DataFrameGroupBy) +- def dtypes(self): +- return frame_base.DeferredFrame.wrap( +- expressions.ComputedExpression( +- 'dtypes', +- lambda gb: gb.dtypes, +- [self._expr], +- requires_partition_by=partitionings.Arbitrary(), +- preserves_partition_by=partitionings.Arbitrary() +- ) +- ) ++ if hasattr(DataFrameGroupBy, 'dtypes'): ++ @property # type: ignore ++ @frame_base.with_docs_from(DataFrameGroupBy) ++ def dtypes(self): ++ return frame_base.DeferredFrame.wrap( ++ expressions.ComputedExpression( ++ 'dtypes', ++ lambda gb: gb.dtypes, ++ [self._expr], ++ requires_partition_by=partitionings.Arbitrary(), ++ preserves_partition_by=partitionings.Arbitrary() ++ ) ++ ) + + if hasattr(DataFrameGroupBy, 'value_counts'): + @frame_base.with_docs_from(DataFrameGroupBy) +@@ -4745,7 +4750,8 @@ + describe = frame_base.not_implemented_method('describe', + base_type=DataFrameGroupBy) + diff = frame_base._elementwise_method('diff', base=DataFrameGroupBy) +- fillna = frame_base._elementwise_method('fillna', base=DataFrameGroupBy) ++ if hasattr(DataFrameGroupBy, 'fillna'): ++ fillna = frame_base._elementwise_method('fillna', base=DataFrameGroupBy) + filter = frame_base._elementwise_method('filter', base=DataFrameGroupBy) + first = frame_base._elementwise_method('first', base=DataFrameGroupBy) + get_group = frame_base._elementwise_method('get_group', base=DataFrameGroupBy) diff --git a/pkgs/development/python-modules/autofaiss/default.nix b/pkgs/development/python-modules/autofaiss/default.nix index ffe764851671..654fdb48380b 100644 --- a/pkgs/development/python-modules/autofaiss/default.nix +++ b/pkgs/development/python-modules/autofaiss/default.nix @@ -14,18 +14,20 @@ numpy, pyarrow, + # tests pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "autofaiss"; version = "2.18.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "criteo"; repo = "autofaiss"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XuubpTxmyKdV9nWqLTljp5cNyIwLt2BKJYcBzwPNzD8="; }; @@ -40,12 +42,10 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ + "pandas" # As of v2.15.4, autofaiss asks for fire<0.5 but we have fire v0.5.0 in # nixpkgs at the time of writing (2022-12-25). "fire" - # As of v2.15.3, autofaiss asks for pyarrow<8 but we have pyarrow v9.0.0 in - # nixpkgs at the time of writing (2022-12-15). - "pyarrow" # No official numpy2 support yet "numpy" @@ -60,7 +60,9 @@ buildPythonPackage rec { pyarrow ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTests = [ # Attempts to spin up a Spark cluster and talk to it which doesn't work in @@ -81,8 +83,8 @@ buildPythonPackage rec { description = "Automatically create Faiss knn indices with the most optimal similarity search parameters"; mainProgram = "autofaiss"; homepage = "https://github.com/criteo/autofaiss"; - changelog = "https://github.com/criteo/autofaiss/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/criteo/autofaiss/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ samuela ]; }; -} +}) diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 1cc078b4224a..0bcaf74767cd 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, # build-system setuptools, @@ -42,6 +43,16 @@ buildPythonPackage (finalAttrs: { hash = "sha256-tUTtImqPlbS8g1oLoTTCCWQbeLwLop13qPjFrQeMtb8="; }; + patches = [ + # Allow scipy 1.18 in batched L-BFGS-B fast path + # https://github.com/meta-pytorch/botorch/pull/3328 + (fetchpatch { + name = "scipy-1.18.patch"; + url = "https://github.com/meta-pytorch/botorch/commit/611f14acc8c1b2f30ce2ae058568d90f96bbb2ec.patch"; + hash = "sha256-PiXq9GmPaWQXh+emY7aNI53Y+ufl8K5uOFa8GD0clP8="; + }) + ]; + build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/cel-python/default.nix b/pkgs/development/python-modules/cel-python/default.nix new file mode 100644 index 000000000000..46ce25d69767 --- /dev/null +++ b/pkgs/development/python-modules/cel-python/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + google-re2, + jmespath, + lark, + pendulum, + pyyaml, + + # tests + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "cel-python"; + version = "0.5.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "cloud-custodian"; + repo = "cel-python"; + tag = "v${lib.versions.majorMinor finalAttrs.version}"; + hash = "sha256-DPHgHRvzQnBzjl2y9yNWt330xF535dO0iBObuqlr+PI="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + google-re2 + jmespath + lark + pendulum + pyyaml + ]; + + pythonImportsCheck = [ "celpy" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + enabledTestPaths = [ + "tests" + ]; + + disabledTestPaths = [ + # Require cloud-custodian (c7n) + "tests/test_c7n_to_cel.py" + "tests/test_c7nlib.py" + ]; + + meta = { + description = "Pure Python implementation of the Common Expression Language"; + homepage = "https://github.com/cloud-custodian/cel-python"; + changelog = "https://github.com/cloud-custodian/cel-python/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index db63f9cfbe18..1c68f44e324d 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -112,6 +112,10 @@ buildPythonPackage (finalAttrs: { sed -i '1i #![recursion_limit = "256"]' rust/segment/src/lib.rs ''; + pythonRemoveDeps = [ + "build" + ]; + pythonRelaxDeps = [ "fastapi" "posthog" @@ -134,7 +138,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ bcrypt - build fastapi grpcio httpx diff --git a/pkgs/development/python-modules/cmake-parser/default.nix b/pkgs/development/python-modules/cmake-parser/default.nix new file mode 100644 index 000000000000..2ad7294720c1 --- /dev/null +++ b/pkgs/development/python-modules/cmake-parser/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + attrs, + nix-update-script, +}: + +buildPythonPackage (finalAttrs: { + pname = "cmake-parser"; + version = "0.9.2"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "roehling"; + repo = "cmake_parser"; + tag = finalAttrs.version; + hash = "sha256-4hJYlnDOuO+Rs1r9/scWK+BZAU9zSH5BTEvkiS3LUh8="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + attrs + ]; + + pythonImportsCheck = [ + "cmake_parser" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Parse CMake files with Python"; + homepage = "https://github.com/roehling/cmake_parser"; + changelog = "https://github.com/roehling/cmake_parser/blob/${finalAttrs.src.rev}/CHANGELOG.rst"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nim65s ]; + }; +}) diff --git a/pkgs/development/python-modules/crewai-cli/default.nix b/pkgs/development/python-modules/crewai-cli/default.nix new file mode 100644 index 000000000000..64beda797437 --- /dev/null +++ b/pkgs/development/python-modules/crewai-cli/default.nix @@ -0,0 +1,139 @@ +{ + lib, + buildPythonPackage, + + # build-system + hatchling, + + # dependencies + appdirs, + certifi, + click, + crewai-core, + cryptography, + httpx, + packaging, + pydantic, + pydantic-settings, + pyjwt, + python-dotenv, + rich, + textual, + tomli, + tomli-w, + uv, + + # tests + versionCheckHook, + + # passthru + aiohttp, + crewai, + pytest-asyncio, + pytest-recording, + pytest-subprocess, + pytest-timeout, + pytest-xdist, + pytestCheckHook, + vcrpy, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "crewai-cli"; + version = "1.15.10"; + pyproject = true; + __structuredAttrs = true; + + inherit (crewai-core) src; + + sourceRoot = "${finalAttrs.src.name}/lib/cli"; + + build-system = [ + hatchling + ]; + + pythonRelaxDeps = [ + "click" + "crewai-core" + "pydantic" + "pydantic-settings" + "pyjwt" + "python-dotenv" + "textual" + "tomli" + "tomli-w" + "uv" + ]; + dependencies = [ + appdirs + certifi + click + crewai-core + cryptography + httpx + packaging + pydantic + pydantic-settings + pyjwt + python-dotenv + rich + textual + tomli + tomli-w + uv + ]; + + pythonImportsCheck = [ "crewai_cli" ]; + + nativeCheckInputs = [ + versionCheckHook + ]; + + disabledTests = [ + # error: Failed to discover managed Python installations + # Caused by: Could not read ELF interpreter from any of the following paths: /bin/sh, /usr/bin/env, /bin/dash, /bin/ls + "test_create_crew" + "test_deploy_with_project_name" + "test_deploy_with_remote_keeps_remote_path_when_fetch_fails" + "test_deploy_with_remote_keeps_remote_path_when_initial_commit_fails" + "test_deploy_with_uuid" + "test_json_runner_code_loads_current_cli_package_over_project_env" + "test_json_runner_imports_with_older_project_env_crewai_core" + "test_missing_crewai_package_shows_full_install_hint" + "test_publish_calls_api" + "test_publish_metadata_extraction_failure_continues_with_warning" + + # ValueError: Git fetch failed with exit code + "test_publish_api_error" + "test_publish_failure" + + # AssertionError: assert '"crewai[tools]>=1.15.0,<2.0.0"' in content + "test_create_success" + ]; + + # Circular dependency with crewai + passthru.tests = finalAttrs.finalPackage.overrideAttrs (old: { + nativeInstallCheckInputs = [ + aiohttp + crewai + pytest-asyncio + pytest-recording + pytest-subprocess + pytest-timeout + pytest-xdist + pytestCheckHook + vcrpy + writableTmpDirAsHomeHook + ]; + }); + + meta = { + description = "CLI for CrewAI: scaffold, run, deploy and manage AI agent crews"; + homepage = "https://github.com/crewAIInc/crewAI/tree/main/lib/cli"; + changelog = "https://github.com/crewAIInc/crewAI/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "crewai"; + }; +}) diff --git a/pkgs/development/python-modules/crewai-core/default.nix b/pkgs/development/python-modules/crewai-core/default.nix new file mode 100644 index 000000000000..de9591bca56a --- /dev/null +++ b/pkgs/development/python-modules/crewai-core/default.nix @@ -0,0 +1,92 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + appdirs, + cryptography, + httpx, + opentelemetry-api, + opentelemetry-exporter-otlp-proto-http, + opentelemetry-sdk, + packaging, + portalocker, + pydantic, + pyjwt, + rich, + tomli, + + # tests + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "crewai-core"; + version = "1.15.10"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "crewAIInc"; + repo = "crewAI"; + tag = finalAttrs.version; + hash = "sha256-O59F1TqQsTW2TBkuUTiNu4f35UeajRVSVc2HomxHK3Q="; + }; + + sourceRoot = "${finalAttrs.src.name}/lib/crewai-core"; + + build-system = [ hatchling ]; + + pythonRelaxDeps = [ + "opentelemetry-api" + "opentelemetry-exporter-otlp-proto-http" + "opentelemetry-sdk" + "portalocker" + "pydantic" + "tomli" + ]; + + dependencies = [ + appdirs + cryptography + httpx + opentelemetry-api + opentelemetry-exporter-otlp-proto-http + opentelemetry-sdk + packaging + portalocker + pydantic + pyjwt + rich + tomli + ]; + + pythonImportsCheck = [ "crewai_core" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + enabledTestPaths = [ + "tests" + ]; + + pytestFlags = [ + # Avoid loading the repository-wide conftest.py (needs many optional test deps) + "--confcutdir=tests" + # Drop addopts from the repository-wide pyproject.toml (xdist, socket, timeout) + "--override-ini=addopts=" + ]; + + meta = { + description = "Shared utilities for CrewAI (version, paths, user-data, telemetry, printer)"; + homepage = "https://github.com/crewAIInc/crewAI/tree/main/lib/crewai-core"; + changelog = "https://github.com/crewAIInc/crewAI/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/crewai/default.nix b/pkgs/development/python-modules/crewai/default.nix index 204551a50f69..7e500de2cb1c 100644 --- a/pkgs/development/python-modules/crewai/default.nix +++ b/pkgs/development/python-modules/crewai/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchFromGitHub, nix-update-script, # build-system @@ -11,14 +10,17 @@ aiofiles, aiosqlite, appdirs, + cel-python, chromadb, click, + crewai-cli, + crewai-core, + httpx, instructor, json-repair, json5, jsonref, lancedb, - litellm, mcp, openai, opentelemetry-api, @@ -31,12 +33,14 @@ pydantic-settings, pyjwt, python-dotenv, + pyyaml, regex, - textual, tokenizers, tomli, tomli-w, - uv, + + # optional-dependencies + litellm, # tests a2a-sdk, @@ -50,34 +54,24 @@ pytestCheckHook, qdrant-client, vcrpy, - versionCheckHook, writableTmpDirAsHomeHook, }: buildPythonPackage (finalAttrs: { pname = "crewai"; - version = "1.14.4"; + version = "1.15.10"; pyproject = true; + __structuredAttrs = true; - src = fetchFromGitHub { - owner = "crewAIInc"; - repo = "crewAI"; - tag = finalAttrs.version; - hash = "sha256-QrJM2oVoqos8GMhrn9E6i1m1O1guP/q+51b8NYtJA5Q="; - }; + inherit (crewai-core) src; - postPatch = '' - substituteInPlace ../../conftest.py \ - --replace-fail \ - "import vcr.stubs.httpx_stubs as httpx_stubs" \ - "import vcr.stubs.httpcore_stubs as httpx_stubs" \ - --replace-fail \ - "def _patched_make_vcr_request(httpx_request: Any, **kwargs: Any) -> Any:" \ - "def _patched_make_vcr_request(httpx_request: Any, request_body: Any = None, **kwargs: Any) -> Any:" \ - --replace-fail \ - "raw_body = httpx_request.read()" \ - "raw_body = request_body if request_body is not None else httpx_request.read()" - ''; + postPatch = + # The crewai executable is provided by the crewai-cli package (a dependency); + # drop the duplicate entry point to avoid a file collision in shared environments. + '' + substituteInPlace pyproject.toml \ + --replace-fail 'crewai = "crewai_cli.cli:crewai"' "" + ''; sourceRoot = "${finalAttrs.src.name}/lib/crewai"; @@ -90,7 +84,6 @@ buildPythonPackage (finalAttrs: { "json-repair" "json5" "lancedb" - "litellm" "mcp" "openai" "opentelemetry-api" @@ -106,21 +99,23 @@ buildPythonPackage (finalAttrs: { "tokenizers" "tomli" "tomli-w" - "uv" ]; dependencies = [ aiofiles aiosqlite appdirs + cel-python chromadb click + crewai-cli + crewai-core + httpx instructor json-repair json5 jsonref lancedb - litellm mcp openai opentelemetry-api @@ -133,19 +128,21 @@ buildPythonPackage (finalAttrs: { pydantic-settings pyjwt python-dotenv + pyyaml regex - textual tokenizers tomli tomli-w - uv ]; + optional-dependencies = { + litellm = [ litellm ]; + }; + pythonImportsCheck = [ "crewai" ]; disabledTestPaths = [ # Ignore tests that require {chromadb, telemetry, security, test_agent} - "tests/cli/test_git.py" # require git "tests/test_crew.py" # require require API keys "tests/rag/chromadb/test_client.py" # issue with chromadb "tests/telemetry/test_telemetry.py" # telemetry need network access @@ -180,6 +177,7 @@ buildPythonPackage (finalAttrs: { "tests/agents/test_lite_agent.py" # Tests requiring crewai-files + "tests/agents/test_agent_executor.py" "tests/llms/test_multimodal.py" "tests/llms/test_multimodal_integration.py" "tests/test_agent_multimodal.py" @@ -476,16 +474,9 @@ buildPythonPackage (finalAttrs: { "test_areset_wrong_client_type" "test_adelete_collection" - # Tests requiring litellm - "test_litellm_anthropic_error_handling" - "test_litellm_auth_error_handling" - "test_crew_agent_executor_litellm_auth_error" - "test_agent_with_callbacks" - "test_crew_memoization" - "test_task_guardrail" - "test_crew_name" - "test_get_conversion_instructions_non_gpt" - "test_supports_function_calling_false" + # Tests requiring crewai-tools + "test_non_ok_response_becomes_a_tool_failure" + "test_ok_response_still_returns_json" # Tests requiring network "test_agent_events_have_event_ids" @@ -546,13 +537,14 @@ buildPythonPackage (finalAttrs: { anthropic boto3 google-genai - pytestCheckHook + # litellm is an optional dependency upstream, but the test suite requires it + litellm pytest-asyncio pytest-recording pytest-xdist + pytestCheckHook qdrant-client vcrpy - versionCheckHook writableTmpDirAsHomeHook ]; @@ -574,6 +566,5 @@ buildPythonPackage (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ liberodark ]; platforms = lib.platforms.linux; - mainProgram = "crewai"; }; }) diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 1ba07027e78e..2addea4ec542 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: { pname = "databricks-sdk"; - version = "0.122.0"; + version = "0.123.0"; pyproject = true; __structuredAttrs = true; @@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${finalAttrs.version}"; - hash = "sha256-guq9OWQpMd9fFe3/ZNJ4CNgc3ljov17F2WbE564tHBE="; + hash = "sha256-mSxTk8wq9Hq9xL20Jt8kWpry5F5SljMIcFsv8UohY1c="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-localflavor/default.nix b/pkgs/development/python-modules/django-localflavor/default.nix index 16561e2d5871..c00292c2676c 100644 --- a/pkgs/development/python-modules/django-localflavor/default.nix +++ b/pkgs/development/python-modules/django-localflavor/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-localflavor"; - version = "5.0"; + version = "5.1"; pyproject = true; src = fetchFromGitHub { owner = "django"; repo = "django-localflavor"; tag = version; - hash = "sha256-eYhkWfxoZlnxhCIaqBhoEt0+SbkZKkUNUAy4p3tYf4A="; + hash = "sha256-pvfXZVHL1/uXibfhimF3T76w2KwlwEVhJFe2VXWM55k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix index 56323e781f2b..a6951cb80730 100644 --- a/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "django-simple-captcha"; - version = "0.6.3"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "mbi"; repo = "django-simple-captcha"; tag = "v${version}"; - hash = "sha256-Fee7YfIWGyKMsN7XQz10bjIhbjUYRuY7Oe4Q8n8ILz0="; + hash = "sha256-httRO6OYKgo3/E2Z9EFdhuuLqcrcfB3EgxptZ7XDYlc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-tenants/default.nix b/pkgs/development/python-modules/django-tenants/default.nix index 818ee54866ae..345e01ead7cd 100644 --- a/pkgs/development/python-modules/django-tenants/default.nix +++ b/pkgs/development/python-modules/django-tenants/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pyprojectVersionPatchHook, setuptools, django, psycopg, @@ -10,20 +9,16 @@ buildPythonPackage rec { pname = "django-tenants"; - version = "3.11.2"; + version = "3.12.0"; pyproject = true; src = fetchFromGitHub { owner = "django-tenants"; repo = "django-tenants"; tag = "v${version}"; - hash = "sha256-J7poXEHbRxhULYwFbV4tktet5wdsvd7RNHgivETy9+8="; + hash = "sha256-0HFkLG2GDECiaG9OKYR4V1q5oy0vzmthlKoiSM5IIFc="; }; - nativeBuildInputs = [ - pyprojectVersionPatchHook - ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/django-vcache/default.nix b/pkgs/development/python-modules/django-vcache/default.nix index 962bee51346c..8a37756f3cdc 100644 --- a/pkgs/development/python-modules/django-vcache/default.nix +++ b/pkgs/development/python-modules/django-vcache/default.nix @@ -12,19 +12,19 @@ buildPythonPackage (finalAttrs: { pname = "django-vcache"; - version = "2.3.0"; + version = "3.1.1"; pyproject = true; src = fetchFromGitLab { owner = "glitchtip"; repo = "django-vcache"; tag = "v${finalAttrs.version}"; - hash = "sha256-/LyNJlz3Tx6tgQAwY4vIIsDlL2nCvKM6bna2bXyP5So="; + hash = "sha256-9KsIijeWC97IAD+xlE78UvSSIUp5DbpOdaDRcw8ZxWQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-a9+3k6YTotmj+LBO6OyVd2NUh3hpLwpKXJsX7pBxXNE="; + hash = "sha256-tpf0r32wNJ/XCmNutoirTobqKgsEX96s4MsI6+p7KlQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index 0abdc91b1741..1dd9f92d7f3a 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "dsmr-parser"; - version = "1.11.1"; + version = "1.11.2"; pyproject = true; src = fetchFromGitHub { owner = "ndokter"; repo = "dsmr_parser"; tag = "v${finalAttrs.version}"; - hash = "sha256-2q2e1/xt8a24QmACZUc9zWOnAiFhEYMg+44kOlx1JAk="; + hash = "sha256-MIiJwCRIUSrmp+wfJrfCPW0JY22ATfA66uENgPySgCc="; }; pythonRelaxDeps = [ "dlms_cosem" ]; diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index 6d518ff7e734..b3eb184358af 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -3,22 +3,17 @@ buildPythonPackage, fetchFromGitHub, - writableTmpDirAsHomeHook, fontconfig, # nativeBuildInputs - cmake, - doxygen, - graphviz, - pkg-config, scipy, # buildInputs boost, + jrl-cmakemodules, # propagatedBuildInputs eigen, - jrl-cmakemodules, numpy, }: @@ -40,7 +35,7 @@ buildPythonPackage rec { "out" ]; - cmakeFlags = [ + cmakeFlags = jrl-cmakemodules.docsCmakeFlags ++ [ "-DINSTALL_DOCUMENTATION=ON" "-DBUILD_TESTING=ON" "-DBUILD_TESTING_SCIPY=ON" @@ -51,20 +46,17 @@ buildPythonPackage rec { # Fontconfig error: Cannot load default config file: No such file: (null) env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; - nativeBuildInputs = [ - cmake - doxygen - graphviz - pkg-config + nativeBuildInputs = jrl-cmakemodules.docsNativeBuildInputs ++ [ scipy - writableTmpDirAsHomeHook ]; - buildInputs = [ boost ]; + buildInputs = [ + boost + jrl-cmakemodules + ]; propagatedBuildInputs = [ eigen - jrl-cmakemodules numpy ]; diff --git a/pkgs/development/python-modules/energieleser/default.nix b/pkgs/development/python-modules/energieleser/default.nix index f01d2c2a223a..ec82ab412e1e 100644 --- a/pkgs/development/python-modules/energieleser/default.nix +++ b/pkgs/development/python-modules/energieleser/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "energieleser"; - version = "0.1.5"; + version = "0.1.6"; pyproject = true; src = fetchFromGitHub { owner = "nineti-GmbH"; repo = "energieleser.py"; tag = "v${finalAttrs.version}"; - hash = "sha256-vJ4eJaf0ue4N9aXwsPR79sTVt3NM1GKNw5XomhQUUdU="; + hash = "sha256-bg+XdASeegWLWU7kjywmMSih3SarVB3Mc2YHVCnU93w="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index 469e2365dc30..cca686975039 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -139,6 +140,10 @@ buildPythonPackage (finalAttrs: { "test_array_spec_valid" "test_obj" "test_spec_like" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # AssertionError: assert '/tmp/to/something' == '/private/tmp/to/something' + "test_repr" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/example-robot-data/default.nix b/pkgs/development/python-modules/example-robot-data/default.nix index fe452c73b439..f8ba30e176e9 100644 --- a/pkgs/development/python-modules/example-robot-data/default.nix +++ b/pkgs/development/python-modules/example-robot-data/default.nix @@ -27,7 +27,6 @@ toPythonModule ( propagatedBuildInputs = [ pinocchio ] - ++ super.propagatedBuildInputs ++ lib.optional buildStandalone example-robot-data; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/exllamav3/default.nix b/pkgs/development/python-modules/exllamav3/default.nix index c339bd7165e1..86cd146e35ee 100644 --- a/pkgs/development/python-modules/exllamav3/default.nix +++ b/pkgs/development/python-modules/exllamav3/default.nix @@ -27,14 +27,14 @@ let in buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { pname = "exllamav3"; - version = "1.2.1"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "turboderp-org"; repo = "exllamav3"; tag = "v${finalAttrs.version}"; - hash = "sha256-ErsCtCM/T1YuCQAwrKhc860ETLgiS5Qu4nrQSuEzsPk="; + hash = "sha256-pWdh5fiGZEkdSLXvI5DAEdj6XmBFquzew57L1YIsEg8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 79d8045bdb0b..0428ff424fe1 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.3.10"; + version = "0.3.11"; pyproject = true; src = fetchFromGitHub { owner = "breezy-team"; repo = "fastbencode"; tag = "v${version}"; - hash = "sha256-e+Ei+UIJ5sve6k3ApPJ2nswTgZLkzxZmpthK/f/rfCs="; + hash = "sha256-hQwu0VKJ6tp155meE5JXbk5xEmcfktBHgUqVJYs2exM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-dqD/QF6/XCB9H/QkEobfIOo9S663fh9AHUuHqCoEcLM="; + hash = "sha256-QHu3ryg7beYVBSWFxkX7CaJLcsrmGpGAm9Ee9ZHKTgk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fressnapftracker/default.nix b/pkgs/development/python-modules/fressnapftracker/default.nix index 53b1b86b88dc..d1fc2d7395b8 100644 --- a/pkgs/development/python-modules/fressnapftracker/default.nix +++ b/pkgs/development/python-modules/fressnapftracker/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "fressnapftracker"; - version = "0.2.2"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "eifinger"; repo = "fressnapftracker"; tag = "v${finalAttrs.version}"; - hash = "sha256-gJsE/1HnUXEDa5Y7eLtHexx+G00MGQDZJu3pui9OeMM="; + hash = "sha256-4ZsK/yW+E4nwP5S300FPXnfPe11fIL2ULII2SkhLAys="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/funsor/default.nix b/pkgs/development/python-modules/funsor/default.nix index 04ece9b20542..4c57b7fbb58c 100644 --- a/pkgs/development/python-modules/funsor/default.nix +++ b/pkgs/development/python-modules/funsor/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system setuptools, @@ -29,7 +28,7 @@ buildPythonPackage (finalAttrs: { pname = "funsor"; - version = "0.4.7"; + version = "0.4.8"; pyproject = true; __structuredAttrs = true; @@ -37,15 +36,15 @@ buildPythonPackage (finalAttrs: { owner = "pyro-ppl"; repo = "funsor"; tag = finalAttrs.version; - hash = "sha256-0STJv1OOliJaHdmYUXdnOnocH3hVXceH/Uw5nILvT+U="; + hash = "sha256-iTkDd6vz4wesY3jABSMxLtTKioP98DhGB0plLL+vhNY="; }; patches = [ - # Compatibility with torch >= 2.5 (arg_constraints is now a property) - (fetchpatch { - url = "https://github.com/pyro-ppl/funsor/commit/c5e2a48d73cad4e98058147af4090171272a44e5.patch"; - hash = "sha256-sTR+hbJtS0Th5sIqlvB2bReEC0wnEbnB7gAiZKiqjAQ="; - }) + # Compatibility with torch >= 2.5, where `Uniform.arg_constraints` is a property. + # Remaining part of the pending upstream PR https://github.com/pyro-ppl/funsor/pull/610 + # (the `Uniform` parameter registration was already merged as part of + # https://github.com/pyro-ppl/funsor/pull/614). + ./torch-arg-constraints-property.patch ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/funsor/torch-arg-constraints-property.patch b/pkgs/development/python-modules/funsor/torch-arg-constraints-property.patch new file mode 100644 index 000000000000..e6dd756af6d1 --- /dev/null +++ b/pkgs/development/python-modules/funsor/torch-arg-constraints-property.patch @@ -0,0 +1,52 @@ +diff --git a/funsor/distribution.py b/funsor/distribution.py +index 5a48ecb..cfb2d2e 100644 +--- a/funsor/distribution.py ++++ b/funsor/distribution.py +@@ -309,7 +309,10 @@ class Distribution(Funsor, metaclass=DistributionMeta): + @classmethod + @functools.lru_cache(maxsize=5000) + def _infer_param_domain(cls, name, raw_shape): +- support = cls.dist_class.arg_constraints.get(name, None) ++ constraints = getattr(cls.dist_class, "arg_constraints", {}) ++ if isinstance(constraints, property): ++ constraints = {} ++ support = constraints.get(name, None) + # XXX: if the backend does not have the same definition of constraints, we should + # define backend-specific distributions and overide these `infer_value_domain`, + # `infer_param_domain` methods. +@@ -330,9 +333,8 @@ class Distribution(Funsor, metaclass=DistributionMeta): + # for discrete multivariate distributions in Pyro + elif support_name == "Real": + if name == "logits" and ( +- "probs" in cls.dist_class.arg_constraints +- and type(cls.dist_class.arg_constraints["probs"]).__name__.lstrip("_") +- == "Simplex" ++ "probs" in constraints ++ and type(constraints.get("probs")).__name__.lstrip("_") == "Simplex" + ): + output = Reals[raw_shape[-1 - event_dim :]] + else: +@@ -377,10 +379,13 @@ def make_dist( + backend_dist_class, param_names=(), generate_eager=True, generate_to_funsor=True + ): + if not param_names: ++ constraints = getattr(backend_dist_class, "arg_constraints", {}) ++ if isinstance(constraints, property): ++ constraints = {} + param_names = tuple( + name + for name in inspect.getfullargspec(backend_dist_class.__init__)[0][1:] +- if name in backend_dist_class.arg_constraints ++ if name in constraints + ) + + @makefun.with_signature( +@@ -608,7 +613,7 @@ class CoerceDistributionToFunsor: + def __call__(self, cls, args, kwargs): + # Check whether distribution class takes any tensor inputs. + arg_constraints = getattr(cls, "arg_constraints", None) +- if not arg_constraints: ++ if not arg_constraints or isinstance(arg_constraints, property): + return + + # Check whether any tensor inputs are actually funsors. diff --git a/pkgs/development/python-modules/hass-client/default.nix b/pkgs/development/python-modules/hass-client/default.nix index ba0fdc3aec80..5b8ebf454ffa 100644 --- a/pkgs/development/python-modules/hass-client/default.nix +++ b/pkgs/development/python-modules/hass-client/default.nix @@ -7,25 +7,28 @@ fetchFromGitHub, lib, orjson, + pyprojectVersionPatchHook, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hass-client"; - version = "1.2.3"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "python-hass-client"; - tag = version; - hash = "sha256-uCVwxa/KTiOmaexmdeynL2LSqBhDu8Zfre+Nh9Oauiw="; + tag = finalAttrs.version; + hash = "sha256-mrS3kuG/6ZE02B0Ua10AAAsgVBrEDRJxNfmIHT+EHWw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "1.0.0" "${version}" - ''; + nativeBuildInputs = [ + pyprojectVersionPatchHook + ]; build-system = [ setuptools @@ -48,14 +51,17 @@ buildPythonPackage rec { "hass_client" ]; - # upstream has no tests - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; meta = { - changelog = "https://github.com/music-assistant/python-hass-client/releases/tag/${version}"; + changelog = "https://github.com/music-assistant/python-hass-client/releases/tag/${finalAttrs.version}"; description = "Basic client for connecting to Home Assistant over websockets and REST"; homepage = "https://github.com/music-assistant/python-hass-client"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 00e924d73860..fb58f9f99440 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202607301"; + version = "0.1.202608031"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-lEDf8Su+wWwS1PG3zrU26aL4rtXtFE7itxTd7aLqP+0="; + hash = "sha256-pOaSqBOTIwEDqXMHVeCXcSckbbpKaaa7UkwibnOhLhQ="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 5d10f3739173..d19cf94ba4f0 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.25.0"; + version = "3.26.0"; pyproject = true; src = fetchFromGitHub { owner = "IBM"; repo = "python-sdk-core"; tag = "v${version}"; - hash = "sha256-UA4xZ9doaz/4yYdbXJoevXrdzsrfuv/nhSd2+rkHAQ4="; + hash = "sha256-indY3DCATi3Czs8Btlyhx3H1ZsMZSbgddIa9XC06FEI="; }; pythonRelaxDeps = [ "requests" ]; diff --git a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix index d059a9441e63..856391e06be0 100644 --- a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix +++ b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { pname = "lance-namespace-urllib3-client"; - version = "0.8.6"; + version = "0.9.0"; pyproject = true; __structuredAttrs = true; @@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: { owner = "lancedb"; repo = "lance-namespace"; tag = "v${finalAttrs.version}"; - hash = "sha256-QYzVsarjTg2arNNuCFbVgtA7rfLTm6AJD3liNr3QuSU="; + hash = "sha256-8BfKK7k7NDptFYjaJ312QID/tIr24y3oGTmxHz/b2w0="; }; sourceRoot = "${finalAttrs.src.name}/python/lance_namespace_urllib3_client"; diff --git a/pkgs/development/python-modules/lance-namespace/default.nix b/pkgs/development/python-modules/lance-namespace/default.nix index 1f570a3a5be5..371949cc66fc 100644 --- a/pkgs/development/python-modules/lance-namespace/default.nix +++ b/pkgs/development/python-modules/lance-namespace/default.nix @@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: { pname = "lance-namespace"; - version = "0.8.6"; + version = "0.9.0"; pyproject = true; __structuredAttrs = true; @@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: { owner = "lancedb"; repo = "lance-namespace"; tag = "v${finalAttrs.version}"; - hash = "sha256-QYzVsarjTg2arNNuCFbVgtA7rfLTm6AJD3liNr3QuSU="; + hash = "sha256-8BfKK7k7NDptFYjaJ312QID/tIr24y3oGTmxHz/b2w0="; }; sourceRoot = "${finalAttrs.src.name}/python/lance_namespace"; diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index d06a03ae56ba..096766b79646 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: { pname = "lancedb"; - version = "0.32.0"; + version = "0.36.0"; pyproject = true; __structuredAttrs = true; @@ -50,16 +50,36 @@ buildPythonPackage (finalAttrs: { owner = "lancedb"; repo = "lancedb"; tag = "python-v${finalAttrs.version}"; - hash = "sha256-OIoQCk0YlWpaaau4AiWxarvH4oy1rAjaS9yvs3mIzzo="; + hash = "sha256-JOUrLHoVBZs4B8UGYFZIs00kzBnxFFAkTXFIz2bOZ7w="; }; buildAndTestSubdir = "python"; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-rfAhvC6byg134NF21CR5n0A0DL42CLGy7VvHi9aZUrw="; + hash = "sha256-KEczUf/e3+Eb53pouOzajp+yVjWctDUNbdVEgQVoCZE="; }; + # `lance-linalg`'s AVX-512 VNNI u8-distance kernels call `_mm512_dpbusd_epi32` / + # `_mm512_dpwssd_epi32`. With the current toolchain, stdarch's signature for these intrinsics + # mismatches LLVM's `llvm.x86.avx512.vpdpbusd.512`, so the crate fails to compile. + # Drop the AVX-512 VNNI dispatch branch: the kernels then become dead code (their module is + # crate-private and otherwise only used from `#[cfg(test)]`, which is not built for + # dependencies), so they are never codegen'd and runtime dispatch falls back to the equivalent + # AVX2 / scalar kernels. + postPatch = '' + lanceDistance="$cargoDepsCopy/source-registry-0/lance-linalg-9.0.0/src/distance" + + substituteInPlace "$lanceDistance/dot_u8.rs" \ + --replace-fail "return |a, b| unsafe { x86::dot_u8_avx512_vnni(a, b) };" "" + + substituteInPlace "$lanceDistance/l2_u8.rs" \ + --replace-fail "return |a, b| unsafe { x86::l2_u8_avx512_vnni(a, b) };" "" + + substituteInPlace "$lanceDistance/cosine_u8.rs" \ + --replace-fail "return |a, b| unsafe { x86::cosine_u8_accum_avx512_vnni(a, b) };" "" + ''; + build-system = [ rustPlatform.maturinBuildHook ]; nativeBuildInputs = [ @@ -110,7 +130,7 @@ buildPythonPackage (finalAttrs: { disabledTests = [ # Requires internet access # RuntimeError: lance error: LanceError(IO): Generic S3 error - "test_bucket_without_dots_passes" + "test_bucket_without_dots_is_not_rejected" # lance_namespace.errors.UnsupportedOperationError: Not supported: create_empty_table "TestAsyncNamespaceConnection" diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix index 2d4495724662..b71f232b093c 100644 --- a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix +++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix @@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: { pname = "langgraph-runtime-inmem"; - version = "0.31.1"; + version = "0.31.2"; pyproject = true; __structuredAttrs = true; @@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { pname = "langgraph_runtime_inmem"; inherit (finalAttrs) version; - hash = "sha256-mNTJgdiFkQgOgy+681ALxQOMceo3jWn+cfBvH67weAU="; + hash = "sha256-VE7gXsjV+pXhz85rZnD9mhgwp5QRXvxEjdgF7tjNBAE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix index 10d7a790ad21..0f2e02d25294 100644 --- a/pkgs/development/python-modules/marisa/default.nix +++ b/pkgs/development/python-modules/marisa/default.nix @@ -13,6 +13,13 @@ buildPythonPackage { patches = marisa.patches or [ ]; + # fix The 'marisa' derivation has version '0.3.1' but .dist-info/METADATA specifies version '0.0.0'. + postPatch = '' + substituteInPlace bindings/python/setup.py --replace-fail \ + 'setup(name = "marisa",' \ + 'setup(name = "marisa", version = "${marisa.version}"', + ''; + build-system = [ setuptools ]; nativeBuildInputs = [ swig ]; diff --git a/pkgs/development/python-modules/modelscope/default.nix b/pkgs/development/python-modules/modelscope/default.nix index 65328d8b3903..e4f153bce457 100644 --- a/pkgs/development/python-modules/modelscope/default.nix +++ b/pkgs/development/python-modules/modelscope/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "modelscope"; - version = "1.38.1"; + version = "1.39.0"; pyproject = true; src = fetchFromGitHub { owner = "modelscope"; repo = "modelscope"; tag = "v${finalAttrs.version}"; - hash = "sha256-BTiK6rk9j5Wh6DZZ8eufzAyP8wWCEfIzQKeJ3fJzsjg="; + hash = "sha256-tkwgn3EeR6SVIcOIMJ2U+ktFAckhaFLubRgteO4BGxA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nanoeigenpy/default.nix b/pkgs/development/python-modules/nanoeigenpy/default.nix index f5e4424dc825..cb0bc0f29bc3 100644 --- a/pkgs/development/python-modules/nanoeigenpy/default.nix +++ b/pkgs/development/python-modules/nanoeigenpy/default.nix @@ -6,8 +6,6 @@ python, # nativeBuildInputs - cmake, - doxygen, nanobind, # propagatedBuildInputs @@ -50,7 +48,7 @@ buildPythonPackage rec { "out" ]; - cmakeFlags = [ + cmakeFlags = jrl-cmakemodules.docsCmakeFlags ++ [ (lib.cmakeBool "INSTALL_DOCUMENTATION" true) (lib.cmakeBool "BUILD_TESTING" true) (lib.cmakeBool "BUILD_WITH_CHOLMOD_SUPPORT" true) @@ -62,16 +60,11 @@ buildPythonPackage rec { strictDeps = true; - nativeBuildInputs = [ - cmake - doxygen - nanobind - ]; - + buildInputs = [ jrl-cmakemodules ]; + nativeBuildInputs = jrl-cmakemodules.docsNativeBuildInputs ++ [ nanobind ]; propagatedBuildInputs = [ suitesparse eigen - jrl-cmakemodules ]; dependencies = [ diff --git a/pkgs/development/python-modules/nicegui-highcharts/default.nix b/pkgs/development/python-modules/nicegui-highcharts/default.nix index 107efc786a6a..c61759f69041 100644 --- a/pkgs/development/python-modules/nicegui-highcharts/default.nix +++ b/pkgs/development/python-modules/nicegui-highcharts/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, nicegui, hatchling, + pyprojectVersionPatchHook, }: buildPythonPackage (finalAttrs: { @@ -23,6 +24,8 @@ buildPythonPackage (finalAttrs: { build-system = [ hatchling ]; + nativeBuildInputs = [ pyprojectVersionPatchHook ]; + dependencies = [ docutils nicegui diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index 2016c83e9c24..5f1d4861de29 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: { pname = "pylance"; - version = "8.0.0"; + version = "9.0.0"; pyproject = true; __structuredAttrs = true; @@ -43,7 +43,7 @@ buildPythonPackage (finalAttrs: { owner = "lancedb"; repo = "lance"; tag = "v${finalAttrs.version}"; - hash = "sha256-pxggvF23u3Wfm6YdaHwbDUZDUwtJ4tOaTLViUfGZ0B8="; + hash = "sha256-G4BcK/con6a1MOlA9pB3+uI8YULLNg71G8bFLKhUedg="; }; sourceRoot = "${finalAttrs.src.name}/python"; @@ -55,9 +55,29 @@ buildPythonPackage (finalAttrs: { src sourceRoot ; - hash = "sha256-VSy1cOshPLAic+1HkTGiavdNRffiEVAlWThNeebJSyg="; + hash = "sha256-IzB+kzjAEWQpA0gCyKAXI+5XAJK00AV3alFRgastbPM="; }; + # `lance-linalg`'s AVX-512 VNNI u8-distance kernels call `_mm512_dpbusd_epi32` / + # `_mm512_dpwssd_epi32`. With the current toolchain, stdarch's signature for these intrinsics + # mismatches LLVM's `llvm.x86.avx512.vpdpbusd.512`, so the crate fails to compile. + # Drop the AVX-512 VNNI dispatch branch: the kernels then become dead code (their module is + # crate-private and otherwise only used from `#[cfg(test)]`, which is not built for + # dependencies), so they are never codegen'd and runtime dispatch falls back to the equivalent + # AVX2 / scalar kernels. + postPatch = '' + lanceDistance="../rust/lance-linalg/src/distance" + + substituteInPlace "$lanceDistance/dot_u8.rs" \ + --replace-fail "return |a, b| unsafe { x86::dot_u8_avx512_vnni(a, b) };" "" + + substituteInPlace "$lanceDistance/l2_u8.rs" \ + --replace-fail "return |a, b| unsafe { x86::l2_u8_avx512_vnni(a, b) };" "" + + substituteInPlace "$lanceDistance/cosine_u8.rs" \ + --replace-fail "return |a, b| unsafe { x86::cosine_u8_accum_avx512_vnni(a, b) };" "" + ''; + nativeBuildInputs = [ pkg-config protobuf # for protoc @@ -74,8 +94,10 @@ buildPythonPackage (finalAttrs: { protobuf ]; - pythonRelaxDeps = [ "pyarrow" ]; - + pythonRelaxDeps = [ + "lance-namespace" + "pyarrow" + ]; dependencies = [ lance-namespace numpy diff --git a/pkgs/development/python-modules/pysbd/default.nix b/pkgs/development/python-modules/pysbd/default.nix index 09e666419918..1f6509265b26 100644 --- a/pkgs/development/python-modules/pysbd/default.nix +++ b/pkgs/development/python-modules/pysbd/default.nix @@ -2,36 +2,44 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + pytestCheckHook, tqdm, spacy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysbd"; version = "0.3.4"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; # provides no sdist on pypi src = fetchFromGitHub { owner = "nipunsadvilkar"; repo = "pySBD"; - rev = "v${version}"; - sha256 = "12p7qm237z56hw4zr03n8rycgfymhki2m9c4w3ib0mvqq122a5dp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-txUlRMB4V7Di4ISlKuKE1bvHfEZ2gPwJh6b8M0TF54o="; }; - nativeCheckInputs = [ - tqdm - spacy + build-system = [ + setuptools ]; - doCheck = false; # requires pyconll and blingfire + nativeCheckInputs = [ + pytestCheckHook + spacy + tqdm + ]; pythonImportsCheck = [ "pysbd" ]; meta = { description = "Pysbd (Python Sentence Boundary Disambiguation) is a rule-based sentence boundary detection that works out-of-the-box across many languages"; homepage = "https://github.com/nipunsadvilkar/pySBD"; + changelog = "https://github.com/nipunsadvilkar/pySBD/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; teams = [ lib.teams.tts ]; }; -} +}) diff --git a/pkgs/development/python-modules/pythonkuma/default.nix b/pkgs/development/python-modules/pythonkuma/default.nix index 72d4bbc8b87c..9b86ae19f3d7 100644 --- a/pkgs/development/python-modules/pythonkuma/default.nix +++ b/pkgs/development/python-modules/pythonkuma/default.nix @@ -40,7 +40,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Simple Python wrapper for Uptime Kuma"; homepage = "https://github.com/tr4nt0r/pythonkuma"; - changelog = "https://github.com/tr4nt0r/pythonkuma/releases/tag/v${finalAttrs.src.tag}"; + changelog = "https://github.com/tr4nt0r/pythonkuma/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.jamiemagee ]; }; diff --git a/pkgs/development/python-modules/resvg-py/default.nix b/pkgs/development/python-modules/resvg-py/default.nix index 6d30ded2d52e..3670f085f13e 100644 --- a/pkgs/development/python-modules/resvg-py/default.nix +++ b/pkgs/development/python-modules/resvg-py/default.nix @@ -12,19 +12,19 @@ buildPythonPackage (finalAttrs: { pname = "resvg-py"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; src = fetchFromGitHub { owner = "baseplate-admin"; repo = "resvg-py"; tag = finalAttrs.version; - hash = "sha256-XYV3XVLZNlCGPvvYPtyr4UX+9yuXnV7ZWwqt2I/rxTc="; + hash = "sha256-SRY22I4wK3v8RrwkS3/5YjBe+IRLnUS/KYYThDUByXY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-v7Y+Kh8Z5S5gn8zoijjwKq8UZGT36azltC62m9xCHiY="; + hash = "sha256-5gyzo48SEct7kaN9ckectoHsuS1EJcJOdT+dxpKw+QQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix index 05432ca9b957..68cda3e0e04d 100644 --- a/pkgs/development/python-modules/sqlfmt/default.nix +++ b/pkgs/development/python-modules/sqlfmt/default.nix @@ -26,20 +26,19 @@ buildPythonPackage (finalAttrs: { pname = "sqlfmt"; - version = "0.30.0"; + version = "0.31.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "tconbeer"; repo = "sqlfmt"; tag = "v${finalAttrs.version}"; - hash = "sha256-/8BTH2nuqO+du6PsTPB59L21HvvAIZKDcG1kV9XHxsg="; + hash = "sha256-nbgLzeMOXgiXtvV/XHu1I0LkwwaTrzj8ga6EtoZuvRk="; }; build-system = [ hatchling ]; - pythonRelaxDeps = [ "click" ]; - dependencies = [ click jinja2 @@ -61,13 +60,10 @@ buildPythonPackage (finalAttrs: { versionCheckHook writableTmpDirAsHomeHook ] - ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; - disabledTestPaths = [ - # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr' - "tests/functional_tests/test_end_to_end.py" - "tests/unit_tests/test_cli.py" - ]; + # importlib.metadata.PackageNotFoundError: No package metadata was found for sqlfmt + dontCheckPythonMetadata = true; meta = { description = "Formatter for dbt SQL files"; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 050db17d7a55..b6a50ee469de 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "stripe"; - version = "15.3.1"; + version = "15.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-L5qNlh5cLsGRSftOC0fZcJ0BSmhZLNsfTv0ESryNI1k="; + hash = "sha256-+UwngKdyjF+0l4ng+7GOmEJn+T+nJOhACzGuvzbQGx4="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/syne-tune/default.nix b/pkgs/development/python-modules/syne-tune/default.nix index 21645320fe63..c788e5d43a6e 100644 --- a/pkgs/development/python-modules/syne-tune/default.nix +++ b/pkgs/development/python-modules/syne-tune/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, @@ -11,119 +10,65 @@ dill, numpy, pandas, + psutil, + scikit-learn, sortedcontainers, + statsmodels, + tqdm, typing-extensions, + xgboost, - # optional-dependencies - autograd, + # tests botorch, - # configspace, fastparquet, h5py, huggingface-hub, - matplotlib, pymoo, - scikit-learn, - scipy, - # smac, - statsmodels, - xgboost, - # yahpo-gym, - - # tests - pytestCheckHook, pytest-timeout, - ray, + pytestCheckHook, writableTmpDirAsHomeHook, }: buildPythonPackage (finalAttrs: { pname = "syne-tune"; - version = "0.15.0"; + version = "0.16.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "syne-tune"; repo = "syne-tune"; tag = "v${finalAttrs.version}"; - hash = "sha256-UNBpfC+aLXhkbyvCG2K00yedJnpYpfldqisZ/wDPtuA="; + hash = "sha256-fejG/KWWT6HrGCGzGh4p/Q3kzIDgYbRgfwGQf5sgKic="; }; build-system = [ setuptools ]; - pythonRelaxDeps = [ - "numpy" - ]; - dependencies = [ dill numpy pandas + psutil + scikit-learn sortedcontainers + statsmodels + tqdm typing-extensions + xgboost ]; - optional-dependencies = lib.fix (self: { - blackbox-repository = [ - fastparquet - h5py - huggingface-hub - numpy - pandas - scikit-learn - xgboost - ]; - bore = [ - scikit-learn - xgboost - ]; - botorch = [ botorch ]; - gpsearchers = [ - autograd - scipy - ]; - kde = [ statsmodels ]; - moo = [ - pymoo - scipy - ]; - sklearn = [ scikit-learn ]; - # smac = [ smac swig ]; # smac unavailable on nixpkgs - visual = [ matplotlib ]; - # yahpo = [ configspace onnxruntime pandas pyyaml yahpo-gym ]; # yahpo-gym unavailable on nixpkgs - }); + pythonImportsCheck = [ "syne_tune" ]; nativeCheckInputs = [ - pytestCheckHook + botorch + fastparquet + h5py + huggingface-hub + pymoo pytest-timeout - ray + pytestCheckHook writableTmpDirAsHomeHook - ] - ++ ray.optional-dependencies.tune - ++ finalAttrs.passthru.optional-dependencies.blackbox-repository - ++ finalAttrs.passthru.optional-dependencies.bore - ++ finalAttrs.passthru.optional-dependencies.botorch - ++ finalAttrs.passthru.optional-dependencies.gpsearchers - ++ finalAttrs.passthru.optional-dependencies.kde - ++ finalAttrs.passthru.optional-dependencies.sklearn; - - disabledTests = [ - # NameError: name 'HV' is not defined - # these require pkg `pymoo` and adding `pymoo` raises: - # setuptools.errors.PackageDiscoveryError: Multiple top-level packages discovered in a flat-layout: ['cma', 'notebooks']. - "test_append_hypervolume_indicator" - "test_hypervolume" - "test_hypervolume_progress" - "test_hypervolume_simple" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # assert np.float64(1.0114686865847489e-12) < 1e-12 - "test_cholesky_factorization" - ]; - - pythonImportsCheck = [ - "syne_tune" ]; meta = { diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index 2d6056d1f890..b76997879701 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -19,19 +19,19 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.10.3"; + version = "0.10.4"; pyproject = true; src = fetchFromGitHub { owner = "ariebovenberg"; repo = "whenever"; tag = version; - hash = "sha256-CBNk69vS4BqavwatOoA312/6M3EnARIzL7C62KrIvXY="; + hash = "sha256-yDI5TAnEyVPNYXqsCEitFrQnk+Ed0CyRKcCykxFqeWU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-bmKUeVZwaqCN81v1YDnz66ZsUE8VTMBHlph6ZootKu8="; + hash = "sha256-ZJhHIY9oFGGfK0XdZtzH7uSqbg3y3aDEh5q4ba5W0tI="; }; build-system = [ diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 5b5628d19405..c64a7ce1fd44 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.18.41"; - hash = "sha256-nGDN+qkTNaUVgV+aFOvEtwkDaK7uqpjvXgENpkviDFg="; + version = "6.18.42"; + hash = "sha256-yDtXLGdFM4rg8mtxUJbUvCvjs2dvFiSGuCV7seKlWqM="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "7.1.5"; - hash = "sha256-zELqn/UieXjOBkTNTLi2OCkK4+rpD/IfJEDb7GTTJfk="; + version = "7.1.6"; + hash = "sha256-H+dNmTMCWfJm792HR6lz1wVUD70pyZpn5HlTUXwsnLI="; }; }; diff --git a/pkgs/os-specific/linux/lkrg/default.nix b/pkgs/os-specific/linux/lkrg/default.nix index 734a8cef3f7f..d4f6ca01c4c8 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 = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "lkrg-org"; repo = "lkrg"; rev = "v${finalAttrs.version}"; - hash = "sha256-Eb0+rgbI+gbY1NjVyPLB6kZgDsYoSCxjy162GophiMI="; + hash = "sha256-j/0iK/I+pj69Z39lZJFaCQ3WxzZL6663Kxy4Sf46tOo="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index e5f941af3770..a38b92f9444f 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -167,16 +167,16 @@ optionalAttrs allowAliases aliases generate = name: value: pkgs.callPackage ( - { runCommand, remarshal_0_17 }: + { runCommand, remarshal }: runCommand name { - nativeBuildInputs = [ remarshal_0_17 ]; + nativeBuildInputs = [ remarshal ]; inherit value; preferLocalBuild = true; __structuredAttrs = true; } '' - json2yaml ${ + remarshal --from json --to yaml-1.1 ${ # attributes with null values are omitted from the JSON with structured attrs # yaml_1_1Null test keeps this in check if value == null then ''<(echo "null")'' else ''--unwrap value "$NIX_ATTRS_JSON_FILE"'' diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index b03b44c99150..56ce50ed6953 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -168,6 +168,8 @@ runBuildTests { time = "22:30:00"; }; expected = '' + %YAML 1.1 + --- attrs: foo: null 'false': false @@ -188,8 +190,9 @@ runBuildTests { format = formats.yaml_1_1 { }; input = null; expected = '' - null - ... + %YAML 1.1 + --- + null ''; }; diff --git a/pkgs/servers/http/nginx/modules/echo/package.nix b/pkgs/servers/http/nginx/modules/echo/package.nix index ea4a748cc50f..03c215d76990 100644 --- a/pkgs/servers/http/nginx/modules/echo/package.nix +++ b/pkgs/servers/http/nginx/modules/echo/package.nix @@ -6,14 +6,14 @@ mkNginxPlugin (finalAttrs: { pname = "echo"; - version = "0.63"; + version = "0.65"; src = fetchFromGitHub { name = "echo"; owner = "openresty"; repo = "echo-nginx-module"; tag = "v${finalAttrs.version}"; - hash = "sha256-K7oOE0yxPYLf+3YMVbBsncpHRpGHXjs/8B5QPO3MQC4="; + hash = "sha256-DiukXNS1ZoKVMnDD/65DZxxQSS/lAKZ5b0Pp0Hs6MTc="; }; meta = { diff --git a/pkgs/servers/http/nginx/modules/lua/package.nix b/pkgs/servers/http/nginx/modules/lua/package.nix index 58c3094376ad..f8f45586e4ab 100644 --- a/pkgs/servers/http/nginx/modules/lua/package.nix +++ b/pkgs/servers/http/nginx/modules/lua/package.nix @@ -7,13 +7,13 @@ mkNginxPlugin (finalAttrs: { pname = "lua"; - version = "0.10.29"; + version = "0.10.31"; src = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; rev = "v${finalAttrs.version}"; - hash = "sha256-z62Vwrthl1FJiTdrdhifZZe6crdi8c6sTkUim6KmVlU="; + hash = "sha256-pS3Ce8duBtD1qb/E3NNnkuNU/39D4S9dJlGIfd9hkkc="; }; buildInputs = [ luajit_openresty ]; diff --git a/pkgs/servers/http/nginx/modules/modsecurity/package.nix b/pkgs/servers/http/nginx/modules/modsecurity/package.nix index 43b18cb900a4..ec3cd5fa0d3c 100644 --- a/pkgs/servers/http/nginx/modules/modsecurity/package.nix +++ b/pkgs/servers/http/nginx/modules/modsecurity/package.nix @@ -12,13 +12,13 @@ mkNginxPlugin (finalAttrs: { pname = "modsecurity"; - version = "1.0.3-unstable-2025-02-17"; + version = "1.0.4"; src = fetchFromGitHub { owner = "owasp-modsecurity"; repo = "ModSecurity-nginx"; - rev = "0b4f0cf38502f34a30c8543039f345cfc075670d"; - hash = "sha256-P3IwKFR4NbaMXYY+O9OHfZWzka4M/wr8sJpX94LzQTU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-pOHn4lHISqRspbRxtB4XpbEydeKVlXpvEVHzSbuLp/s="; }; buildInputs = [ @@ -32,7 +32,7 @@ mkNginxPlugin (finalAttrs: { meta = { description = "Open source, cross platform web application firewall (WAF)"; - homepage = "https://github.com/owasp-modsecurity/ModSecurity"; + homepage = "https://github.com/owasp-modsecurity/ModSecurity-nginx"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/servers/http/nginx/modules/moreheaders/package.nix b/pkgs/servers/http/nginx/modules/moreheaders/package.nix index 051206ac8db2..e47efb7decde 100644 --- a/pkgs/servers/http/nginx/modules/moreheaders/package.nix +++ b/pkgs/servers/http/nginx/modules/moreheaders/package.nix @@ -6,13 +6,13 @@ mkNginxPlugin (finalAttrs: { pname = "moreheaders"; - version = "0.36"; + version = "0.40"; src = fetchFromGitHub { owner = "openresty"; repo = "headers-more-nginx-module"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-X+ygIesQ9PGm5yM+u1BOLYVpm1172P8jWwXNr3ixFY4="; + sha256 = "sha256-4oddjLXtJyDmxCa2ocBtNAeKWXxI38I9eHeFVw9/ANc="; }; meta = { diff --git a/pkgs/servers/http/nginx/modules/pam/package.nix b/pkgs/servers/http/nginx/modules/pam/package.nix index bb2bb00331b8..4c9166dd40a0 100644 --- a/pkgs/servers/http/nginx/modules/pam/package.nix +++ b/pkgs/servers/http/nginx/modules/pam/package.nix @@ -7,13 +7,13 @@ mkNginxPlugin (finalAttrs: { pname = "pam"; - version = "1.5.3"; + version = "1.5.5"; src = fetchFromGitHub { owner = "sto"; repo = "ngx_http_auth_pam_module"; tag = "v${finalAttrs.version}"; - hash = "sha256-Kojk0/zxAktpZ/8YvCglVlN0xi+jELYGMcU8CZukliY="; + hash = "sha256-ESlrWZwpLE0bVS1MwTc2Zcu7892HsaCQ7APGsmdbIuU="; }; buildInputs = [ pam ]; diff --git a/pkgs/servers/http/nginx/modules/set-misc/package.nix b/pkgs/servers/http/nginx/modules/set-misc/package.nix index 0f299ad65240..2fb1c10c2d41 100644 --- a/pkgs/servers/http/nginx/modules/set-misc/package.nix +++ b/pkgs/servers/http/nginx/modules/set-misc/package.nix @@ -8,13 +8,13 @@ mkNginxPlugin (finalAttrs: { pname = "set-misc"; - version = "0.33"; + version = "0.34"; src = fetchFromGitHub { owner = "openresty"; repo = "set-misc-nginx-module"; tag = "v${finalAttrs.version}"; - hash = "sha256-jMMj3Ki1uSfQzagoB/O4NarxPjiaF9YRwjSKo+cgMxo="; + hash = "sha256-2QHidYeKCELkWAdXwmMq9DsirK7I06gbsUVz6uJy+CI="; }; passthru.tests.nginx = nginx.override { diff --git a/pkgs/servers/http/nginx/modules/upstream-check/package.nix b/pkgs/servers/http/nginx/modules/upstream-check/package.nix index b91fd1190405..780238a06496 100644 --- a/pkgs/servers/http/nginx/modules/upstream-check/package.nix +++ b/pkgs/servers/http/nginx/modules/upstream-check/package.nix @@ -6,13 +6,13 @@ mkNginxPlugin (finalAttrs: { pname = "upstream-check"; - version = "0.3.0-unstable-2019-11-03"; + version = "0.4.0"; src = fetchFromGitHub { owner = "yaoweibin"; repo = "nginx_upstream_check_module"; - rev = "e538034b6ad7992080d2403d6d3da56e4f7ac01e"; - hash = "sha256-lJzVs+B/1VjGiQeDyl0md/6o1AYVgeWxx7+LAwiYxxs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-UttWL83yG/QbMstfQwv2cK7mJTzR4G5rv7cktPpC6sI="; }; meta = { diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix index db3fdd340ac9..6092b2ea98ee 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_rational.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_rational.nix @@ -7,13 +7,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg_rational"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "begriffs"; repo = "pg_rational"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sp5wuX2nP3KGyWw7MFa11rI1CPIKIWBt8nvBSsASIEw="; + hash = "sha256-8ctA1XkBOMyO0V9sy2ll6q89jLa7aG5xW9rtr3ugoeA="; }; meta = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 73efb15c4bc4..8f4da2320b2d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2084,6 +2084,7 @@ mapAliases { redpanda = throw "'redpanda' has been renamed to/replaced by 'redpanda-client'"; # Converted to throw 2025-10-27 redshift-plasma-applet = throw "'redshift-plasma-applet' has been removed as it is obsolete and lacks maintenance upstream."; # Added 2025-11-09 reiserfsprogs = throw "'reiserfsprogs' has been removed as ReiserFS has not been actively maintained for many years."; # Added 2025-11-13 + remarshal_0_17 = throw "'remarshal_0_17' has been removed because 'remarshal' supports YAML 1.1 with the `--to yaml-1.1` flag."; # added 2026-07-30 remodel = throw "'remodel' has been removed because it was unmaintained upstream, deprecated in favor of 'lune'"; # Added 2026-05-08 remotebox = throw "remotebox has been removed because it was unmaintained and broken for a long time"; # Added 2025-09-11 resp-app = throw "'resp-app' has been replaced by 'redisinsight'"; # Added 2025-12-17 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d70e57ff7a9e..1c7a15a11e6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2932,6 +2932,8 @@ self: super: with self; { cdxj-indexer = callPackage ../development/python-modules/cdxj-indexer { }; + cel-python = callPackage ../development/python-modules/cel-python { }; + celery = callPackage ../development/python-modules/celery { }; celery-batches = callPackage ../development/python-modules/celery-batches { }; @@ -3281,6 +3283,8 @@ self: super: with self; { cmake-build-extension = callPackage ../development/python-modules/cmake-build-extension { }; + cmake-parser = callPackage ../development/python-modules/cmake-parser { }; + cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; cmd2 = callPackage ../development/python-modules/cmd2 { }; @@ -3677,6 +3681,10 @@ self: super: with self; { crewai = callPackage ../development/python-modules/crewai { }; + crewai-cli = callPackage ../development/python-modules/crewai-cli { }; + + crewai-core = callPackage ../development/python-modules/crewai-core { }; + crispy-bootstrap3 = callPackage ../development/python-modules/crispy-bootstrap3 { }; crispy-bootstrap4 = callPackage ../development/python-modules/crispy-bootstrap4 { }; @@ -5339,9 +5347,7 @@ self: super: with self; { eheimdigital = callPackage ../development/python-modules/eheimdigital { }; - eigenpy = callPackage ../development/python-modules/eigenpy { - inherit (pkgs) graphviz; # need the `dot` program, not the python module - }; + eigenpy = callPackage ../development/python-modules/eigenpy { }; einops = callPackage ../development/python-modules/einops { }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 47b2133368b3..51407db2654f 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -54,7 +54,7 @@ let meta.description = "Release-critical packages from the python package sets"; constituents = [ jobs.nixos-render-docs.x86_64-linux # Used in nixos manual - jobs.remarshal_0_17.x86_64-linux # Used in pkgs.formats.yaml_1_1 + jobs.remarshal.x86_64-linux # Used in pkgs.formats.yaml_1_1 jobs.python313Packages.afdko.x86_64-linux # Used in noto-fonts-color-emoji jobs.python313Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert jobs.python313Packages.colorama.x86_64-linux # Used in nixos test-driver