diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index e84c3bfbbd63..b6d5a3f69434 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -62,6 +62,8 @@ - [Zapret2](https://github.com/bol-van/zapret2), an extensible DPI bypass program. Available as [services.zapret2](#opt-services.zapret2.enable). +- [Solaar](https://github.com/pwr-Solaar/Solaar), a program to control logitech devices. + - [FlapAlerted](https://github.com/Kioubit/FlapAlerted), detects BGP flapping events and provides statistics based on BGP update messages. Available as [services.flap-alerted](#opt-services.flap-alerted.enable). - [gocron](https://github.com/flohoss/gocron), a task scheduler with web interface. Available as [services.gocron](#opt-services.gocron.enable). diff --git a/nixos/modules/hardware/logitech.nix b/nixos/modules/hardware/logitech.nix index 74c8a230bc46..07adf77a9965 100644 --- a/nixos/modules/hardware/logitech.nix +++ b/nixos/modules/hardware/logitech.nix @@ -19,8 +19,8 @@ in [ "hardware" "logitech" "wireless" "enable" ] ) (lib.mkRenamedOptionModule - [ "hardware" "logitech" "enableGraphical" ] [ "hardware" "logitech" "wireless" "enableGraphical" ] + [ "programs" "solaar" "enable" ] ) ]; @@ -56,20 +56,11 @@ in wireless = { enable = lib.mkEnableOption "support for Logitech Wireless Devices"; - - enableGraphical = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable graphical support applications."; - }; }; }; config = lib.mkIf (cfg.wireless.enable || cfg.lcd.enable) { - environment.systemPackages = - [ ] - ++ lib.optional cfg.wireless.enable pkgs.ltunify - ++ lib.optional cfg.wireless.enableGraphical pkgs.solaar; + environment.systemPackages = lib.optional cfg.wireless.enable pkgs.ltunify; services.udev = { # ltunifi and solaar both provide udev rules but the most up-to-date have been split diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 953343df682e..c8c9dcf057fd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -326,6 +326,7 @@ ./programs/skim.nix ./programs/slock.nix ./programs/sniffnet.nix + ./programs/solaar.nix ./programs/soundmodem.nix ./programs/ssh.nix ./programs/starship.nix diff --git a/nixos/modules/programs/solaar.nix b/nixos/modules/programs/solaar.nix new file mode 100644 index 000000000000..320e8559b8db --- /dev/null +++ b/nixos/modules/programs/solaar.nix @@ -0,0 +1,93 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.solaar; + inherit (lib) + mkEnableOption + mkIf + mkOption + types + maintainers + mkPackageOption + ; +in +{ + options.programs.solaar = { + enable = mkEnableOption "Solaar, the open source driver for Logitech devices."; + + package = mkPackageOption pkgs "solaar" { }; + + userService = { + enable = mkEnableOption "Enable the solaar systemd service for each user."; + + window = mkOption { + type = types.enum [ + "show" + "hide" + "only" + ]; + default = "hide"; + description = '' + Start with window showing / hidden / only (no tray icon). + ''; + }; + + batteryIcons = mkOption { + type = types.enum [ + "regular" + "symbolic" + "solaar" + ]; + default = "regular"; + description = '' + Prefer regular battery / symbolic battery / solaar icons. + ''; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--restart-on-wake-up" ]; + description = '' + Extra arguments to pass to Solaar. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + hardware.logitech.wireless.enable = lib.mkDefault true; + environment.systemPackages = [ cfg.package ]; + + systemd.user.services.solaar = mkIf cfg.userService.enable { + description = "Solaar, the open source driver for Logitech devices"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + after = [ "dbus.service" ]; + serviceConfig = { + Type = "simple"; + ExecStart = lib.escapeShellArgs ( + [ + (lib.getExe cfg.package) + "--window" + cfg.userService.window + "--battery-icons" + cfg.userService.batteryIcons + ] + ++ cfg.userService.extraArgs + ); + Restart = "on-failure"; + RestartSec = "5"; + }; + }; + }; + + meta = { + maintainers = [ maintainers.Svenum ]; + }; +} diff --git a/nixos/modules/programs/zoxide.nix b/nixos/modules/programs/zoxide.nix index de85259d0100..d93e44f86093 100644 --- a/nixos/modules/programs/zoxide.nix +++ b/nixos/modules/programs/zoxide.nix @@ -6,7 +6,7 @@ }: let inherit (lib.options) mkEnableOption mkPackageOption mkOption; - inherit (lib.modules) mkIf; + inherit (lib.modules) mkIf mkAfter; inherit (lib.meta) getExe; inherit (lib.types) listOf str; inherit (lib.strings) concatStringsSep; @@ -52,15 +52,15 @@ in environment.systemPackages = [ cfg.package ]; programs = { - zsh.interactiveShellInit = mkIf cfg.enableZshIntegration '' + zsh.interactiveShellInit = mkIf cfg.enableZshIntegration (mkAfter '' eval "$(${getExe cfg.package} init zsh ${cfgFlags} )" - ''; - bash.interactiveShellInit = mkIf cfg.enableBashIntegration '' + ''); + bash.interactiveShellInit = mkIf cfg.enableBashIntegration (mkAfter '' eval "$(${getExe cfg.package} init bash ${cfgFlags} )" - ''; - fish.interactiveShellInit = mkIf cfg.enableFishIntegration '' + ''); + fish.interactiveShellInit = mkIf cfg.enableFishIntegration (mkAfter '' ${getExe cfg.package} init fish ${cfgFlags} | source - ''; + ''); xonsh.config = '' execx($(${getExe cfg.package} init xonsh ${cfgFlags}), 'exec', __xonsh__.ctx, filename='zoxide') ''; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b426fb633b52..7bb6c1c1b5e8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -967,7 +967,9 @@ in livekit = runTest ./networking/livekit.nix; lix = runTest ./lix.nix; lk-jwt-service = runTest ./matrix/lk-jwt-service.nix; - llama-swap = runTest ./web-servers/llama-swap.nix; + llama-swap = import ./web-servers/llama-swap.nix { + inherit pkgs runTest; + }; lldap = runTest ./lldap.nix; local-content-share = runTest ./local-content-share.nix; locale = runTest ./locale.nix; diff --git a/nixos/tests/opencloud.nix b/nixos/tests/opencloud.nix index 919ed99f4b5d..25bd5295f68c 100644 --- a/nixos/tests/opencloud.nix +++ b/nixos/tests/opencloud.nix @@ -21,12 +21,14 @@ let from selenium.webdriver.common.by import By from selenium.webdriver import Firefox from selenium.webdriver.firefox.options import Options + from selenium.webdriver.firefox.service import Service from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC options = Options() options.add_argument('--headless') - driver = Firefox(options=options) + service = Service(executable_path="${lib.getExe pkgs.geckodriver}") + driver = Firefox(options=options, service=service) host = sys.argv[1] user = sys.argv[2] @@ -71,6 +73,7 @@ in environment = { ADMIN_PASSWORD = adminPassword; IDM_CREATE_DEMO_USERS = "true"; + IDM_LDAPS_ADDR = "127.0.0.1:9235"; IDM_LDAPS_CERT = "${certs.${domain}.cert}"; IDM_LDAPS_KEY = "${certs.${domain}.key}"; OC_INSECURE = "false"; diff --git a/nixos/tests/web-servers/llama-swap.nix b/nixos/tests/web-servers/llama-swap.nix index 90766b74c1ed..1e80f6ab233c 100644 --- a/nixos/tests/web-servers/llama-swap.nix +++ b/nixos/tests/web-servers/llama-swap.nix @@ -1,261 +1,295 @@ -{ pkgs, lib, ... }: +{ + pkgs, + lib ? pkgs.lib, + runTest, + ... +}: let - wrapSrc = attrs: pkgs.runCommand "${attrs.pname}-${attrs.version}" attrs "ln -s $src $out"; + makeLlamaSwapTest = + name: + { + withUI ? true, + # opt in for e2e test with a small LLM + withLLM ? false, + }: + ( + let + wrapSrc = attrs: pkgs.runCommand "${attrs.pname}-${attrs.version}" attrs "ln -s $src $out"; - smollm2-135m = wrapSrc rec { - pname = "smollm2-135m"; - version = "9e6855bc4be717fca1ef21360a1db4b29d5c559a"; - src = pkgs.fetchurl { - url = "https://huggingface.co/unsloth/SmolLM2-135M-Instruct-GGUF/resolve/${version}/SmolLM2-135M-Instruct-Q4_K_M.gguf"; - hash = "sha256-7V+jDEh7KC7BVsKQYvEiLlwgh1qUSsmCidvSQulH90c="; + smollm2-135m = wrapSrc rec { + pname = "smollm2-135m"; + version = "9e6855bc4be717fca1ef21360a1db4b29d5c559a"; + src = pkgs.fetchurl { + url = "https://huggingface.co/unsloth/SmolLM2-135M-Instruct-GGUF/resolve/${version}/SmolLM2-135M-Instruct-Q4_K_M.gguf"; + hash = "sha256-7V+jDEh7KC7BVsKQYvEiLlwgh1qUSsmCidvSQulH90c="; + }; + + meta.license = with lib.licenses; [ + asl20 # actual license of the model weights + unfree # to force an opt-in - do not remove + ]; + }; + + # grab allowUnfreePredicate if it exists or default deny + allowUnfreePredicate = + if builtins.hasAttr "allowUnfreePredicate" pkgs.config then + pkgs.config.allowUnfreePredicate + else + (_: false); + + # check if we can use smollm2-135m taking either globally allowUnfree or + # explicit allow with predicate + # or the test explicitly opts in + useSmollm2-135m = withLLM || pkgs.config.allowUnfree || allowUnfreePredicate smollm2-135m; + in + { + name = "llama-swap-${name}"; + meta.maintainers = with lib.maintainers; [ + jk + podium868909 + ]; + + nodes = { + machine = + { pkgs, ... }: + { + # running models can be memory intensive but + # default `virtualisation.memorySize` is fine + + services.llama-swap = { + enable = true; + settings = + # config for basic tests + if !useSmollm2-135m then + { } + # config for extended tests using SmolLM2 + else + let + llama-cpp = pkgs.llama-cpp; + llama-server = lib.getExe' llama-cpp "llama-server"; + in + { + # more useful logging output + logLevel = "debug"; + logToStdout = "both"; + + hooks.on_startup.preload = [ + "smollm2" + ]; + # temperature and top-k important for SmolLM2 performance/accuracy + models = { + "smollm2" = { + ttl = 10; + cmd = "${llama-server} --port \${PORT} -m ${smollm2-135m} --alias smollm2 --no-webui --temp 0.2 --top-k 9"; + }; + "smollm2-group-1" = { + cmd = "${llama-server} --port \${PORT} -m ${smollm2-135m} --alias smollm2-group-1 --no-webui --temp 0.2 --top-k 9 -c 1024"; + }; + "smollm2-group-2" = { + proxy = "http://127.0.0.1:5802"; + cmd = "${llama-server} --port 5802 -m ${smollm2-135m} --alias smollm2-group-2 --no-webui --temp 0.2 --top-k 9 -c 1024"; + }; + }; + groups = { + "standalone" = { + swap = true; + exclusive = true; + members = [ + "smollm2" + ]; + }; + "group" = { + swap = false; + exclusive = true; + members = [ + "smollm2-group-1" + "smollm2-group-2" + ]; + }; + }; + }; + }; + }; + }; + + testScript = + { nodes, ... }: + '' + # core tests + import json + + def get_json(route): + args = [ + '-v', + '-s', + '--fail', + '-H "Content-Type: application/json"' + ] + return json.loads(machine.succeed("curl {args} http://localhost:8080{route}".format(args=" ".join(args), route=route))) + + def post_json(route, data): + args = [ + '-v', + '-s', + '--fail', + '-H "Content-Type: application/json"', + "-d '{d}'".format(d=json.dumps(data)) + ] + return json.loads(machine.succeed('curl {args} http://localhost:8080{route}'.format(args=" ".join(args), route=route))) + + machine.wait_for_unit('llama-swap') + machine.wait_for_open_port(8080) + + '' + + lib.optionalString withUI '' + with subtest('check is serving ui'): + machine.succeed('curl --fail http:/localhost:8080/ui/') + + '' + + '' + with subtest('check is healthy'): + response_healthy = machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/health') + assert 'OK' in response_healthy, '/health was not OK' + + '' + + lib.optionalString useSmollm2-135m '' + # extended tests using SmolLM2 + with subtest('check `/running` for preloaded smollm2'): + machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/running | grep "smollm2"') + running_response = get_json('/running') + assert len(running_response['running']) == 1, f'running doesn\'t have one entry as expected: {running_response}' + running_model = running_response['running'][0] + assert running_model['model'] == 'smollm2', f'running model is not smollm2: {running_response}' + assert running_model['state'] == 'ready', f'running smollm2 is not ready: {running_response}' + + with subtest('runs smollm2'): + response = None + with subtest('send request to smollm2'): + data = { + 'model': 'smollm2', + 'messages': [ + { + 'role': 'user', + 'content': 'Say hello' + } + ] + } + response = post_json('/v1/chat/completions', data) + + with subtest('response is from smollm2'): + assert response['model'] == 'smollm2', f'response was not from smollm2: {response['model']}' + + with subtest('response contains at least one item in "choices"'): + assert len(response['choices']) >= 1, f'response had no choices: {response}' + + assistant_choices = None + with subtest('response contains at least one "assistant" message'): + assistant_choices = [c for c in response['choices'] if c['message']['role'] == 'assistant'] + assert len(assistant_choices) >= 1, f'response had no assistant message: {response}' + + with subtest('first message (lowercase) starts with "hello"'): + assert assistant_choices[0]['message']['content'].lower()[:5] == 'hello', f'response didn\'t start with hello: {response}' + + with subtest('check `/running` for just smollm2'): + running_response = get_json('/running') + assert len(running_response['running']) == 1, f'running doesn\'t have one entry as expected: {running_response}' + running_model = running_response['running'][0] + assert running_model['model'] == 'smollm2', f'running model is not smollm2: {running_response}' + assert running_model['state'] == 'ready', f'running smollm2 is not ready: {running_response}' + + with subtest('check `/running` for smollm2 to timeout'): + machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/running | grep -v "smollm2"', timeout=11) + running_response = get_json('/running') + assert len(running_response['running']) == 0, "smollm2 was still running after timeout" + + with subtest('runs smollm2-group-1 and smollm2-group-2'): + response_1 = None + with subtest('send request to smollm2-group-1'): + data = { + 'model': 'smollm2-group-1', + 'messages': [ + { + 'role': 'user', + 'content': 'Say hello' + } + ] + } + response_1 = post_json('/v1/chat/completions', data) + + with subtest('response 1 is from smollm2-group-1'): + assert response_1['model'] == 'smollm2-group-1', f'response was not from smollm2-group-1: {response_1['model']}' + + with subtest('response 1 contains at least one item in "choices"'): + assert len(response_1['choices']) >= 1, f'response had no choices: {response_1}' + + assistant_choices_1 = None + with subtest('response 1 contains at least one "assistant" message'): + assistant_choices_1 = [c for c in response_1['choices'] if c['message']['role'] == 'assistant'] + assert len(assistant_choices_1) >= 1, f'response had no assistant message: {response_1}' + + with subtest('first message (lowercase) in response 1 starts with "hello"'): + assert assistant_choices_1[0]['message']['content'].lower()[:5] == 'hello', f'response didn\'t start with hello: {response_1}' + + with subtest('check `/running` for just smollm2-group-1'): + running_response = get_json('/running') + assert len(running_response['running']) == 1, f'running doesn\'t have one entry as expected: {running_response}' + running_model = running_response['running'][0] + assert running_model['model'] == 'smollm2-group-1', f'running model is not smollm2-group-1: {running_response}' + assert running_model['state'] == 'ready', f'running smollm2-group-1 is not ready: {running_response}' + + response_2 = None + with subtest('send request to smollm2-group-2'): + data = { + 'model': 'smollm2-group-2', + 'messages': [ + { + 'role': 'user', + 'content': 'Say hello' + } + ] + } + response_2 = post_json('/v1/chat/completions', data) + + with subtest('response 2 is from smollm2-group-2'): + assert response_2['model'] == 'smollm2-group-2', f'response was not from smollm2-group-2: {response_2['model']}' + + with subtest('response 2 contains at least one item in "choices"'): + assert len(response_2['choices']) >= 1, f'response had no choices: {response_2}' + + assistant_choices_2 = None + with subtest('response 2 contains at least one "assistant" message'): + assistant_choices_2 = [c for c in response_2['choices'] if c['message']['role'] == 'assistant'] + assert len(assistant_choices_2) >= 1, f'response had no assistant message: {response_2}' + + with subtest('first message (lowercase) in response 1 starts with "hello"'): + assert assistant_choices_2[0]['message']['content'].lower()[:5] == 'hello', f'response didn\'t start with hello: {response_2}' + + with subtest('check `/running` for both smollm2-group-1 and smollm2-group-2'): + running_response = get_json('/running')['running'] + assert len(running_response) == 2, 'expected both in smollm2 group to be running' + assert len([ + rm for rm in running_response + if rm['state'] == 'ready' and rm['model'] == 'smollm2-group-1' + ]) == 1, f'smollm2-group-1 not in running group and ready {running_response}' + assert len([ + rm for rm in running_response + if rm['state'] == 'ready' and rm['model'] == 'smollm2-group-2' + ]) == 1, f'smollm2-group-2 not in running group and ready {running_response}' + ''; + } + ); +in +lib.recurseIntoAttrs ( + builtins.mapAttrs (k: v: runTest (makeLlamaSwapTest k v)) { + full = { }; + minimal = { + withUI = false; }; - meta.license = with lib.licenses; [ - asl20 # actual license of the model - unfree # to force an opt-in - do not remove - ]; - }; - - # grab allowUnfreePredicate if it exists or default deny - allowUnfreePredicate = - if builtins.hasAttr "allowUnfreePredicate" pkgs.config then - pkgs.config.allowUnfreePredicate - else - (_: false); - - # check if we can use smollm2-135m taking either globally allowUnfree or - # explicit allow with predicate - useSmollm2-135m = pkgs.config.allowUnfree || allowUnfreePredicate smollm2-135m; -in -{ - name = "llama-swap"; - meta.maintainers = with lib.maintainers; [ - jk - podium868909 - ]; - - nodes = { - machine = - { pkgs, ... }: - { - # running models can be memory intensive but - # default `virtualisation.memorySize` is fine - - services.llama-swap = { - enable = true; - settings = - # config for basic tests - if !useSmollm2-135m then - { } - # config for extended tests using SmolLM2 - else - let - llama-cpp = pkgs.llama-cpp; - llama-server = lib.getExe' llama-cpp "llama-server"; - in - { - # more useful logging output - logLevel = "debug"; - logToStdout = "both"; - - hooks.on_startup.preload = [ - "smollm2" - ]; - # temperature and top-k important for SmolLM2 performance/accuracy - models = { - "smollm2" = { - ttl = 10; - cmd = "${llama-server} --port \${PORT} -m ${smollm2-135m} --alias smollm2 --no-webui --temp 0.2 --top-k 9"; - }; - "smollm2-group-1" = { - cmd = "${llama-server} --port \${PORT} -m ${smollm2-135m} --alias smollm2-group-1 --no-webui --temp 0.2 --top-k 9 -c 1024"; - }; - "smollm2-group-2" = { - proxy = "http://127.0.0.1:5802"; - cmd = "${llama-server} --port 5802 -m ${smollm2-135m} --alias smollm2-group-2 --no-webui --temp 0.2 --top-k 9 -c 1024"; - }; - }; - groups = { - "standalone" = { - swap = true; - exclusive = true; - members = [ - "smollm2" - ]; - }; - "group" = { - swap = false; - exclusive = true; - members = [ - "smollm2-group-1" - "smollm2-group-2" - ]; - }; - }; - }; - }; - }; - }; - - testScript = - { nodes, ... }: - '' - # core tests - import json - - def get_json(route): - args = [ - '-v', - '-s', - '--fail', - '-H "Content-Type: application/json"' - ] - return json.loads(machine.succeed("curl {args} http://localhost:8080{route}".format(args=" ".join(args), route=route))) - - def post_json(route, data): - args = [ - '-v', - '-s', - '--fail', - '-H "Content-Type: application/json"', - "-d '{d}'".format(d=json.dumps(data)) - ] - return json.loads(machine.succeed('curl {args} http://localhost:8080{route}'.format(args=" ".join(args), route=route))) - - machine.wait_for_unit('llama-swap') - machine.wait_for_open_port(8080) - - with subtest('check is serving ui'): - machine.succeed('curl --fail http:/localhost:8080/ui/') - - with subtest('check is healthy'): - response_healthy = machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/health') - assert 'OK' in response_healthy, '/health was not OK' - - '' - + lib.optionalString useSmollm2-135m '' - # extended tests using SmolLM2 - with subtest('check `/running` for preloaded smollm2'): - machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/running | grep "smollm2"') - running_response = get_json('/running') - assert len(running_response['running']) == 1, f'running doesn\'t have one entry as expected: {running_response}' - running_model = running_response['running'][0] - assert running_model['model'] == 'smollm2', f'running model is not smollm2: {running_response}' - assert running_model['state'] == 'ready', f'running smollm2 is not ready: {running_response}' - - with subtest('runs smollm2'): - response = None - with subtest('send request to smollm2'): - data = { - 'model': 'smollm2', - 'messages': [ - { - 'role': 'user', - 'content': 'Say hello' - } - ] - } - response = post_json('/v1/chat/completions', data) - - with subtest('response is from smollm2'): - assert response['model'] == 'smollm2', f'response was not from smollm2: {response['model']}' - - with subtest('response contains at least one item in "choices"'): - assert len(response['choices']) >= 1, f'response had no choices: {response}' - - assistant_choices = None - with subtest('response contains at least one "assistant" message'): - assistant_choices = [c for c in response['choices'] if c['message']['role'] == 'assistant'] - assert len(assistant_choices) >= 1, f'response had no assistant message: {response}' - - with subtest('first message (lowercase) starts with "hello"'): - assert assistant_choices[0]['message']['content'].lower()[:5] == 'hello', f'response didn\'t start with hello: {response}' - - with subtest('check `/running` for just smollm2'): - running_response = get_json('/running') - assert len(running_response['running']) == 1, f'running doesn\'t have one entry as expected: {running_response}' - running_model = running_response['running'][0] - assert running_model['model'] == 'smollm2', f'running model is not smollm2: {running_response}' - assert running_model['state'] == 'ready', f'running smollm2 is not ready: {running_response}' - - with subtest('check `/running` for smollm2 to timeout'): - machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/running | grep -v "smollm2"', timeout=11) - running_response = get_json('/running') - assert len(running_response['running']) == 0, "smollm2 was still running after timeout" - - with subtest('runs smollm2-group-1 and smollm2-group-2'): - response_1 = None - with subtest('send request to smollm2-group-1'): - data = { - 'model': 'smollm2-group-1', - 'messages': [ - { - 'role': 'user', - 'content': 'Say hello' - } - ] - } - response_1 = post_json('/v1/chat/completions', data) - - with subtest('response 1 is from smollm2-group-1'): - assert response_1['model'] == 'smollm2-group-1', f'response was not from smollm2-group-1: {response_1['model']}' - - with subtest('response 1 contains at least one item in "choices"'): - assert len(response_1['choices']) >= 1, f'response had no choices: {response_1}' - - assistant_choices_1 = None - with subtest('response 1 contains at least one "assistant" message'): - assistant_choices_1 = [c for c in response_1['choices'] if c['message']['role'] == 'assistant'] - assert len(assistant_choices_1) >= 1, f'response had no assistant message: {response_1}' - - with subtest('first message (lowercase) in response 1 starts with "hello"'): - assert assistant_choices_1[0]['message']['content'].lower()[:5] == 'hello', f'response didn\'t start with hello: {response_1}' - - with subtest('check `/running` for just smollm2-group-1'): - running_response = get_json('/running') - assert len(running_response['running']) == 1, f'running doesn\'t have one entry as expected: {running_response}' - running_model = running_response['running'][0] - assert running_model['model'] == 'smollm2-group-1', f'running model is not smollm2-group-1: {running_response}' - assert running_model['state'] == 'ready', f'running smollm2-group-1 is not ready: {running_response}' - - response_2 = None - with subtest('send request to smollm2-group-2'): - data = { - 'model': 'smollm2-group-2', - 'messages': [ - { - 'role': 'user', - 'content': 'Say hello' - } - ] - } - response_2 = post_json('/v1/chat/completions', data) - - with subtest('response 2 is from smollm2-group-2'): - assert response_2['model'] == 'smollm2-group-2', f'response was not from smollm2-group-2: {response_2['model']}' - - with subtest('response 2 contains at least one item in "choices"'): - assert len(response_2['choices']) >= 1, f'response had no choices: {response_2}' - - assistant_choices_2 = None - with subtest('response 2 contains at least one "assistant" message'): - assistant_choices_2 = [c for c in response_2['choices'] if c['message']['role'] == 'assistant'] - assert len(assistant_choices_2) >= 1, f'response had no assistant message: {response_2}' - - with subtest('first message (lowercase) in response 1 starts with "hello"'): - assert assistant_choices_2[0]['message']['content'].lower()[:5] == 'hello', f'response didn\'t start with hello: {response_2}' - - with subtest('check `/running` for both smollm2-group-1 and smollm2-group-2'): - running_response = get_json('/running')['running'] - assert len(running_response) == 2, 'expected both in smollm2 group to be running' - assert len([ - rm for rm in running_response - if rm['state'] == 'ready' and rm['model'] == 'smollm2-group-1' - ]) == 1, f'smollm2-group-1 not in running group and ready {running_response}' - assert len([ - rm for rm in running_response - if rm['state'] == 'ready' and rm['model'] == 'smollm2-group-2' - ]) == 1, f'smollm2-group-2 not in running group and ready {running_response}' - ''; -} + # opt in to smollm2-135m + full-with-llm = { + withLLM = true; + }; + } +) diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix index ac4657b975c3..676248f17e4e 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "snes9x"; - version = "0-unstable-2026-07-13"; + version = "0-unstable-2026-08-09"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; - rev = "b5cc7651f9fc02189cb51b5a43848877db5aec42"; - hash = "sha256-htwL5m49J+ku7h79Eu4y74LKiHkbL3UE3+LAXE52ZY8="; + rev = "2ab06b3695bce429a074ced6f5193eb1c7acefaf"; + hash = "sha256-L4j6wzYFiDQr+uKxLgPEEKecdeoPwED2U2TICZGvSuc="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 0822977a4a5b..f0ff989e5d7d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -1,153 +1,153 @@ { "linux-canary": { "distro": { - "hash": "sha256-wVyW1GrvmMEM/btexjTf2uFkTt7GNG+dkI3C+dWnrJQ=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/full.distro" + "hash": "sha256-4nUnQx19P9O1lRgpeGR8EBRtllpLTDIF2Ve0yST7qQE=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/full.distro" }, "kind": "distro", "modules": { "discord_arborium": { - "hash": "sha256-F5zZEtp67OAUM4gLtV0Uhsy4Gj1eqX7vBjIlOn/GzNI=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_arborium/1/full.distro", + "hash": "sha256-J7av4dx1OMSeop00Eqe05BIfw3ZcCS6UUn3ZWosRMUE=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_arborium/1/full.distro", "version": 1 }, "discord_cloudsync": { - "hash": "sha256-Tic8LFWOoX4AyiGmMwYwCr6T807aXLYbamW72/bZwN4=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_cloudsync/1/full.distro", + "hash": "sha256-z/84+k8byRDLPkuoV0LERMyyZzBDv79+H7VM9BrtpGw=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-zSF6kyKXzCERAEx8LslGt/YYPtWXNgr2Kdpj0Yx05F0=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_desktop_core/1/full.distro", + "hash": "sha256-PikHYaMHkNENx0p0A/q+qLJIiEq5+pVupL/yshtsNAI=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-8jJd14m9a3eias4cMCT1wRnu1aT8dzXUXCv5dAMLxN8=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_dispatch/1/full.distro", + "hash": "sha256-+4ecTzNxBToBfzj20C83muMSX72e493geKkcHsGuw5A=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-uhrQCnQC4Dm/XkoYRqVzjUvweYabsJxQrA2LtUxQ7Ac=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_erlpack/1/full.distro", + "hash": "sha256-62ldpyV9LgV1gfO9TI/2atgWokwq4DrI5u0fFTbfGi4=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-32OQHDin9330UsgJ6JYWkT2dv+ToyWzbBpxMKnjxEQY=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_game_utils/1/full.distro", + "hash": "sha256-xDZsOkb93ugR9JfF+EptWKnVRznUfTQ54j7PHipeOoQ=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-2SfBfbzwcl2yhKikIiaw95qqixa/hm8apwhVnks/3cM=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_krisp/1/full.distro", + "hash": "sha256-DlfgIscLn9Ya38D9xaI3p2yNBDu45xReqdGqjXkQGdI=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-PmTRUml1bZY45GNEfZqMWDl3eNHdGrkM2f/kASSoFEQ=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_modules/1/full.distro", + "hash": "sha256-f7ahh310bYRUlJltj9l72CtTSZB5qjj5T2toYM8P50M=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-n4WUN1e2mYwyd4TEa5AEOFv9OhXlimkTCNe6cWucH3s=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_rpc/1/full.distro", + "hash": "sha256-WcvN38d9hPzlEO65q2OYKVyqc5xIYF69wxiekjWFLLQ=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-koi/kVLiq9lSGlhiCXl2Cbw0O812+PPkgC2aBH0kKwU=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_spellcheck/1/full.distro", + "hash": "sha256-TDVRsaybdgsTogUvbGzdesQnbxTr4VqdY/+4iXrpVic=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-c9HSxlOz9RMvwSie5nEjHsI51cLyC+mInQrSwFbuHAo=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_utils/1/full.distro", + "hash": "sha256-tazljX9G9wcnHNTejDKgEcr1QNksLF5nmAu/F0dafp4=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-KBesDj1E++Ty2JO3CXKr81RR4DOfL+26sYi1F6oZJfo=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_voice/1/full.distro", + "hash": "sha256-XPxQzRmB+G8gxNedcwBJ2zq+sn7AEjboxxwcONj0hV0=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-Q5KpWnY3TaE9R9qXw/1E1m5wu1UXegFlfWY7rh2iQ3g=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1635/discord_zstd/1/full.distro", + "hash": "sha256-DchoZ8gBq3OT/XkersDVWrrx36VjLmcgh4T7nRKXbj8=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1646/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.1635" + "version": "1.0.1646" }, "linux-development": { "distro": { - "hash": "sha256-yrpyHVaPpM5uPbB+iCApdeQmkyyGaqN1LrT6ZYHbhbY=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/full.distro" + "hash": "sha256-tmjpT2oZ+1BefLhh4Bxipi0xLTO3JjOzzGLdVcmyuvE=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/full.distro" }, "kind": "distro", "modules": { "discord_arborium": { - "hash": "sha256-ONuhQI6g6BmU+TpWAPlijXyqn3nIvaPkT0sydfxvZao=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_arborium/1/full.distro", + "hash": "sha256-yEK2W6Fp0pcF6FSCZYgopcKMTC7ofswVq1G3SK/TOWY=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_arborium/1/full.distro", "version": 1 }, "discord_cloudsync": { - "hash": "sha256-KOOtLoQpgQN+ZB6jJ/dHVX6GsdY+Rwbs6Lg7XAaIMs8=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_cloudsync/1/full.distro", + "hash": "sha256-hNSSWkwjEaqaKYqFBBh3v8PBEHB0YEa2bZJd6Lt0xbc=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-OFRRyIG92N+w0uH5i4oKrQjfaSMFLn1+XdCQlx2MLhQ=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_desktop_core/1/full.distro", + "hash": "sha256-TYzmzahlesOKI6sUNGNq2fr6++sJpRycLWZRUAhtfhc=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-LPnrtss4ahqkSsJLbi7oNv4w6fGtRYEbwwJAkM6lXDs=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_dispatch/1/full.distro", + "hash": "sha256-xZ2d7lTbZunbHcQJKPm9Z0NQE7Oq3qH4uR2zq71IdOs=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-W8qd42fl2vbwC0QR4QrJjPC+mgT/a7aZ0C9IRNOOlI8=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_erlpack/1/full.distro", + "hash": "sha256-LC1cBf23zXmSfpW6I7UxuLi30y6m0l+2NwqJsSCt4Cw=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-IMqtXTj2vZKhRpS/WstkhLDjltFFXlGEOqbaz6ex+5I=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_game_utils/1/full.distro", + "hash": "sha256-zrxP8s1Npfs6GSHW5q8MuWkhFeINzXwi9A+S93o9vD8=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-AoKbpqRFOZDNDOFSJegmvRbTKnQeLWmLYXA5XNZz3qE=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_krisp/1/full.distro", + "hash": "sha256-ulpY2VnZwBFbEBcwXXO8cNhGgWEqkoBVEbMn/ictKQg=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-itja8snUwlNzic87xWv9LM3ppB63QlzZalOyCdNELsE=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_modules/1/full.distro", + "hash": "sha256-BCrN7APbCd0bw55cL51umhfpYBUpkEIBxHF8IZaEpRM=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-Lj+Cwc8M1nyIlMwQryv8tmw9Doyq/tYBqG9KFCW1Zh4=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_rpc/1/full.distro", + "hash": "sha256-RsWNLlNSyuIhnFqpSG374vlmLqfFEZRAL8XcmiI3JPE=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-QU4mP0bNQHh/+Y18vI8jsTDSmTlRGbnDjU41gjSfYTg=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_spellcheck/1/full.distro", + "hash": "sha256-KyeC+llmxpjjbjJGf7F4RYXnIQxnhDnvgixHeubM27Y=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-Eua48+eBqqsFXJZnfM6mup3PstbdOt/1IxL/THhM+l0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_utils/1/full.distro", + "hash": "sha256-iKsHKmIlzSTbmsbtNTUwhClJLNf/dF55A/S0ZHuwLUg=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-QNYGjzAsete+b2i4izZxGGiqBj70IX33SLdFYNQHR1g=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_voice/1/full.distro", + "hash": "sha256-tWiXPoJUXHGmZE7d+oS5hD5LfuqK6NQOKVPILFmvGLY=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-3z2OmC0r9JpkzcDOPWwNlK+qrgyaQjKn7rkB+Jb/XGY=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1008/discord_zstd/1/full.distro", + "hash": "sha256-s4fndo1YnagUsY1Nb9CLb/goaxID8+cPJKOzf0NAXh0=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1009/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.1008" + "version": "1.0.1009" }, "linux-ptb": { "distro": { @@ -226,258 +226,258 @@ }, "linux-stable": { "distro": { - "hash": "sha256-3P0AC0nzWyxUCZZfqeeZj8p57E8bD6dfAnC7rYCUch4=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/full.distro" + "hash": "sha256-AzcQ2f6fsLAOvamgJMxMVJbhVh3JSkHeeLRsCwNqsnw=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/full.distro" }, "kind": "distro", "modules": { "discord_arborium": { - "hash": "sha256-EctcvW6AClcKnx+WMc1Az6XBD3Gr12H20sJrwJggjkU=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_arborium/1/full.distro", + "hash": "sha256-wOodeJufXbDUDSsSyrG8+OJ/OxBPFfg3r7utbI7slms=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_arborium/1/full.distro", "version": 1 }, "discord_cloudsync": { - "hash": "sha256-b7WtS7VLHO7wUIXRbUqD5e4Kg22bAa8z71n0akkjSs8=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_cloudsync/1/full.distro", + "hash": "sha256-Z9AHOO66v3eo/l9dMNE6FPduXwk7itn/ux+IBHKyUNw=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-YNJiO7xyeAMEYioARzVTTYcnBQtqqeQLi/y6eOpZ7oc=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_desktop_core/2/full.distro", - "version": 2 + "hash": "sha256-Zis/QM7anwCebhJVXeO+kYQ+82JVxE/l/9DSFvbE0M8=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_desktop_core/1/full.distro", + "version": 1 }, "discord_dispatch": { - "hash": "sha256-A+1g70FYSe+CY9/a/S7BSIGy5OMfFbOrbnoJTPVAUyU=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_dispatch/1/full.distro", + "hash": "sha256-rpF8mVEsRC9sR+OiihCV9EhJF1c0JwuEFlKxaeREhYY=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-Uz8QoOc8c6fMUXEHyLZ80nOKDMb26IxdHGw7Pw8ZEp8=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_erlpack/1/full.distro", + "hash": "sha256-MMcPGHruTeb/Fu9syNn5/XTxUR0JTNqAesGTLbAi20s=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-HdWOJQy25w1l8Rmt4EwlJh06w5LxLVpfcLHhV8FZaRI=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_game_utils/1/full.distro", + "hash": "sha256-UkZ7f/Ckc2oDKSI1tdZU/2YBukkVV1eugtOCQ5ShVgk=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-wcLDDaaNbyjBZGiN+OwIGsKPob5nHYVY2Qy1vAY11ss=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_krisp/1/full.distro", + "hash": "sha256-rFGeGhR5d7Y7Jo1R3netJNz0aAkHd8uBfRtbcK3mZFg=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-Ih6vth/F4DTkNs15nhtvLmb5cUCQRRERaVUBAuqc3F8=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_modules/1/full.distro", + "hash": "sha256-9/KdLuTux8f5mWoQBSpqNkcU/PvodaMVmAuGRkHW72c=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-3YCXPhC1WoakCT5nYBrrilwh8Pzn34lz2mT1aRYOReQ=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_rpc/1/full.distro", + "hash": "sha256-8AgyHPFu3ixeCi71M1W4hjcZHvacWZK2vPNhqRMFqZs=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-LHGbGj/Tg3Xqt9VSvVZ12SNE+rgEwX8EcSsMGBqdA5I=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_spellcheck/1/full.distro", + "hash": "sha256-lZZitgtDkVaznkda2t7/5krxfOh3hF2R6ID9oHfaNos=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-To64PXhcM77MPEgvs5iHCGi/lxnTykLUR45wZ9fYA/M=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_utils/1/full.distro", + "hash": "sha256-bi74t/4DTAL4X8LIiRvx95UlvPy1b1ORgVo49S5iGrA=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-i5oAPf1e/FMD0E6nIXaxXWxC/VWBBOREMQxWaMUkvxs=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_voice/1/full.distro", + "hash": "sha256-o8dEAGCZbwy7MNGX3XlEb1/2cfSwW6t9NUS5S4ePd5o=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-vxFw1kpEiPAyt9oFCnGKrnXo9JsqQEwlv2OnRW4mWC8=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.152/discord_zstd/1/full.distro", + "hash": "sha256-wPVbgwlzi7qvim3+VeXvk1oXBYVniNi7tilH1R3/Xm4=", + "url": "https://dl.discordapp.net/distro/app/stable/linux/x64/1.0.153/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.152" + "version": "1.0.153" }, "osx-canary": { "distro": { - "hash": "sha256-6zmHOjqyBufB6xXawxcSJKoQm1pWdYkIp5ISAeHjfe0=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/full.distro" + "hash": "sha256-oMoOhtB5M0BbSKhHbomjp5vCyNYCAh8UtEpINCi4wlc=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/full.distro" }, "kind": "distro", "modules": { "discord_arborium": { - "hash": "sha256-jy9RTaxyDXIpZbdC+5bx9uju0PeDxQaNTKgxFzVIZpM=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_arborium/1/full.distro", + "hash": "sha256-6NYHxQfprHHdZGknYMxEl0lo29pt0ryrR9sDvYHO05s=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_arborium/1/full.distro", "version": 1 }, "discord_cloudsync": { - "hash": "sha256-TV5AuV66V9CI7K9leE3sO569mGYLXnloaUz621Wg1Ow=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_cloudsync/1/full.distro", + "hash": "sha256-+PHB1wpTO5+R3zA9dufE3xLy0syuQYSS+a0jsCNGNjs=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-DNiXFsfr0KZbeoZbMNdZr8rEu1kqosTVlMBw8N7UvzI=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_desktop_core/1/full.distro", + "hash": "sha256-Tcb6S/HtSvoNLfAK0GVnKBqp+2upf0UxuStxaIXVK3o=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-908gzkHlwxHhoipBf2KveaKEQQTg+KMCID0smEM4SWw=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_dispatch/1/full.distro", + "hash": "sha256-2DKqLoaZtxY5LhYOPPejnsVq43mv5spxuMXAhCiq/NM=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-k29XwPhAnWFK9Y2KkXHI5LoRZuUAmF464OMQvSD8kzw=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_erlpack/1/full.distro", + "hash": "sha256-nBObSAmMDKQKGYvgnsV8j/D1Z6z/zVHK7yIt7JnD/Zs=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-vsPbERMnUxRFaQi/4K6ncqpvUshKN1q8boE2RUne0j0=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_game_utils/1/full.distro", + "hash": "sha256-7KQ38od6K27ycVkvOnaH7SLv/Jx6hPYOE84nzFH1dXI=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_game_utils/1/full.distro", "version": 1 }, "discord_intents": { - "hash": "sha256-QG63psMwtqLpVxUhL5Qw89kyyAafzRIFC2u8pMmzyS0=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_intents/1/full.distro", + "hash": "sha256-APCh8BArgt5RevI2QJOVLAssgYS/cjdFpIHs8JPTTAg=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_intents/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-t6GDZyGfX5YLvSBaNRFzaMOsdYHEX3XoX2yXQr1STKs=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_krisp/1/full.distro", + "hash": "sha256-fLU6kopr2sQUkXG4A+atBY+AVxjHSxfYAR6TGBdZLvY=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-lvD9cYkx4qV2dPC880HEYmyE3cR3kQOCnLzHFin+nec=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_modules/1/full.distro", + "hash": "sha256-rC8XQ2jm17GBY9FCZXjVILpEIqW20wGs7jauzX7f87A=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_modules/1/full.distro", "version": 1 }, "discord_notifications": { - "hash": "sha256-zCpbLLX6VSkTbltrJTViCRmnR3dBxeU8rcPhOCxl2LQ=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_notifications/1/full.distro", + "hash": "sha256-RUDniZB+PdGPlDcVRYlsJYeHvaYokmZ2BZNRO3KOJH4=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_notifications/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-urpWdkMSqKioIOxpdjNT3JJZcikDvs0dSsVUkUG4PY0=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_rpc/1/full.distro", + "hash": "sha256-ruTPBYzfG71eKxnglHyC6OkhZQryh1ftqFNMWOJ/3CU=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-/50/mm6byljJ8MC6SalU+lRggcF1CKy9cwclpbMsrAk=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_spellcheck/1/full.distro", + "hash": "sha256-DQryV7MY/Xz2XL8agjM3iJY2wY4LYsjQ5ImYfEnUvnQ=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-zXams2ljKyMGgco9hvSQHC3HD42TQCVKfMyG/PF9ubw=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_utils/5/full.distro", - "version": 5 + "hash": "sha256-ZDv3ejnvfCzRlhJm7CEWhm5MX+C/lA+ETKXT+97lCz4=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_utils/1/full.distro", + "version": 1 }, "discord_voice": { - "hash": "sha256-waDSMuxHPQLNzTdIzoELL0erZjFJej4KWOIYzSDVNvU=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_voice/2/full.distro", + "hash": "sha256-WVv+Bdbuodno6Q3+p6JBWe0FlgtOxLYkUm8YrJI5Ows=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_voice/2/full.distro", "version": 2 }, "discord_webauthn": { - "hash": "sha256-YhBNYnuXHlr17VqnOpMlH0p4TyDMZmr63Y0v/1efwJk=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_webauthn/1/full.distro", + "hash": "sha256-4iSifUx00540kHxVmTRUELc7CTdeQlrzumL6PoZ5UYc=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_webauthn/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-xN5RNiSGDbpt7qrJkhhf4cn3XA/Z2P/Ro1xdkBulzB4=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1259/discord_zstd/1/full.distro", + "hash": "sha256-IAfkqNAHP1nGZ1mavrRYVnkNwyfTchb70XLuFAiTB+I=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1263/discord_zstd/1/full.distro", "version": 1 } }, - "version": "0.0.1259" + "version": "0.0.1263" }, "osx-development": { "distro": { - "hash": "sha256-5kbK9PeDcx16e8R1cdvy5UTPfurhJw9G6M4N09XDczU=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/full.distro" + "hash": "sha256-h+90ma3vDxyFepJafVMPt+xnnwhlHp8xyWiEy4e8BtE=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/full.distro" }, "kind": "distro", "modules": { "discord_arborium": { - "hash": "sha256-SePXBJQn09OPdGk8C1kkNSWz35GXi18PJn6Uj9xzR0w=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_arborium/1/full.distro", + "hash": "sha256-0CSXXOysVTXkOIX+PGiLxhO5TF52RbnAeAdaUt8gIsA=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_arborium/1/full.distro", "version": 1 }, "discord_cloudsync": { - "hash": "sha256-oTarTEo+9DXqiA4vFObY7Db/TXvOGQs0iVi1LLNmalQ=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_cloudsync/1/full.distro", + "hash": "sha256-OTFs1oZxifyZQCSawl15uwmUGEtdMmfn3IirfqNM7Dg=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-EsGnAbLFwGZxvVu2vQdOLqwHDFRt2tItlsaSdQ835NA=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_desktop_core/1/full.distro", + "hash": "sha256-ZdfclWKmnf4LDp3bZuHa8yOLoH/nQJg1HXY97yz2+Zs=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-X9Fln640uCRnnpg09U5o32uDiCDwoizjck7VNcwY1W0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_dispatch/1/full.distro", + "hash": "sha256-TdKvrQD5QEdU91Iuk6Bj0zahMHzebLp/+9iJ6YVcQos=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-v1uDvFN/lwwgDsIpVfQyNiuaSBsgsCrkQhT1uwSzBXY=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_erlpack/1/full.distro", + "hash": "sha256-8mo1PxrdfoACT0ue1Vnn+9V66iYWYo0sAKpbPV/Z9AA=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-hLFkB034tOioo8QqSESbExeKvYQWO4lFK83gyNqfODk=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_game_utils/1/full.distro", + "hash": "sha256-q6iYGIUMgn6ONBiP+uYB+NOoqtAIWf8kAJGHBOSPHCY=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_game_utils/1/full.distro", "version": 1 }, "discord_intents": { - "hash": "sha256-l8XAfLol1w9UdPz0sYbZF5DBjEAalM7+pugIwZdIiKE=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_intents/1/full.distro", + "hash": "sha256-cSWAEnxpiN2L3OqYo+WXW/CGgUs+fK0c5WqgwC+/PV0=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_intents/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-EUKEYMfWE7BF2ttIvhyJFnJQ2dhXqXphTT1QQjQz/iQ=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_krisp/1/full.distro", + "hash": "sha256-S7oaSuskr7Tlb//L6+oU9UTEnvME63h/UQ6WClPjr4U=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-YdUOQ+JcpHDBc7HQsm8iQ60a8Afa4M000AcerwhHqT0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_modules/1/full.distro", + "hash": "sha256-WvuQBFrzhJXvUWpeD44VTEWT9fx9SJShfBSvkI1G32M=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_modules/1/full.distro", "version": 1 }, "discord_notifications": { - "hash": "sha256-ku7VBMlahg0WHlv6FoLgyqPMKJwcJU5HzaigW+8qL0g=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_notifications/1/full.distro", + "hash": "sha256-56laGA0e4UDYLDvympNDYhzYN/xpdXxZwOI7tQ5wQFM=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_notifications/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-YiZ/PJyP0qHpRxHjguS3XWtwYlnl9Wf19IoToEIyFOA=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_rpc/1/full.distro", + "hash": "sha256-Hxkf9GgMO3oHZXAgrzVp14xunA+QPcq+esKiVaAhvJU=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-6adzIekyegQdXwBkd8jgmhJIl8RwmQs4kxQe1iuTbJ4=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_spellcheck/1/full.distro", + "hash": "sha256-VFwm5bLjYbbc7g4VDKHuO51/Hu9JQbvEGnm4SBAnf3U=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-y/sDjwW2VHJmLfhFORQwzR/fyV65RmyDI1AsWGJdX8w=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_utils/1/full.distro", + "hash": "sha256-7MIIqJEPA3Fw13kQS1mCoQNeKoOa9X8RlpwIjf1ug38=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-prXIjXQAR5IvOMf+eezdBltr9rKN+EOKjEM6sEpNgO0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_voice/1/full.distro", + "hash": "sha256-X7Ao2wuOSbYEjbVqLxHzWDq19QpVuKseo1lAUCSn4YQ=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_voice/1/full.distro", "version": 1 }, "discord_webauthn": { - "hash": "sha256-5ngUr7GKUW372bvByaP0Dy3EEsSHJS2DPwcITOIFjfA=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_webauthn/1/full.distro", + "hash": "sha256-UoXmSxoU0lrk8KYHTlOY2pGYdNEp/E5dxINq/b3J5HQ=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_webauthn/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-V6lNy0S9ECxQBSVa8Ly1gqdV5pBXpwvqKlnStxp57cE=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1015/discord_zstd/1/full.distro", + "hash": "sha256-cUu9IJje2A7eqGAOTYdCADN81zE2hZSH3hnWUsUynEA=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1017/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.1015" + "version": "1.0.1017" }, "osx-ptb": { "distro": { @@ -571,92 +571,92 @@ }, "osx-stable": { "distro": { - "hash": "sha256-Xs01Ui0u96n2Fpc/T5qObZWjqmbNuU4WTa9Z8OOtNk0=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/full.distro" + "hash": "sha256-v1xV1DYVKfwelYbYMVhL3BDKAfsXe9Npny4kqpX6qDs=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/full.distro" }, "kind": "distro", "modules": { "discord_arborium": { - "hash": "sha256-15EkIwQbVXPCnv65FpUc05Y+W/LfiIcFD8BJ0DehqEg=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_arborium/1/full.distro", + "hash": "sha256-4PVxJjyYtSGI9StNjMKeaUSbYIifEYWTz7kktr5cPOk=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_arborium/1/full.distro", "version": 1 }, "discord_cloudsync": { - "hash": "sha256-z8yUwMAWanKhcs1dEIB2Xn05KPjPqDInE56pbbHis+c=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_cloudsync/1/full.distro", + "hash": "sha256-ffvvOuTkACsGgnBmubB6XDibYpeihr2i/lmlOGOa7VE=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-jtzoHhXgMlPRkyd6FO52IyMyTjVzonJslADK1G4toiU=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_desktop_core/2/full.distro", - "version": 2 + "hash": "sha256-y46vUEzpmwRnRCs/KGzD/pRRSLA0/5l11VKJsEoridQ=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_desktop_core/1/full.distro", + "version": 1 }, "discord_dispatch": { - "hash": "sha256-FteG3F0mMpOiLburBCySJ/DacqT01T2jfx4m5UW1UF8=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_dispatch/1/full.distro", + "hash": "sha256-LEm7zYYCVLB9l5JdlsIhJ6zVR3eCiyJfhvsMKvK6yTI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-p83ovML/oSDeEsdjuP9RH27ehXzbLLjVwAS1a58ItZ8=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_erlpack/1/full.distro", + "hash": "sha256-ClyKJPwYhHXW2p2nCVsa1Kf5Faeuxur4H0CI7xpnBdA=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-o+zjv5zskYrhoFtHq2UnvKkPkg66JSCnhV1h210Bt+w=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_game_utils/1/full.distro", + "hash": "sha256-aUVuPOS5zxnzVXUs+pstMWt9rkJsecvrBSruTNjHKyY=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_game_utils/1/full.distro", "version": 1 }, "discord_intents": { - "hash": "sha256-6aIKC5/mFx1Xy2hvckMGEZOJaZjbosbiccPVfvncZUg=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_intents/1/full.distro", + "hash": "sha256-qWgjn5WOjl78GVTAO/J/RA8ljlFrmYynfpEAXqYbGAo=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_intents/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-AnVRy1f8PyTnHZ0xYtickRJFWcbvpQl5PKoCg3WlUxU=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_krisp/1/full.distro", + "hash": "sha256-RtQS0+jCoeBt0V2CGRkwjuTEar9+JxOv1V864e64cHk=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-VKN53f0QD8mavsVN1iJASDyBEbQWbrKzGMKCtZzoCFA=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_modules/1/full.distro", + "hash": "sha256-De6mRVFdakXVDk5IMLTdCTXVnVkNfmvcLLPRvtj3XAY=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_modules/1/full.distro", "version": 1 }, "discord_notifications": { - "hash": "sha256-kwzPD9lHU+IIoq44dF8rKs3fRqh5UI0N4uz2LC8UrGQ=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_notifications/1/full.distro", + "hash": "sha256-AzLpxosut9r3acJPPBVw1pumW/le24+hMVlYDSu2u48=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_notifications/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-YgeTVunMN9Rk5uodwkJclD43ApqzO/6dGad02XZtsgo=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_rpc/1/full.distro", + "hash": "sha256-bPvnC2DfmRETFYJFDQviXdFF2YI8gWRz5FcgZr8CX8A=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-Wk9cUfZspD2PtcbyO7pmT/351SvNa7z+5bwP5kKlEuA=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_spellcheck/1/full.distro", + "hash": "sha256-K6JoXsJNim/VOAVjqHU5Izaj1n4HZiDKTDU8HRFDQaU=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-G0WtNX4hbO4iB9Xz8rY43ZEmeSUFU0m3XlLrlOhAzZE=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_utils/1/full.distro", + "hash": "sha256-GkcdoGruyIOzokHgd/jeCPkPsGtHAry1c3WrOaRuHYI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-EzRy0SjuEzkMvFlH7w6GyVDEh22hSeikw7hD5s7lsw8=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_voice/1/full.distro", + "hash": "sha256-9B1pjqlvOM5Pit1JImYrVOzIAURyJN4pwIS+NBLaqvI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_voice/1/full.distro", "version": 1 }, "discord_webauthn": { - "hash": "sha256-fivCWaJhxbouKbhWPRgrXqv/7FKL+RpS8Qn9lIHngnc=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_webauthn/1/full.distro", + "hash": "sha256-tqxA5qhMdUjKUWSRChBUnE5ul4obLxodxZPuSUE6+Sw=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_webauthn/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-IEHHrGPCcxWjKTPY7hYEQzk6Zh5UsC6rTCANgF77mjI=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.406/discord_zstd/1/full.distro", + "hash": "sha256-QJ46FR7YP7eAmbs844t3ueQtcKNK9PJm3jNEPKCx0Vw=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.407/discord_zstd/1/full.distro", "version": 1 } }, - "version": "0.0.406" + "version": "0.0.407" } } diff --git a/pkgs/by-name/be/beammp-launcher/package.nix b/pkgs/by-name/be/beammp-launcher/package.nix index ce29078fa3b4..8613a9f5d1b7 100644 --- a/pkgs/by-name/be/beammp-launcher/package.nix +++ b/pkgs/by-name/be/beammp-launcher/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "beammp-launcher"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "BeamMP"; repo = "BeamMP-Launcher"; tag = "v${finalAttrs.version}"; - hash = "sha256-xg6lHsfIYRC9OxrI+A7MXYCxGbZrGHb/9gR7Dno6Pwk="; + hash = "sha256-9zfagbDUyhUBLtZ18QNztaf1A5GMqqSa7fLAGih4y8k="; }; strictDeps = true; diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index 7401778c1396..73dd7bf922d9 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "biome"; - version = "2.5.6"; + version = "2.5.8"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "@biomejs/biome@${finalAttrs.version}"; - hash = "sha256-jutNefPBi39eM/Db04IHA6RId+Un7xLBv/L7tMaC3iI="; + hash = "sha256-ZEOaJGrVnZRZBDuVqQgmCD07ZUvBa8COgsj0XvfKRZM="; }; - cargoHash = "sha256-pPX9sbVYfN9k3LeTBY1SMXU1xOFlYmQCkvSg8U9dL+w="; + cargoHash = "sha256-mMQM7koZlKfgTPDXWan0qi2LGk2gksM2ZDC0m2/X+1M="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index f250c351bf1a..4e4609ff6b5f 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -32,6 +32,7 @@ obs-studio-plugins, nix-update-script, removeWarningPopup ? false, + withObsVkCapture ? false, }: python3Packages.buildPythonApplication (finalAttrs: { @@ -114,13 +115,13 @@ python3Packages.buildPythonApplication (finalAttrs: { mangohud vmtouch fvs2 - obs-studio-plugins.obs-vkcapture # Undocumented (subprocess.Popen()) lsb-release pciutils procps - ]; + ] + ++ lib.optional withObsVkCapture obs-studio-plugins.obs-vkcapture; pyproject = false; dontWrapGApps = true; # prevent double wrapping diff --git a/pkgs/by-name/bo/bottles/package.nix b/pkgs/by-name/bo/bottles/package.nix index b8391ec48998..18294079be11 100644 --- a/pkgs/by-name/bo/bottles/package.nix +++ b/pkgs/by-name/bo/bottles/package.nix @@ -5,6 +5,7 @@ extraPkgs ? pkgs: [ ], extraLibraries ? pkgs: [ ], removeWarningPopup ? false, + withObsVkCapture ? false, }: let @@ -17,7 +18,7 @@ let pkgs: with pkgs; [ - (bottles-unwrapped.override { inherit removeWarningPopup; }) + (bottles-unwrapped.override { inherit removeWarningPopup withObsVkCapture; }) # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env) # See https://github.com/bottlesdevs/Bottles/issues/2401 vkbasalt diff --git a/pkgs/by-name/br/breitbandmessung/sources.nix b/pkgs/by-name/br/breitbandmessung/sources.nix index ce7b303d73ee..25da7cb0580c 100644 --- a/pkgs/by-name/br/breitbandmessung/sources.nix +++ b/pkgs/by-name/br/breitbandmessung/sources.nix @@ -1,11 +1,11 @@ { - version = "3.12.0"; + version = "3.12.1"; x86_64-linux = { - url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.12.0-linux.deb"; - sha256 = "sha256-3wQVUNTjFgoFBpy0Gl1r/FEdgqRrdjM3SFqPpl6z6O4="; + url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.12.1-linux.deb"; + sha256 = "sha256-uUgzGk6N8Py91vus5Yh3DmK0xh5+J5xqD3nvWB3ggPE="; }; aarch64-darwin = { - url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.12.0-mac.dmg"; - sha256 = "sha256-QuJaNTyBAVQb3SCHNjnhd5klxTrH/9/J56Mxl6l/sKs="; + url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.12.1-mac.dmg"; + sha256 = "sha256-8zzsQ86udXf4NeTYrxgrb28N5wwRaYrAAtZ5H/1T5w4="; }; } diff --git a/pkgs/by-name/ca/calibre/dont_build_unrar_plugin.patch b/pkgs/by-name/ca/calibre/dont_build_unrar_plugin.patch deleted file mode 100644 index e501844516f7..000000000000 --- a/pkgs/by-name/ca/calibre/dont_build_unrar_plugin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py -index 83a549d3b6..a4c5fe5ce5 100644 ---- a/src/calibre/ebooks/metadata/archive.py -+++ b/src/calibre/ebooks/metadata/archive.py -@@ -127,7 +127,7 @@ class ArchiveExtract(FileTypePlugin): - name = 'Archive Extract' - author = 'Kovid Goyal' - description = _('Extract common e-book formats from archive files (ZIP/RAR/7z). Also try to autodetect if they are actually CBZ/CBR/CB7 files.') -- file_types = {'zip', 'rar', '7z'} -+ file_types = {'zip', '7z'} - supported_platforms = ['windows', 'osx', 'linux'] - on_import = True - diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 0fc66990b504..0b06900d6ab9 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -29,6 +29,7 @@ qt6, speechd-minimal, sqlite, + versionCheckHook, xdg-utils, wrapGAppsHook3, popplerSupport ? true, @@ -42,6 +43,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; version = "9.13.0"; + __structuredAttrs = true; + strictDeps = true; + src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; hash = "sha256-ONfYjXq8vGLG/jV1SD+1STzpYtJhqXihpNtNWLxLN5M="; @@ -64,8 +68,17 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/debian-calibre/calibre/raw/refs/tags/debian/${debian-tag}/debian/patches/hardening/0007-Hardening-Qt-code.patch"; hash = "sha256-ItJalYmBhK4Qgz6QDGbPpBMaa6oGQetQvg5ie3oxFMM="; }) - ] - ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; + ]; + + postPatch = + lib.optionalString (!unrarSupport) + # Don't build the unrar plugin + '' + substituteInPlace src/calibre/ebooks/metadata/archive.py \ + --replace-fail \ + "file_types = {'zip', 'rar', '7z'}" \ + "file_types = {'zip', '7z'}" + ''; prePatch = '' sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \ @@ -82,10 +95,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + # `pdftotext`/`pdftohtml` are run by the test suite + poppler-utils python3Packages.python qt6.qmake qt6.wrapQtAppsHook wrapGAppsHook3 + # `xdg-icon-resource` & co. are run by the desktop integration setup in `installPhase` + xdg-utils ]; buildInputs = [ @@ -236,6 +253,11 @@ stdenv.mkDerivation (finalAttrs: { installCheckInputs = with python3Packages; [ psutil ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + # `calibre --version` drops a trailing `.0`, so check against a binary reporting the full version + versionCheckProgram = "${placeholder "out"}/bin/ebook-convert"; installCheckPhase = let excludedTestNames = [ @@ -245,6 +267,10 @@ stdenv.mkDerivation (finalAttrs: { "test_import_of_all_python_modules" # explores actual file paths, gets confused "test_websocket_basic" # flaky + # Flaky: asserts on page-granularity RSS deltas, which are 0 (assertion skipped) + # on most runs and allocator noise otherwise + "test_mem_leaks" + # hangs with cuda enabled, also: # eglInitialize: Failed to get system egl display # Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory @@ -289,6 +315,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://calibre-ebook.com"; description = "Comprehensive e-book software"; + mainProgram = "calibre"; longDescription = '' calibre is a powerful and easy to use e-book manager. Users say it’s outstanding and a must-have. It’ll allow you to do nearly everything and diff --git a/pkgs/by-name/ca/cargo-flamegraph/package.nix b/pkgs/by-name/ca/cargo-flamegraph/package.nix index 7d71c6786d68..f880f9c15e8e 100644 --- a/pkgs/by-name/ca/cargo-flamegraph/package.nix +++ b/pkgs/by-name/ca/cargo-flamegraph/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-flamegraph"; - version = "0.6.13"; + version = "0.6.14"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-XB0/ltiiYZpOlQWoyEPyNFhHqolDgIq0waIjQwT3L88="; + sha256 = "sha256-tjphY9qZaKkqrbwm8lszyyIBpaKZx644LudBq81qngU="; }; - cargoHash = "sha256-OxPvye1HjcQOazAWn7VIa+twWC7uKXeyXkicPiWVe6I="; + cargoHash = "sha256-mSItpfrGRFL9L3Rlqsvx+FdYyJL8rcWWS8Abyixto7c="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]; diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 4d10d49e4521..4905f7e5dc59 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-shear"; - version = "1.13.3"; + version = "1.13.4"; src = fetchCrate { pname = "cargo-shear"; version = finalAttrs.version; - hash = "sha256-Qaq3nBZZR0biG5kVL15zhI8GwLEWBNzgeD3rHeZZOeU="; + hash = "sha256-bTTNiDWkbyjxFo59Hkeah23lQEGiuH5Xrm6z7SUNtoQ="; }; - cargoHash = "sha256-3YMdOCCK+rVx0XZfBqiMAw+aep1TBU5Ok6//c433h4o="; + cargoHash = "sha256-Mhxrcc9ErTYIV+yuIROuMdhbxrFdZZ2yAAXK0WRWcRI="; env = { # https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54 diff --git a/pkgs/by-name/cl/clj-kondo/package.nix b/pkgs/by-name/cl/clj-kondo/package.nix index c341414d1b21..34a45e30faa3 100644 --- a/pkgs/by-name/cl/clj-kondo/package.nix +++ b/pkgs/by-name/cl/clj-kondo/package.nix @@ -6,11 +6,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "clj-kondo"; - version = "2026.08.03"; + version = "2026.08.04"; src = fetchurl { url = "https://github.com/clj-kondo/clj-kondo/releases/download/v${finalAttrs.version}/clj-kondo-${finalAttrs.version}-standalone.jar"; - sha256 = "sha256-EXZJtX1855Tz8m7a9gxI1+DGw9zbPF0oVgX0ZoMuKmg="; + sha256 = "sha256-iElpFiQzzKwbYKi7gIRXc81C38ix3s4vvuEwcP0gos0="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/by-name/cl/cloudquery/package.nix b/pkgs/by-name/cl/cloudquery/package.nix index fb602644e68a..0d31291d2dea 100644 --- a/pkgs/by-name/cl/cloudquery/package.nix +++ b/pkgs/by-name/cl/cloudquery/package.nix @@ -9,19 +9,19 @@ buildGoModule (finalAttrs: { pname = "cloudquery"; - version = "6.41.0"; + version = "6.41.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "cloudquery"; repo = "cloudquery"; tag = "v${finalAttrs.version}"; - hash = "sha256-ybHyZnJTtOacywgjJ+PiH8KJNn1DgBNJ4yMMtu4y/vw="; + hash = "sha256-7NM9EFkvQRXp0gHvK1/9EhAoPrNf/g0yCXaVtEMGloQ="; }; modRoot = "cli"; - vendorHash = "sha256-zXYYheZtWFuOZ/9AH+h/Qjf4+UZ6RRb9grk/mrJZxTU="; + vendorHash = "sha256-uAe+zbRtMfFU1CH5D9wzlO7Sx/ckkziQIxecgwDM+Kk="; subPackages = [ "." diff --git a/pkgs/by-name/cy/cyan-skillfish-governor-smu/package.nix b/pkgs/by-name/cy/cyan-skillfish-governor-smu/package.nix new file mode 100644 index 000000000000..25b1970b3c96 --- /dev/null +++ b/pkgs/by-name/cy/cyan-skillfish-governor-smu/package.nix @@ -0,0 +1,60 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libdrm, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cyan-skillfish-governor-smu"; + version = "0.4.12"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "filippor"; + repo = "cyan-skillfish-governor"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yer2MlLnj9lx2cEBeYqAktbx0BqQEK/eFPiga5gXCr8="; + }; + + cargoHash = "sha256-zlAVGLGnub2Gc0Bkzb5GU9NBAJ2YWLhIG8JOa+1wHx8="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libdrm ]; + + env.CYAN_SKILLFISH_GOVERNOR_VERSION = finalAttrs.version; + + postInstall = '' + install -Dm755 scripts/cyan-skillfish-performance-mode \ + $out/bin/cyan-skillfish-performance-mode + + install -Dm644 com.cyanskillfish.Governor.conf \ + $out/share/dbus-1/system.d/com.cyanskillfish.Governor.conf + + install -Dm644 default-config.toml \ + $out/share/cyan-skillfish-governor-smu/default-config.toml + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "SMU-based GPU governor for the AMD Cyan Skillfish APU (ASRock BC-250)"; + homepage = "https://github.com/filippor/cyan-skillfish-governor"; + changelog = "https://github.com/filippor/cyan-skillfish-governor/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ liberodark ]; + mainProgram = "cyan-skillfish-governor-smu"; + }; +}) diff --git a/pkgs/by-name/de/deja/package.nix b/pkgs/by-name/de/deja/package.nix index 6b7a3b33d4cc..14a49275625a 100644 --- a/pkgs/by-name/de/deja/package.nix +++ b/pkgs/by-name/de/deja/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "deja"; - version = "0.4.0"; + version = "0.4.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "Giammarco-Ferranti"; repo = "deja"; tag = "v${finalAttrs.version}"; - hash = "sha256-SAn/9OM5ivUkJpiBXgV2o01ww85xRo3fQKZp0spwe/w="; + hash = "sha256-NDTiesARUyZJQGm+ePZQgofkZYFe/07ztQQcruIkXuE="; }; - vendorHash = "sha256-KmLdMK94cGOXMPJwWS6NgLB5OiNmJbszHdnLzauqJm8="; + vendorHash = "sha256-XHcZUtx82zT3yPCYzJG+a7zfARPW4clbMn77/4luskw="; ldflags = [ "-s" diff --git a/pkgs/by-name/de/devin-desktop/info.json b/pkgs/by-name/de/devin-desktop/info.json index a760ba80f3a4..cfe982ef1a1e 100644 --- a/pkgs/by-name/de/devin-desktop/info.json +++ b/pkgs/by-name/de/devin-desktop/info.json @@ -1,14 +1,14 @@ { "aarch64-darwin": { - "version": "3.6.27", + "version": "3.7.16", "vscodeVersion": "1.126.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0becb483ee8498d49deadf6aefe8c24f58b8007e/Devin-darwin-arm64-3.6.27.zip", - "sha256": "a683913ce3164a3112bf0be0aaf1c52973cf1995b745a42fc0c32007fd108088" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/355c3c9ee32dad08f605d5ee8f9a7e6786316d4c/Devin-darwin-arm64-3.7.16.zip", + "sha256": "a5f8ff8e467dfae13ab11a3ccf0550ba7ddffd29efdfa6013949e84cfb14d766" }, "x86_64-linux": { - "version": "3.6.27", + "version": "3.7.16", "vscodeVersion": "1.126.0", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0becb483ee8498d49deadf6aefe8c24f58b8007e/Devin-linux-x64-3.6.27.tar.gz", - "sha256": "c80c5068e401cb641980dd94b721c7f15847bf6e33840170ff05e809d1462f50" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/355c3c9ee32dad08f605d5ee8f9a7e6786316d4c/Devin-linux-x64-3.7.16.tar.gz", + "sha256": "7ce94e6a720a476b91a6a24c6618a7c670c9b4f76b8bb91f7c84b2c63bcf6435" } } diff --git a/pkgs/by-name/do/dokieli/missing-hashes.json b/pkgs/by-name/do/dokieli/missing-hashes.json index 8987bc04facd..e12cfdf61fc1 100644 --- a/pkgs/by-name/do/dokieli/missing-hashes.json +++ b/pkgs/by-name/do/dokieli/missing-hashes.json @@ -1,28 +1,27 @@ { - "@rolldown/binding-android-arm64@npm:1.0.0-rc.17": "7c821eb984e2dd03b05979be3116d927326a1752e7d04462f6c78721fc47fb33d1a584e8c739b181dbfb5c28170541d05f775ada38e81bb685e43d03d974abe3", - "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.17": "ddedec6840b8e32b7c45a4afe9d797bb24ea74ef222a1b443161045f0b53ec3a5752b108552fe6c99182e2553dd53498d96d3b30551cd3f1e8057559f23b1ed7", - "@rolldown/binding-darwin-x64@npm:1.0.0-rc.17": "b66ce82e3162261c045027b3aa061cd735c9b1395e77756e06b973f8d0e4256247ddfdb7ee8134363dfcd9d83e665b647b45b666a65c8454babdee19f6d57b40", - "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.17": "87b9045771edda717c7d66df105bba2c22c88214254eae48d54ca641f79b4558c2d1ae3db27d8e36b230728263d539c5f6e03e895dbed6e08afa495f634eb42d", - "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.17": "43e60168d359a5edae352d948a6515c40a8e047fef7541693cbf18a09d80076efb9308a804c5ea7f645883f8f6b7b43e0e14ea677df63fb4016a55ba6f63b947", - "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.17": "d6bfe49089d598886e8c9c92e45240a2404e9594c4abc25f303c8655b859e0f0b67c18947e23177ccc5fb81c9b22a1bd32f2ed052531cc41491b4261ed728342", - "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.17": "be5459bf78de0931993158783af8e349a68d03610876eb131f48fa51414a45683047cd9b4ad7631f385fedc9bb89677e8d12e874104a038b63932aaa1d7bceb3", - "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.17": "e36194c8a39afc6522ca71c2ebf4c038792bf2c0141da76e8a385bebdda077a52f95ece9bd0a3818d5c0023e7e8ce708566d42ecd2ff31296a26a41ed6847aa4", - "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.17": "288ce91c69b13e37b2106fcfb663a981aba9de65d3bb4d3cd8c17b9e8193f3de44d08d1201c4d3a18fdeec5a89256d5b3b4d5bb913ff023cb577c403f8889917", - "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.17": "d532e43e02e0a84c71ff9be34791d7b32b71786bac4921f9e4f92da39a7d5daeabeb4188c7cc088a8a80ab0691dcf1cc9d414396ce7ff6a970b1374e033df8f6", - "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.17": "56aecbe0a2aeaedd558c62a5057a7f915ecada0528a27b5edd80478d948c3645104a56c88121c71edefe9a6af7500f053724103099a90764eb8b84c3ee1f9536", - "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.17": "cc7a806e106f4c0d24400af42155b8b396f712e25d76e13b033895b3b635e21edb2246d3c8592c86989c7aaae1ded1708d36516472555bbed3ccaffc939403a4", - "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.17": "e6fb0aff901de475a4874af6b0473b396bf1bddf6cbb9acbdb6d4c9318ab2fa3e09d80435ecaeb7866b03effea79c57db9a271b5c720007341949e06828c8385", - "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.17": "d3724ce9f4117d28f903ae1bfc34e3a3efac853691577e511cef91259eb8355dc24f2f27a832bbbd9ad3323dc1b0c3ddbdc4c791ae2a6dd5e5b0c9051384d4d0", - "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.17": "6f4a348202955f74481ccf1c0ec5fa96671507353b6a7f680b920c773f0dda4ebd46c1561428efcefacb9b4d279cd550c80a79fa261f8db173b527ae9a671eca", - "lightningcss-android-arm64@npm:1.32.0": "1cb326ad39dcb02cf9f45025c167b6900e3a04b08f5149d3c5ee26054b00d08db3736fb69183a6c3ed1cb32dddd148608c784b6631b4777623f7dd0c032c392d", - "lightningcss-darwin-arm64@npm:1.32.0": "da954d0c215d0e95f15a92c8717f871017586e1332b98fd40e96196571d2fd3d51a727dc530768afee9f6a04da210510740574dd0c8dbf2ecced79e5996f1a06", - "lightningcss-darwin-x64@npm:1.32.0": "b1d298c9173f839e8447d1917ed8bc5ab098ed0fc4e4b419d36ac5afe8b27bf21cb47d00a35c3d2edadcac598086e9b4f26c992a809d79f9681d6865a230d79e", - "lightningcss-freebsd-x64@npm:1.32.0": "0eb59f6acf2fcdc944c921b0ac2a16ee803452b9438f573ad6bc41be00040b791ed698698ed5c06f98ef43a6fed0a54987ba3a88da204de9978db2fca96a4a65", - "lightningcss-linux-arm-gnueabihf@npm:1.32.0": "7d1ea43986d2370a90cefc920dac3e041e0d19445cc4fdaf244644b57b6937588d7c3a464c31440617231f55a6dad79744cf707912e05f3b46a1694abb5b4e00", - "lightningcss-linux-arm64-gnu@npm:1.32.0": "f01ede75f41480a164d18338fa46d9fccdb4a821717174ce848ff8b2aa4badba4f1d331deb3ebec3ee2f0eb95bfa2e35f54877f371427b04e6f36a4783aa1414", - "lightningcss-linux-arm64-musl@npm:1.32.0": "38d373f99768f1c5ab6a9c87e1c0ec45eccdb3fe4d216dd5cd06629648c4b0689570ad4e89285d490662cde1790cd36e6b3d176c14e5e31f6869c604aa2df820", - "lightningcss-linux-x64-gnu@npm:1.32.0": "0a1433d46a4a010f87b615c3fa43725a456bae259858a2c927899cbf93074f0ae40f49901bf6af6daa30a4d169c86f594f6341fd775bf7b59293b8d7947b81c5", - "lightningcss-linux-x64-musl@npm:1.32.0": "a6f48ccc30a73d30563c7b61856d1fd6a8812ce62b1bee797f227e06612df70aab4ccd1908552952f77ca7ff2a51019f62d14ae5310ca67311635eeec55d3a9e", - "lightningcss-win32-arm64-msvc@npm:1.32.0": "a919be7fb298c1102bccf18b6f83d54946adfac70ab2ac9c95e4ae38ded76d8f530215b0bcda4d38df4ffc40a70abe3afd91d01d35fd122e7d119ed0e46972d0", - "lightningcss-win32-x64-msvc@npm:1.32.0": "5b8d3431aadbdc40a0a7eae32f2415e4f28b547af1a1cd5b35a35d67f772a89492c7fa03e9fc88ce804b14f5f88e412e49fff40d1b0aad67177de815c434207e" + "@rolldown/binding-android-arm64@npm:1.2.3": "5181b7152d6b6d20e219fa5a3dc57d258c146f1e41d4c1441482b134a29096d104002cb28f5762029556285c781d829ba67a6fdce842a7ecdae2f9b12ab3bc24", + "@rolldown/binding-darwin-arm64@npm:1.2.3": "7ff0488b1b7acc8ae6c8e20b15811b221226000ae8560ac2334f28ca07adf1da6a088804d67cf35c4884779113ab34858043b6fff93f7579fb41675aa22bb685", + "@rolldown/binding-darwin-x64@npm:1.2.3": "6b09cf6781128651bca9bbe2ea1f9de129a64717e191c7245140c0a12185498b03e248b0b4028d7dd92f98c22dc282bc44d544edb79a9508c94723d865b966ed", + "@rolldown/binding-freebsd-x64@npm:1.2.3": "e52524ae9120e6da7cf85bac985a50ba9c9714aaa34ebfdafb421d94b543de410217a11364ff048acdead2f8c7df24cc17a0dfef4f6f2ccc21e0bd1ad9f32eac", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.2.3": "bd27b41ad476b6de2455108b857a627b1df0f47eb885205a9a06a60ea670cffe8b366be89acea13cbc7a55b387331509bcfef2cfad0cb25faa0c1db450e9dbb3", + "@rolldown/binding-linux-arm64-gnu@npm:1.2.3": "cf5bd6b0064274cc49f0b720da71672783a5e0cd4820dde5f3475bdcc228c3315791f597d5a75b5ae9d8ddde41d2c81ad67cc6a99c5ae49039fffb54cfcbc764", + "@rolldown/binding-linux-arm64-musl@npm:1.2.3": "740ebdac1f806a279f4128f99060e44d6cc4f00a9bed1dc70637aab53d785e96be7a1876a74202268bf73cc3a425aa1f1550da2f86872bbf49cbd46edf09b6d3", + "@rolldown/binding-linux-ppc64-gnu@npm:1.2.3": "704536b8de2c6d680153874fb57016c1284d297d87b166a696e53f1af1d9d0176cfc578252b588d7e59849309d71d638f73c6163c3c0714335e8993b8ff2d97f", + "@rolldown/binding-linux-s390x-gnu@npm:1.2.3": "a29de0fad1238e97e7700e3df3762872493d0557977ee9e15eacb9f9d3c9c0f29b110d858881eb4bfbf9b43f939bb61687bb33760f52ccb3acad2e998f66a283", + "@rolldown/binding-linux-x64-gnu@npm:1.2.3": "a048e32713eae7513d0f68ad675087bc86ed57493d59cb9920bb10f2ad567adbe9fa3e82e786705d2cb26d820ff98b48cd13abcc069e7044a593de4b8b795a9d", + "@rolldown/binding-linux-x64-musl@npm:1.2.3": "0b73be9ae16942651c9060ffdc2146677151a496159ca301701174aed4400e27eda8de078f649efd670da3ba208b0429c0130bf627d37c77ff3f23d97c78f6aa", + "@rolldown/binding-openharmony-arm64@npm:1.2.3": "5bf6288cbc11e96fdd9dae69dad2828535df0da14ed64373bc80f813b1098f61e7320e6448c36bc573cbd9119cd6855a7e13e76cf5bbab42d9d1586a8a499647", + "@rolldown/binding-win32-arm64-msvc@npm:1.2.3": "7a1dbc749f69f50cdf71804bfe8e6af8880b5d9f5c7f8d2e9fb5d1d8702e74b09471b6bbc1bb81051812f187298404c5f46d4bcbf92682a4d0e9a37d850fbed8", + "@rolldown/binding-win32-x64-msvc@npm:1.2.3": "5281bbfe23a6ef1938400ea0e1803293b54364489cf1b43d49d9fc346d0f258cec237cc112ceb8539190d7fa12913f6ef749a75b655c8b5bb95ed1ab4830c4e7", + "lightningcss-android-arm64@npm:1.33.0": "46c40a0474a7a9ddcdc33e0ea634912894a9360b6ba6f2bc42f1a817d16992784d2fe6f421d293a90ea94fb481503e27fdc54f0540de0b41d7028fe9e9c9e56a", + "lightningcss-darwin-arm64@npm:1.33.0": "398b770e33f66db9e4c14e4a45d0e93fa59644bd29ce5082de79ee9560a5946321ac55e896aa7fb3f177d218bef3f2dca530e209a857f0f066bf3296f5dc0742", + "lightningcss-darwin-x64@npm:1.33.0": "132bdab8f7b66dc99730f1ccfcb882880e411420e3f9ca764c348c686112d75962d5d7e928f3bbce7088c1be168d00ea8d722fd909033b807eef191b5a2832c0", + "lightningcss-freebsd-x64@npm:1.33.0": "05001395776e994ea1254dcc2613f06b44458ba33769e3a1679a0f577e43632af378cc1582f3bd1cb36e480d237066a371bc04233d6c84f8e2fe9979ab4a4032", + "lightningcss-linux-arm-gnueabihf@npm:1.33.0": "d0f6d993846992cf6db80f2992d0b89ffddd65a8260bbe6a1534bde28510bcfa214e8831df9ccfef5ede006a6368de1649e1d96a3e122169286647b704e08f5f", + "lightningcss-linux-arm64-gnu@npm:1.33.0": "278a5c553e15ed7645d3e83a3b1515060e98a8742b7008af28d610d6495a09368e73ed8b90bcb537b37249bfc2446ef5b9614b3626222f25153c538909488548", + "lightningcss-linux-arm64-musl@npm:1.33.0": "7aa2a2ef42e8c713e6e8eb947bf64d5272c6fdbfca7b4eb3adde555357652be27cc0d84d6fef6266543c2d303943a4c4472679d1e258458119b159f0ca868ffe", + "lightningcss-linux-x64-gnu@npm:1.33.0": "fa57a09af3340dc5f11fdbff820fbb7b08e306e69350a500b523c88f54c1e3a40b3785fed6043d69e2e18bacd4b72410518c9b817ee987c704a80851d9201e45", + "lightningcss-linux-x64-musl@npm:1.33.0": "4b0cad846f8fbe4ec321a45ef9c0d02cf4277980ac34dcfc7b422b34381e7cb11512819401b01bf029d10aa0fb8a35906ce850ba38d9f43605917ccc9b0b5d4a", + "lightningcss-win32-arm64-msvc@npm:1.33.0": "5e4b58d7a41fe3c37ce2af7b1a95c3722a6064a84fb6286ba2cf1106651223403b5a5863ecd3eb8fb9732480e612e30d786b859329391b0197dffc88ca18c953", + "lightningcss-win32-x64-msvc@npm:1.33.0": "7beb4c8580f9ea45fea6d92a8de42f706c4935b2ca68f4f5163a2bd9f6ed1574f7e53686e4927883078b07a4063a9fffdc4b41968568354259066c7a70c156a4" } diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix index b3efb73d4b8b..6cb45e4d6366 100644 --- a/pkgs/by-name/do/dokieli/package.nix +++ b/pkgs/by-name/do/dokieli/package.nix @@ -16,19 +16,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dokieli"; - version = "0-unstable-2026-05-08"; + version = "0-unstable-2026-08-10"; src = fetchFromGitHub { owner = "dokieli"; repo = "dokieli"; - rev = "f0372663098582c0310c9e16918a55cf000fbaf1"; - hash = "sha256-jpIQcE1GdjvEsk6HPxjdFLbrxGWvVCaaG7T08HdMj7Y="; + rev = "c23e80e4fe54a2ad20f36a9f21a0987f5e3e4505"; + hash = "sha256-ZwK+MxrTodDvvJuQCIhcDkluor4ri856m/WhcVRwfzo="; }; missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-SEoYmh7oHmJrVhShOjRyaClyQxW9S96GCI3ggRkW+6U="; + hash = "sha256-AqmUWgVDksQeBKcC8mpq1xgQ5NcHTjX/YSgm9J+feBs="; }; buildPhase = '' @@ -79,9 +79,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Clientside editor for decentralised article publishing, annotations and social interactions"; homepage = "https://github.com/dokieli/dokieli"; - license = with lib.licenses; [ - cc-by-40 - mit + license = lib.licenses.AND [ + lib.licenses.asl20 + lib.licenses.cc-by-40 ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ shogo ]; diff --git a/pkgs/by-name/ec/eclipse-mat/package.nix b/pkgs/by-name/ec/eclipse-mat/package.nix index 3f0dfba9ca2a..ca009a3e19b5 100644 --- a/pkgs/by-name/ec/eclipse-mat/package.nix +++ b/pkgs/by-name/ec/eclipse-mat/package.nix @@ -1,135 +1,170 @@ { + lib, + stdenvNoCC, + bintools, fetchurl, - fontconfig, - freetype, + copyDesktopItems, + makeDesktopItem, + makeWrapper, + unzip, + jdk, glib, gsettings-desktop-schemas, gtk3, - jdk17, - lib, - libx11, - libxrender, libxtst, - makeDesktopItem, - makeWrapper, - shared-mime-info, - stdenv, - unzip, webkitgtk_4_1, - zlib, }: -let - pVersion = "1.15.0.20231206"; - pVersionTriple = lib.splitVersion pVersion; - majorVersion = lib.elemAt pVersionTriple 0; - minorVersion = lib.elemAt pVersionTriple 1; - patchVersion = lib.elemAt pVersionTriple 2; - baseVersion = "${majorVersion}.${minorVersion}.${patchVersion}"; - jdk = jdk17; -in -stdenv.mkDerivation rec { - pname = "eclipse-mat"; - version = pVersion; +stdenvNoCC.mkDerivation ( + finalAttrs: + let + baseVersion = lib.versions.pad 3 finalAttrs.version; - src = fetchurl { - url = "https://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; - sha256 = "sha256-icmo5zdK0XaH32kXwZUVaQ0VPSGEgvlLr7v7PtdbmCg="; - }; + sources = { + x86_64-linux = { + suffix = "linux.gtk.x86_64"; + hash = "sha256-4eqAp5hNQR5MTX37qwktqSVfe3ctaBolamEEm8yIN2c="; + }; + aarch64-linux = { + suffix = "linux.gtk.aarch64"; + hash = "sha256-MJUome0KjXjmjROTTnDbSTSnDKiUGHt6LAZY1giXmQ0="; + }; + aarch64-darwin = { + suffix = "macosx.cocoa.aarch64"; + hash = "sha256-Of/BJTaxD6x0+aNDKeod1RVWG86XFBmk8qdbU/p73qQ="; + }; + }; - desktopItem = makeDesktopItem { - name = "eclipse-mat"; - exec = "eclipse-mat"; - icon = "eclipse"; - comment = "Eclipse Memory Analyzer"; - desktopName = "Eclipse MAT"; - genericName = "Java Memory Analyzer"; - categories = [ "Development" ]; - }; + inherit (stdenvNoCC.hostPlatform) system; + source = sources.${system} or (throw "Unsupported system: ${system}"); + in + { + pname = "eclipse-mat"; + version = "1.17.0.20260601"; - unpackPhase = '' - unzip $src - ''; + strictDeps = true; + __structuredAttrs = true; - buildCommand = '' - mkdir -p $out - unzip $src - mv mat $out + src = fetchurl { + urls = [ + "https://ftp.halifax.rwth-aachen.de/eclipse/mat/${baseVersion}/rcp/MemoryAnalyzer-${finalAttrs.version}-${source.suffix}.zip" + "https://download.eclipse.org/mat/${baseVersion}/rcp/MemoryAnalyzer-${finalAttrs.version}-${source.suffix}.zip" + ]; + inherit (source) hash; + }; - # Patch binaries. - interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2) - libCairo=$out/eclipse/libcairo-swt.so - patchelf --set-interpreter $interpreter $out/mat/MemoryAnalyzer - [ -f $libCairo ] && patchelf --set-rpath ${ - lib.makeLibraryPath [ - freetype - fontconfig - libx11 - libxrender - zlib - ] - } $libCairo + sourceRoot = "."; - # Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/ - makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \ - --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - glib - gtk3 - libxtst - webkitgtk_4_1 - ] - } \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration" + nativeBuildInputs = [ + makeWrapper + unzip + ] + ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ + copyDesktopItems + glib + ]; - # Create desktop item. - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - mkdir -p $out/share/pixmaps - find $out/mat/plugins -name 'eclipse*.png' -type f -exec cp {} $out/share/pixmaps \; - mv $out/share/pixmaps/eclipse64.png $out/share/pixmaps/eclipse.png - ''; + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ + gsettings-desktop-schemas + gtk3 + ]; - nativeBuildInputs = [ - unzip - makeWrapper - ]; - buildInputs = [ - fontconfig - freetype - glib - gsettings-desktop-schemas - gtk3 - jdk - libx11 - libxrender - libxtst - zlib - shared-mime-info - webkitgtk_4_1 - ]; + # Keep the .app's notarized upstream signature valid + dontPatchShebangs = stdenvNoCC.hostPlatform.isDarwin; - dontBuild = true; - dontConfigure = true; + # The bundle ships JNA natives for every OS, so auditTmpdir finds Linux ELF + # objects and calls patchelf, which does not exist on Darwin. + noAuditTmpdir = stdenvNoCC.hostPlatform.isDarwin; - meta = { - description = "Fast and feature-rich Java heap analyzer"; - mainProgram = "eclipse-mat"; - longDescription = '' - The Eclipse Memory Analyzer is a tool that helps you find memory - leaks and reduce memory consumption. Use the Memory Analyzer to - analyze productive heap dumps with hundreds of millions of - objects, quickly calculate the retained sizes of objects, see - who is preventing the Garbage Collector from collecting objects, - run a report to automatically extract leak suspects. - ''; - homepage = "https://www.eclipse.org/mat"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.epl20; - maintainers = [ lib.maintainers.ktor ]; - platforms = [ "x86_64-linux" ]; - }; + desktopItems = lib.optionals stdenvNoCC.hostPlatform.isLinux [ + (makeDesktopItem { + name = "eclipse-mat"; + exec = "eclipse-mat"; + icon = "eclipse-mat"; + comment = "Eclipse Memory Analyzer"; + desktopName = "Eclipse MAT"; + genericName = "Java Memory Analyzer"; + categories = [ + "Development" + "Profiling" + ]; + }) + ]; -} + installPhase = + if stdenvNoCC.hostPlatform.isDarwin then + '' + runHook preInstall + + mkdir -p $out/Applications + cp -R MemoryAnalyzer.app $out/Applications/ + + makeWrapper $out/Applications/MemoryAnalyzer.app/Contents/MacOS/MemoryAnalyzer $out/bin/eclipse-mat \ + --prefix PATH : ${lib.makeBinPath [ jdk ]} \ + --set JAVA_HOME ${jdk.home} \ + --add-flags "-configuration \$HOME/.eclipse-mat/${finalAttrs.version}/configuration" + + runHook postInstall + '' + else + '' + runHook preInstall + + mkdir -p $out + cp -r mat $out/mat + + patchelf --set-interpreter ${bintools.dynamicLinker} $out/mat/MemoryAnalyzer + + # Pass -configuration so that settings are written to ~/.eclipse-mat/ + # instead of the read-only store path. + makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \ + --prefix PATH : ${lib.makeBinPath [ jdk ]} \ + --set JAVA_HOME ${jdk.home} \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + glib + gtk3 + libxtst + webkitgtk_4_1 + ] + } \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --add-flags "-configuration \$HOME/.eclipse-mat/${finalAttrs.version}/configuration" + + unzip -j -q mat/plugins/org.eclipse.mat.ui.rcp_*.jar "icons/memory_analyzer_*.png" -d icons + for size in 32 48 64 128 256; do + install -Dm444 icons/memory_analyzer_$size.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/eclipse-mat.png + done + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Fast and feature-rich Java heap analyzer"; + longDescription = '' + The Eclipse Memory Analyzer is a tool that helps you find memory + leaks and reduce memory consumption. Use the Memory Analyzer to + analyze productive heap dumps with hundreds of millions of + objects, quickly calculate the retained sizes of objects, see + who is preventing the Garbage Collector from collecting objects, + run a report to automatically extract leak suspects. + ''; + homepage = "https://eclipse.dev/mat/"; + changelog = "https://eclipse.dev/mat/${baseVersion}/noteworthy.html"; + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + license = lib.licenses.epl20; + mainProgram = "eclipse-mat"; + maintainers = with lib.maintainers; [ + ktor + dfjay + ]; + platforms = lib.attrNames sources; + }; + } +) diff --git a/pkgs/by-name/ec/eclipse-mat/update.sh b/pkgs/by-name/ec/eclipse-mat/update.sh new file mode 100755 index 000000000000..274c14b78791 --- /dev/null +++ b/pkgs/by-name/ec/eclipse-mat/update.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p bash curl gnused coreutils common-updater-scripts + +set -euo pipefail + +BASEDIR="$(dirname "$(readlink -f "$0")")/../../../.." +MIRROR="https://ftp.halifax.rwth-aachen.de/eclipse/mat" + +baseVersion=$(curl -sL "$MIRROR/" | + sed -n 's/.*href="\([0-9]\+\.[0-9]\+\.[0-9]\+\)\/".*/\1/p' | + sort -V | tail -1) + +latestVersion=$(curl -sL "$MIRROR/$baseVersion/rcp/" | + sed -n 's/.*href="MemoryAnalyzer-\([0-9.]\+\)-linux\.gtk\.x86_64\.zip".*/\1/p' | + sort -V | tail -1) + +currentVersion=$(nix-instantiate --eval -E "with import $BASEDIR {}; lib.getVersion eclipse-mat" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ -z "$latestVersion" ]]; then + echo "could not determine the latest version" >&2 + exit 1 +fi + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +for target in \ + "x86_64-linux:linux.gtk.x86_64" \ + "aarch64-linux:linux.gtk.aarch64" \ + "aarch64-darwin:macosx.cocoa.aarch64"; do + nixSystem="${target%%:*}" + suffix="${target#*:}" + + prefetch=$(nix-prefetch-url "$MIRROR/$baseVersion/rcp/MemoryAnalyzer-$latestVersion-$suffix.zip") + hash=$(nix-hash --type sha256 --to-sri "$prefetch") + + (cd "$BASEDIR" && update-source-version eclipse-mat "$latestVersion" "$hash" --system="$nixSystem" --ignore-same-version) +done diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 8eb9abbf547c..ffef47e5c75e 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,13 +17,13 @@ }: let - version = "0.313.1"; + version = "0.313.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-P/NEP+gGS3Wni9j09NVujmdDYaAz7ntOtrPFZNKy/Bo="; + hash = "sha256-gFsAf10GT4rGXR08P09vZHguQ2alVGy3PJwYPgNPGaw="; }; vendorHash = "sha256-QJsdBqa/JHaBig4bRtU3LqlYwh/BHnP3vg8YM3reuDY="; diff --git a/pkgs/by-name/ex/ext4fuse/package.nix b/pkgs/by-name/ex/ext4fuse/package.nix deleted file mode 100644 index 113201fb7f2e..000000000000 --- a/pkgs/by-name/ex/ext4fuse/package.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fuse, - macfuse-stubs, - pkg-config, - which, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "ext4fuse"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "gerard"; - repo = "ext4fuse"; - rev = "v${finalAttrs.version}"; - hash = "sha256-bsFo+aaeNceSme9WBUVg4zpE4DzlmLHv+esQIAlTGGU="; - }; - - nativeBuildInputs = [ - pkg-config - which - ]; - - buildInputs = [ (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse) ]; - - installPhase = '' - runHook preInstall - - install -Dm555 ext4fuse $out/bin/ext4fuse - - runHook postInstall - ''; - - meta = { - description = "EXT4 implementation for FUSE"; - mainProgram = "ext4fuse"; - homepage = "https://github.com/gerard/ext4fuse"; - maintainers = with lib.maintainers; [ felixalbrigtsen ]; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2Plus; - }; -}) diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index ed4e7f35e84e..10f8c8f1e7ea 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -13,6 +13,7 @@ makeShellWrapper, copyDesktopItems, electron, + darwin, nixosTests, }: @@ -67,6 +68,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpm makeShellWrapper copyDesktopItems + ] + ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ + darwin.autoSignDarwinBinariesHook ]; installPhase = '' diff --git a/pkgs/by-name/fr/freetube/patch-build-script.patch b/pkgs/by-name/fr/freetube/patch-build-script.patch index f925f420212a..a4a386c9d6d5 100644 --- a/pkgs/by-name/fr/freetube/patch-build-script.patch +++ b/pkgs/by-name/fr/freetube/patch-build-script.patch @@ -11,3 +11,12 @@ index bef1f6f1d..d2ee86611 100644 appId: `io.freetubeapp.${packageDetails.name}`, copyright: 'Copyleft © 2020-2026 freetubeapp@protonmail.com', // asar: false, +@@ -99,7 +101,7 @@ export default { + // Enable ad-hoc signing + // If we skip signing entirely, macOS says that the application is damaged, which makes users open bug reports. + // With an ad-hoc signature it still refuses to launch by default but with the reason that it cannot verify the signature +- identity: '-' ++ identity: null + }, + win: { + icon: '_icons/icon.ico', diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix index b0e39baf439b..a3c01b42aae7 100644 --- a/pkgs/by-name/ge/gersemi/package.nix +++ b/pkgs/by-name/ge/gersemi/package.nix @@ -2,22 +2,39 @@ lib, python3Packages, fetchFromGitHub, + cargo, + rustPlatform, + rustc, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "gersemi"; - version = "0.23.2"; + version = "0.28.0"; pyproject = true; src = fetchFromGitHub { owner = "BlankSpruce"; repo = "gersemi"; tag = finalAttrs.version; - hash = "sha256-sXgu3KscRi/3Myg/4jarMZ4W7/CaQTmyxxbcu8/0o6Y="; + hash = "sha256-92R+jSsE9icZgeNXcPyagZtL4jZNLh2EMCMofM5FFsU="; }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src pname version; + sourceRoot = "${finalAttrs.src.name}/gersemi/rust-backend"; + hash = "sha256-2ukdpS5oNDE9kf0zFrPXyh+6zA/l0ByUhb71xhJJ8nA="; + }; + + cargoRoot = "gersemi/rust-backend"; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustc + ]; + build-system = with python3Packages; [ - setuptools + setuptools-rust ]; dependencies = with python3Packages; [ @@ -30,6 +47,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Formatter to make your CMake code the real treasure"; homepage = "https://github.com/BlankSpruce/gersemi"; + changelog = "https://github.com/BlankSpruce/gersemi/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ xeals ]; mainProgram = "gersemi"; diff --git a/pkgs/by-name/gh/ghr-cli/package.nix b/pkgs/by-name/gh/ghr-cli/package.nix index 1b5c81832a3f..f8eff30a9c9b 100644 --- a/pkgs/by-name/gh/ghr-cli/package.nix +++ b/pkgs/by-name/gh/ghr-cli/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ghr-cli"; - version = "0.8.2"; + version = "0.9.0"; __structuredAttrs = true; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "chenyukang"; repo = "ghr"; tag = "v${finalAttrs.version}"; - hash = "sha256-ELYWoGUP6s2Trtnk9zgDLlT7MtaiHzfsFbzH+LmsKDE="; + hash = "sha256-LmQaBPPX+VRWFHDMvzyhtWcoiEZJocNeyu6EKBX4IjI="; }; - cargoHash = "sha256-siMxS08K+7L8f9A32gEWwQF9PAQh5UPMA+xTkTlz13o="; + cargoHash = "sha256-UCu/z6TzNYV0scWnl5XnN+nj9V9cg9hpUNqFZXlMXaM="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix index 7893b9202809..03391b0cb42b 100644 --- a/pkgs/by-name/go/golds/package.nix +++ b/pkgs/by-name/go/golds/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "golds"; - version = "0.8.5"; + version = "0.8.7"; src = fetchFromGitHub { owner = "go101"; repo = "golds"; tag = "v${finalAttrs.version}"; - hash = "sha256-WYjNvpNT5vuiHqo6TWE+uhptG4fke3eaKkJbeNIwwoU="; + hash = "sha256-plzfpH3+zcsiQlTHR1oTj3ImQrWlJmLI/CzCIu2dGqI="; }; # nixpkgs is not using the go distpack archive and missing a VERSION file in the source diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix index c086f010657a..668977a37ca0 100644 --- a/pkgs/by-name/hy/hydrus/package.nix +++ b/pkgs/by-name/hy/hydrus/package.nix @@ -7,11 +7,8 @@ copyDesktopItems, makeDesktopItem, writableTmpDirAsHomeHook, - swftools, ffmpeg, miniupnpc, - - enableSwftools ? false, }: python3Packages.buildPythonApplication (finalAttrs: { @@ -35,6 +32,7 @@ python3Packages.buildPythonApplication (finalAttrs: { buildInputs = [ qt6.qtbase qt6.qtcharts + qt6.qtmultimedia ]; desktopItems = [ @@ -53,37 +51,40 @@ python3Packages.buildPythonApplication (finalAttrs: { }) ]; - dependencies = with python3Packages; [ - beautifulsoup4 - cbor2 - chardet - cloudscraper - dateparser - html5lib - lxml - lz4 - numpy - opencv4 - olefile - pillow - pillow-heif - psutil - psd-tools - pympler - pyopenssl - pyqt6 - pyqt6-charts - pysocks - python-dateutil - python3Packages.mpv - pyyaml - qtpy - requests - show-in-file-manager - send2trash - service-identity - twisted - ]; + dependencies = + with python3Packages; + [ + beautifulsoup4 + cbor2 + chardet + dateparser + html5lib + lxml + lz4 + mpv + numpy + opencv4 + olefile + pillow + pillow-heif + pillow-jxl-plugin + psutil + pympler + pyopenssl + pyqt6 + pyqt6-charts + pysocks + python-dateutil + pyyaml + qtpy + requests + show-in-file-manager + send2trash + service-identity + twisted + ] + ++ python3Packages.twisted.optional-dependencies.tls + ++ python3Packages.twisted.optional-dependencies.http2; nativeCheckInputs = (with python3Packages; [ @@ -121,15 +122,7 @@ python3Packages.buildPythonApplication (finalAttrs: { # desktop item mkdir -p "$out/share/icons/hicolor/scalable/apps" ln -s "$doc/share/doc/hydrus/assets/hydrus-white.svg" "$out/share/icons/hicolor/scalable/apps/hydrus-client.svg" - '' - + lib.optionalString enableSwftools '' - mkdir -p $out/${python3Packages.python.sitePackages}/bin - # swfrender seems to have to be called sfwrender_linux - # not sure if it can be loaded through PATH, but this is simpler - # $out/python3Packages.python.sitePackages/bin is correct NOT .../hydrus/bin - ln -s ${swftools}/bin/swfrender $out/${python3Packages.python.sitePackages}/bin/swfrender_linux - '' - + '' + runHook postInstall ''; @@ -159,6 +152,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Danbooru-like image tagging and searching system for the desktop"; + mainProgram = "hydrus-client"; license = lib.licenses.wtfpl; homepage = "https://hydrusnetwork.github.io/hydrus/"; changelog = "https://github.com/hydrusnetwork/hydrus/releases/tag/${finalAttrs.src.tag}"; diff --git a/pkgs/by-name/in/inngest/package.nix b/pkgs/by-name/in/inngest/package.nix index 8a13fb82b684..39ba533076d2 100644 --- a/pkgs/by-name/in/inngest/package.nix +++ b/pkgs/by-name/in/inngest/package.nix @@ -10,14 +10,14 @@ testers, }: let - version = "1.37.0"; + version = "1.41.1"; websiteRev = "159c0ac611e85ec85ffe0a8c8bf2c4a0330bdb38"; src = fetchFromGitHub { owner = "inngest"; repo = "inngest"; tag = "v${version}"; - hash = "sha256-m9VFmplaMFD3+Z0qioehsuKeJaS6fUSb++liUabDEuM="; + hash = "sha256-vP8If2O3JIF6DDGLar8ovKeFAS1wp0ql1nt5m7rKIuA="; }; website = fetchFromGitHub { @@ -42,7 +42,7 @@ let pnpm = pnpm_10; sourceRoot = "${finalAttrs.src.name}/ui"; fetcherVersion = 4; - hash = "sha256-bt/7cpN9EXf2CZFRAaybr7pgJyInV0fdUy7Rv/UcT/I="; + hash = "sha256-9Aud9JUj2C/Bow7lB+P/BgniQXJa2MVqI7TcPICgxrI="; }; pnpmRoot = "ui"; diff --git a/pkgs/by-name/ki/kitty-bin/package.nix b/pkgs/by-name/ki/kitty-bin/package.nix index f197b6819f5f..66438722447a 100644 --- a/pkgs/by-name/ki/kitty-bin/package.nix +++ b/pkgs/by-name/ki/kitty-bin/package.nix @@ -8,14 +8,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "kitty-bin"; - version = "0.47.4"; + version = "0.48.2"; __structuredAttrs = true; strictDeps = true; src = fetchurl { url = "https://github.com/kovidgoyal/kitty/releases/download/v${finalAttrs.version}/kitty-${finalAttrs.version}.dmg"; - hash = "sha256-tTubGKJ9U61Eol3Wd2/ejEdIe04QOsUNaCrx7o57d+0="; + hash = "sha256-+AT1juS2nHb4TrMoHhQHSCaaY/P0qBYBWo3sKgbSsZU="; }; # undmg can't read the APFS dmg; -snld keeps the .app's symlinks intact. diff --git a/pkgs/by-name/kl/klayout/package.nix b/pkgs/by-name/kl/klayout/package.nix index 7e6ff18cc50b..9629f886cbd4 100644 --- a/pkgs/by-name/kl/klayout/package.nix +++ b/pkgs/by-name/kl/klayout/package.nix @@ -19,15 +19,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "klayout"; - version = "0.30.8"; + version = "0.30.10"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; tag = "v${finalAttrs.version}"; - hash = "sha256-RjMH6hrc0jyCLgG1D6cztBp5Fb3W5HgTxVTfI2bxgCs="; + hash = "sha256-ruM9+aD0k5RRpHMAzNNGtU5Xb2rmzz6yIsxxyHVcwRs="; }; + __structuredAttrs = true; strictDeps = true; postPatch = '' @@ -128,6 +129,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.klayout.de/"; changelog = "https://www.klayout.de/development.html#${finalAttrs.version}"; platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = [ ]; + maintainers = [ lib.maintainers.gonsolo ]; }; }) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index b4e117f1380f..2a87a6f0e27e 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdeltachat"; - version = "2.57.0"; + version = "2.58.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${finalAttrs.version}"; - hash = "sha256-MZhb3w4khWjWGEA9XvXgHjYiY9hQ5jCBWRwu6yMuaho="; + hash = "sha256-2ztbUSaxeUHfeDX+nt1uJZ/71no1mxOQphKNYpHNOnY="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit (finalAttrs) version src; - hash = "sha256-gRtNhrKue2cMhq3J/jFQihJTpa6k1IJeIJ9C5hAbiOM="; + hash = "sha256-WZJSx+gswWBaQEXN2NVWLr3xy5uQMtomefEM71nDdlQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libfm/package.nix b/pkgs/by-name/li/libfm/package.nix index 4ef3af6c21d4..6f4a69dcdc92 100644 --- a/pkgs/by-name/li/libfm/package.nix +++ b/pkgs/by-name/li/libfm/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoreconfHook, gtk-doc, glib, @@ -11,14 +10,11 @@ pango, pkg-config, vala, - extraOnly ? false, - withGtk3 ? false, - gtk2, gtk3, + extraOnly ? false, }: let - gtk = if withGtk3 then gtk3 else gtk2; inherit (lib) optional optionalString; in stdenv.mkDerivation (finalAttrs: { @@ -41,16 +37,16 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ glib - gtk + gtk3 pango ] ++ optional (!extraOnly) menu-cache; configureFlags = [ "--sysconfdir=/etc" + "--with-gtk=3" ] - ++ optional extraOnly "--with-extra-only" - ++ optional withGtk3 "--with-gtk=3"; + ++ optional extraOnly "--with-extra-only"; installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; diff --git a/pkgs/by-name/li/libtommath/force_mp_set_double.patch b/pkgs/by-name/li/libtommath/force_mp_set_double.patch new file mode 100644 index 000000000000..1517ca46dcd7 --- /dev/null +++ b/pkgs/by-name/li/libtommath/force_mp_set_double.patch @@ -0,0 +1,14 @@ +diff --git a/bn_mp_set_double.c b/bn_mp_set_double.c +index a42fc70..4a13539 100644 +--- a/bn_mp_set_double.c ++++ b/bn_mp_set_double.c +@@ -3,7 +3,8 @@ + /* LibTomMath, multiple-precision integer library -- Tom St Denis */ + /* SPDX-License-Identifier: Unlicense */ + +-#if defined(__STDC_IEC_559__) || defined(__GCC_IEC_559) ++#if defined(__STDC_IEC_559__) || defined(__GCC_IEC_559) || \ ++ (defined(__APPLE__) && defined(__aarch64__)) + mp_err mp_set_double(mp_int *a, double b) + { + uint64_t frac; diff --git a/pkgs/by-name/li/libtommath/package.nix b/pkgs/by-name/li/libtommath/package.nix index 52580ffa819e..af133212172d 100644 --- a/pkgs/by-name/li/libtommath/package.nix +++ b/pkgs/by-name/li/libtommath/package.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; }; + patches = [ + ./force_mp_set_double.patch + ]; + postPatch = '' substituteInPlace makefile.shared \ --replace-fail glibtool libtool \ diff --git a/pkgs/by-name/li/libxfce4windowing/package.nix b/pkgs/by-name/li/libxfce4windowing/package.nix index d72e843ed4f5..51192ebdbd25 100644 --- a/pkgs/by-name/li/libxfce4windowing/package.nix +++ b/pkgs/by-name/li/libxfce4windowing/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxfce4windowing"; - version = "4.20.6"; + version = "4.20.7"; outputs = [ "out" @@ -40,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: { owner = "xfce"; repo = "libxfce4windowing"; tag = "libxfce4windowing-${finalAttrs.version}"; - hash = "sha256-lTOCvxUSo0CCok5nPCX7B6RqVoNMYcSb97alR+htBtY="; + fetchSubmodules = true; + hash = "sha256-4z+JP0da0vzJgw13ZB8hI0RC4SyoaRfZyy26eEIVF8Q="; }; patches = [ diff --git a/pkgs/by-name/li/liteparse/package.nix b/pkgs/by-name/li/liteparse/package.nix index f67f8d727925..c617a2570b84 100644 --- a/pkgs/by-name/li/liteparse/package.nix +++ b/pkgs/by-name/li/liteparse/package.nix @@ -64,14 +64,14 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "liteparse"; - version = "2.8.0"; + version = "2.11.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "run-llama"; repo = "liteparse"; tag = "crates-v${finalAttrs.version}"; - hash = "sha256-s6NWlr1zHfnZer31fxUZcitHpjZeQpWmQMgB1Myq+qs="; + hash = "sha256-F2zajjX55EWpJaH/W1I5ZO7Fi11zdRrX1QsPk1T4h6E="; }; postPatch = '' @@ -106,7 +106,7 @@ rustPlatform.buildRustPackage (finalAttrs: { tesseract ]; - cargoHash = "sha256-0rqhhTsL0Jft13KxhFUzCPIHV5qVt3FKZxne8/Ek3Zk="; + cargoHash = "sha256-21t92uT5wzIxFpyFH85dBo0T5BKu6jlaXdObLGYF9i0="; cargoBuildFlags = [ "--package" "liteparse" diff --git a/pkgs/by-name/ll/llama-swap-minimal/package.nix b/pkgs/by-name/ll/llama-swap-minimal/package.nix index df9303570750..d5141fe77c80 100644 --- a/pkgs/by-name/ll/llama-swap-minimal/package.nix +++ b/pkgs/by-name/ll/llama-swap-minimal/package.nix @@ -1,5 +1,7 @@ { llama-swap }: +# if more "-minimal" options are added +# you may need to update main llama-swap's passthru.tests.nixos llama-swap.override { withUI = false; } diff --git a/pkgs/by-name/ll/llama-swap/package.nix b/pkgs/by-name/ll/llama-swap/package.nix index 066ef2f14b5d..85cae79471c4 100644 --- a/pkgs/by-name/ll/llama-swap/package.nix +++ b/pkgs/by-name/ll/llama-swap/package.nix @@ -21,7 +21,7 @@ let in buildGoModule (finalAttrs: { pname = "llama-swap"; - version = "240"; + version = "249"; outputs = [ "out" @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { owner = "mostlygeek"; repo = "llama-swap"; tag = "v${finalAttrs.version}"; - hash = "sha256-cvxF4J9Qvi522dBGjaNZvwwY/bV3wXSE0oGFATjzD4U="; + hash = "sha256-7wXOL8XtcKV6Abdxar25C85ODQ34RYOAGYCTaCXxPpY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -45,7 +45,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-jQRnFGqQvk6my7ejnesv1pylCmEXLs9GKbQJEZdsaYg="; + vendorHash = "sha256-MhR8B2+Yb/xqrTlIxaVHLoQf1eTOO49c65l72IAuZyU="; # Upstream only embeds the UI when this build tag is set. tags = lib.optionals withUI [ "embed_ui" ]; @@ -137,7 +137,7 @@ buildGoModule (finalAttrs: { doInstallCheck = true; versionCheckProgramArg = "-version"; - passthru.tests.nixos = nixosTests.llama-swap; + passthru.tests.nixos = if withUI then nixosTests.llama-swap.full else nixosTests.llama-swap.minimal; passthru.updateScript = nix-update-script { extraArgs = [ "--subpackage" diff --git a/pkgs/by-name/ll/llama-swap/ui.nix b/pkgs/by-name/ll/llama-swap/ui.nix index 4d0f02b6c85b..a8871af6532a 100644 --- a/pkgs/by-name/ll/llama-swap/ui.nix +++ b/pkgs/by-name/ll/llama-swap/ui.nix @@ -7,7 +7,7 @@ buildNpmPackage (finalAttrs: { pname = "${llama-swap.pname}-ui"; inherit (llama-swap) version src; - npmDepsHash = "sha256-cAdFKDhmyaYCoKqSYEuAhu29rBxs7i8uTmU2SHwTLnY="; + npmDepsHash = "sha256-6MPXQtmaz97D9PUU2Nn5DH/2HZNP/rnAWVSck/FiCyk="; postPatch = '' substituteInPlace vite.config.ts \ diff --git a/pkgs/by-name/lx/lxpanel/package.nix b/pkgs/by-name/lx/lxpanel/package.nix index 7952ee45f5d6..9d4be53e3fae 100644 --- a/pkgs/by-name/lx/lxpanel/package.nix +++ b/pkgs/by-name/lx/lxpanel/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - (libfm.override { withGtk3 = true; }) + libfm keybinder3 gtk3 libx11 diff --git a/pkgs/by-name/mi/microbin/package.nix b/pkgs/by-name/mi/microbin/package.nix index 420b2973f629..c43fdfca8a19 100644 --- a/pkgs/by-name/mi/microbin/package.nix +++ b/pkgs/by-name/mi/microbin/package.nix @@ -1,67 +1,27 @@ { fetchFromGitHub, - fetchpatch, lib, oniguruma, openssl, pkg-config, rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "microbin"; - version = "2.0.4"; + version = "2.1.4"; src = fetchFromGitHub { owner = "szabodanika"; repo = "microbin"; rev = "v${finalAttrs.version}"; - hash = "sha256-fsRpqSYDsuV0M6Xar2GVoyTgCPT39dcKJ6eW4YXCkQ0="; + hash = "sha256-ipSMiUJgbZ0kijGs7Ok8bRTGdFzygIPEY6ZuJ/eRb9s="; }; - cargoHash = "sha256-cQyb9KpmdJ2DB395Ce24JX8YcMLQn3fmeYZUo72L38s="; + cargoHash = "sha256-vvSQfXu67RNBXzfDIE2rcfUOcAfTACaVRvSBBITJ9gY="; - patches = [ - # Prefix some URLs with args.public_path_as_str() by PeterUpfold - # https://github.com/szabodanika/microbin/pull/194 - # MicroBin returns wrong URLs on deployments with non-root URLs. - (fetchpatch { - name = "0001-fixup-explicit-urls.patch"; - url = "https://github.com/szabodanika/microbin/compare/b8a0c5490d681550d982ad02d67a1aaa0897f503..df062134cbaf3fd0ebcb67af8453a4c66844cd13.patch"; - hash = "sha256-h13FBuzu2O4AwdhRHF5EX5LaKyPeWJAcaV6SGTaYzTg="; - }) - - # Minor fixups by LuK1337 - # https://github.com/szabodanika/microbin/pull/211 - # Fixup styling, password protected and private pastas. - (fetchpatch { - name = "0002-minor-fixups.patch"; - url = "https://github.com/szabodanika/microbin/compare/b8a0c5490d681550d982ad02d67a1aaa0897f503..3b0c025e9b6dc1ca69269541940bdb53032a048a.patch"; - hash = "sha256-cZB/jx5d6F+C4xOn49TQ1at/Z4ov26efo9PTtWEdCHw="; - }) - - # Fix MICROBIN_ETERNAL_PASTA by SouthFox-D - # https://github.com/szabodanika/microbin/pull/215 - # MICROBIN_ETERNAL_PASTA config doesn't work without this. - (fetchpatch { - name = "0003-fix-microbin-eternal-pasta.patch"; - url = "https://github.com/szabodanika/microbin/compare/b8a0c5490d681550d982ad02d67a1aaa0897f503..c7c846c64344b8d51500aa9a4b2e9a92de8d09d8.patch"; - hash = "sha256-gCio73Jt0F7YCFtQxtf6pPBDLNcyOAcfSsiyjLFzEzY="; - }) - - # Fix raw pastes returning 404 by GizmoTjaz - # https://github.com/szabodanika/microbin/pull/218 - # Existing pastas return code 404 even when they exist. - (fetchpatch { - name = "0004-fix-raw-pastas-returning-404.patch"; - url = "https://github.com/szabodanika/microbin/compare/b8a0c5490d681550d982ad02d67a1aaa0897f503..e789901520824d4bf610d28923097affe85ead7d.patch"; - hash = "sha256-R47ozwu/FD1kCu5nx4Gf1cOFeLVFdS67K8RNDygwoZM="; - }) - ]; - - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma @@ -73,6 +33,8 @@ rustPlatform.buildRustPackage (finalAttrs: { RUSTONIG_SYSTEM_LIBONIG = true; }; + passthru.updateScript = nix-update-script { }; + meta = { description = "Tiny, self-contained, configurable paste bin and URL shortener written in Rust"; homepage = "https://github.com/szabodanika/microbin"; diff --git a/pkgs/by-name/mi/miller/package.nix b/pkgs/by-name/mi/miller/package.nix index 147d8cbca1f5..59fa2d1cf536 100644 --- a/pkgs/by-name/mi/miller/package.nix +++ b/pkgs/by-name/mi/miller/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "miller"; - version = "6.20.2"; + version = "6.21.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-unzjbPuOmppEY56JnV+A3TZuaHMLNeZS3n7tKpudCXk="; + sha256 = "sha256-E/O+uzYaiHBxCOZ0VCmpNlJZDaEBKlCtKAXgm5iY/ps="; }; outputs = [ @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { "man" ]; - vendorHash = "sha256-ZA9ueehDXsRI3eEE44hJziWKAAsZXkF77hBkYvX2k+U="; + vendorHash = "sha256-22RaVj9z7hrXKoKtEDjjUL1gYObhFRvstTIRtDtyD5U="; postInstall = '' mkdir -p $man/share/man/man1 diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 9871208dbaa8..b644a16bd0d9 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -7,75 +7,77 @@ writableTmpDirAsHomeHook, }: let + node_modules = + finalAttrs: + stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-node_modules"; + inherit (finalAttrs) version src; + + __structuredAttrs = true; + strictDeps = true; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" + "SOCKS_SERVER" + ]; + + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + bun install \ + --cpu="*" \ + --frozen-lockfile \ + --ignore-scripts \ + --no-progress \ + --os="*" + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + find . -type d -name node_modules -exec cp -R --parents {} $out \; + + runHook postInstall + ''; + + # NOTE: Required else we get errors that our fixed-output derivation references store paths + dontFixup = true; + + outputHash = "sha256-aL2kNCYF6Y4QnEvlpQ9U5Qe+K8a1J2X7BvJqE+BnRcY="; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { pname = "models-dev"; - version = "sdk-v0.0.5-unstable-2026-08-04"; + version = "sdk-v0.0.5-unstable-2026-08-11"; + + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitHub { owner = "anomalyco"; repo = "models.dev"; - rev = "183bea88e4c0e9922c81eddb3987d9edb3a640ed"; - hash = "sha256-h7GsDMuZFOzFVR0Yp3C0fEJAqQi0XLrC/hohMUKE6/8="; + rev = "4abaeb87f8c672300eb65e050d6ffc41b1d4046b"; + hash = "sha256-ttfFpm/0hdBgCS920wf8f4ydW9UGj96SDlrP4WnwZT4="; }; - node_modules = stdenvNoCC.mkDerivation { - pname = "${pname}-node_modules"; - inherit version src; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - "GIT_PROXY_COMMAND" - "SOCKS_SERVER" - ]; - - nativeBuildInputs = [ - bun - writableTmpDirAsHomeHook - ]; - - dontConfigure = true; - - buildPhase = '' - runHook preBuild - - bun install \ - --cpu="*" \ - --frozen-lockfile \ - --ignore-scripts \ - --no-progress \ - --os="*" - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - find . -type d -name node_modules -exec cp -R --parents {} $out \; - - runHook postInstall - ''; - - # NOTE: Required else we get errors that our fixed-output derivation references store paths - dontFixup = true; - - outputHash = "sha256-aL2kNCYF6Y4QnEvlpQ9U5Qe+K8a1J2X7BvJqE+BnRcY="; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - }; -in -stdenvNoCC.mkDerivation (finalAttrs: { - inherit - pname - version - src - node_modules - ; - nativeBuildInputs = [ bun ]; configurePhase = '' runHook preConfigure - cp -R ${node_modules}/. . + cp -R ${finalAttrs.passthru.node_modules}/. . runHook postConfigure ''; @@ -100,6 +102,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { + jsonschema = "${finalAttrs.finalPackage}/dist/model-schema.json"; + node_modules = node_modules finalAttrs; updateScript = nix-update-script { extraArgs = [ "--version=branch" @@ -107,7 +111,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { "node_modules" ]; }; - jsonschema = "${finalAttrs.finalPackage}/dist/model-schema.json"; }; meta = { diff --git a/pkgs/by-name/mo/mold-unwrapped/package.nix b/pkgs/by-name/mo/mold-unwrapped/package.nix index b2e0e1731961..c437ba87c84e 100644 --- a/pkgs/by-name/mo/mold-unwrapped/package.nix +++ b/pkgs/by-name/mo/mold-unwrapped/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mold-unwrapped"; - version = "2.41.0"; + version = "2.42.0"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; tag = "v${finalAttrs.version}"; - hash = "sha256-N+dFJk4KJY8E0UBrAlKXpMSuiseF4KAtpFMUA/nbleQ="; + hash = "sha256-PPKYjdU4aLxhGLSZTTZFt06/yVi1cTjJalovr/ohDew="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 16260e110379..e64a3e90098b 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -40,7 +40,7 @@ assert pythonPackages.buildPythonApplication (finalAttrs: { pname = "music-assistant"; - version = "2.9.10"; + version = "2.9.13"; pyproject = true; __structuredAttrs = true; @@ -48,7 +48,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { owner = "music-assistant"; repo = "server"; tag = finalAttrs.version; - hash = "sha256-v9xFW83/v8CjKa04oql1yGQKB58VQtFmXZTN/KMN/gM="; + hash = "sha256-HCqd8++PKdbuzyeztkcLUXhTivTLJEl749VD2oCsHZA="; }; patches = [ @@ -204,6 +204,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { "snapcast" "sonic_analysis" "sonic_similarity" + "sonos" "sonos_s1" "tidal" "wiim" diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index e21bc88f9efc..fb0d34731dfc 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,7 +1,7 @@ # Do not edit manually, run ./update-providers.py { - version = "2.9.10"; + version = "2.9.13"; builtins = [ "builtin" "coverartarchive" diff --git a/pkgs/by-name/mu/music-assistant/update-providers.py b/pkgs/by-name/mu/music-assistant/update-providers.py index b9273f4280b7..1befe967b5ba 100755 --- a/pkgs/by-name/mu/music-assistant/update-providers.py +++ b/pkgs/by-name/mu/music-assistant/update-providers.py @@ -12,7 +12,7 @@ from functools import cache from io import BytesIO from pathlib import Path from subprocess import check_output, run -from typing import Dict, Final, List, Optional, Set, Union, cast +from typing import Final, cast from urllib.request import urlopen from jinja2 import Environment @@ -82,15 +82,12 @@ EXTRA_LIST_DEPS = { } -def run_sync(cmd: List[str]) -> None: +def run_sync(cmd: list[str]) -> None: print(f"$ {' '.join(cmd)}") - process = run(cmd) - - if process.returncode != 0: - sys.exit(1) + run(cmd, check=True) -async def check_async(cmd: List[str]) -> str: +async def check_async(cmd: list[str]) -> str: print(f"$ {' '.join(cmd)}") process = await asyncio.create_subprocess_exec( *cmd, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE @@ -113,11 +110,11 @@ class Nix: ] @classmethod - async def _run(cls, args: List[str]) -> Optional[str]: + async def _run(cls, args: list[str]) -> str | None: return await check_async(cls.base_cmd + args) @classmethod - async def eval(cls, expr: str) -> Union[List, Dict, int, float, str, bool]: + async def eval(cls, expr: str) -> list | dict | int | float | str | bool: response = await cls._run(["eval", "-f", f"{ROOT}/default.nix", "--json", expr]) if response is None: raise RuntimeError("Nix eval expression returned no response") @@ -127,15 +124,16 @@ class Nix: raise RuntimeError("Nix eval response could not be parsed from JSON") -async def get_provider_manifests(version: str = "master") -> List: +async def get_provider_manifests(version: str = "master") -> list: manifests = [] with tempfile.TemporaryDirectory() as tmp: - with urlopen( - f"https://github.com/music-assistant/music-assistant/archive/refs/tags/{version}.tar.gz" - ) as response: - tarfile.open(fileobj=BytesIO(response.read())).extractall( - tmp, filter="data" - ) + with ( + urlopen( # noqa: ASYNC210 + f"https://github.com/music-assistant/music-assistant/archive/refs/tags/{version}.tar.gz" + ) as response, + tarfile.open(fileobj=BytesIO(response.read())) as tar, + ): + tar.extractall(tmp, filter="data") basedir = Path(os.path.join(tmp, f"server-{version}")) sys.path.append(str(basedir)) @@ -179,10 +177,12 @@ class NoMatch(Exception): def resolve_package_attribute(package: str) -> str: - pattern = re.compile(rf"^music-assistant\.pythonPackages\.{package}$", re.I) + pattern = re.compile( + rf"^music-assistant\.pythonPackages\.{package}$", re.IGNORECASE + ) packages = packageset_attributes() matches = [] - for attr in packages.keys(): + for attr in packages: if pattern.match(attr): matches.append(attr.split(".")[-1]) @@ -215,7 +215,7 @@ class Provider: return hash(self.domain) -async def resolve_providers(manifests) -> tuple[Set, Set]: +async def resolve_providers(manifests) -> tuple[set, set]: errors = [] providers = set() for manifest in manifests: @@ -257,7 +257,7 @@ async def resolve_providers(manifests) -> tuple[Set, Set]: return providers, builtins -def render(outpath: str, version: str, providers: Set, builtins: Set): +def render(outpath: str, version: str, providers: set, builtins: set): env = Environment() template = env.from_string(TEMPLATE) template.stream(version=version, providers=providers, builtins=builtins).dump( @@ -278,7 +278,7 @@ async def main(): if __name__ == "__main__": run_sync(["pyright", __file__]) - run_sync(["ruff", "check", "--ignore=E501", __file__]) + run_sync(["ruff", "check", "--ignore=EXE005", __file__]) run_sync(["isort", __file__]) run_sync(["ruff", "format", __file__]) asyncio.run(main()) diff --git a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix index ee4e267442a0..3d9ad185c065 100644 --- a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix +++ b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix @@ -4,17 +4,16 @@ fetchFromGitHub, cmake, }: - stdenv.mkDerivation (finalAttrs: { pname = "neural-amp-modeler-lv2"; - version = "0.1.4"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mikeoliphant"; repo = "neural-amp-modeler-lv2"; - tag = finalAttrs.version; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-5BOZOocZWWSWawXJFMAgM0NR0s0CbkzDVr6fnvZMvd0="; + hash = "sha256-TkynGmhwnkTqieJNuC+H2rDgxYZ9IFvqukfmtbSj790="; }; nativeBuildInputs = [ @@ -22,7 +21,10 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - maintainers = [ lib.maintainers.viraptor ]; + maintainers = [ + lib.maintainers.viraptor + lib.maintainers.gabyx + ]; description = "Neural Amp Modeler LV2 plugin implementation"; homepage = finalAttrs.src.meta.homepage; license = lib.licenses.gpl3; diff --git a/pkgs/by-name/no/notepad-next/package.nix b/pkgs/by-name/no/notepad-next/package.nix index a2892e3bec4e..7dff6f6b78ac 100644 --- a/pkgs/by-name/no/notepad-next/package.nix +++ b/pkgs/by-name/no/notepad-next/package.nix @@ -115,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with lib.maintainers; [ Holiu618 ]; - broken = stdenv.hostPlatform.isAarch64; mainProgram = "NotepadNext"; }; }) diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index e1db8c7a871f..63b961c4f85a 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "openfga"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "openfga"; repo = "openfga"; rev = "v${finalAttrs.version}"; - hash = "sha256-lmTrAED94yXrdlhQu6BUdsEicMhkgBzReBx5/X36k+M="; + hash = "sha256-iqxoUU5mMh4HntDeOvS5F45C7TB9pNHRB9W6Ki5zbEs="; }; vendorHash = "sha256-lB6DoULR0zTOcdVAQUNIH0Rwa6mPWh7y7erClmk0mws="; diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index b7a90e7cccdd..733ba7609610 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "opengist"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; tag = "v${finalAttrs.version}"; - hash = "sha256-yE9HvRFEQzv3Fhhbs9hXeLc4vudCMi+NMA2T8YUlREw="; + hash = "sha256-BOqAmQsT8MtohE/1k2YaNZv8cmruWzLur+yyNs3ARcQ="; }; frontend = buildNpmPackage { diff --git a/pkgs/by-name/op/openvox/package.nix b/pkgs/by-name/op/openvox/package.nix index df8f579f1574..503a54d8da7f 100644 --- a/pkgs/by-name/op/openvox/package.nix +++ b/pkgs/by-name/op/openvox/package.nix @@ -6,7 +6,8 @@ ruby_3_4, testers, }: -((bundlerApp.override { ruby = ruby_3_4; }) { + +(bundlerApp.override { ruby = ruby_3_4; }) { pname = "openvox"; gemdir = ./.; exes = [ "puppet" ]; @@ -28,11 +29,4 @@ mainProgram = "puppet"; maintainers = with lib.maintainers; [ skyethepinkcat ]; }; -}).overrideAttrs - # Workaround `bundlerApp` not specifying `__structuredAttrs = true` and `strictDeps = true` for its result package. - { - # TODO(@ShamrockLee, @skyethepinkcat): Revert/remove after PR #539303 lands on the master branch. - __structuredAttrs = true; - # TODO(@ShamrockLee, @skyethepinkcat): Revert/remove after PR #540069 lands on the master branch. - strictDeps = true; - } +} diff --git a/pkgs/by-name/pc/pcmanfm/package.nix b/pkgs/by-name/pc/pcmanfm/package.nix index 6eaa493ed6ba..57f59547b037 100644 --- a/pkgs/by-name/pc/pcmanfm/package.nix +++ b/pkgs/by-name/pc/pcmanfm/package.nix @@ -16,9 +16,6 @@ nix-update-script, }: -let - libfm' = libfm.override { withGtk3 = true; }; -in stdenv.mkDerivation (finalAttrs: { pname = "pcmanfm"; version = "1.4.0"; @@ -40,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib gtk3 - libfm' + libfm libx11 pango adwaita-icon-theme diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix index f6c5f1fa21cf..860cd0ddf8b5 100644 --- a/pkgs/by-name/pg/pgdog/package.nix +++ b/pkgs/by-name/pg/pgdog/package.nix @@ -7,29 +7,30 @@ rustPlatform, useMoldLinker, versionCheckHook, - withMold ? with clangStdenv.hostPlatform; isUnix && !isDarwin, + withMold ? with clangStdenv.hostPlatform; isLinux, }: let stdenv = if withMold then useMoldLinker clangStdenv else clangStdenv; in rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: { pname = "pgdog"; - version = "0.1.49"; + version = "0.1.52"; src = fetchFromGitHub { owner = "pgdogdev"; repo = "pgdog"; tag = "v${finalAttrs.version}"; - hash = "sha256-zfVNF/y1wzkvPjJ64HSzez0pOR/AEZHWc/S+cUYgat0="; + hash = "sha256-k2M5D4/g/NqCC34lnzNmTO0v5rTNClBA94rUlHdYEno="; }; - cargoHash = "sha256-B4jigKyK19IhCygF9ZMvO6rHDrEquLLpTVeptaFBuX0="; + cargoHash = "sha256-lKDaBpbfNmOox96KVwh2MGj5u6V2Ak3g2vSrombUChI="; # Hardcoded paths for C compiler and linker postPatch = '' rm .cargo/config.toml ''; + env.RUSTFLAGS = "--cfg tokio_unstable"; cargoBuildFlags = [ "--package" "pgdog" diff --git a/pkgs/by-name/pl/plemoljp-hs/package.nix b/pkgs/by-name/pl/plemoljp-hs/package.nix index d7be0af69b5b..60280d178439 100644 --- a/pkgs/by-name/pl/plemoljp-hs/package.nix +++ b/pkgs/by-name/pl/plemoljp-hs/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchzip { url = "https://github.com/yuru7/PlemolJP/releases/download/v${finalAttrs.version}/PlemolJP_HS_v${finalAttrs.version}.zip"; - hash = "sha256-V21T8ktNZE4nq3SH6aN9iIJHmGTkZuMsvT84yHbwSqI="; + hash = "sha256-ebBPun8CVHBOxs3c9SNHvT8lP1YqUH4DhBLAZk6NOrE="; }; installPhase = '' diff --git a/pkgs/by-name/pl/plemoljp-nf/package.nix b/pkgs/by-name/pl/plemoljp-nf/package.nix index c37d584f9292..9cfe19429cde 100644 --- a/pkgs/by-name/pl/plemoljp-nf/package.nix +++ b/pkgs/by-name/pl/plemoljp-nf/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchzip { url = "https://github.com/yuru7/PlemolJP/releases/download/v${finalAttrs.version}/PlemolJP_NF_v${finalAttrs.version}.zip"; - hash = "sha256-m8zR9ySl88DnVzG4fKJtc9WjSLDMLU4YDX+KXhcP2WU="; + hash = "sha256-7DVWDxciW5pEuaIdIinibwPi7QjNsQBPFq/wtP+fTeg="; }; installPhase = '' diff --git a/pkgs/by-name/pl/plemoljp/package.nix b/pkgs/by-name/pl/plemoljp/package.nix index 3899f7448193..a6ac509dbe1b 100644 --- a/pkgs/by-name/pl/plemoljp/package.nix +++ b/pkgs/by-name/pl/plemoljp/package.nix @@ -3,15 +3,17 @@ stdenvNoCC, fetchzip, nix-update-script, + plemoljp-hs, + plemoljp-nf, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plemoljp"; - version = "3.0.0"; + version = "3.1.0"; src = fetchzip { url = "https://github.com/yuru7/PlemolJP/releases/download/v${finalAttrs.version}/PlemolJP_v${finalAttrs.version}.zip"; - hash = "sha256-R4zC1pnM72FVqBQ5d03z8vyVccsM163BE15m2hdEnSA="; + hash = "sha256-X4DUAU7uicWtm8o3L9HmfU9By1YMnnjVrVU0iyw273A="; }; installPhase = '' @@ -26,8 +28,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { + inherit plemoljp-hs plemoljp-nf; + updateScript = nix-update-script { - extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; + extraArgs = [ + "--version-regex=^v([0-9.]+)$" + "--subpackage" + "plemoljp-hs" + "--subpackage" + "plemoljp-nf" + ]; }; }; diff --git a/pkgs/by-name/po/polychromatic/package.nix b/pkgs/by-name/po/polychromatic/package.nix index 5e5f7c11dacf..a276ef3f09c1 100644 --- a/pkgs/by-name/po/polychromatic/package.nix +++ b/pkgs/by-name/po/polychromatic/package.nix @@ -17,14 +17,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "polychromatic"; - version = "0.9.7"; + version = "0.9.8"; pyproject = false; src = fetchFromGitHub { owner = "polychromatic"; repo = "polychromatic"; tag = "v${finalAttrs.version}"; - hash = "sha256-2Uo6/74o+cSQQsYsE+7nVDsetnaYjQzL8xkJhUN3E2o="; + hash = "sha256-5+7u99+fwDXg3s32QyjLO7X0irw5wY7pUDvT6sSv5nA="; }; postPatch = '' diff --git a/pkgs/by-name/pr/prettier-plugin-tailwindcss/package.nix b/pkgs/by-name/pr/prettier-plugin-tailwindcss/package.nix new file mode 100644 index 000000000000..315cb6ba3612 --- /dev/null +++ b/pkgs/by-name/pr/prettier-plugin-tailwindcss/package.nix @@ -0,0 +1,76 @@ +{ + fetchFromGitHub, + fetchPnpmDeps, + lib, + nix-update-script, + nodejs, + pnpmConfigHook, + pnpm_11, + stdenv, +}: + +let + pnpm = pnpm_11; +in +stdenv.mkDerivation (finalAttrs: { + pname = "prettier-plugin-tailwindcss"; + version = "0.8.1"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "tailwindlabs"; + repo = "prettier-plugin-tailwindcss"; + tag = "v${finalAttrs.version}"; + hash = "sha256-mqK3R1+VJ8PqKhkltZnQpTAn8mbQC4VfptoaqmxqobM="; + }; + + nativeBuildInputs = [ + nodejs + pnpm + pnpmConfigHook + ]; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-ZhtyQsEnIoA9SpyD+oaXFzGSDAfufWnwiL7C8ImLZ7E="; + }; + + buildPhase = '' + runHook preBuild + + NODE_ENV=production pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/node_modules/prettier-plugin-tailwindcss + + # Required for `pnpm deploy` to work without the `--legacy` flag + pnpm config set --location=project inject-workspace-packages true + + pnpm --filter=prettier-plugin-tailwindcss --prod \ + deploy $out/lib/node_modules/prettier-plugin-tailwindcss/ + + # Workaround for "Cannot find package 'prettier' imported from ..." + cp -rL node_modules/prettier $out/lib/node_modules/prettier-plugin-tailwindcss/node_modules/ + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Formatter plugin for Tailwind CSS"; + homepage = "https://github.com/tailwindlabs/prettier-plugin-tailwindcss"; + changelog = "https://github.com/tailwindlabs/prettier-plugin-tailwindcss/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ starryreverie ]; + }; +}) diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix index 49c905775d6a..2635dad2bf50 100644 --- a/pkgs/by-name/py/pytr/package.nix +++ b/pkgs/by-name/py/pytr/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "pytr"; - version = "0.4.9"; + version = "0.4.10"; pyproject = true; src = fetchFromGitHub { owner = "pytr-org"; repo = "pytr"; tag = "v${version}"; - hash = "sha256-W6OtXK9c8NV8wIhvaym2tAg6UNJtCEPk1mt5VB0+Rkg="; + hash = "sha256-xo/J0POH21mLm//+gpfhuxIGdKGHJpFbpL82TIDufrM="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/qu/quarto/package.nix b/pkgs/by-name/qu/quarto/package.nix index 155f9eddf12a..30ecca6d5ea9 100644 --- a/pkgs/by-name/qu/quarto/package.nix +++ b/pkgs/by-name/qu/quarto/package.nix @@ -7,16 +7,24 @@ deno, fetchurl, dart-sass, + installShellFiles, rWrapper, rPackages, extraRPackages ? [ ], makeWrapper, runCommand, python3, - quarto, extraPythonPackages ? ps: [ ], sysctl, which, + autoPatchelfHook, + bashNonInteractive, + coreutils, + versionCheckHook, + writeShellScript, + curl, + jq, + common-updater-scripts, }: let @@ -36,20 +44,39 @@ let ] ++ (extraPythonPackages ps) ); + + # bin/quarto resolves every bundled tool through bin/tools/$ARCH_DIR, which it + # derives from uname and can only ever be x86_64 or aarch64 + archDir = stdenv.hostPlatform.parsed.cpu.name; + denoDomExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; + denoDomPlugin = "libplugin.${denoDomExt}"; in stdenv.mkDerivation (finalAttrs: { pname = "quarto"; - version = "1.9.37"; + version = "1.10.18"; - src = fetchurl { - url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${finalAttrs.version}/quarto-${finalAttrs.version}-linux-amd64.tar.gz"; - hash = "sha256-ePzZDpg+Pn2+Pw0ZIcwQJTweynuSwg3UvCo8G8oKmvU="; - }; + src = + finalAttrs.passthru.sources.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + # the macOS tarball unpacks flat instead of into a versioned directory + sourceRoot = if stdenv.hostPlatform.isDarwin then "." else "quarto-${finalAttrs.version}"; + + strictDeps = true; nativeBuildInputs = [ + installShellFiles makeWrapper - which - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + + buildInputs = [ + # bin/quarto is a bash script; under strictDeps patchShebangs only resolves + # its interpreter from the host dependencies + bashNonInteractive + ] + # libgcc_s.so.1 for the retained typst-gather and deno_dom binaries + ++ lib.optionals stdenv.hostPlatform.isLinux [ (stdenv.cc.cc.libgcc or null) ]; dontStrip = true; @@ -60,6 +87,13 @@ stdenv.mkDerivation (finalAttrs: { --set-default QUARTO_ESBUILD ${lib.getExe esbuild} \ --set-default QUARTO_DART_SASS ${lib.getExe dart-sass} \ --set-default QUARTO_TYPST ${lib.getExe typst} \ + --set-default QUARTO_DENO_DOM $out/bin/tools/${archDir}/deno_dom/${denoDomPlugin} \ + --suffix PATH : ${ + lib.makeBinPath [ + coreutils + which + ] + } \ ${lib.optionalString (rWrapper != null) "--set-default QUARTO_R ${rWithPackages}/bin/R"} \ ${ lib.optionalString (python3 != null) "--set-default QUARTO_PYTHON ${pythonWithPackages}/bin/python3" @@ -73,8 +107,46 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/bin $out/share + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # the macOS asset bundles a complete tool tree for every architecture, + # alongside AppleDouble metadata files + find bin/tools -mindepth 1 -maxdepth 1 -type d ! -name ${archDir} -exec rm -r {} + + find . -name '._*' -delete + '' + + '' + tools=bin/tools/${archDir} + if [ ! -d "$tools" ]; then + echo "upstream no longer ships $tools, which is where quarto looks up its tools" >&2 + exit 1 + fi - rm -r bin/tools + # swap the vendored tools for the nixpkgs builds. typst-gather and deno_dom + # have no nixpkgs equivalent and are kept: dropping the whole directory + # broke `quarto call typst-gather` and the DENO_DOM_PLUGIN export. + rm -r "$tools"/deno "$tools"/pandoc "$tools"/typst "$tools"/esbuild "$tools"/dart-sass + + ln -s ${lib.getExe deno} "$tools"/deno + ln -s ${lib.getExe pandoc} "$tools"/pandoc + ln -s ${lib.getExe typst} "$tools"/typst + ln -s ${lib.getExe esbuild} "$tools"/esbuild + mkdir "$tools"/dart-sass + ln -s ${lib.getExe dart-sass} "$tools"/dart-sass/sass + + # the linux-arm64 asset names the plugin libplugin-linux-aarch64.so, while + # bin/quarto and QUARTO_DENO_DOM only ever point at the unsuffixed name; a + # dlopen miss is swallowed and silently downgrades quarto to the wasm parser + if [ ! -e "$tools"/deno_dom/${denoDomPlugin} ]; then + mv "$tools"/deno_dom/libplugin*.${denoDomExt} "$tools"/deno_dom/${denoDomPlugin} + fi + + # pre-1.4 location, still probed by the VS Code extension + ln -s ${archDir}/pandoc bin/tools/pandoc + + # share/man also holds the qmd the page is generated from, which + # compressManPages would gzip in place for mandb to trip over + installManPage --name quarto.1 share/man/quarto-man.man + rm -r share/man mv bin/* $out/bin mv share/* $out/share @@ -82,17 +154,63 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = { - quarto-check = - runCommand "quarto-check" - { - nativeBuildInputs = [ which ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sysctl ]; - } - '' - export HOME="$(mktemp -d)" - ${quarto}/bin/quarto check - touch $out - ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru = { + sources = { + x86_64-linux = fetchurl { + url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${finalAttrs.version}/quarto-${finalAttrs.version}-linux-amd64.tar.gz"; + hash = "sha256-r60HG1vSLALy0wBpV0MYnTZQ4FN6Uwc+ZUtjDP8rDHM="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${finalAttrs.version}/quarto-${finalAttrs.version}-linux-arm64.tar.gz"; + hash = "sha256-9qB99o4lMwtd809l099mvKYFrM47gwxZOljpGITUz2w="; + }; + # the macOS asset is a universal binary carrying both architectures + aarch64-darwin = fetchurl { + url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${finalAttrs.version}/quarto-${finalAttrs.version}-macos.tar.gz"; + hash = "sha256-3danGp4ESKsV+2VbxYnhHLZYmiSOw1zNf39EE3UxaI4="; + }; + }; + + tests = { + quarto-check = + runCommand "quarto-check" + { + nativeBuildInputs = [ which ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sysctl ]; + } + '' + export HOME="$(mktemp -d)" + ${lib.getExe finalAttrs.finalPackage} check + touch $out + ''; + }; + + updateScript = writeShellScript "update-quarto" '' + set -o errexit -o pipefail + export PATH="${ + lib.makeBinPath [ + curl + jq + common-updater-scripts + ] + }" + NEW_VERSION=$(curl --fail --silent --show-error --location https://api.github.com/repos/quarto-dev/quarto-cli/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output) + # a truncated response still leaves jq at exit 0, and an empty version + # would reach update-source-version + if [[ -z "$NEW_VERSION" || "$NEW_VERSION" = "null" ]]; then + echo "Could not read the latest release tag from the GitHub API." >&2 + exit 1 + fi + if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then + echo "The new version same as the old version." + exit 0 + fi + for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do + update-source-version "''${UPDATE_NIX_ATTR_PATH:-quarto}" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" + done + ''; }; meta = { @@ -104,11 +222,11 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://quarto.org/"; changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl2Plus; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ mrtarantoga ]; - platforms = lib.platforms.all; + platforms = builtins.attrNames finalAttrs.passthru.sources; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode binaryBytecode diff --git a/pkgs/by-name/ru/rura/package.nix b/pkgs/by-name/ru/rura/package.nix index 2d8d2de57579..4085d7b03a43 100644 --- a/pkgs/by-name/ru/rura/package.nix +++ b/pkgs/by-name/ru/rura/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rura"; - version = "1.10.0"; + version = "1.11.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "tlipinski"; repo = "rura"; tag = "v${finalAttrs.version}"; - hash = "sha256-yxYTBXGFX2PdtzgYexnXyjNMcDTnfwsy2s8S0y4hp+M="; + hash = "sha256-oPvO6oCefkyCkhpidfyQzW4ckN2cxSKijdWlKjWc6PU="; }; - cargoHash = "sha256-FnLeyUUwQFWLNLLQX538LHIlzwNRg+JfAW9r3IiBnWg="; + cargoHash = "sha256-V69RoAhk3Q7RmlgOEhLsoVHofGxY8aT/iZHoWEv47qw="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix index 830fe89f013b..d1553031cd71 100644 --- a/pkgs/by-name/sh/shopify-cli/package.nix +++ b/pkgs/by-name/sh/shopify-cli/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "shopify"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "shopify"; repo = "cli"; tag = finalAttrs.version; - hash = "sha256-iSXONoEcnLvaEGRzsXhyogjOw3jiQ5+JqDyKgplL9zg="; + hash = "sha256-c+fp/ml5x4CLmpkTxAZrB/zqaDWuG3cgrjNdmuvHdKY="; }; pnpmDeps = fetchPnpmDeps { diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix index 4d61443b4844..accb21344c9f 100644 --- a/pkgs/by-name/so/solanum/package.nix +++ b/pkgs/by-name/so/solanum/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "solanum"; - version = "0-unstable-2026-06-23"; + version = "0-unstable-2026-07-26"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = "solanum"; - rev = "a17cc145a7de564e49b84807d335289f30b12d00"; - hash = "sha256-tlocAC1U5WM3AKPxmBqqGGN05t+rwgA3p2im0NKKBuQ="; + rev = "115b1e2e8c3d94a490cdcb0fc1f7a4448cefc6bf"; + hash = "sha256-xy3nRooKpTmEr8WRdU8Xs4bmNwLv9oTk2y5KvpZjfDc="; }; postPatch = '' diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 114bafb0b103..404724e61f69 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule (finalAttrs: { pname = "stackit-cli"; - version = "0.68.0"; + version = "0.70.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-ifi+lUXZ0pn5GdjdeyjRD1Xixe/wZGlUp7gKvH6udng="; + hash = "sha256-jKOJPpmELJBkljVetIJkd5cZ2FMz687FEUCwV2ZVFjA="; }; - vendorHash = "sha256-hAgtOsfHh5QtbWbItHAckuw7wP+aeAAL5JDYZXokgJ0="; + vendorHash = "sha256-ptS1n1Z74q6NnFiOqDrBZLjjfNdpaZuZiggXKg5hRO4="; subPackages = [ "." ]; diff --git a/pkgs/by-name/st/stakk/package.nix b/pkgs/by-name/st/stakk/package.nix index def14f812ca2..01edc4105249 100644 --- a/pkgs/by-name/st/stakk/package.nix +++ b/pkgs/by-name/st/stakk/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "stakk"; - version = "1.17.2"; + version = "1.19.0"; src = fetchFromGitHub { owner = "glennib"; repo = "stakk"; tag = "v${finalAttrs.version}"; - hash = "sha256-+q94xzOV9rA7B1pBBt9ZjESzcV8mhraiMGgDQekZM7Y="; + hash = "sha256-tbzy8+dt5nxGODhng1Mb07PiEesIMZ0DROPLZBDWusI="; }; - cargoHash = "sha256-/Wx1n5zt+rBGtM04bi2PTiO8zqCJvgKz5aoTo7f08NI="; + cargoHash = "sha256-t/O+EXeuGZXQn1fwVnjF2rAleDUWFTwIaSF+NSGrX4w="; useNextest = true; diff --git a/pkgs/by-name/sw/swiftformat/package.nix b/pkgs/by-name/sw/swiftformat/package.nix index 2d44cd06482a..07e5d56fa509 100644 --- a/pkgs/by-name/sw/swiftformat/package.nix +++ b/pkgs/by-name/sw/swiftformat/package.nix @@ -10,13 +10,13 @@ swift.stdenv.mkDerivation (finalAttrs: { pname = "swiftformat"; - version = "0.61.1"; + version = "0.62.1"; src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; rev = finalAttrs.version; - sha256 = "sha256-h0d/vdoKZuYJkMO+TmFFgomaSVA94P+MKclSlBlIleE="; + sha256 = "sha256-LW/ihr0PaQyd8/SbOD1p8MOETbALO1RQMaEspt3y0Hs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix index e3fb14d8c429..a884d6969ef7 100644 --- a/pkgs/by-name/ta/taze/package.nix +++ b/pkgs/by-name/ta/taze/package.nix @@ -12,20 +12,20 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "taze"; - version = "19.16.0"; + version = "20.0.1"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "taze"; tag = "v${finalAttrs.version}"; - hash = "sha256-VVWceyF/jgsdJt33FbHJUNCey5peIB3BxhmOwxhVaHI="; + hash = "sha256-0BvMBb7QFxZgR+6V1xP3CZWmmW3VU3r2/rtMytm/Eiw="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-p0rkOHqieg1K+QWAMr2JtXL5Cq6iEa+Skt0B0Iq/OpI="; + hash = "sha256-mylj8NazfOAs9wHoCawcU0/5xy2pYGkKb/B9g5BhUuY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/to/toppler/gcc14.patch b/pkgs/by-name/to/toppler/gcc14.patch deleted file mode 100644 index 9582fe694bb0..000000000000 --- a/pkgs/by-name/to/toppler/gcc14.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/Makefile b/Makefile -index a6a140f..fb9a8b9 100644 ---- a/Makefile -+++ b/Makefile -@@ -518,7 +518,7 @@ src/po/%.po: _build/toppler.pot - # TODO dist and windist.. - - .PHONY: install --install: toppler.dat toppler $(TRANSLATIONFILES_INST) -+install: toppler $(TRANSLATIONFILES_INST) - $(INSTALL) -m755 -d $(DESTDIR)$(PKGDATADIR) - $(INSTALL) -m755 -d $(DESTDIR)$(BINDIR) - $(INSTALL) -m755 -d $(DESTDIR)$(MANDIR)/man6 -diff --git a/src/decl.cc b/src/decl.cc -index f80f83e..8a7bbd9 100644 ---- a/src/decl.cc -+++ b/src/decl.cc -@@ -22,6 +22,7 @@ - #include - - #include -+#include - #include - #include - #include -diff --git a/src/keyb.cc b/src/keyb.cc -index c3c13df..7d37847 100644 ---- a/src/keyb.cc -+++ b/src/keyb.cc -@@ -156,7 +156,7 @@ static void handleEvents(void) { - mouse_button = e.button.button; - break; - case SDL_QUIT: -- fprintf(stderr, _("Wheee!!\n").c_str()); -+ fprintf(stderr, "%s", _("Wheee!!\n").c_str()); - exit(0); - break; - -diff --git a/src/level.cc b/src/level.cc -index e1e2bb8..ac2faf3 100644 ---- a/src/level.cc -+++ b/src/level.cc -@@ -27,6 +27,7 @@ - #endif - - #include "decl.h" -+#include - - #ifdef _WIN32 - #include -diff --git a/src/main.cc b/src/main.cc -index 522d041..ffc8e40 100644 ---- a/src/main.cc -+++ b/src/main.cc -@@ -46,7 +46,7 @@ static bool parse_arguments(int argc, char *argv[]) { - if (parm >= '0' && parm <= '9') { - printf(_("Debug level is now %c.\n").c_str(), parm); - config.debug_level(parm - '0'); -- } else printf(_("Illegal debug level value, using default.\n").c_str()); -+ } else printf("%s", _("Illegal debug level value, using default.\n").c_str()); - } else { - printhelp(); - return false; -@@ -110,7 +110,7 @@ int main(int argc, char *argv[]) { - atexit(QuitFunction); - srand(time(0)); - startgame(); -- printf(_("Thanks for playing!\n").c_str()); -+ printf("%s", _("Thanks for playing!\n").c_str()); - SDL_ShowCursor(mouse); - SDL_Quit(); - } -diff --git a/src/screen.cc b/src/screen.cc -index eb18543..ce23571 100644 ---- a/src/screen.cc -+++ b/src/screen.cc -@@ -30,6 +30,8 @@ - #include "keyb.h" - #include "configuration.h" - -+#include -+ - static SDL_Surface *display = nullptr; - static SDL_Window *sdlWindow = nullptr; - static SDL_Renderer *sdlRenderer = nullptr; diff --git a/pkgs/by-name/to/toppler/package.nix b/pkgs/by-name/to/toppler/package.nix deleted file mode 100644 index c8db49d899f8..000000000000 --- a/pkgs/by-name/to/toppler/package.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - nix-update-script, - writableTmpDirAsHomeHook, - - buildPackages, - pkg-config, - gettext, - povray, - imagemagick, - gimp2, - - sdl2-compat, - SDL2_mixer, - SDL2_image, - libpng, - zlib, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "toppler"; - version = "1.3"; - - src = fetchFromGitLab { - owner = "roever"; - repo = "toppler"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ecEaELu52Nmov/BD9VzcUw6wyWeHJcsKQkEzTnaW330="; - }; - - strictDeps = true; - enableParallelBuilding = true; - - depsBuildBuild = [ - buildPackages.stdenv.cc - pkg-config - sdl2-compat - SDL2_image - libpng - zlib - ]; - - nativeBuildInputs = [ - pkg-config - gettext - povray - imagemagick - gimp2 - # GIMP needs a writable home - writableTmpDirAsHomeHook - ]; - - buildInputs = [ - sdl2-compat - SDL2_mixer - zlib - ]; - - patches = [ - # Based on https://gitlab.com/roever/toppler/-/merge_requests/3 - ./gcc14.patch - ]; - - makeFlags = [ - "CXX_NATIVE=$(CXX_FOR_BUILD)" - "PKG_CONFIG_NATIVE=$(PKG_CONFIG_FOR_BUILD)" - "PREFIX=${placeholder "out"}" - ]; - - preBuild = '' - # The `$` is escaped in `makeFlags` so using it for these parameters results in infinite recursion - makeFlagsArray+=(CXX=$CXX PKG_CONFIG=$PKG_CONFIG); - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Jump and run game, reimplementation of Tower Toppler/Nebulus"; - homepage = "https://gitlab.com/roever/toppler"; - license = with lib.licenses; [ - gpl2Plus - # Makefile - gpl3Plus - ]; - maintainers = with lib.maintainers; [ fgaz ]; - platforms = lib.platforms.all; - mainProgram = "toppler"; - }; -}) diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix index 542ddc058ac4..94b18bd2768f 100644 --- a/pkgs/by-name/ts/tsx/package.nix +++ b/pkgs/by-name/ts/tsx/package.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "tsx"; - version = "4.23.1"; + version = "4.23.12"; src = fetchFromGitHub { owner = "privatenumber"; repo = "tsx"; tag = "v${finalAttrs.version}"; - hash = "sha256-zR3a3AZLPYmnIeiT0SNwN6gVcnR4ObzJsfj7aQ8LOkQ="; + hash = "sha256-hHiJaLyCJwxSV1fc9Zpn/JHmvRS2fhT1XmL+B94+axw="; }; pnpmDeps = fetchPnpmDeps { @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm'; fetcherVersion = 3; - hash = "sha256-jnCz9u+UMGV20t6fhzk/rVq68K+e5eBvUth6O7jOpQg="; + hash = "sha256-KysktlAKCChQW0CwI8qsVJu2rEmMwF+eVNvxuzAYLis="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tu/tuigreet/package.nix b/pkgs/by-name/tu/tuigreet/package.nix index b1a16c8f2f5d..23345ce3b1b2 100644 --- a/pkgs/by-name/tu/tuigreet/package.nix +++ b/pkgs/by-name/tu/tuigreet/package.nix @@ -8,16 +8,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "tuigreet"; - version = "0.9.1"; + version = "0.11.0"; + + __structuredAttrs = true; src = fetchFromGitHub { - owner = "apognu"; + owner = "tuigreet"; repo = "tuigreet"; tag = finalAttrs.version; - hash = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY="; + hash = "sha256-4DB4Pl2UwIeab/MJaX3VfVNMsPWE6Q513z1NDdxvG3o="; }; - cargoHash = "sha256-w6ZOqpwogKoN4oqqI1gFqY8xAnfvhEBVaL8/6JXpKXs="; + cargoHash = "sha256-5Q4E8nnmQ109gcfxxctn/rne5N4Qvz2Pft6o7as2fSc="; nativeBuildInputs = [ installShellFiles @@ -33,10 +35,13 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Graphical console greeter for greetd"; - homepage = "https://github.com/apognu/tuigreet"; - changelog = "https://github.com/apognu/tuigreet/releases/tag/${finalAttrs.version}"; + homepage = "https://github.com/tuigreet/tuigreet"; + changelog = "https://github.com/tuigreet/tuigreet/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + NotAShelf + antoineco + ]; platforms = lib.platforms.linux; mainProgram = "tuigreet"; }; diff --git a/pkgs/by-name/ua/uavs3d/package.nix b/pkgs/by-name/ua/uavs3d/package.nix index 39a0d4c7d612..ee0e70573dc5 100644 --- a/pkgs/by-name/ua/uavs3d/package.nix +++ b/pkgs/by-name/ua/uavs3d/package.nix @@ -4,17 +4,17 @@ cmake, stdenv, testers, - unstableGitUpdater, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "uavs3d"; - version = "1.1-unstable-2025-12-13"; + version = "1.2"; src = fetchFromGitHub { owner = "uavs3"; repo = "uavs3d"; - rev = "0e20d2c291853f196c68922a264bcd8471d75b68"; + tag = finalAttrs.version; hash = "sha256-SlCGLglBsU3ua406Bnf89c4X80F5B93piF2sAXqtRus="; }; @@ -41,9 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; + updateScript = gitUpdater { }; tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; }; diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix index 54caf412332a..62faa1801652 100644 --- a/pkgs/by-name/ul/ultrastardx/package.nix +++ b/pkgs/by-name/ul/ultrastardx/package.nix @@ -15,7 +15,7 @@ SDL2_mixer, SDL2_net, SDL2_ttf, - ffmpeg_8, + ffmpeg, sqlite, zlib, libx11, @@ -39,19 +39,19 @@ let libx11 libGLU libGL - ffmpeg_8 + ffmpeg ]; in stdenv.mkDerivation (finalAttrs: { pname = "ultrastardx"; - version = "2026.6.0"; + version = "2026.8.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${finalAttrs.version}"; - hash = "sha256-xqP50OFUT+wreG/EZhmh5zPOwpNvG1TQkLzovgVDquI="; + hash = "sha256-dtZrVsXXpy70aJvMqs/IUPsvRd52FKpm9I5XuZSLwCY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 5853dec5a7c0..e0bb8b5486f6 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -12,17 +12,17 @@ buildGoModule (finalAttrs: { pname = "updatecli"; - version = "0.119.0"; + version = "0.120.0"; src = fetchFromGitHub { owner = "updatecli"; repo = "updatecli"; rev = "v${finalAttrs.version}"; - hash = "sha256-iXlaKJcxL2dwu0NTVtuLyinOY/fLWOGQU8jn1ZASrzw="; + hash = "sha256-KVGvOCdxgTK9chZU8TwemrQUlkvOdvWIzBG0dSY/VpU="; }; proxyVendor = true; - vendorHash = "sha256-xiE9aRZCDF9x7e4z5WMCNMPoMOQJldp7iuz2HU1KnSo="; + vendorHash = "sha256-iZf6nB6arDEWDANq3Gp72kfFQi5QKGymHLKFJcnT+98="; # tests require network access doCheck = false; diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json index 44f6ca0c7599..48531507a423 100644 --- a/pkgs/by-name/ve/velocity/deps.json +++ b/pkgs/by-name/ve/velocity/deps.json @@ -37,12 +37,19 @@ "module": "sha256-NMCTxQIrGzueJvGDW6JYNKMV7a41/2bv+iE5528MEiw=", "pom": "sha256-yZIwMm954KZ4M0gs0HWGn8qyIrf17xuZpnOH5RjyAio=" }, - "com/google/code/gson#gson-parent/2.8.9": { - "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" }, - "com/google/code/gson#gson/2.8.9": { - "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", - "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + }, + "com/google/errorprone#error_prone_annotations/2.27.0": { + "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", + "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" + }, + "com/google/errorprone#error_prone_parent/2.27.0": { + "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" }, "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", @@ -75,13 +82,13 @@ "module": "sha256-pnYDnqavCPJXtG4Hwr8VcaRqTUtbnMuGw/yY0H+v6hs=", "pom": "sha256-arSo7K4qu9NrkZ0Lm5+yTBdxSPE+U2TJegxu4Ro/xCY=" }, - "io/papermc#fill-gradle/1.0.10": { - "jar": "sha256-bus0jbvo7Q5DIHtK4tZ3Mej1iT9UTyOogKbaHjFp8G0=", - "module": "sha256-3XcMaCi73jdXaT9jRCDsQfLC7HUj812wHEyl/b5ulUc=", - "pom": "sha256-fzyVO0ASsxooOLuG8wj9zZyFY28PXwRNowZOTi25m4o=" + "io/papermc#fill-gradle/1.0.12": { + "jar": "sha256-6V0UIlMg/pW6cwDp9J5h2E+lYaP8BT+Bv0DR7ZwGczk=", + "module": "sha256-UHDlz/3z1BjsmaUCzglE7niQPBSjSTtNIpmEJIQtIIA=", + "pom": "sha256-hpEZH3pmqKAdxYpUKzEXybZtsoZ1jKa28yF8R5gSNNk=" }, - "io/papermc/fill/gradle#io.papermc.fill.gradle.gradle.plugin/1.0.10": { - "pom": "sha256-btM/SagAKm6tp/rMWgrl+jtEzgf0CEUEu5XbTMLWUsc=" + "io/papermc/fill/gradle#io.papermc.fill.gradle.gradle.plugin/1.0.12": { + "pom": "sha256-6QgmgblRWPmLcnuNXlQ1NJmEogCMk22xVHEe4pPpIX0=" }, "org/apache#apache/35": { "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" @@ -100,13 +107,13 @@ "jar": "sha256-eJRUAUwVDyrfaBzYD47PSYF9k+15DzZZs2LcoHreh7g=", "pom": "sha256-ok2dkGpHjhJrIZqdJFGLgztm2ksQP5Y+ILkFC+virhU=" }, - "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": { - "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=", - "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=", - "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8=" + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/6.5.7": { + "jar": "sha256-zIyqQQGjXQzwQzpj6K04kRpMhIBz/MlPQ64CUfM+Ta8=", + "module": "sha256-ENa9ZquwiOylvjYP9yVQyWFU0mdu/t10rzHEUAF8OQk=", + "pom": "sha256-q+nzlg+nNZciqHUuYb/ElnYeFdFHNeTGQiB5cHYGq74=" }, - "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": { - "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/6.5.7": { + "pom": "sha256-Ldg2zAlxLNrd/u/GgNLqZutD2NxjOGvVlSZYE0l/Ry0=" }, "org/gradle/toolchains#foojay-resolver/1.0.0": { "jar": "sha256-eLhqR9/fdpfJvRXaeJg/2A2nJH1uAvwQa98H4DiLYKg=", @@ -120,96 +127,89 @@ "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { - "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", - "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + "org/jetbrains/kotlin#abi-tools-api/2.3.20": { + "jar": "sha256-U2hfV4OwSQaDiY11Wrrk1Bi26DugYTSFiv3ctZRYmek=", + "pom": "sha256-qIbJ/X8rlmlFf+wCHxnc8V8EY+DbS9rVOuGBJTZsxvk=" }, - "org/jetbrains/kotlin#kotlin-assignment/2.0.21": { - "module": "sha256-8638yrZURNtqqzwNfSVoZG7AyS8kWCh/KLKu5POXNtw=", - "pom": "sha256-QBfCQqfb3Oca6ApXB7S/OyOoIr8jpodahFp7UTYhzQ8=" + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.20": { + "module": "sha256-bNjWSw5lN3kE8wb2qFja/ZMcQTUkD4RMk9UpTumP6Dk=", + "pom": "sha256-SgpFTor25QOv5ngwoYVjubaA3u67GhcGoNe0S8UHQKE=" }, - "org/jetbrains/kotlin#kotlin-assignment/2.0.21/gradle85": { - "jar": "sha256-USUeNCELiNTJCAXKZS6Xe93IR4OkVAY5ydIQkJhbrOY=" + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.20/gradle813": { + "jar": "sha256-pPEKPw6l3dH1VaT3BuCep/VSs8hSK7EAY2HdMG4152o=" }, - "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": { - "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=", - "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0=" + "org/jetbrains/kotlin#kotlin-assignment/2.3.20": { + "module": "sha256-GCp0ZM5mvM/ejjG+aPoO7DE8HZDD2POWeclyJyliFjg=", + "pom": "sha256-f3R8uTA9Hfqh1hJfZsFUG+o4PsuZh2ta28riSAVZZ48=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { - "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", - "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + "org/jetbrains/kotlin#kotlin-assignment/2.3.20/gradle813": { + "jar": "sha256-tYin5gfij7WAIo4SDdX/+L6nO9J3JnM6F35kRYLooB0=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { - "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", - "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" + "org/jetbrains/kotlin#kotlin-build-statistics/2.3.20": { + "jar": "sha256-ptJ7PINhdlLdBlYG+Yz1nPviY/jCDr5OvVpvJonrDU8=", + "pom": "sha256-nQqNf/FyPV1y00ldVVc9jTxrd3TWHYBXlxT3nCQmX48=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { - "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", - "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.3.20": { + "jar": "sha256-IvGrIjhUuUkJn2slnO9UHVtYo2Q9+aScRXfGPEFuhDs=", + "pom": "sha256-G14LLDaQXcL1XgpLeBKuY+MSXe/PaG0sD0kPg7c9nV4=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { - "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", - "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.3.20": { + "jar": "sha256-wGnzCkA75wyBUviqnyXsy6GI7q1UJjrgKvFEIUN6Igg=", + "pom": "sha256-jYTqDt1gs4vOpWLeUXgVKiZxqaAFPWcPkxRSs9sBMig=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { - "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", - "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.3.20": { + "jar": "sha256-xxp8G+j7/wTgr0XJ7oy3ph2JU7ymuL8iWlcZxyWpC0Q=", + "pom": "sha256-nnyLgHJBF/cqrOZfa+SNg224/Dl1OtlR8ruQhi1+cIA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": { - "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=", - "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.3.20": { + "jar": "sha256-4WYu10cyK2P2HU+t2Zq3gQTEXq8JwRp4mGJBXoHBjcQ=", + "pom": "sha256-aP+Cf8E1DZPw1nM2jAZHm2K31eXDBlipWM+TBmgx6Nk=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { - "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", - "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=", - "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.3.20": { + "module": "sha256-04UBEP9ajrcP7S1Xi0X7B+vESvaika5M88eUMMZRKLo=", + "pom": "sha256-AdVSITSRyFPVb4frdIEwON+e4dhekIaqN70GY7JJb4g=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": { - "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.3.20/gradle813": { + "jar": "sha256-ybwX32m/OZB8WXweGb7EtHnHWqx1+/1jIeNEW0lxLog=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": { - "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=", - "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.3.20": { + "jar": "sha256-5Cicv5/0lAfwQd3GM24bV3pspM8r4dKjEzgnHBPu0+0=", + "pom": "sha256-9veHObqf4nEunwyeW8T16TcZzP6pW0fC9JslC+F2NX4=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": { - "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", - "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=", - "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.3.20": { + "jar": "sha256-lS5zlI4qINOYwmuHprtwzPZkGPuvFSfDUVsYjqnUvWA=", + "module": "sha256-b7XZcwCl5Vmv1Nn/msA1bE2Wb31pS2Yvrhaf2HQhUx4=", + "pom": "sha256-WROHIVGNgqND99wvCRK3BJjT7vM2PJ66wiCssPyTjsw=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": { - "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=", - "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=", - "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.3.20": { + "module": "sha256-lVUmc7gbNXitmy86/xRUtjzoBsb9SrfGBJIx6GQKtHE=", + "pom": "sha256-EcMjwt2KgE6fWOBHwsAYZLKgHcDYEys2PApDEiFbwJs=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": { - "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=", - "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.3.20/gradle813": { + "jar": "sha256-RuFu4mWU9ID+y5LJbarjdTDoNQJreON+8yUelX8D9vs=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": { - "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk=" + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.3.20": { + "module": "sha256-+CvXZF0MPv609PZVIKPGWz6MMCsIMyIDegABuHsC6ZA=", + "pom": "sha256-3WuRkZfhMv5x3axw9vxdj65/Und6/YN7FN6HG4wKVAA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": { - "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=", - "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.3.20": { + "jar": "sha256-vpN3SFQS0A8B54KZyzC+SAJZHCcwNCtuva/AiU91J0M=", + "pom": "sha256-IbFbpb1i0h1Ta7egyMtnQ1cfwPQwklSKQjWybyodIgs=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": { - "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=", - "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ=" + "org/jetbrains/kotlin#kotlin-native-utils/2.3.20": { + "jar": "sha256-QxnCdkeV773/K3julUVRV9evC5FVaYuqG6Uqar46vy0=", + "pom": "sha256-LAp+ADViCIXUN+fxJidEdbpYqiJC+1279D+R8gyvpwg=" }, - "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": { - "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=", - "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.3.20": { + "module": "sha256-nhEhx/ZQMDvdx/BH/tMCf4FjuzZ1Gy3w+vNjfumFsh8=", + "pom": "sha256-Y/Gk4+TT3jrPghTwWgtW/5IM4L9ZYVSnkE8gVuP41RE=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21": { - "module": "sha256-kJCVCx7oa4b+KWmV2AKG6opPN5+yshjoVvzt0ErS1Hk=", - "pom": "sha256-7lYZBmzLB5zDMy4kcnQ1n9dQXeLVQPuRtyd5ICW2Siw=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.3.20/gradle813": { + "jar": "sha256-oHxdPMvaP8dWTkB0RybhNz5UvSXwVGPT9D1DnXeOy90=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21/gradle85": { - "jar": "sha256-HSNuNiIzuaJx5QsiOlDI2+rdA1C2OiRkYIJWhS2jaKM=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": { - "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", - "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.3.20": { + "module": "sha256-fV4z3nFM3ddQeGQgmMvL7pfBg5jQNLd9MrSwdLlQOTk=", + "pom": "sha256-/Xtj7fb31urrwWoYVgu7koszQlYepcnR92kZiw/puYg=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.0": { "pom": "sha256-36lkSmrluJjuR1ux9X6DC6H3cK7mycFfgRKqOBGAGEo=" @@ -228,30 +228,34 @@ "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { - "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", - "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", - "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + "org/jetbrains/kotlin#kotlin-stdlib/2.3.20": { + "jar": "sha256-CuElBKUEDrrzdwOQhINCDRpWJN0dk/NXZl+Md8hIoB4=", + "module": "sha256-9Os0T8TR46KK4WwIbsPkL1I3O0ZtQwgYL7OG45LA76M=", + "pom": "sha256-yDwC2afi6VRzBJHDPC8dwDwnZi4ntWbsK0TS0Bhjm5g=" }, - "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": { - "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", - "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo=" + "org/jetbrains/kotlin#kotlin-tooling-core/2.3.20": { + "jar": "sha256-NnFCeBKZvA+RIMHe7A5ik0oa+ep/AaqpxaU1TcXY19k=", + "pom": "sha256-R+Ou/SS1vmLYB7bLzXnFW4P5S1XP4Y79xuM84RvxkOQ=" }, - "org/jetbrains/kotlin#kotlin-util-io/2.0.21": { - "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=", - "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA=" + "org/jetbrains/kotlin#kotlin-util-io/2.3.20": { + "jar": "sha256-DnbnRx6RxT6mjS0k7x8p+1kqxfuw0dEPqpFkMO/z2so=", + "pom": "sha256-lcKKgo/B8eWeZWOCR6ZPdm2B2LWfbY3r7y0YoMwyH4k=" }, - "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { - "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", - "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" + "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.3.20": { + "jar": "sha256-qJlOC8poRt+xn0WMTMFdexN3nKGw2fNIgLX/LCorc7M=", + "pom": "sha256-jxApEHGu+rvY5m/5r3dDojiB1pxqryjhNhbMDpW9F7c=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { - "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + "org/jetbrains/kotlin#kotlin-util-klib/2.3.20": { + "jar": "sha256-lWK407egS+uisUwFZx5xOFnqVLvAohB+ZbK88nP6hEg=", + "pom": "sha256-WlhMPMK6O0HR5c1+eiCDV2wbjDl6ebuBY2dtjvew6hc=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { - "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", - "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", - "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { + "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": { + "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=", + "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", + "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" }, "org/junit#junit-bom/5.13.4": { "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", @@ -332,56 +336,56 @@ "com/fasterxml#oss-parent/55": { "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" }, - "com/fasterxml#oss-parent/61": { - "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" - }, "com/fasterxml#oss-parent/68": { "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc=" }, - "com/fasterxml#oss-parent/70": { - "pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk=" + "com/fasterxml#oss-parent/69": { + "pom": "sha256-OFbVhKqhyOM86UxnJE9x9vcFOKJZ/+jngXYbn6qth18=" }, - "com/fasterxml/jackson#jackson-base/2.20.1": { - "pom": "sha256-C3SKsMx/KH21tgGMYUz+Z+fh9NgJQc4vQdMXzMO1tcU=" + "com/fasterxml#oss-parent/79": { + "pom": "sha256-kga33Wf7E4A2V2w9/KlHoqjz4sTS2cHy0d6lGbOk2uE=" }, - "com/fasterxml/jackson#jackson-bom/2.19.1": { - "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4=" + "com/fasterxml/jackson#jackson-base/2.22.0": { + "pom": "sha256-JSCeuNzVprRyMLP8EZzxwDgB9pg7lSliS37/aBPwFyY=" }, - "com/fasterxml/jackson#jackson-bom/2.20.1": { - "pom": "sha256-DGRn7UyMc5JSTOcDymzj7YhZbuw5DxOwwmTy+WEwilQ=" + "com/fasterxml/jackson#jackson-bom/2.19.2": { + "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM=" }, - "com/fasterxml/jackson#jackson-parent/2.19.2": { - "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U=" + "com/fasterxml/jackson#jackson-bom/2.22.0": { + "pom": "sha256-Yx1zbVKdGb+iUFTYuaRCZFh72NJEmuisGMcfDvLS8kQ=" }, - "com/fasterxml/jackson#jackson-parent/2.20": { - "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U=" + "com/fasterxml/jackson#jackson-parent/2.19.3": { + "pom": "sha256-I9GGyNjNBgFdAixxDHFUI9Zg1J4pc7FYcLApzCYBhoI=" }, - "com/fasterxml/jackson/core#jackson-annotations/2.20": { - "jar": "sha256-lZov+y1ZFDb1Hxg8alIfyJNHkS9xG/DK4AjN8EXZUxk=", - "module": "sha256-wHDxTsg1jQlcAurootZcsAzLoOXFqnOwASlDM/5GiXE=", - "pom": "sha256-TXQMRHjdCNCJ7NxtBjIopVoRp+jkl9pDOPhy+BFXlKQ=" + "com/fasterxml/jackson#jackson-parent/2.22": { + "pom": "sha256-fUWn77ad8ge+18xUuHoLsBLxCVLAlVcKJztJSF2g0Sk=" }, - "com/fasterxml/jackson/core#jackson-core/2.20.1": { - "jar": "sha256-/6tNlX2qJ5bPJMtm0LeKcJDxvL4Xw6RXjwmv+q8TcIk=", - "module": "sha256-GalAQ0Ic2ahuFUkSnDjBjgs1exQUWuT3Ns2gL4Bch8k=", - "pom": "sha256-FuBJqySPgqpssEjwTVLvPuH1TIDaHSY68k++UM9ueX4=" + "com/fasterxml/jackson/core#jackson-annotations/2.22": { + "jar": "sha256-Id21mIB9OlGodnBOuXnZKW4cam9Hqxgm/4jG1qEnotA=", + "module": "sha256-PSJwREjpjf1XjF31ZG3QqYrsBAgLCKMkXPi+uKJdy10=", + "pom": "sha256-OMO6UqDq3j4+rMWxNJnVbhA4zLrY7Eu3lCbcIUMrRtA=" }, - "com/fasterxml/jackson/core#jackson-databind/2.20.1": { - "jar": "sha256-NLvrRSb/9PhWWxIQa/haavy66FiWbUibVCFKxGsuJug=", - "module": "sha256-S1M7Mu5wZfVaSnsNbuTYn9WDdxSr83YUyJkRT7EhWHo=", - "pom": "sha256-vP3yeCUyMraDq1HeLcvI+Y8g9Hc4wRHs/SyFxBsTHOw=" + "com/fasterxml/jackson/core#jackson-core/2.22.0": { + "jar": "sha256-0ujdTfHg9ht4bqBnkvW/QjXYJ48Vjzvm6ZfpVZMcDJg=", + "module": "sha256-YIIVtvFyn7S4gI73UdJki62kTgivii0JzOI5UFeV7l8=", + "pom": "sha256-WqFPSdI2n4hbfD3D6oLoqtscCTZ26GCIPmiHFQ5z0/Q=" }, - "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.20.1": { - "jar": "sha256-aSvoPH4u67U7mVwR2BPGA6fXFtYMnS1PuUhuyxBfkpE=", - "module": "sha256-Ym4ePGc34Ie1v0UXrorr1pQ1ChBIdvtHSmJ3h+HEq0Y=", - "pom": "sha256-8V/WLrJEdrAKsf93IPALFmtpc+YobRRwi7hmEuv5I9Q=" + "com/fasterxml/jackson/core#jackson-databind/2.22.0": { + "jar": "sha256-NSCgNR8pRpnj4bejfHpyav2B4aia5wKsfUf/NH/S7L8=", + "module": "sha256-McdjazHtpftn3FUh4gHzyV2WiWX+YMECdW4xmy0YD28=", + "pom": "sha256-dryzSDZ2c9C158+siWGxi9AIGrPBUaFui+UiEL7CMTY=" }, - "com/fasterxml/jackson/module#jackson-modules-java8/2.20.1": { - "pom": "sha256-ARd18sV1jwGRus7bTlFDj6/crz2rJUi/xLfXlaRUNg0=" + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.22.0": { + "jar": "sha256-yLP1aFVSPtfq5oXKKS0tvpf/IgWt8v6RoHWePuB1TUw=", + "module": "sha256-23MyjrwA9Z0hzyKzS2O0i0CMtoX8Iih0lszyewul+z0=", + "pom": "sha256-DekC1FGLtdtaO+KWeRHkmbPKRiyweE/h9HcXa2uCB3I=" }, - "com/fasterxml/woodstox#woodstox-core/7.1.0": { - "jar": "sha256-gSZpIKHNxHMGqKK0cmyZ7Imz+/McJHDk9eR32dhXyp8=", - "pom": "sha256-+ZXFCx0gl18KjW8OUyK8jRPHiuPcGCcXdoQUlypmzIU=" + "com/fasterxml/jackson/module#jackson-modules-java8/2.22.0": { + "pom": "sha256-inDeHu8ntNOzDZ5gLQQF8lBJ94o26BtHbF6gjk+YSGo=" + }, + "com/fasterxml/woodstox#woodstox-core/7.1.1": { + "jar": "sha256-ArnQIunUdwT/inqFmg2/07KIKoMR63/x4YD3YMzaJxI=", + "pom": "sha256-r7XLRdQcH542dZCd5P7yQr3BzqRHagY0riD016VEM/8=" }, "com/github/ben-manes/caffeine#caffeine/3.2.3": { "jar": "sha256-ynDJCl0c4VEYgM6ck9StIhCPYREdPa+R61J2K1cb0Xk=", @@ -415,15 +419,15 @@ "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" }, - "com/google/code/gson#gson-parent/2.13.2": { - "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0=" + "com/google/code/gson#gson-parent/2.14.0": { + "pom": "sha256-grD2aUxXWKuLsH4FYwII1Q9YnUteBP0KBG1Zzfe6PR0=" }, "com/google/code/gson#gson-parent/2.8.0": { "pom": "sha256-Dx2DabHp8bxLRnyNz92LWXM6rVtchBnDpZsvmrrwTNI=" }, - "com/google/code/gson#gson/2.13.2": { - "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=", - "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y=" + "com/google/code/gson#gson/2.14.0": { + "jar": "sha256-LL0Rm/GWHCh4gxCWPcgLpl9Yze7B3ROci9sSQPqiw28=", + "pom": "sha256-H6ASLA43MxkmQoYcNr5Mb3maeVMnojvdKSJpG26bpIA=" }, "com/google/code/gson#gson/2.8.0": { "jar": "sha256-xiIXY715xPHD3H91C18poLs4s2e4ExTE9xiW40DECCU=", @@ -444,13 +448,13 @@ "com/google/errorprone#error_prone_annotations/2.38.0": { "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc=" }, - "com/google/errorprone#error_prone_annotations/2.41.0": { - "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=", - "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4=" + "com/google/errorprone#error_prone_annotations/2.47.0": { + "jar": "sha256-U2S8byLnLpgZXkBqWNO6HAn/oR3qBylZLLhw3C3kBW0=", + "pom": "sha256-2AyImkpvcR9pRfvueeBewkexeKVn6dWr9Y6ybr8KB1I=" }, - "com/google/errorprone#error_prone_annotations/2.43.0": { - "jar": "sha256-SCcudcFuH3vce9GVKcys1e4XBARwHX9aI0QbtYR5V/U=", - "pom": "sha256-T2uIia+o3r2+Hj/ipfjmbiIWygtWPya05UE4cw7s3IA=" + "com/google/errorprone#error_prone_annotations/2.48.0": { + "jar": "sha256-tJxclYMW7WegnGmd2pqnScr0NNUdhj3qWZ7zakm5yFU=", + "pom": "sha256-GJ4JrQSJwyXpDaqp1cj0BjMGAvo2Zgm8oHy82tA6udo=" }, "com/google/errorprone#error_prone_parent/2.11.0": { "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" @@ -464,11 +468,11 @@ "com/google/errorprone#error_prone_parent/2.38.0": { "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w=" }, - "com/google/errorprone#error_prone_parent/2.41.0": { - "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI=" + "com/google/errorprone#error_prone_parent/2.47.0": { + "pom": "sha256-I2ipkMemMJXh0NREWdWkCS8Osx+FYr0SzfDhyHe2poU=" }, - "com/google/errorprone#error_prone_parent/2.43.0": { - "pom": "sha256-u5LEWE0CEb1ZvspPsnYXD13FD+NGFG6TV40tqyYDPhA=" + "com/google/errorprone#error_prone_parent/2.48.0": { + "pom": "sha256-sz+opFyfF5SlAIwLLYOoTrKLXQEXptFW8AP58JvnQQ8=" }, "com/google/guava#failureaccess/1.0.1": { "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", @@ -496,8 +500,8 @@ "com/google/guava#guava-parent/33.4.0-android": { "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM=" }, - "com/google/guava#guava-parent/33.5.0-jre": { - "pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU=" + "com/google/guava#guava-parent/33.6.0-jre": { + "pom": "sha256-N0vTH2Gxz2Er7pqy5NcLvfd92FpJtDH4CdT73JAfLdQ=" }, "com/google/guava#guava/21.0": { "jar": "sha256-lyE5cYq8ikiT+njLqM97LJA/Ncl6r0T6MDGwZplItIA=", @@ -515,10 +519,10 @@ "jar": "sha256-vX+iJ1kfuFCWd9DREiz5UVjzuKn0VlP1goHYefbcSMU=", "pom": "sha256-QsJX9/c203ezGv7u6XirJtcwzXCvYN3nZi4YI1LiSCo=" }, - "com/google/guava#guava/33.5.0-jre": { - "jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=", - "module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=", - "pom": "sha256-BHj6eKkIs8Mf5td76ZeKqmIeKhgduEAH49OzdCSirGE=" + "com/google/guava#guava/33.6.0-jre": { + "jar": "sha256-3Fc+H8pP1UVPSl/T19ot8DACh2pBdbr8FKlZgN13E7M=", + "module": "sha256-K69zzoOa5I5LngCD4law5Y/Dv4/Hj8P755e7yJARIW4=", + "pom": "sha256-tFt4lEKABUMRxT2pJwgJ+0Dcq8QIzmbOVXMAmbT1fTI=" }, "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", @@ -562,13 +566,13 @@ "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" }, - "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.3.1": { - "pom": "sha256-UTTWOg2SWbKU+BUhoZoEAhUkhUVGiq7E9MBGfIKVx1o=" + "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.5.1": { + "pom": "sha256-Mi1vdR/j/QgX4xsZnQzx3MbwOZvJ1IfE7ad+/4kGqac=" }, - "com/gradleup/shadow#shadow-gradle-plugin/9.3.1": { - "jar": "sha256-lGB42YbsVs6P+NAWN9kPcJ8zPVg6tSCq3Y5EnTcE2Gc=", - "module": "sha256-IuNwRjPPGSGbTVGUqNKJDPfPTbctRA5g6BIlcS+na2w=", - "pom": "sha256-nLrNpEyjh3wt54LMo5iIGUYCimh4H/kOypnamAgO/JE=" + "com/gradleup/shadow#shadow-gradle-plugin/9.5.1": { + "jar": "sha256-6Qv/4KUXI4nhG/Js1Zy1AFyBGJIo9QA5UL/jQ0VPMmE=", + "module": "sha256-64DurOvM0TfqSwoYSZB/rmDtt6rkAuZ2pN0zynsIbJk=", + "pom": "sha256-/t6danx5fZsl5xwVwj0DkDVrUwlqMM1CclE0MHs6LWM=" }, "com/lmax#disruptor/4.0.0": { "jar": "sha256-wrqAhBVBJyvIFbytq5ENLXFqpWPsoVdiRQq0yIlEBQU=", @@ -620,13 +624,17 @@ "jar": "sha256-avZllfn2p7tYzmZRjWiI1AtUfDZtImLwZnbu4ZUo/2Y=", "pom": "sha256-r/ZFxYzUGsUYTZds6O443laU2Zq4dk1u5/FPcOrV+Ys=" }, + "commons-codec#commons-codec/1.22.0": { + "jar": "sha256-0WT+efJiwy2bGKC1stMX0cJ2U9Xpj9K5mMJL+QHHLOQ=", + "pom": "sha256-2aVl2Xj6pp0rEZX7HsJ+YPKef+sJr7ha2sePKABo+P4=" + }, "commons-collections#commons-collections/3.2.2": { "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" }, - "commons-io#commons-io/2.21.0": { - "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=", - "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas=" + "commons-io#commons-io/2.22.0": { + "jar": "sha256-K5p7H3JvuGIW29LIMh6r4CIdvVsb6BwY4ctTgRsQR1g=", + "pom": "sha256-ZCXOwOp2ADXvp3J33oX4n6bb7RR6s92VuNLLxVNArM8=" }, "dev/equo/ide#solstice/1.8.1": { "jar": "sha256-bluizOgTvh1xzNwuzz5JJxsU5pG/u7GhFM86MOdzsQ0=", @@ -637,110 +645,117 @@ "jar": "sha256-DnGR++Mk+5340tIHwHtma43CW7vib1OkxS4v7OYkqXY=", "pom": "sha256-+pvmlFd2A+LUy1X0UjctP2wPk+XzjuXNf7Yos3k8qbw=" }, + "io/github/java-diff-utils#java-diff-utils-parent/4.12": { + "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk=" + }, + "io/github/java-diff-utils#java-diff-utils/4.12": { + "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=", + "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw=" + }, "io/leangen/geantyref#geantyref/1.3.16": { "jar": "sha256-fx1ZEJLVFCtqqnz1n5TEx01X2+7wOy+CYpSfjza6xuM=", "pom": "sha256-JCgbY4MutO8QZOfd/b57eWquGr+IeYrb9NC5ZpurpKQ=" }, - "io/netty#netty-buffer/4.2.15.Final": { - "jar": "sha256-E2H9nJuoW5gxz1ShsuRd3DzjSnaJMXJsCZ0/XvDv5KM=", - "pom": "sha256-65fBAZy/5xAdObyuO9p4EgYJLijqCaZ9hDk1RHMry98=" + "io/netty#netty-buffer/4.2.16.Final": { + "jar": "sha256-zDaun70LA/51XrTrRCTKU7Wc/Sl9f9R9SeWxBZvt7Ww=", + "pom": "sha256-vlW9UE+MhdG1OfKuDpRwniKk9K7Ts5LdUZnz1EoOQBo=" }, - "io/netty#netty-codec-base/4.2.15.Final": { - "jar": "sha256-LG051ycGKLjPwxZvvXqT1ZWVjlnEYbwy3bODyMkb+BE=", - "pom": "sha256-Yo9jcdvZkUKSeNM/py8joObWy4+0mp9gi96pLeox8r8=" + "io/netty#netty-codec-base/4.2.16.Final": { + "jar": "sha256-/rQQIlk42ZcN5rYkoMAx0HmAT6XMXh7G6SmPFttZmKc=", + "pom": "sha256-ZkVXYbAnBBnSS0CbBylN7eVw7u17Lq5bPi+Vk1sRWdc=" }, - "io/netty#netty-codec-compression/4.2.15.Final": { - "jar": "sha256-StqlzdTS6bULI+TD7/Quc95utAhIcYs6qEzVtFTabOg=", - "pom": "sha256-Wmcscj2X0KkT+k+S+5LzPVa3/k4/+fAT38vV+mnOcC4=" + "io/netty#netty-codec-compression/4.2.16.Final": { + "jar": "sha256-E8hWVBTdIRUoEwPvStH3zGm9d3HY0Sx9L7MTB9/ybRE=", + "pom": "sha256-KwI/X/Ssk3HYJ1WnuZcR7mc4nrQpGpnMNZPzcNI9S0s=" }, - "io/netty#netty-codec-haproxy/4.2.15.Final": { - "jar": "sha256-/rBrqlm9QTnWrWFojQatjpBmq6ZIDKnvqdHqaHWy98U=", - "pom": "sha256-nL6AzyIRXZwZ52TOMenN4ci0gYsOfGa163TbQIFNglQ=" + "io/netty#netty-codec-haproxy/4.2.16.Final": { + "jar": "sha256-utoBbTDrCtywcDvF80ORSC7QRGddER+DAmPW8+MAZ10=", + "pom": "sha256-c2aec//A9ebb7XFOIZyj7YNyFLlrgxQHYAeQGGgkx40=" }, - "io/netty#netty-codec-http/4.2.15.Final": { - "jar": "sha256-dq5X6HrzezxBBxQPULkkSxRWFjpqIlUQg498WkRY7CI=", - "pom": "sha256-L2DNcK6TJT2XPGLgJ1FFD2dMJpDgBSvTo6SBnhApDe8=" + "io/netty#netty-codec-http/4.2.16.Final": { + "jar": "sha256-DRb5gd6NDTBKKrGoHwpnSJIIn7qopYMQCuu0pbAEVuw=", + "pom": "sha256-8AXeoD9FJF3QsnAUqh8c73sSu+1aUr488RTY50ERIqQ=" }, - "io/netty#netty-codec-marshalling/4.2.15.Final": { - "jar": "sha256-u8ZVtSUzh/Vmsl1BhRUpUfASH7Ov7yw1LnqlK5+5ZdM=", - "pom": "sha256-adEoNDr92lR7EVWv2nDxq+G/YKVqjrvLOpFiqKnZuUo=" + "io/netty#netty-codec-marshalling/4.2.16.Final": { + "jar": "sha256-lpGBjG5ZqX5FT4OByG3+hAMCFo2YUJiieNygd4Hvx14=", + "pom": "sha256-1axV/Hv2JI89GCljAGR6Wm96Q4zhlMWFCvw0dHGf8Ec=" }, - "io/netty#netty-codec-protobuf/4.2.15.Final": { - "jar": "sha256-7POiRpU3SzVEcA2U21aHXakMHfvh5Dx0TcwV4eiZigE=", - "pom": "sha256-jgC64Kk0jBh7Ei9/Ap4aDrulRD+H9irXJykFTydtjjk=" + "io/netty#netty-codec-protobuf/4.2.16.Final": { + "jar": "sha256-u2byPMtUPdhC3dqRtsjpfiIiINLvpUWfakaiKt47IXA=", + "pom": "sha256-TiexREeB19B1v56pdi3boTz6QvwxW9TJjvrnM9DhiBw=" }, - "io/netty#netty-codec/4.2.15.Final": { - "jar": "sha256-FTsRoWZFlzOvefsNRmfzC/o5eSiW9omyHJOkpAkTh+o=", - "pom": "sha256-sLXSrAj8Ig2Mb1FncT9DRkPiLEXBjsAT7EYSzQ2cTh0=" + "io/netty#netty-codec/4.2.16.Final": { + "jar": "sha256-QYaLzEKJVOcH45owaGzt3AvSODkdOYnQTfty1fBzWSY=", + "pom": "sha256-42iq3f6M+/Tl+dzdBTTN5zDe1pP5Dboq6WspfcFXchg=" }, - "io/netty#netty-common/4.2.15.Final": { - "jar": "sha256-eCBqp/bRl8qpJikUCMAYiba5EMoPdAF9P8vazPlWKVk=", - "pom": "sha256-5tiUFFbAqD6Bq1eWqdEXrE62BVYbi6OeTbEY55k/Ro0=" + "io/netty#netty-common/4.2.16.Final": { + "jar": "sha256-mCXuaKDcTNK1Pi9TJQJAGyIRutm3fosEiC2eZEhyg/8=", + "pom": "sha256-TWJqGdVkbPRBGRaz/pS5hwgetg2OW3/gawO4P09avCU=" }, - "io/netty#netty-handler/4.2.15.Final": { - "jar": "sha256-mbWeS+pyIg0q7VLfi6832XQxsGreCxNSJs33MWiXXqs=", - "pom": "sha256-omoi2DUluf+cHSF+YhGjWFvWiDVLpbW8dmY8n7BasZU=" + "io/netty#netty-handler/4.2.16.Final": { + "jar": "sha256-olnKSW2gWsGYH5XNhWIR+JSjKAVqYSnpzXDbvV30Afc=", + "pom": "sha256-K3TxgB2lbN/5DgZBkWKU+78g0BwR+NXO6EAQdKhxwoU=" }, - "io/netty#netty-parent/4.2.15.Final": { - "pom": "sha256-4GUVjGqeWiONLlBYvbQeSqO4PJsLV9pPW8kCntRa568=" + "io/netty#netty-parent/4.2.16.Final": { + "pom": "sha256-WRgTKjEV1EispZT6haJhTZuGqWk8Ti9CSpSupdkpQXI=" }, - "io/netty#netty-resolver/4.2.15.Final": { - "jar": "sha256-JDGEl/KjpkWWT+1Bj0iHm6ETZcq44fjWbEf6faFe8Zo=", - "pom": "sha256-rcbfcXVa/IHdpi0ourEVeXVxbXcGrZZx94Y034FzOHo=" + "io/netty#netty-resolver/4.2.16.Final": { + "jar": "sha256-yeymqZA2SFzx0Ya0pqWVsKVMU4CDGe4DkkJw6uBMMrs=", + "pom": "sha256-YuLxeXHiRXTb/RQxaaegsdtXdHYZQbVawwb5fjLYnCU=" }, - "io/netty#netty-transport-classes-epoll/4.2.15.Final": { - "jar": "sha256-vlCUB/1xpLgzeFZ8YTQg21RNZZu1It97JTodvoyil/4=", - "pom": "sha256-w2AsL/4gFAb1LjkIYcjNwpCglQsjU82uppNqnFZWVo4=" + "io/netty#netty-transport-classes-epoll/4.2.16.Final": { + "jar": "sha256-nytTIQ25yNJOeH7UPziWqvMNaG7ScMevuymrYzDGqiM=", + "pom": "sha256-vb/ZFXklc5aAVemBp4NeW2sZYu8+AFQ7W6FGL1ztVeY=" }, - "io/netty#netty-transport-classes-io_uring/4.2.15.Final": { - "jar": "sha256-3PucV45HrtXQUEW0uApdBce00M++Y+tDEKCVHL336Js=", - "pom": "sha256-bJ4vm0AqUUDgQvenry7sCucwrm42Jc0T1Hf1BykonLg=" + "io/netty#netty-transport-classes-io_uring/4.2.16.Final": { + "jar": "sha256-LwsYmDSqLJRbLvll/tMByYg7RajFRAjiVlck9GUQpZ4=", + "pom": "sha256-KhvKEYchZGzw+glMgjDOMZlJC3emX/4wdrGWZ/5ewAc=" }, - "io/netty#netty-transport-classes-kqueue/4.2.15.Final": { - "jar": "sha256-KhXiITof5J5ztLs5vHRucZbbqMGxgrwNIacZpNG+LAA=", - "pom": "sha256-xvcz3fb1A0K7FhEAPSl6JYmFwwxhkpaBy1TvDhuJsKQ=" + "io/netty#netty-transport-classes-kqueue/4.2.16.Final": { + "jar": "sha256-ZZm0lfaUIMskCrChqmChmi3zvHJ5FykXDgmTcnY3pok=", + "pom": "sha256-BJZ8VzolqZK1UmaFI1J0tTxUF3TBTkhgSjzAuo+7xZo=" }, - "io/netty#netty-transport-native-epoll/4.2.15.Final": { - "jar": "sha256-mIBLKVRKIPVvJCJAu+wiBoTz4fzHgItxGKfV5+mZxBA=", - "pom": "sha256-nkXMVKRyv81Jtb0wbBBh9iUg9b3E5K/It+E/46y3iIA=" + "io/netty#netty-transport-native-epoll/4.2.16.Final": { + "jar": "sha256-TmFq5d867+4rusNMznKQ/K7edFk/jPCnJB0DiP7yDp8=", + "pom": "sha256-QRVO4MBLhXd72/rfepRzUgHoyyTXYZQJxZl9OUzYd2Q=" }, - "io/netty#netty-transport-native-epoll/4.2.15.Final/linux-aarch_64": { - "jar": "sha256-WkAenftPk343oiIfa5HaJaAI6sHwjd1LsNntIODjJmg=" + "io/netty#netty-transport-native-epoll/4.2.16.Final/linux-aarch_64": { + "jar": "sha256-ISzH2BOQ4xtYCh+5G2yNljtD52LtByxVXisJrUR26Sg=" }, - "io/netty#netty-transport-native-epoll/4.2.15.Final/linux-x86_64": { - "jar": "sha256-VEDjj1yihY/ujXiY5lKR4FtmVzbJ6KFMgy5wdRH126Y=" + "io/netty#netty-transport-native-epoll/4.2.16.Final/linux-x86_64": { + "jar": "sha256-LgBUjnMZSIgdDHPuedLq11klTnUJKUBqHVlUhHWPAmc=" }, - "io/netty#netty-transport-native-io_uring/4.2.15.Final": { - "jar": "sha256-vuDQYNcWxXGFAGX3C5v4Plyb3ma0friZC4V3RE86e5g=", - "pom": "sha256-0np3cX5rpNzjAMDNREgJSudXIlLTvhajJrpgNLjYty4=" + "io/netty#netty-transport-native-io_uring/4.2.16.Final": { + "jar": "sha256-0Iz035DxeoA0dbOIYbkVyxwmbH6LtFY6tRFk+FN5/tI=", + "pom": "sha256-5pMebTJsgi549gvRlXw1kkNdRQlwV4cViC/tgD2pUiI=" }, - "io/netty#netty-transport-native-io_uring/4.2.15.Final/linux-aarch_64": { - "jar": "sha256-uYiMSZ/40F33tfNfJ8N9042x8Uh14rSeWAXX1rwxG08=" + "io/netty#netty-transport-native-io_uring/4.2.16.Final/linux-aarch_64": { + "jar": "sha256-Tsoxe+Z6N5ni4S4XqLtBRBKDhCF9p7cu0bdf2Gh5FOk=" }, - "io/netty#netty-transport-native-io_uring/4.2.15.Final/linux-x86_64": { - "jar": "sha256-FDjPsr9kJuJS2kjBHvgDzyg+m/2Djdr1Fwu0DFsjiRc=" + "io/netty#netty-transport-native-io_uring/4.2.16.Final/linux-x86_64": { + "jar": "sha256-m2xqbFD0lAQBkZttB0412lqMcjnyS9b8UwtsrJyHrEk=" }, - "io/netty#netty-transport-native-kqueue/4.2.15.Final": { - "jar": "sha256-PksUkkGKsOqduvbKFWDDn/auyERrW2I/fwvfGoCNVQY=", - "pom": "sha256-9emre+S1ndRDWHQg5yTkLuoqym4XvdI7MULFPc5MCKo=" + "io/netty#netty-transport-native-kqueue/4.2.16.Final": { + "jar": "sha256-WPsZTq1tUUTGPXH8XFsAuYV+ozOadAO3HHlU1oCaUTw=", + "pom": "sha256-6WV9u1HizKEFYV5hou8q+IC25LLkuk5el0S0bVqDAAg=" }, - "io/netty#netty-transport-native-kqueue/4.2.15.Final/osx-aarch_64": { - "jar": "sha256-yWlqQeVJ60JDLx4sw/OHyFQ1A0tzo7+HSP//QNAPkho=" + "io/netty#netty-transport-native-kqueue/4.2.16.Final/osx-aarch_64": { + "jar": "sha256-eWxQP3qAIXF3vTFfZEgmMTTuD5BCYn1f1pjHYLz5nIw=" }, - "io/netty#netty-transport-native-kqueue/4.2.15.Final/osx-x86_64": { - "jar": "sha256-YJXClmGr4fL7wsecVKlN5P2t3W6ZxwKSf9PADmaHJXQ=" + "io/netty#netty-transport-native-kqueue/4.2.16.Final/osx-x86_64": { + "jar": "sha256-BaCaSrUfSI8MIvQszObAaTWvv6xRFz+uRBcEZaoHKCg=" }, - "io/netty#netty-transport-native-unix-common/4.2.15.Final": { - "jar": "sha256-ueqfxa1eugTpmv3/dbLrl7Xd+yrXcuLy712PJ388vXY=", - "pom": "sha256-PHTmq7oFksjigPJiOU192YMbOsxHf5gXpYbWxCCpryU=" + "io/netty#netty-transport-native-unix-common/4.2.16.Final": { + "jar": "sha256-QcqP4ZIIPReRe+fdzs3tTaT8HbHRZW0D0LyxTi9DEVU=", + "pom": "sha256-iLtMG6+R4rBUJGu5g7mqAvtmwj+w6G5aKCOHarJGbW4=" }, - "io/netty#netty-transport/4.2.15.Final": { - "jar": "sha256-n7Zx6WZRBmzxoo2tPxOCx8md9bgybUohTZo3WzEfjcE=", - "pom": "sha256-Ta4gEvr/cYZwdwOzlST6fCAu9Br65bk4Sgk3zDwEFLo=" + "io/netty#netty-transport/4.2.16.Final": { + "jar": "sha256-z6P2VMr/kGZTOF9LfdqlOdeVt49XEaYiSCsX0rc0hMA=", + "pom": "sha256-wUroBRmAFPeewCE4EL/oxFxaPWmUoYHyM+t2wZ6UIwo=" }, - "it/unimi/dsi#fastutil/8.5.15": { - "jar": "sha256-z/62ZzvfHm5Dd9aE3y9VrDWc9c9t9hPgXmLe7qUAk2o=", - "pom": "sha256-f2baEne0E7MncoaNO1C1XF/lTiZD8bVORZbk9Sofvtg=" + "it/unimi/dsi#fastutil/8.5.18": { + "jar": "sha256-kJSuZ9AdCtJG+IbxGtVX/C55xyy/P+7YPhUSqK6Qp0o=", + "pom": "sha256-GE28pJp9A+Oh358Pl7RiCW6En1rQXFz3s4YibsFZ73k=" }, "jakarta/inject#jakarta.inject-api/2.0.1": { "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=", @@ -786,16 +801,6 @@ "module": "sha256-14HUFbA5BUa6FkvPf74dwreas6rTtN6jpIrEvpQzI54=", "pom": "sha256-QzBXYlX/5/CT5fjU2AQ0t3P5VCqovZs7L+36+BCCSGQ=" }, - "net/kyori#adventure-platform-api/4.4.1": { - "jar": "sha256-7GBGKMK3wWXqdMH8s6LQ8DNZwsd6FJYOOgvC43lnCsI=", - "module": "sha256-eQK22+/3zL7KP5EHK10TlnoPi4aDYL1pOh/GIuIAN0s=", - "pom": "sha256-116fYiU8axNS3XTNyLmuRqoFyz3fTnV98xetsWXY75w=" - }, - "net/kyori#adventure-platform-facet/4.4.1": { - "jar": "sha256-IPjm2zTXIqSszL7cybbALo7ms8q5NQsGqz0cCwuLRU8=", - "module": "sha256-5bh8za6MLPoH27A4UsnTVFaMXk5XbCKgIpHzoYOFZaE=", - "pom": "sha256-SLtXCyvxeN2kDMBb6aJtOpY5QLcYpl8X2YvDhcgGaXQ=" - }, "net/kyori#adventure-text-logger-slf4j/5.2.0": { "jar": "sha256-rnm384RsXZc7N8fuwDGQvUThgpGNE0bncFxZkaG137M=", "module": "sha256-0BEmhpPSXU/YmXCP+s90I40Cyi/eBDgnbUxgaRM3SMk=", @@ -888,16 +893,19 @@ "org/apache#apache/35": { "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" }, - "org/apache/ant#ant-launcher/1.10.15": { - "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", - "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" + "org/apache#apache/37": { + "pom": "sha256-Uk7EeHr/c69rOp+voVTH8YgbZIKZtmP9v8rdoShvI1M=" }, - "org/apache/ant#ant-parent/1.10.15": { - "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA=" + "org/apache/ant#ant-launcher/1.10.17": { + "jar": "sha256-9uPeBtwOo5ZjgATxoAP1X9vSDD58z7m3pST0n9CuhWg=", + "pom": "sha256-9AC2o10TvZ5x6sSDWfHZH799QMhtnHduwxZ/cQh5Xs0=" }, - "org/apache/ant#ant/1.10.15": { - "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", - "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" + "org/apache/ant#ant-parent/1.10.17": { + "pom": "sha256-mp73BzK+4Ro0oIZDqmlGPRwlhlhAHXJ5pU9zrQoVqeQ=" + }, + "org/apache/ant#ant/1.10.17": { + "jar": "sha256-i+aS4Cg39BpHo9Ic3mZVeSFC/fQv4jvLFtcSnK2bIoQ=", + "pom": "sha256-Y6briOLg/NdpZ6rn5vWBGwLz+cUtltt2a2tJBXaPxis=" }, "org/apache/commons#commons-parent/39": { "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" @@ -911,6 +919,9 @@ "org/apache/commons#commons-parent/91": { "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI=" }, + "org/apache/commons#commons-parent/98": { + "pom": "sha256-1AMYUn9WAz4P8HiZccw4yFaqmaaF7qEScIFOfx7an7o=" + }, "org/apache/groovy#groovy-bom/4.0.27": { "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=", "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs=" @@ -936,48 +947,76 @@ "jar": "sha256-8r8vLHdyFpyeMGmXGWZ60w+bRsTp14QZB96y0S2ZI/4=", "pom": "sha256-f8K4BFgJ8/J6ydTZ6ZudNGIbY3HPk8cxPs2Epa8Om64=" }, - "org/apache/logging/log4j#log4j-api/2.25.3": { - "jar": "sha256-6IZoKSD6D7nW62OV3LTeCIRD+GRsicXlhG4WjjJ/QG8=", - "module": "sha256-W+T3N0jWz53pXLci63n8rVvCQnk6l4p+cmbyNZGBHAw=", - "pom": "sha256-MoS+ZXOuuDNGz/a3RvoyXSPq3Z0JyOKG7R11kEoS3W4=" + "org/apache/logging/log4j#log4j-api/2.26.0": { + "jar": "sha256-gg3nu69DDq8uPlzLkvI+IIV5fFrE1Pf8bItmD776Hbw=", + "module": "sha256-oSTwJk9jCkX7b0GfRhR0KXi1tRco8J5kAwNfHWPcTCE=", + "pom": "sha256-pLhyPB5gXu3Cs5bdtTL6BhryQufi4mmOytUCsMNcV7I=" }, - "org/apache/logging/log4j#log4j-bom/2.25.3": { - "pom": "sha256-ZleICHEo/mw6+dAlJEhTKvl4cRdmSB20k5a/AyWibK0=" + "org/apache/logging/log4j#log4j-api/2.26.1": { + "jar": "sha256-8YEKRwTMzgGdArugKdwCpPKsDJl/ZHtGXn1AnBkn+CI=", + "module": "sha256-Xtk/b7UzS/fuUpQ9GmVLw6Hz8Qdlri/Uu9OHMzvmZ4o=", + "pom": "sha256-yKuGj5xTIjO9EvMRzqkKP23mXqB6eqRww+K7+Dtcefs=" }, - "org/apache/logging/log4j#log4j-core/2.25.3": { - "jar": "sha256-Nit/y2W3OqRsxLxTq/TrIW9ESoO10aA3y2/f/wrp8Pk=", - "module": "sha256-ChRnoKtPxLJSc7VVHGCL15UguZ/SgRGgM9M4jwJVYwA=", - "pom": "sha256-ysGDRqDJErAmrVF/SE78POgyZ/LPambKhGmRL/GYaw0=" + "org/apache/logging/log4j#log4j-bom/2.26.0": { + "pom": "sha256-1K8Y0C3O/GV/Wkl/M5wUuf3lVGhsfIHF+Acr4WXbdXg=" }, - "org/apache/logging/log4j#log4j-iostreams/2.25.3": { - "jar": "sha256-/bYDbzyivDDtcC92iVBzx6K0D7Z8abhI28hfhrzbT18=", - "module": "sha256-w16fRwVrq6CHkPU1NbwMZzcA3AtDYdashOfZuLostKc=", - "pom": "sha256-B6fd6EEZoZgc5jJXCgumiZfDhM14BF/1fWG5aa2ISo8=" + "org/apache/logging/log4j#log4j-bom/2.26.1": { + "pom": "sha256-RBWtGJ3QTbVJWKQ+I7N8w5eh7e6eiIIUuL1H++gZBy4=" }, - "org/apache/logging/log4j#log4j-jul/2.25.3": { - "jar": "sha256-JvGAp0Z1gERrC2oYwl2Lx3Ny0QRnYj0epv+gi/ZubT8=", - "module": "sha256-z7mvFAXDC9A6Rd2vkNR20h2Q+XJOU9W9x1yYIpjKWYs=", - "pom": "sha256-az9qo3TRyvI39ikwuNGy+jjtRxXfs5h+oNDmSrDIXKA=" + "org/apache/logging/log4j#log4j-core/2.26.0": { + "jar": "sha256-QGuzEyxHpdMi5cVx/rB4fKhElkafNG61Hx7y7kVJmQI=", + "module": "sha256-l9KA4YMBLdiYgQpxdqI4EntnyCUX7CvUXCPEHOB5kLs=", + "pom": "sha256-pAJ6Ewgiftxul2LUHNIAqueglUL917rrR6l0EJ5WduM=" }, - "org/apache/logging/log4j#log4j-slf4j2-impl/2.25.3": { - "jar": "sha256-vtxWAWj0AF0JRS5raVmyUvnvouuMvRfGZgw27s7HI4s=", - "module": "sha256-EPKDWuK5Gf9a6uJmWX892PAbncsOtDju6BsPF/J06HQ=", - "pom": "sha256-4VDwlijvLRf+UUyi2y1S0y7M3VPnSrOtTuKPM01pWgE=" + "org/apache/logging/log4j#log4j-core/2.26.1": { + "jar": "sha256-LsjDv1ptfIm+hiARai/Jc/fdoa0CYa05PE1HJu39Pcs=", + "module": "sha256-A7/Yrb4wasRgAeyd5mj45dJPZlnyEvxk5iobZypaL2o=", + "pom": "sha256-Gj/ZpEZ8OrmxJ+cUG+8Sm2JCj+Ey9/klw69/Uk3XqLU=" }, - "org/apache/logging/log4j#log4j/2.25.3": { - "pom": "sha256-pbdIJFris5b1vKlHpJbtwI29vfeWmuLMsattS0lznn8=" + "org/apache/logging/log4j#log4j-iostreams/2.26.0": { + "jar": "sha256-HE4U6+z9ag4QCgj57M+2OXhKRB51keiHdSRAu0yUH+g=", + "module": "sha256-fgesENfiXLzx62YnB3qzvTjeZJ+PmUbcaAHJ2TI+KGs=", + "pom": "sha256-w1ZZ/qd8q01GPl0izY60qAL4m1e7941HHC14nqIFwfg=" }, - "org/apache/maven#maven-api-annotations/4.0.0-rc-3": { - "jar": "sha256-XTSQ9yrTp+gr6IsnYp83xZ/SUxuuURw7E4ZkINXYYr0=", - "pom": "sha256-83HUqkRgxMwP4x0W20WC2+eGHvzS5nqvGEPimR8Xx0I=" + "org/apache/logging/log4j#log4j-jul/2.26.0": { + "jar": "sha256-bdJsxNf5URhI0PgwJsb/CeiCVvlGZL8plvebYgaoPk8=", + "module": "sha256-6sOaiZ2yNHRDi9u6b5kzxyNpAJ+vkYlNbmV2Dfau+Fc=", + "pom": "sha256-Rf6AcmVLH4jvd88P7PUvQq+HepB/OlSTMMrr9DJ21TQ=" }, - "org/apache/maven#maven-api-xml/4.0.0-rc-3": { - "jar": "sha256-8+OzZCNzxp1MdEHUDroHZeHXROmStiGURS9epUUd/bo=", - "pom": "sha256-XxSOOelo08K3a4426hN3mJ8KeetDpqWa5yPZElzLXGE=" + "org/apache/logging/log4j#log4j-slf4j2-impl/2.26.0": { + "jar": "sha256-z8G929OeaEtpiuloKR2KOzpV7g7C7z0+pcIzap4VFZg=", + "module": "sha256-KT7CmLbfDlHBOibm/r/IjoDZvj1WJsPXCRuy7x34O2M=", + "pom": "sha256-kGxQhfOYyeT5psxrpWxeVbjgpxXx5ytXT8qkkkO67Gw=" }, - "org/apache/maven#maven-xml/4.0.0-rc-3": { - "jar": "sha256-BjxCTLR/dRZBJdXuolFnuTHdaU40Jo1QJHN050IR3Rk=", - "pom": "sha256-nZZekiyqwDYkl9J7v6UaRI+UydcTYjZnnGhSNwb3KYI=" + "org/apache/logging/log4j#log4j/2.26.0": { + "pom": "sha256-5fqx/dFG24mAzuDdE4P1+vinkmYG+si9qpv+8XyY1cQ=" + }, + "org/apache/logging/log4j#log4j/2.26.1": { + "pom": "sha256-6kcFcl/ZS/XevikR1Op68giYYD9oNU5kskYaDySeRF0=" + }, + "org/apache/maven#maven-api-annotations/4.0.0-rc-5": { + "jar": "sha256-H3MlwBoKxaUgbK/wn6OIUgxlBdq4UBePRS0saq09PIM=", + "pom": "sha256-KUsXWzHbZT0YahLB+cEqvDDOJNhP0I7Y7nrNP/z/c1I=" + }, + "org/apache/maven#maven-api-xml/4.0.0-rc-5": { + "jar": "sha256-NYhRqH7dDd1WakN0cOoCG6hRoEh+xNFIJf8E2wP/WHc=", + "pom": "sha256-ipJVq+4mRj+acwxara70LVkUk1mAUJvRZ3f4hfJzLRs=" + }, + "org/apache/maven#maven-api/4.0.0-rc-5": { + "pom": "sha256-YQwETwFZpuFcV57QV5QDJw+/ngDoPtsnaSaxz3f1rKk=" + }, + "org/apache/maven#maven-impl-modules/4.0.0-rc-5": { + "pom": "sha256-lzSkwzOHhsbmqv59tDdsrQufTt6mPZ78yOnybyBiXzU=" + }, + "org/apache/maven#maven-parent/45": { + "pom": "sha256-lP6Gnrm0zp/OOZXQXqhrFoyF2Sf50XvrgUoZYMdtfm8=" + }, + "org/apache/maven#maven-xml/4.0.0-rc-5": { + "jar": "sha256-pLetPjQQ4P62Q467YjHI4CRJzQL89kUbrtggAIoQNWQ=", + "pom": "sha256-pQMKSVjqpDsGfONgwpcxkL14uknuzOXq828ZaFPvyS8=" + }, + "org/apache/maven#maven/4.0.0-rc-5": { + "pom": "sha256-hRSh6zmY8SItJFgJCcRXbVzw31PUBp27tMptNDE4AvU=" }, "org/apiguardian#apiguardian-api/1.1.2": { "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", @@ -1026,16 +1065,16 @@ "org/codehaus/mojo#mojo-parent/40": { "pom": "sha256-/GSNzcQE+L9m4Fg5FOz5gBdmGCASJ76hFProUEPLdV4=" }, - "org/codehaus/plexus#plexus-utils/4.0.2": { - "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=", - "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8=" + "org/codehaus/plexus#plexus-utils/4.0.3": { + "jar": "sha256-Qh/27RRsU6nU6q3o9im1KxKvcYcQHxvQbCxk6QQBnzw=", + "pom": "sha256-NXNmWPP+Hvo5UIbJHfJZJmT6+iTD8mCP2roRNtF/02A=" }, - "org/codehaus/plexus#plexus-xml/4.1.0": { - "jar": "sha256-huan8HSE6LH3r2bZfTujyz1pKlRhtLHQordnDPV0jok=", - "pom": "sha256-uKO6h7WsMXVJUEngIXiIDKJczJ6rGkR9OKGbU3xXgk4=" + "org/codehaus/plexus#plexus-xml/4.1.1": { + "jar": "sha256-4JsfzEbadEoOTavnA/KHzhM7Yx6pXG4aioLrrSsaKBU=", + "pom": "sha256-z4hxHMW/kIkzRxDnJ2FglUB88EuWg3Vnfg3aqYqlfg0=" }, - "org/codehaus/plexus#plexus/20": { - "pom": "sha256-p7WUsAL8eRczyOlEcNCQRfT9aak61cN1dS8gV/hGM7Q=" + "org/codehaus/plexus#plexus/25": { + "pom": "sha256-+qeUfCAglnrQySslnun6Nh0F6QzQNtF8NwmLse2uo6M=" }, "org/codehaus/woodstox#stax2-api/4.2.2": { "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=", @@ -1047,31 +1086,24 @@ "org/eclipse/ee4j#project/1.0.7": { "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" }, - "org/eclipse/jgit#org.eclipse.jgit-parent/7.4.0.202509020913-r": { - "pom": "sha256-1TcU7SZJuBcyiPZUBeVPvvdRZWuRSAxUWfTcAZIAJHI=" - }, "org/eclipse/jgit#org.eclipse.jgit-parent/7.5.0.202512021534-r": { "pom": "sha256-fjiAaoU2kaSdsW6sg2/mtiYnaUOxCLZ3VKPVx0D7vA4=" }, - "org/eclipse/jgit#org.eclipse.jgit/7.4.0.202509020913-r": { - "jar": "sha256-m8fPLQQAoTDjQF5K6ceHddm9sQNwmNALLY6nlDbzp/M=", - "pom": "sha256-XwwOLNvW14gwL6hLKNDFOKBjNLoIEvxkJSBQkHIi0ws=" + "org/eclipse/jgit#org.eclipse.jgit-parent/7.7.0.202606012155-r": { + "pom": "sha256-S4qHPLaFhEH/MSUDTbVU0leSL7cIIEeVtyAZDW+05iE=" }, "org/eclipse/jgit#org.eclipse.jgit/7.5.0.202512021534-r": { "jar": "sha256-FZe8eKjYwBFpdtRqlIcqLMKGVnDrpNsLn1GBGzSTbXI=", "pom": "sha256-bJVN/BDxwwG9uiXT1jCfd0eYBDY891VuUei7NxRVXGQ=" }, + "org/eclipse/jgit#org.eclipse.jgit/7.7.0.202606012155-r": { + "jar": "sha256-onxHjV94vD2VRh8VOmDv3xYjknUCxopFetmplaNcWnw=", + "pom": "sha256-owH00aR2nxrSVstU54V6Uq8n59A+UMo8UPTLZDw98SY=" + }, "org/eclipse/platform#org.eclipse.osgi/3.24.0": { "jar": "sha256-eJRUAUwVDyrfaBzYD47PSYF9k+15DzZZs2LcoHreh7g=", "pom": "sha256-ok2dkGpHjhJrIZqdJFGLgztm2ksQP5Y+ILkFC+virhU=" }, - "org/fusesource#fusesource-pom/1.12": { - "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" - }, - "org/fusesource/jansi#jansi/2.4.2": { - "jar": "sha256-C3uLADqQ6kkVebYvURiCjkURKRTGVYmwD6pJ1ux4WDk=", - "pom": "sha256-Lory+B0MmVUIvWfJid4ewhbrakdgk/WY9CFOz2ESjfA=" - }, "org/javassist#javassist/3.28.0-GA": { "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=", "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0=" @@ -1093,85 +1125,108 @@ "module": "sha256-W07rjbph51OBYVPgxz9WKyDgF+OTk5UtTeTdMbdyYLs=", "pom": "sha256-+NxQzzqsS87HQKkJVfKADkElHpxANjC3W3UtO271vuI=" }, - "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { - "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", - "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + "org/jetbrains/kotlin#abi-tools-api/2.3.20": { + "jar": "sha256-U2hfV4OwSQaDiY11Wrrk1Bi26DugYTSFiv3ctZRYmek=", + "pom": "sha256-qIbJ/X8rlmlFf+wCHxnc8V8EY+DbS9rVOuGBJTZsxvk=" }, - "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.0.21": { - "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=", - "pom": "sha256-rIU9chaJ+vEV8RiBCjU2/CcvE1to0CdFOqpW6eY79wc=" + "org/jetbrains/kotlin#abi-tools/2.3.20": { + "jar": "sha256-R9fBgRPZhYUGWrUky6HEcLTDaTB2l8qdHIEOULk9C9E=", + "pom": "sha256-Pi8inRHuIgaFPTAL/l0R3dzpYFqJ5cmvrwa3Ij0Zh1c=" }, - "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { - "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", - "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" + "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.3.20": { + "jar": "sha256-EjVTkgnMVtLi7G+XeYaHiHK3Cgh4H2Sv/0Ubwfe9VrE=", + "pom": "sha256-m9zHQ84iL4oxnuYJe2Cq7unmvqe1vzKXYVp1tLpsFDM=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { - "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", - "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.3.20": { + "jar": "sha256-IvGrIjhUuUkJn2slnO9UHVtYo2Q9+aScRXfGPEFuhDs=", + "pom": "sha256-G14LLDaQXcL1XgpLeBKuY+MSXe/PaG0sD0kPg7c9nV4=" }, - "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": { - "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=", - "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE=" + "org/jetbrains/kotlin#kotlin-build-tools-compat/2.3.20": { + "jar": "sha256-RMMHtO3UysUflgqBNBEtZkyTB2cAzaXoZulNmkKWNA4=", + "pom": "sha256-rpC+JesEdhCNlo6+Mqjd9SXhQIhYj6BUc9sSgVoPG3Q=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { - "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", - "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" + "org/jetbrains/kotlin#kotlin-build-tools-cri-impl/2.3.20": { + "jar": "sha256-VOztYw8oEkzP4uRk5srMKB5SiopQqJclchVUyWk1SP4=", + "pom": "sha256-5zeMZYHvXw4stA46TOxR0rlj5iVkWpK2fqCVJa+XxMM=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { - "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", - "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.3.20": { + "jar": "sha256-loG8IWSovZ9t30wIXPSoNrktJ1BmZ9c7q59thVM2yRA=", + "pom": "sha256-gswavl5j0/5nV+eXKE8F25r9fq3D6D0ROcOlW2TUstU=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { - "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", - "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.3.20": { + "jar": "sha256-l2+YnQtfXYDo6KitS3PaC/wn/dllufo4Nisr557MEzc=", + "pom": "sha256-DDWu7jcvB1FOvtN7lAe44RgdFCd1UTnlzudxnKBf5+g=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { - "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", - "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.3.20": { + "jar": "sha256-wGnzCkA75wyBUviqnyXsy6GI7q1UJjrgKvFEIUN6Igg=", + "pom": "sha256-jYTqDt1gs4vOpWLeUXgVKiZxqaAFPWcPkxRSs9sBMig=" }, - "org/jetbrains/kotlin#kotlin-metadata-jvm/2.3.0": { - "jar": "sha256-DGQgOZHQIy2YnNXjZtYCjSexsIckCBgXi9UMJo7qtW8=", - "pom": "sha256-N51JdplIjLxv11nTN2QrRWLD2lI4g8NMH201PgZZvJc=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.3.20": { + "jar": "sha256-xxp8G+j7/wTgr0XJ7oy3ph2JU7ymuL8iWlcZxyWpC0Q=", + "pom": "sha256-nnyLgHJBF/cqrOZfa+SNg224/Dl1OtlR8ruQhi1+cIA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.3.20": { + "jar": "sha256-iHC6uEC4CHyWxN3AYIi0rt9RMcQIrzZ0MGME8flq8/Q=", + "pom": "sha256-YVQOWzoywLEZYkSWZZJMbNdVTqmu4IVb2OT1t/YQoKs=" + }, + "org/jetbrains/kotlin#kotlin-klib-abi-reader/2.3.20": { + "jar": "sha256-XAo6pyBAjdL2PnYIdd0/Z9t+0Ws/AAKA4IgcYHDOT2M=", + "pom": "sha256-ui+7W5OjnlGraeWCJPGNdxYqDrYDkIbl9lVne8O3xno=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.3.20": { + "jar": "sha256-4FeWYwUcbaKyPZX8LDpBKnYnnbg6eQHuhqfjrPbnHjQ=", + "pom": "sha256-shhlfghlbEa018djdux6BOoGAJpGLTpkcBFvr92OPss=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.3.20": { + "jar": "sha256-FyZLlpD+7TSqi459VW+y55UfaABGLxFyQ/upYgEBT30=", + "pom": "sha256-DF/7/5dG1Ca56GasBWviiSizGKJc3FaDkIHsRJspzZc=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.4.0": { + "jar": "sha256-mq3FHFiOdsjPPYPUCQ5GpLaH8u2qH99lqp/kQiMpSSc=", + "pom": "sha256-chmTkfj8cneq1l3owN3xiekzupPXw21DBBuEVqPITCk=" }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" }, - "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { - "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", - "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" + "org/jetbrains/kotlin#kotlin-reflect/2.3.20": { + "jar": "sha256-40b6PD/0RR9fcHoxKIf9TIVV2kjMFfqdsrqTwz+J+BM=", + "pom": "sha256-iwC9L+srtVON85aVQXTZ3cDsVA00ElhjA1ObHpZVwzM=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.0.21": { - "jar": "sha256-x88d6VXfIqFihyImvQZ3yaDItmMKLi1z0R0UfNDFO3M=", - "pom": "sha256-cWKsEOFFTpJ2c7FcrQMp2jgvt1jmVPWfy0AHRZ2eyEE=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.3.20": { + "jar": "sha256-hvch6zOswK/QbdZoDnenZLY0qb2LEbc77yv8CQnxiUA=", + "pom": "sha256-Vg23nSOjmud5dqVmkZRw3sQazHeqUa6qVlzAKbkXGqw=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": { - "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=", - "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.3.20": { + "jar": "sha256-b8232m5lz4zEPlqrq5S9zEiCXnkzaG+KG/aU64j44A4=", + "pom": "sha256-ZgmWdnA6CB/ZrEMTlmWIPlwUUCC2QHWd4FOdiRb/JH8=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": { - "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=", - "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU=" + "org/jetbrains/kotlin#kotlin-scripting-common/2.3.20": { + "jar": "sha256-tMI52HsjvhgvBb9Xz16B+V1wv370qYnrmLczicbryJ8=", + "pom": "sha256-h+/vFa4RjxNDUmPrEJcAZGD7qDlph340uKcvDjPIOsk=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": { - "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=", - "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.3.20": { + "jar": "sha256-vVX49hvUHOxSllbC1HeEvLpawmDpT0FWwnLDFJZu71k=", + "pom": "sha256-1l8YaBd9zkuKkv+93bVrFzH5+66IyOcw7XvLcAy7soo=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": { - "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=", - "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.3.20": { + "jar": "sha256-gG/WOzvOxea17rGghD1qsJTVV4aoRl5HSiQ5KVocCiU=", + "pom": "sha256-xKkTo4XzTjKlbyBd8XoI3U4RfDBsV+XkfcXUlSPw6+E=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": { - "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", - "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.3.20": { + "jar": "sha256-cEfOA1P0kSXDx0Z5LU92wyZde3L+YmlLfuwHW7oCUow=", + "pom": "sha256-B8Ba4tHs4K4e1mAQ7TGNnN3LNYcEbGM8GGvRTM8EYdU=" }, "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=", "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": { - "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", - "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.3.20": { + "module": "sha256-fV4z3nFM3ddQeGQgmMvL7pfBg5jQNLd9MrSwdLlQOTk=", + "pom": "sha256-/Xtj7fb31urrwWoYVgu7koszQlYepcnR92kZiw/puYg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.0": { + "pom": "sha256-36lkSmrluJjuR1ux9X6DC6H3cK7mycFfgRKqOBGAGEo=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" @@ -1194,54 +1249,57 @@ "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { - "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", - "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", - "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + "org/jetbrains/kotlin#kotlin-stdlib/2.3.20": { + "jar": "sha256-CuElBKUEDrrzdwOQhINCDRpWJN0dk/NXZl+Md8hIoB4=", + "module": "sha256-9Os0T8TR46KK4WwIbsPkL1I3O0ZtQwgYL7OG45LA76M=", + "pom": "sha256-yDwC2afi6VRzBJHDPC8dwDwnZi4ntWbsK0TS0Bhjm5g=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { - "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + "org/jetbrains/kotlin#kotlin-tooling-core/2.3.20": { + "jar": "sha256-NnFCeBKZvA+RIMHe7A5ik0oa+ep/AaqpxaU1TcXY19k=", + "pom": "sha256-R+Ou/SS1vmLYB7bLzXnFW4P5S1XP4Y79xuM84RvxkOQ=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { - "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", - "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", - "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { + "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" }, - "org/jline#jline-native/3.30.6": { - "jar": "sha256-Q8NvCTRUWpVJ+zyP86+jYcMg7+HJR1ns0Js0Bkg5fIA=", - "pom": "sha256-yHC+cymTnXtPEBOlSMgyV6bCXGLYuQBlKyAJmvip9Q4=" + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": { + "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=", + "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", + "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" + }, + "org/jline#jline-native/4.3.1": { + "jar": "sha256-/5SrS8zDwVSURAgs4HonYMvxrU2uBOQ1CFl72AK8sjE=", + "pom": "sha256-GtgjRIisZV0MN6GKQgZQz5vu6ZlIrWQLxG0ERX61qR8=" }, "org/jline#jline-parent/3.20.0": { "pom": "sha256-cXjGACAsS8Jux6S2IlXu829wVsrSpeYjnFdL7qXCEMo=" }, + "org/jline#jline-parent/4.3.1": { + "pom": "sha256-KE7hO/HegCVCPmekmMQ8nGkBU3zcY0jkyZx8sMd34Xw=" + }, "org/jline#jline-reader/3.20.0": { "jar": "sha256-rNHJTR4iiqe3li9psh7Tqf2CjrOmPkuvkIaVTmJq8fA=", "pom": "sha256-2fF+3XIcAqExcgN21sB4eHgutrb6/rX/QkBKtXFD4TY=" }, - "org/jline#jline-terminal-jansi/3.30.6": { - "jar": "sha256-6cGTeJwc3JxwQe+EDH9F0yo1vMy4Tn3sbErV5aNEeQI=", - "pom": "sha256-RtfReyoFCTCZFoCUA7uJuCJMcJ7fEMppQwXJZZHo2D0=" + "org/jline#jline-terminal-ffm/4.3.1": { + "jar": "sha256-KRPOpI5erD4HY/WDgFlwGwXBnW3EHoKa7hagY2SjQNY=", + "pom": "sha256-xYsPdcM+DCcCXuYmdGoSEKl2U9BTfdsZUhevc+NxTX4=" }, "org/jline#jline-terminal/3.20.0": { "jar": "sha256-EhJRcOeVUZum3IAQwHC1PHaq6StIXB43Uw5Uq13QjUM=", "pom": "sha256-EMo7z1F48YUH8hCmOtljeJaFM0OtHBKRoBmhFvIWpUg=" }, - "org/jline#jline-terminal/3.30.6": { - "jar": "sha256-mo396KJbCpaHzxHg3UoShmXoMfFPnO2F/8KE062603Q=", - "pom": "sha256-Yv7vISV+WE0/bEvZIqStBnVudSYwwK8IKJzgEEKWoCo=" + "org/jline#jline-terminal/4.3.1": { + "jar": "sha256-JyknNjRx/b8vOHEL77/oZqzB7TRyBiqM7QKxZobye8w=", + "pom": "sha256-vwkp2Y0b/BrKJZIKT2zOOy9HSzrdl5KAyOM33dc2FRw=" }, "org/jspecify#jspecify/1.0.0": { "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" }, - "org/junit#junit-bom/5.11.4": { - "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", - "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" - }, - "org/junit#junit-bom/5.13.2": { - "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=", - "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k=" + "org/junit#junit-bom/5.13.1": { + "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=", + "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM=" }, "org/junit#junit-bom/5.13.4": { "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", @@ -1251,44 +1309,56 @@ "module": "sha256-etPdstdOanfWWuiaykXUaMl7+ZFba8UvRJ1nXk5vmzU=", "pom": "sha256-9apHs2ZIPo0fm+8Q5noMZvZq/A8zHJ+WaxMQutYND28=" }, + "org/junit#junit-bom/5.14.1": { + "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=", + "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ=" + }, "org/junit#junit-bom/5.14.2": { "module": "sha256-XSb0RAOSMm3SSDz0kBQ+6hSV1QlUWaC5ZRp7GzjiTr8=", "pom": "sha256-7S3MeFW9RgvMyTob8Mli5jtWb/fY8d7Q8fJZO6gYOq8=" }, - "org/junit/jupiter#junit-jupiter-api/5.14.2": { - "jar": "sha256-cEzaGFcxa7eRGZsaG/gXOwd4uTioRFyFvhFUxfiBOgo=", - "module": "sha256-Cw9Y0AG0zPQduv9mL/CPBGQLn1FWshXS3FfO6TaS6CY=", - "pom": "sha256-NXvqCt8V4DrCyOrfIEW5NCUPr4SAlAmWNZm89HXeszg=" + "org/junit#junit-bom/5.14.3": { + "module": "sha256-8lxAv6Usi3tCXVdqiPMQ9kMmFtYrpYkyA/on37yfAl4=", + "pom": "sha256-CKAoVuSHyTV/mynjh0X4roBYSBEectFarQNSM48WMuE=" }, - "org/junit/jupiter#junit-jupiter-engine/5.14.2": { - "jar": "sha256-Ak2bBtMbkPucWnwLxiz6LUnGc6aKenW+m1JUi6YoNQk=", - "module": "sha256-VB9i/FQLJZxofAveUbVBhLcvlGJIpA6C5J9kVXYSsGU=", - "pom": "sha256-2j/YDMHhYiWQKIDDwXB/O4laEdqcYjMISgSzlcDh/QE=" + "org/junit#junit-bom/6.0.3": { + "module": "sha256-KA48NIVfKhPeJBIZN+TPl+S565IG5g+JHk8KHPDnq6E=", + "pom": "sha256-plW2pdwA0b68kfsrFcDH6K6snWvc+HlZVQU3DidTAoc=" }, - "org/junit/jupiter#junit-jupiter-params/5.14.2": { - "jar": "sha256-BthnOrFhdBF+uup8ydwIgJ23o5T12T79JANi2IPQHfA=", - "module": "sha256-9VHVeJrqNQzfsYFkyp2a/1bgyYIsfG32HTF3ZL6LQA0=", - "pom": "sha256-CuKLm95MW9YCVeCb7vGRXAfvL5gdO49HyLSIeVGJFuY=" + "org/junit/jupiter#junit-jupiter-api/6.0.3": { + "jar": "sha256-1lXX5vDHrgfxCi87uq67bTDpsmIEoGitnps5UKooeSw=", + "module": "sha256-6k1/evmsFrsuF34miQeJb6PG+a5QcmBNRoLXrv/inKg=", + "pom": "sha256-dmyA+zGOFgDr9smpId6AGIexVIqigtataRiLdgjVbUc=" }, - "org/junit/jupiter#junit-jupiter/5.14.2": { - "jar": "sha256-7gTJsMUyE2pLxKhTH+VKIsY3uTppC8BkcYNXWE0eca4=", - "module": "sha256-yjO7T4OBTaS6iffR9w0zNieo/Pab5G2cf9973XACpr8=", - "pom": "sha256-6IK8iSW+9JsonGrn/GcKd0zmT3eer9dHuKo9ioqGfjo=" + "org/junit/jupiter#junit-jupiter-engine/6.0.3": { + "jar": "sha256-Hi+rYa0n6gj8fHDdlnfPjG0a5UNNQtz91jOxLH58BNA=", + "module": "sha256-03TlhvHApdyh+00ZNJ4KgEqRc7lh+EHijPxYgeLmUV0=", + "pom": "sha256-uvvAmTJsGIPw7hywVtMbQiLiYWX5+aqbiW89P3ijFTg=" }, - "org/junit/platform#junit-platform-commons/1.14.2": { - "jar": "sha256-kRf5qtxmOsVQrl6B2NOrnx4Juy40wW5goesWM6F7zAY=", - "module": "sha256-LIpzAEQQ2y0nkUEBq+hnLcackhHD0ziuNHHZSisratI=", - "pom": "sha256-b6pnFLuLb4V7Gz7Tthz5EOv9rZPyWDJ506T9RWVa+cU=" + "org/junit/jupiter#junit-jupiter-params/6.0.3": { + "jar": "sha256-zylH4jArn4yKBZJZoneIHBytro+8JRTBapJc/re+suU=", + "module": "sha256-1LBksP8UD1Vd0GdEscxr//wQ9SSbLdWqRprl9NTv7Cg=", + "pom": "sha256-mVtk7KoiJ8S1Xz6453c19URDSi7Cz+7QYF6LrxCCY94=" }, - "org/junit/platform#junit-platform-engine/1.14.2": { - "jar": "sha256-WkXEMHY6JsbFVHHhktivu2RDlWvBFrfmeWuNeJpaFG0=", - "module": "sha256-rJRHEJU5b12sFYUmoSVj/dUEkq57Km9JH62ixRsHS+s=", - "pom": "sha256-k2qlp7HfWDlzoyJ/y9uV6nTjHhvrGOqGmS7JBlPwqGo=" + "org/junit/jupiter#junit-jupiter/6.0.3": { + "jar": "sha256-eEtlgV9HmgyZqdOlc7FC4qUl77YCXZf3UbGecvkK7aM=", + "module": "sha256-gaZM8ir7jnaHVSE+nIDr06sDMc5ACm/WOeQ6VJWtj+A=", + "pom": "sha256-vO0g6RqqVnfxupb6b3GBAKuD6JSlLplhtgBMBWoYRew=" }, - "org/junit/platform#junit-platform-launcher/1.14.2": { - "jar": "sha256-HfxXdiDdEx6Ddl9mKsqhCaLfV1KgOZ8DTIaKyHMyOvI=", - "module": "sha256-TlbYQ96bbUO3CC/Ux0IHDSp9+rUZL7oaKQCYDwa+MTk=", - "pom": "sha256-BFn8NaM0Pr/qeOt5MvpB7OdtgyQ3A1MAsEjnpC6A5wk=" + "org/junit/platform#junit-platform-commons/6.0.3": { + "jar": "sha256-OfJi0Jw9UnGf4Ld/CA6Qo2leKF13mkGyMuF5Y65dogA=", + "module": "sha256-nfLma22VBAClGKmt00M9CjBxzhwzpvgPnPIlYtUpRbc=", + "pom": "sha256-vbjiS+l+Dll2nyFktTYfVSJ5WN9BA9aGgvh3mtLKjX0=" + }, + "org/junit/platform#junit-platform-engine/6.0.3": { + "jar": "sha256-SR6eT3RfFhuKjkGGoafGpFDqEscJMMmu2uQnIVMB2Uc=", + "module": "sha256-U1qGeP2rxB2/DEHMW3Vh7xINdWUMPcOTAqfWCTdmE5M=", + "pom": "sha256-eofYxqCn2wJgsAzjAxgPb0HQQFYoldaARhnV227iMr4=" + }, + "org/junit/platform#junit-platform-launcher/6.0.3": { + "jar": "sha256-MVYINy5NxEvKDMs66KB+zCBrM2cDP6BXSKA8zVY/EwE=", + "module": "sha256-glZnrWqEsMW6dTdSvpqZ4wFL/lKRQ7xmtGdNkbA/pbg=", + "pom": "sha256-TTngPyCTd29BkwccjN8ZgTa5YWbHtDteN+fWFWudmO0=" }, "org/lanternpowered#lmbda/2.0.0": { "jar": "sha256-v7mL90YQgkvVbhDYJSM6Zg66M7qRXPlHJGJX9QPadfM=", @@ -1297,9 +1367,12 @@ "org/mockito#mockito-bom/4.11.0": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" }, - "org/mockito#mockito-core/5.21.0": { - "jar": "sha256-A9sj3nQsvKQqo9YSf9rOVg+sN7A22TGHCAH4TCiL0oY=", - "pom": "sha256-AiGzH5bfAaFYxkU3Gq2BstP1vuD1icoNDC6qbo2gkvM=" + "org/mockito#mockito-bom/5.20.0": { + "pom": "sha256-YmvA9584nSxBVD0W2NnbC1OtCEjMN6bgtM53Gk/gvEk=" + }, + "org/mockito#mockito-core/5.22.0": { + "jar": "sha256-GKIGNowsj9aT52LzdD42WswgjDKxp18m7qqa87CSYcc=", + "pom": "sha256-gnO7dguz2m8eaEqnCDGOnJxdJDNUFRMeY5JOVB8+jTA=" }, "org/objenesis#objenesis-parent/3.3": { "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" @@ -1340,23 +1413,26 @@ "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=", "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc=" }, - "org/slf4j#slf4j-api/1.7.36": { - "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", - "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" - }, "org/slf4j#slf4j-api/2.0.17": { "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" }, + "org/slf4j#slf4j-api/2.0.18": { + "jar": "sha256-RFCP0VdlAGiMeQsZCs3Rb+xPjHmj4LkAr9cFA88FX1U=", + "pom": "sha256-bCx/LAJ3TMK3thn70t94c82tKXGJJuRHVLh/cNHrQ8s=" + }, "org/slf4j#slf4j-bom/2.0.17": { "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" }, - "org/slf4j#slf4j-parent/1.7.36": { - "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + "org/slf4j#slf4j-bom/2.0.18": { + "pom": "sha256-khmqtgFXUSbE5m4TMesrDGwXozCsTVoH480R1YCgwS0=" }, "org/slf4j#slf4j-parent/2.0.17": { "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" }, + "org/slf4j#slf4j-parent/2.0.18": { + "pom": "sha256-CziWvtrSye2Wl+3L6h2gxUzSOKcjWDqBNYqDv7eC6fo=" + }, "org/sonatype/oss#oss-parent/5": { "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" }, @@ -1414,9 +1490,9 @@ "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" }, - "org/vafer#jdependency/2.14": { - "jar": "sha256-HT3hIYOiqJada8b/Wtdx3l1W0ISXxdk+FopctxDiy/E=", - "pom": "sha256-yGRf/88P5qu8IVS8i/0Jysbgd2M4Kz6cGLXbmR7IFjk=" + "org/vafer#jdependency/2.16": { + "jar": "sha256-hpgdL1CrFe6+GpD4Q6GV8o8L0e5SJV12pz7AtLfsec0=", + "pom": "sha256-+jUpmw0MRzE9cDZKddILmsOoh0Q8Yyx+z1C6ffiHG+U=" }, "org/xmlresolver#xmlresolver/5.1.1": { "jar": "sha256-MSL4rkDERq27MDzVUldoA/2/bq77hL985D0TNlsnymg=", diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix index eeb87546ce27..60aa3a037998 100644 --- a/pkgs/by-name/ve/velocity/package.nix +++ b/pkgs/by-name/ve/velocity/package.nix @@ -2,13 +2,12 @@ lib, stdenv, fetchFromGitHub, - gradle, - jdk17, - jdk21, + gradle_9, + jdk25, makeBinaryWrapper, openssl, libdeflate, - jre_headless, + jdk25_headless, writeScript, nixosTests, @@ -19,7 +18,6 @@ ], }: let - gradle_jdk17 = gradle.override { javaToolchains = [ jdk17 ]; }; velocityNativePlatform = { x86_64-linux = "linux_x86_64"; @@ -34,17 +32,17 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "velocity"; - version = "3.5.0-unstable-2026-07-10"; + version = "4.1.0-unstable-2026-08-03"; src = fetchFromGitHub { owner = "PaperMC"; repo = "Velocity"; - rev = "97b386d86ff99f787117cb30e8a4b50c83dba6c2"; - hash = "sha256-EzoR12YsXP0F7n1ifk/Eg16S//pmYnRpSiO7qkerBes="; + rev = "00759e52790e85e148efc08adb7e7dd29e6c5110"; + hash = "sha256-D9r4OyVfeLNzbEklUdWJ7vEqRsZ9ja5AanqeerdFJck="; }; nativeBuildInputs = [ - gradle_jdk17 + gradle_9 makeBinaryWrapper ]; @@ -54,16 +52,22 @@ stdenv.mkDerivation (finalAttrs: { libdeflate # needed for building velocity-native jni - jdk21 + jdk25 ]; strictDeps = true; - mitmCache = gradle_jdk17.fetchDeps { + mitmCache = gradle_9.fetchDeps { inherit (finalAttrs) pname; data = ./deps.json; }; + gradleUpdateScript = '' + runHook preBuild + + gradle --write-verification-metadata sha256 + ''; + patches = [ ./fix-version.patch # remove build-time dependency on git and use version string from a env var instead ./disable-javadocs.patch # disable building java docs because they cause build failures @@ -97,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/bin $out/share/velocity cp proxy/build/libs/velocity-proxy-${builtins.head (builtins.split "-" finalAttrs.version)}-SNAPSHOT-all.jar $out/share/velocity/velocity.jar - makeWrapper ${lib.getExe jre_headless} "$out/bin/velocity" \ + makeWrapper ${lib.getExe jdk25_headless} "$out/bin/velocity" \ --append-flags "-jar $out/share/velocity/velocity.jar" ${lib.optionalString withVelocityNative '' diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index 481342d49c05..e237032abfc5 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wasm-tools"; - version = "1.254.0"; + version = "1.255.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-Zy+cJdbsRmwRyy9y/nfpi3kWmklKOrgrw78DwQ/s+fs="; + hash = "sha256-QQ9lSQLPaLSNumGtr64W9n56vBXh5m9Z/dge/tbl3gU="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-RgAew00flGTwt1FvfWsmPgg/MK4CMFVG2h5dmDgCZMo="; + cargoHash = "sha256-ozxSdq5CpSLwEWsombAvZCrv4wDL0PLqoVIoTBqyUL4="; cargoBuildFlags = [ "--package" "wasm-tools" diff --git a/pkgs/by-name/xb/xbyak/package.nix b/pkgs/by-name/xb/xbyak/package.nix index a8414f561d85..faa83b7bd72b 100644 --- a/pkgs/by-name/xb/xbyak/package.nix +++ b/pkgs/by-name/xb/xbyak/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xbyak"; - version = "7.37.6"; + version = "7.38"; src = fetchFromGitHub { owner = "herumi"; repo = "xbyak"; tag = "v${finalAttrs.version}"; - hash = "sha256-NA4h4BEzYh7gSVOqznixoU2VjKZYx8dde+Es7dOQiOM="; + hash = "sha256-EHQSUZt0fvR1GZBpMqBuXxlPt3j3cLKTtc9JNkCNlt4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix deleted file mode 100644 index ec9db0755fdc..000000000000 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ /dev/null @@ -1,60 +0,0 @@ -# This derivation should be redundant, now that regular smlnj works on Darwin, -# and is preserved only for pre-existing direct usage. New use cases should -# just use the regular smlnj derivation. - -{ - lib, - stdenv, - fetchurl, - cpio, - rsync, - xar, - makeWrapper, -}: - -stdenv.mkDerivation rec { - pname = "smlnj-bootstrap"; - - version = "110.91"; - - src = fetchurl { - url = "http://smlnj.cs.uchicago.edu/dist/working/${version}/smlnj-x86-${version}.pkg"; - sha256 = "12jn50h5jz0ac1vzld2mb94p1dyc8h0mk0hip2wj5xqk1dbzwxl4"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - cpio - rsync - ]; - - unpackPhase = '' - ${xar}/bin/xar -xf $src - cd smlnj.pkg - ''; - - buildPhase = '' - cat Payload | gunzip -dc | cpio -i - ''; - - installPhase = '' - mkdir -p $out/bin - rsync -av bin/ $out/bin/ - - mkdir -p $out/lib - rsync -av lib/ $out/lib/ - ''; - - postInstall = '' - wrapProgram "$out/bin/sml" --set "SMLNJ_HOME" "$out" - ''; - - meta = { - description = "Compiler for the Standard ML '97 programming language"; - homepage = "http://www.smlnj.org"; - license = lib.licenses.free; - platforms = lib.platforms.darwin; - maintainers = [ lib.maintainers.jwiegley ]; - mainProgram = "sml"; - }; -} diff --git a/pkgs/development/coq-modules/CertiRocq/default.nix b/pkgs/development/coq-modules/CertiRocq/default.nix index cf012f592dfb..358b7ff3f29a 100644 --- a/pkgs/development/coq-modules/CertiRocq/default.nix +++ b/pkgs/development/coq-modules/CertiRocq/default.nix @@ -1,7 +1,5 @@ { lib, - pkgs, - pkg-config, mkCoqDerivation, coq, wasmcert, @@ -45,10 +43,6 @@ mkCoqDerivation { }; releaseRev = v: "v${v}"; - buildInputs = [ - pkgs.clang - ]; - propagatedBuildInputs = [ wasmcert compcert @@ -57,10 +51,17 @@ mkCoqDerivation { metarocq-safechecker-plugin ]; - patchPhase = '' + postPatch = '' patchShebangs ./configure.sh patchShebangs ./clean_extraction.sh patchShebangs ./make_plugin.sh + + # drop after https://github.com/CertiRocq/certirocq/pull/162 + substituteInPlace runtime/Makefile \ + --replace-fail "gcc -I /opt/homebrew/include" '$(CC)' + substituteInPlace clean_extraction.sh \ + --replace-fail "mv aST.ml AST.ml" "mv aST.ml AST.ml.tmp && mv AST.ml.tmp AST.ml" \ + --replace-fail "mv aST.mli AST.mli" "mv aST.mli AST.mli.tmp && mv AST.mli.tmp AST.mli" ''; configurePhase = '' diff --git a/pkgs/development/libraries/scenefx/default.nix b/pkgs/development/libraries/scenefx/default.nix index b6ecb7a9c080..de3618403a86 100644 --- a/pkgs/development/libraries/scenefx/default.nix +++ b/pkgs/development/libraries/scenefx/default.nix @@ -88,7 +88,7 @@ let }); in -{ +rec { scenefx_0_4 = generic { version = "0.4.1"; hash = "sha256-XD5EcquaHBg5spsN06fPHAjVCb1vOMM7oxmjZZ/PxIE="; @@ -101,4 +101,6 @@ in wlroots = wlroots_0_20; extraBuildInputs = [ lcms2 ]; }; + + scenefx = scenefx_0_5; } diff --git a/pkgs/development/python-modules/ansi2image/default.nix b/pkgs/development/python-modules/ansi2image/default.nix index 017f2434d91f..b30e172cbbb3 100644 --- a/pkgs/development/python-modules/ansi2image/default.nix +++ b/pkgs/development/python-modules/ansi2image/default.nix @@ -20,6 +20,12 @@ buildPythonPackage (finalAttrs: { hash = "sha256-3nTCWyWfFs1NqUGIvYO3ao9MnOMtrq1fmTihLwSky60="; }; + postPatch = '' + substituteInPlace ansi2image/__meta__.py \ + --replace-fail "__version__ = '0.1.4'" "__version__ = '${finalAttrs.version}'" \ + --replace-fail "__version_tuple__ = version_tuple = (0, 1, 4)" "__version_tuple__ = version_tuple = (${lib.concatStringsSep ", " (lib.splitString "." finalAttrs.version)})" + ''; + build-system = [ setuptools ]; dependencies = [ @@ -35,10 +41,10 @@ buildPythonPackage (finalAttrs: { meta = { description = "Module to convert ANSI text to an image"; - mainProgram = "ansi2image"; homepage = "https://github.com/helviojunior/ansi2image"; changelog = "https://github.com/helviojunior/ansi2image/blob/${finalAttrs.version}/CHANGELOG"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; + mainProgram = "ansi2image"; }; }) diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix index d46086b896c6..4111bab8b64e 100644 --- a/pkgs/development/python-modules/bambi/default.nix +++ b/pkgs/development/python-modules/bambi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: { pname = "bambi"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; __structuredAttrs = true; @@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: { owner = "bambinos"; repo = "bambi"; tag = finalAttrs.version; - hash = "sha256-2BLbvdVN+wkmP2NCGaBoJO10hbBXUJ1/Q7bjRN4idWM="; + hash = "sha256-eTqqcVP+ucQ2Sv9mTyMOUdmYYX0pkrsH76DGQKPGO0k="; }; build-system = [ @@ -93,27 +93,32 @@ buildPythonPackage (finalAttrs: { # Tests require network access "test_alias_equal_to_name" - "test_exclusion" - "test_inplace_false" "test_average_by" "test_ax" "test_basic" + "test_categorical_and_interactions" "test_censored_response" "test_custom_prior" "test_data_is_copied" "test_distributional_model" "test_elasticity" + "test_exclusion" "test_extra_namespace" "test_fig_kwargs" "test_gamma_with_splines" "test_group_effects" "test_hdi_prob" + "test_inplace_false" "test_legend" "test_model_with_group_specific_effects" "test_model_with_intercept" "test_model_without_intercept" + "test_no_offsets_when_centered_parametrization" "test_non_distributional_model" "test_normal_with_splines" + "test_offsets_match_sampled_offsets" + "test_offsets_reconstructed_with_sigma_alias" + "test_offsets_reconstructed_without_centering" "test_predict_new_groups" "test_predict_new_groups_fail" "test_predict_offset" diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 5b52a178d97e..424b0a073b4c 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -100,7 +100,9 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # AssertionError: Not equal to tolerance rtol=1e-07, atol=1e-05 "test_equal_matrices" + "test_pop_oldest_exactness_k5_d5_n10_nwraps2" "test_restart_after_reset_matches_fresh_accumulation" + "test_skips_first_offset_steps" "test_split_pop_k1_degenerate" ]; diff --git a/pkgs/development/python-modules/cardimpose/default.nix b/pkgs/development/python-modules/cardimpose/default.nix index 412e7d28ac0e..ce16b137cea7 100644 --- a/pkgs/development/python-modules/cardimpose/default.nix +++ b/pkgs/development/python-modules/cardimpose/default.nix @@ -1,20 +1,23 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, setuptools, pymupdf, }: -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "cardimpose"; - version = "0.2.1-unstable-2024-12-28"; + version = "0.2.2"; pyproject = true; - src = fetchFromGitHub { - owner = "frsche"; - repo = "cardimpose"; - rev = "eb26a9795e20db3e3dd5b62dbcbbad547cb05a55"; - hash = "sha256-Fel0YOe2D76h+QAon/wxI6EsZhfLca+0ncNi9i888+E="; + __structuredAttrs = true; + + # Get source from Pypi as the GitHub repository doesn't have any version + # indicators, so there's no way to tell when a new version is available or + # what the version should be. + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-fMI2bvsHGYU7nZ9CdaUtWQkNj2MihMEcBCVy8VbE6F0="; }; build-system = [ setuptools ]; @@ -38,4 +41,4 @@ buildPythonPackage { badPlatforms = pymupdf.meta.badPlatforms or [ ]; maintainers = [ lib.maintainers.me-and ]; }; -} +}) diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index 54cc26122485..1db84cffa0dd 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, aiohttp, buildPythonPackage, fetchFromGitHub, @@ -9,7 +10,7 @@ pytestCheckHook, requests, setuptools, - withMypyc ? !isPyPy, + withMypyc ? !isPyPy && !stdenv.hostPlatform.isStatic, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/credsweeper/default.nix b/pkgs/development/python-modules/credsweeper/default.nix index df3793d3da01..801ab22a0187 100644 --- a/pkgs/development/python-modules/credsweeper/default.nix +++ b/pkgs/development/python-modules/credsweeper/default.nix @@ -1,18 +1,23 @@ { lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + + # build-system + hatchling, + + # dependencies base58, beautifulsoup4, - buildPythonPackage, + bech32, + brotli, colorama, cryptography, - deepdiff, - fetchFromGitHub, gitpython, - hatchling, humanfriendly, - hypothesis, lxml, - nix-update-script, numpy, odfpy, onnxruntime, @@ -21,7 +26,7 @@ pdfminer-six, pybase62, pyjks, - pytestCheckHook, + pysquashfsimage, python-dateutil, python-docx, python-pptx, @@ -31,11 +36,20 @@ striprtf, whatthepatch, xlrd, + # < python 3.14 only: + zstandard, + + # tests + deepdiff, + hypothesis, + psutil, + pytestCheckHook, + versionCheckHook, }: buildPythonPackage (finalAttrs: { pname = "credsweeper"; - version = "1.16.0"; + version = "1.17.4"; pyproject = true; __structuredAttrs = true; @@ -44,7 +58,7 @@ buildPythonPackage (finalAttrs: { owner = "Samsung"; repo = "CredSweeper"; tag = "v${finalAttrs.version}"; - hash = "sha256-DiIT7DzH6ut/Ax2qgga5vKjeXocROGbHdARLWJijejY="; + hash = "sha256-JsKwmzC9kMF3dkYVFrLDxYsxOc5X13pFN9aealZEgqY="; }; build-system = [ hatchling ]; @@ -52,6 +66,8 @@ buildPythonPackage (finalAttrs: { dependencies = [ base58 beautifulsoup4 + bech32 + brotli colorama cryptography gitpython @@ -65,6 +81,7 @@ buildPythonPackage (finalAttrs: { pdfminer-six pybase62 pyjks + pysquashfsimage python-dateutil python-docx python-pptx @@ -74,12 +91,17 @@ buildPythonPackage (finalAttrs: { striprtf whatthepatch xlrd + ] + ++ lib.optionals (pythonOlder "3.14") [ + zstandard ]; nativeCheckInputs = [ deepdiff hypothesis + psutil pytestCheckHook + versionCheckHook ]; pythonImportsCheck = [ "credsweeper" ]; @@ -92,10 +114,19 @@ buildPythonPackage (finalAttrs: { "test_match_n" "test_multi_jobs_p" "test_rules_ml_p" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox: + # RuntimeError: Failed to initialize cpuinfo! + "test_external_ml_n" + "test_external_ml_p" + "test_import_config_n" + "test_import_config_p" + "test_it_works_n" + "test_log_n" + "test_log_p" ]; - passthru.updateScript = nix-update-script { }; - meta = { description = "Tool to detect credentials in any directories or files"; homepage = "https://github.com/Samsung/CredSweeper"; diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 2addea4ec542..692e7cad4d1d 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.123.0"; + version = "0.127.0"; pyproject = true; __structuredAttrs = true; @@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${finalAttrs.version}"; - hash = "sha256-mSxTk8wq9Hq9xL20Jt8kWpry5F5SljMIcFsv8UohY1c="; + hash = "sha256-ZifBh5cCxrfbn3a3EUre7EavRoxBwJR3b6TdUDD3H7o="; }; build-system = [ diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix index 1fad76637606..6d2e31bfdd9d 100644 --- a/pkgs/development/python-modules/dj-email-url/default.nix +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -1,31 +1,40 @@ { lib, buildPythonPackage, - fetchPypi, - python, + fetchFromGitHub, + setuptools, + unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dj-email-url"; version = "1.0.6"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-Vf/jMp5I9U+Kdao27OCPNl4J1h+KIJdz7wmh1HYOaZo="; + src = fetchFromGitHub { + owner = "migonzalvar"; + repo = "dj-email-url"; + tag = "v${finalAttrs.version}"; + hash = "sha256-xjJZyQE/7zgFzFM3JnlkiT0juOv94o4X5398AqCn5Qg="; }; - checkPhase = '' - ${python.interpreter} test_dj_email_url.py - ''; + build-system = [ setuptools ]; - # tests not included with pypi release - doCheck = false; + nativeCheckInputs = [ unittestCheckHook ]; + + unittestFlags = [ "." ]; meta = { description = "Use an URL to configure email backend settings in your Django Application"; homepage = "https://github.com/migonzalvar/dj-email-url"; - license = lib.licenses.bsd0; + # https://github.com/migonzalvar/dj-email-url/blob/master/LICENSE + license = + with lib.licenses; + AND [ + bsd2 + cc-by-40 + cc0 + ]; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/fastmcp/default.nix b/pkgs/development/python-modules/fastmcp/default.nix index f30dcd915091..1154fc8668d6 100644 --- a/pkgs/development/python-modules/fastmcp/default.nix +++ b/pkgs/development/python-modules/fastmcp/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, writableTmpDirAsHomeHook, # build-system @@ -29,7 +30,7 @@ buildPythonPackage (finalAttrs: { pname = "fastmcp"; - version = "3.3.1"; + version = "3.4.7"; pyproject = true; __structuredAttrs = true; @@ -37,9 +38,19 @@ buildPythonPackage (finalAttrs: { owner = "PrefectHQ"; repo = "fastmcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-1W5NbWIULxFXGSozZEeITcPt1EbY6IsJLQdyevcn9BI="; + hash = "sha256-EysVbtFbop5ENupc9T5EmtUSZ8osVtQSzpwa6rea/OQ="; }; + patches = [ + # Fix python 3.14 compatibility (https://github.com/PrefectHQ/fastmcp/pull/4796) + # TODO: remove when updating to the next release + (fetchpatch { + url = "https://github.com/PrefectHQ/fastmcp/commit/6be0ac8e15d35ff8f5121266855bc34c1158c9a1.patch"; + includes = [ "fastmcp_slim/fastmcp/tools/function_tool.py" ]; + hash = "sha256-7N86b5sslWLgoB2dS2Xh3JfZX3oTHeXfeSJOaWKI5b0="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "timeout = 5" "timeout = 50" @@ -108,8 +119,11 @@ buildPythonPackage (finalAttrs: { "test_nested_streamable_http_server_resolves_correctly" # Requires prefab-ui (optional dependency) + # https://github.com/NixOS/nixpkgs/pull/510123 adds the prefab-ui package. "TestPrefabAppConfig" "test_doc_examples_quality" + "test_run_dev_apps_with_host" + "test_run_dev_apps_log_panel_propagation" # AssertionError: assert 'INFO' == 'DEBUG' "test_temporary_settings" @@ -120,6 +134,14 @@ buildPythonPackage (finalAttrs: { "test_server_starts_without_auth" "test_canonical_multi_client_with_transforms" + # Server startup is flaky when the suite runs with pytest-xdist + "test_unauthorized_access" + + # Timing-sensitive and flaky + "test_rate_limiting_recovery_over_time" + "test_rate_limiting_with_different_operations" + "test_timeout" + # RuntimeError: Attempted to exit a cancel scope that isn't the current tasks's current cancel scope "test_stateful_proxy" "test_concurrent_log_requests_no_mixing" diff --git a/pkgs/development/python-modules/fireworks-ai/default.nix b/pkgs/development/python-modules/fireworks-ai/default.nix index bfcda1178fc3..7242c76cabf7 100644 --- a/pkgs/development/python-modules/fireworks-ai/default.nix +++ b/pkgs/development/python-modules/fireworks-ai/default.nix @@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: { pname = "fireworks-ai"; - version = "1.2.0"; + version = "1.2.8"; pyproject = true; __structuredAttrs = true; strictDeps = true; @@ -46,7 +46,7 @@ buildPythonPackage (finalAttrs: { owner = "fw-ai-external"; repo = "python-sdk"; tag = "v${finalAttrs.version}"; - hash = "sha256-hcJ32r4MnZFBPYf3aT2PhrtXDIYY3EBaE8Y5wH2Sxuw="; + hash = "sha256-V3xU/6pmiNVUvMaTWPduoyum9R1IN+Vq36JkIDkAoY4="; }; postPatch = '' @@ -97,6 +97,16 @@ buildPythonPackage (finalAttrs: { ] ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; + pytestFlags = [ + # ResourceWarning: Unclosed client session + "-Wignore::ResourceWarning" + ]; + + disabledTests = [ + # httpx.TimeoutException: Test timeout error + "test_retrying_timeout_errors_doesnt_leak" + ]; + pythonImportsCheck = [ "fireworks" ]; diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index 90a35ec2a94a..0f997b0c55c7 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - gcc13Stdenv, buildPythonPackage, fetchFromGitHub, @@ -35,10 +34,7 @@ cudaPackages ? { }, }: -let - stdenvTarget = if cudaSupport then gcc13Stdenv else stdenv; -in -buildPythonPackage.override { stdenv = stdenvTarget; } rec { +buildPythonPackage rec { pname = "llama-cpp-python"; version = "0.3.23"; pyproject = true; @@ -126,7 +122,7 @@ buildPythonPackage.override { stdenv = stdenvTarget; } rec { rev-prefix = "v"; allowedVersions = "^[.0-9]+$"; }; - tests = lib.optionalAttrs stdenvTarget.hostPlatform.isLinux { + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { withCuda = llama-cpp-python.override { cudaSupport = true; }; diff --git a/pkgs/development/python-modules/nanoemoji/default.nix b/pkgs/development/python-modules/nanoemoji/default.nix index 75698fd3396f..792939a5a7b1 100644 --- a/pkgs/development/python-modules/nanoemoji/default.nix +++ b/pkgs/development/python-modules/nanoemoji/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "nanoemoji"; - version = "0.15.9"; + version = "0.16.0"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "nanoemoji"; tag = "v${version}"; - hash = "sha256-T/d7gbw8n2I6amp3qAK/uo3Uf1qZ9teVOCIgkiMSkmE="; + hash = "sha256-gM53wlQSV/X7rDND6P7/fKpX0M28RDnWkGGOHQ+SK+g="; }; patches = [ diff --git a/pkgs/development/python-modules/pynslookup/default.nix b/pkgs/development/python-modules/nslookup/default.nix similarity index 85% rename from pkgs/development/python-modules/pynslookup/default.nix rename to pkgs/development/python-modules/nslookup/default.nix index 411ded3d31be..ea2262922820 100644 --- a/pkgs/development/python-modules/pynslookup/default.nix +++ b/pkgs/development/python-modules/nslookup/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage (finalAttrs: { - pname = "pynslookup"; + pname = "nslookup"; version = "1.9.0"; pyproject = true; @@ -30,6 +30,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Module to do DNS lookups"; homepage = "https://github.com/wesinator/pynslookup"; + changelog = "https://github.com/wesinator/pynslookup/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/openinference-instrumentation-openai/default.nix b/pkgs/development/python-modules/openinference-instrumentation-openai/default.nix index 31a804841153..60e327ed4294 100644 --- a/pkgs/development/python-modules/openinference-instrumentation-openai/default.nix +++ b/pkgs/development/python-modules/openinference-instrumentation-openai/default.nix @@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: { pname = "openinference-instrumentation-openai"; - version = "0.1.52"; + version = "0.1.54"; pyproject = true; __structuredAttrs = true; @@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: { owner = "Arize-ai"; repo = "openinference"; tag = "python-openinference-instrumentation-openai-v${finalAttrs.version}"; - hash = "sha256-wmwqmN/rN521TaXVZfkaRzHPVhANSgKaBVc4rhXgIII="; + hash = "sha256-rEF7Ijx3Zo3NHywFJFa5+QpXZjIWOvkQBie+54v/f8A="; }; sourceRoot = "${finalAttrs.src.name}/python/instrumentation/${finalAttrs.pname}"; diff --git a/pkgs/development/python-modules/pillow-jxl-plugin/default.nix b/pkgs/development/python-modules/pillow-jxl-plugin/default.nix new file mode 100644 index 000000000000..4d6363dd7ac1 --- /dev/null +++ b/pkgs/development/python-modules/pillow-jxl-plugin/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + pytestCheckHook, + fetchPypi, + rustPlatform, + maturin, + cmake, + packaging, + pillow, + numpy, +}: + +buildPythonPackage (finalAttrs: { + pname = "pillow-jxl-plugin"; + version = "1.3.8"; + pyproject = true; + __structuredAttrs = true; + + # Contains Cargo.lock + src = fetchPypi { + pname = "pillow_jxl_plugin"; + inherit (finalAttrs) version; + hash = "sha256-RDD9d1eJl0IHnFSKfSU31tY88PHTIxgAlbwPbwPZ1Po="; + }; + + build-system = [ maturin ]; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + cmake + ]; + + dontUseCmakeConfigure = true; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + hash = "sha256-IiVTlKtKkfZnRXme7QFA5MS8PPiL8+riOYOEoNaHHXc="; + }; + + dependencies = [ + packaging + pillow + ]; + + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + numpy + ]; + + pythonImportsCheck = [ + "pillow_jxl" + ]; + + meta = { + changelog = "https://github.com/Isotr0py/pillow-jpegxl-plugin/releases/tag/v${finalAttrs.version}"; + description = "Pillow plugin that adds support for JPEG XL files"; + homepage = "https://github.com/Isotr0py/pillow-jpegxl-plugin"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + dandellion + KunyaKud + ]; + }; +}) diff --git a/pkgs/development/python-modules/pygeosphere-warnings/default.nix b/pkgs/development/python-modules/pygeosphere-warnings/default.nix new file mode 100644 index 000000000000..26a92718cf43 --- /dev/null +++ b/pkgs/development/python-modules/pygeosphere-warnings/default.nix @@ -0,0 +1,41 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + hatchling, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "pygeosphere-warnings"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tklecka"; + repo = "pygeosphere-warnings"; + tag = "v${finalAttrs.version}"; + hash = "sha256-AQ2TQk5N+S4bW0OmrZj0la2UMIdpmxBUCMhbIkszm3g="; + }; + + build-system = [ hatchling ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pygeosphere_warnings" ]; + + meta = { + description = "Asynchronous Python client for the GeoSphere Austria Warn API"; + homepage = "https://github.com/tklecka/pygeosphere-warnings"; + changelog = "https://github.com/tklecka/pygeosphere-warnings/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/pysquashfsimage/default.nix b/pkgs/development/python-modules/pysquashfsimage/default.nix new file mode 100644 index 000000000000..4d21ba06a6fb --- /dev/null +++ b/pkgs/development/python-modules/pysquashfsimage/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "pysquashfsimage"; + version = "0.9.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "matteomattei"; + repo = "PySquashfsImage"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yQnXqCe/nMx+HGgNThdlnyvdNI++6n3iC3c0YvFl0Jk="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ "PySquashfsImage" ]; + + # No tests + doCheck = false; + + meta = { + description = "Python library to read Squashfs image files"; + homepage = "https://github.com/matteomattei/PySquashfsImage"; + changelog = "https://github.com/matteomattei/PySquashfsImage/releases/tag/${finalAttrs.src.tag}"; + license = with lib.licenses; [ + gpl3Only + lgpl21Only + ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index b76997879701..7767a5601904 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; src = fetchFromGitHub { owner = "ariebovenberg"; repo = "whenever"; tag = version; - hash = "sha256-yDI5TAnEyVPNYXqsCEitFrQnk+Ed0CyRKcCykxFqeWU="; + hash = "sha256-axysocowBamYcNZ9IS58SefSltWC8mdO1Ovf65vMxTk="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 631cff15bf0e..277a52933b88 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2324,7 +2324,8 @@ ]; "geosphere_austria_warnings" = ps: with ps; [ - ]; # missing inputs: pygeosphere-warnings + pygeosphere-warnings + ]; "ghost" = ps: with ps; [ aioghost @@ -8319,6 +8320,7 @@ "geofency" "geonetnz_quakes" "geonetnz_volcano" + "geosphere_austria_warnings" "ghost" "gios" "github" diff --git a/pkgs/servers/home-assistant/custom-components/plant/package.nix b/pkgs/servers/home-assistant/custom-components/plant/package.nix index de0e4670cacb..90be32ad81ed 100644 --- a/pkgs/servers/home-assistant/custom-components/plant/package.nix +++ b/pkgs/servers/home-assistant/custom-components/plant/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "olen"; domain = "plant"; - version = "2026.8.0"; + version = "2026.8.1"; src = fetchFromGitHub { inherit owner; repo = "homeassistant-plant"; tag = "v${version}"; - hash = "sha256-2u+0Ufpg22Ad+TRT4pUzzEdwSpKASotww/tun38e4AA="; + hash = "sha256-GGzALqXi28XJYGJdsMni6oOJxb/RRO479aubtkoJnwY="; }; dependencies = [ diff --git a/pkgs/servers/http/nginx/modules/vts/package.nix b/pkgs/servers/http/nginx/modules/vts/package.nix index 10858b0cb7ca..44eaf415eee1 100644 --- a/pkgs/servers/http/nginx/modules/vts/package.nix +++ b/pkgs/servers/http/nginx/modules/vts/package.nix @@ -6,13 +6,13 @@ mkNginxPlugin (finalAttrs: { pname = "vts"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "vozlt"; repo = "nginx-module-vts"; tag = "v${finalAttrs.version}"; - hash = "sha256-3u4igVGBVsv+GNi3CSduZL6ZaOmdPoItUPA4+wmRw5Y="; + hash = "sha256-5Cwjy3vrhyBohsroSB43qMvxZjIJtP/QHSK5QWnplzw="; }; meta = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e34daf590e0e..79054c6798f2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -786,6 +786,7 @@ mapAliases { evolve-core = throw "'evolve-core' has been removed, as it hindered the removal of flutter329"; # Added 2026-01-25 eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27 ex_doc = warnAlias "'ex_doc' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.ex_doc' instead." beamPackages.ex_doc; # added 2026-06-15 + ext4fuse = throw "'ext4fuse' has been removed as it is unmaintained, and depends on the unmaintained fuse2 library"; # added 2026-08-12 f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # Added 2025-07-18 fabs = throw "'fabs' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 falcon = throw "'falcon' has been removed as it is unmaintained and depends on pcre, which is deprecated"; # Added 2026-06-16 @@ -2430,6 +2431,7 @@ mapAliases { tokyonight-gtk-theme = throw "'tokyonight-gtk-theme' has been removed because it depended on 'gtk-engine-murrine', which was removed because it was unmaintained upstream and depended on GTK 2."; # Added 2026-07-22 tomcat_connectors = throw "'tomcat_connectors' has been renamed to/replaced by 'apacheHttpdPackages.mod_jk'"; # Converted to throw 2025-10-27 tooling-language-server = deputy; # Added 2025-06-22 + toppler = throw "'toppler' has been removed because it was unmaintained upstream and depended on 'gimp2', which is deprecated and relies on GTK 2."; # Added 2026-08-10 tor-browser-bundle-bin = throw "'tor-browser-bundle-bin' has been renamed to/replaced by 'tor-browser'"; # Converted to throw 2025-10-27 tora = throw "'tora' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01 torrent7z = throw "torrent7z is unmaintained and used a p7zip version from 2009. Consider using p7zip with the arguments to remove entropy instead"; # added 2026-05-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a7416ead8f4..2d6479031204 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4105,8 +4105,6 @@ with pkgs; coursier = coursier.override { jre = jdk8; }; }; - # smlnjBootstrap should be redundant, now that smlnj works on Darwin natively - smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage ../development/compilers/smlnj { }; squeak = callPackage ../development/compilers/squeak { @@ -8786,6 +8784,7 @@ with pkgs; inherit (callPackages ../development/libraries/scenefx { }) scenefx_0_4 scenefx_0_5 + scenefx ; sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { }); diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 917ccee50292..46a3613e376e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -519,6 +519,7 @@ mapAliases { pymyq = throw "'pymyq' has been renamed to/replaced by 'python-myq'"; # Converted to throw 2025-10-29 pymystem3 = throw "'pymystem3' has been removed because it is broken and unmaintained"; # Added 2026-04-19 pynotifier = py-notifier; # Added 2026-07-27 + pynslookup = throw "'pynslookup' has been renamed to 'nslookup'"; # Added 2026-08-10 pyobject = throw "'pyobject' has been removed because it was only supporting python 2"; # Added 2026-01-24 pyosmium = warnAlias "'pyosmium' has been renamed to 'osmium'" osmium; # Added 2026-07-27 pyownet = throw "pyownet was removed because Home Assistant switched to aio-ownet"; # added 2025-10-31 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 393e892b0e73..e0f1a6e4fe78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11952,6 +11952,8 @@ self: super: with self; { nskeyedunarchiver = callPackage ../development/python-modules/nskeyedunarchiver { }; + nslookup = callPackage ../development/python-modules/nslookup { }; + nsw-fuel-api-client = callPackage ../development/python-modules/nsw-fuel-api-client { }; nsz = callPackage ../development/python-modules/nsz { }; @@ -13290,6 +13292,8 @@ self: super: with self; { pillow-jpls = callPackage ../development/python-modules/pillow-jpls { }; + pillow-jxl-plugin = callPackage ../development/python-modules/pillow-jxl-plugin { }; + pillowfight = callPackage ../development/python-modules/pillowfight { }; pims = callPackage ../development/python-modules/pims { }; @@ -14744,6 +14748,8 @@ self: super: with self; { pygeocodio = callPackage ../development/python-modules/pygeocodio { }; + pygeosphere-warnings = callPackage ../development/python-modules/pygeosphere-warnings { }; + pygerber = callPackage ../development/python-modules/pygerber { }; pygetwindow = callPackage ../development/python-modules/pygetwindow { }; @@ -15315,8 +15321,6 @@ self: super: with self; { pynrrd = callPackage ../development/python-modules/pynrrd { }; - pynslookup = callPackage ../development/python-modules/pynslookup { }; - pynuki = callPackage ../development/python-modules/pynuki { }; pynut2 = callPackage ../development/python-modules/pynut2 { }; @@ -16039,6 +16043,8 @@ self: super: with self; { pysqlitecipher = callPackage ../development/python-modules/pysqlitecipher { }; + pysquashfsimage = callPackage ../development/python-modules/pysquashfsimage { }; + pysqueezebox = callPackage ../development/python-modules/pysqueezebox { }; pysrdaligateway = callPackage ../development/python-modules/pysrdaligateway { };