diff --git a/lib/modules.nix b/lib/modules.nix index 7d91d4b10ce3..419fc750e8d9 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1121,11 +1121,16 @@ let let # Add in the default value for this option, if any. defs' = - (optional (opt ? default) { - file = head opt.declarations; - value = mkOptionDefault opt.default; - }) - ++ defs; + if opt ? default then + [ + { + file = head opt.declarations; + value = mkOptionDefault opt.default; + } + ] + ++ defs + else + defs; # Handle properties, check types, and merge everything together. res = diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33b85edf05bd..b807086bfca3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3030,6 +3030,14 @@ githubId = 75235; name = "Michael Walker"; }; + bartoostveen = { + name = "Bart Oostveen"; + github = "bartoostveen"; + githubId = 50515369; + email = "bart@bartoostveen.nl"; + matrix = "@bart:bartoostveen.nl"; + keys = [ { fingerprint = "81FF AB19 BAA5 6FFD 6571 890B 992D 94B5 7AC4 3430"; } ]; + }; bartuka = { email = "wand@hey.com"; github = "wandersoncferreira"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a4416d002d23..30e305795d40 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -168,6 +168,7 @@ toml-edit,,,,,5.1,mrcjkb tree-sitter-cli,,,,,, tree-sitter-http,,,,0.0.33-1,, tree-sitter-norg,,,,,5.1,mrcjkb +tree-sitter-norg-meta,,,,,, tree-sitter-orgmode,,,,,5.1, utf8,,,,,, tree-sitter-teal,,,,,, diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index bb77873a484b..62e01f3c885c 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -110,6 +110,8 @@ - [turborepo-remote-cache](https://ducktors.github.io/turborepo-remote-cache/), an open-source implementation of the [Turborepo custom remote cache server](https://turbo.build/repo/docs/core-concepts/remote-caching#self-hosting). Available as [services.turborepo-remote-cache](options.html#opt-services.turborepo-remote-cache). +- [RSSHub](https://github.com/DIYgod/RSSHub), a service to convert many sources into rss. Available as `services.rsshub`. + - [Komodo Periphery](https://github.com/moghtech/komodo), a multi-server Docker and Git deployment agent by Komodo. Available as [services.komodo-periphery](#opt-services.komodo-periphery.enable). - [Shoko](https://shokoanime.com), an anime management system. Available as [services.shoko](#opt-services.shoko.enable). @@ -350,6 +352,7 @@ See . - `systemd.sleep.extraConfig` was replaced by [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md)-compliant `systemd.sleep.settings.Sleep`, which is used to generate the `sleep.conf` configuration file. See {manpage}`sleep.conf.d(5)` for available options. - Support for Bluetooth audio based on `bluez-alsa` has been added to the `hardware.alsa` module. It can be enabled with the new [enableBluetooth](#opt-hardware.alsa.enableBluetooth) option. +- `services.atuin` now has an `environmentFile` option to safely allow configuring secrets, such as an `ATUIN_DB_URI` containing a Postgres password. - `systemd.network.*` has been updated to support all configuration options from upstream `networkd` version 259. diff --git a/nixos/modules/hardware/nfc-nci.nix b/nixos/modules/hardware/nfc-nci.nix index 34d69db2115c..21c2e859ad8d 100644 --- a/nixos/modules/hardware/nfc-nci.nix +++ b/nixos/modules/hardware/nfc-nci.nix @@ -185,6 +185,11 @@ in "nxp-pn5xx" ]; + # libnfc-nci calls sched_setscheduler via pthread_setschedparam, which would be blocked by upstream SystemCallFilter=~@resources + systemd.services.pcscd.serviceConfig.SystemCallFilter = lib.mkIf cfg.enableIFD [ + "sched_setscheduler" + ]; + services.pcscd.readerConfigs = lib.mkIf cfg.enableIFD [ '' FRIENDLYNAME "NFC NCI" diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ce93b9560173..b23517fcce16 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1760,6 +1760,7 @@ ./services/web-apps/reposilite.nix ./services/web-apps/rimgo.nix ./services/web-apps/rss-bridge.nix + ./services/web-apps/rsshub.nix ./services/web-apps/rutorrent.nix ./services/web-apps/screego.nix ./services/web-apps/selfoss.nix diff --git a/nixos/modules/services/audio/music-assistant.nix b/nixos/modules/services/audio/music-assistant.nix index 7757310817a1..c0aaacc756b6 100644 --- a/nixos/modules/services/audio/music-assistant.nix +++ b/nixos/modules/services/audio/music-assistant.nix @@ -82,7 +82,8 @@ in allowedTCPPorts = lib.optional cfg.enable 8097 # Music Assistant stream port ++ lib.optional (lib.elem "airplay" cfg.providers) 7000 - ++ lib.optional (lib.elem "sendspin" cfg.providers) 8927; + ++ lib.optional (lib.elem "sendspin" cfg.providers) 8927 + ++ lib.optional (lib.elem "snapcast" cfg.providers) 1780; # The information published by Apple 1 seem to not apply to libraop. # The closest we could find that represents the port range being used as observed by tcpdump is the ephemeral port range. # 1: https://support.apple.com/en-us/103229#:~:text=49152%E2%80%93-,65535,-TCP%2C%20UDP @@ -97,6 +98,7 @@ in services.avahi = lib.mkIf (lib.elem "airplay_receiver" cfg.providers) { enable = true; + openFirewall = lib.mkIf cfg.openFirewall true; publish = { enable = true; userServices = true; @@ -129,7 +131,7 @@ in ++ lib.optionals (lib.elem "airplay_receiver" cfg.providers) [ shairport-sync ] - ++ lib.optionals (lib.elem "spotify" cfg.providers) [ + ++ lib.optionals (lib.elem "spotify" cfg.providers || lib.elem "spotify_connect" cfg.providers) [ librespot-ma ] ++ lib.optionals (lib.elem "snapcast" cfg.providers) [ diff --git a/nixos/modules/services/misc/atuin.nix b/nixos/modules/services/misc/atuin.nix index df1eaa9c63fa..4a851089cca5 100644 --- a/nixos/modules/services/misc/atuin.nix +++ b/nixos/modules/services/misc/atuin.nix @@ -68,6 +68,15 @@ in ''; }; }; + + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.externalPath; + default = null; + description = '' + Environment file, used to set any secret ATUIN_* environment variables, such as ATUIN_DB_URI containing a password. + See https://docs.atuin.sh/cli/self-hosting/server-setup/#configuration for available environment variables. + ''; + }; }; }; @@ -105,6 +114,7 @@ in serviceConfig = { ExecStart = "${lib.getExe' cfg.package "atuin-server"} start"; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; RuntimeDirectory = "atuin"; RuntimeDirectoryMode = "0700"; DynamicUser = true; diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix index db45fea66d86..1c8f2e76818b 100644 --- a/nixos/modules/services/monitoring/librenms.nix +++ b/nixos/modules/services/monitoring/librenms.nix @@ -735,8 +735,6 @@ in ''; }; - programs.mtr.enable = true; - services.logrotate = { enable = true; settings."${cfg.logDir}/librenms.log" = { diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index e602916426e8..18a1e30d31fe 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -62,6 +62,7 @@ let "domain" "dovecot" "ebpf" + "fail2ban" "fastly" "flow" "fritz" @@ -337,6 +338,31 @@ let services.udev.extraRules = mkIf (name == "smartctl") '' ACTION=="add", SUBSYSTEM=="nvme", KERNEL=="nvme[0-9]*", RUN+="${pkgs.acl}/bin/setfacl -m g:smartctl-exporter-access:rw /dev/$kernel" ''; + systemd.services.prometheus-fail2ban-exporter-setup = + mkIf (config.services.fail2ban.enable && name == "fail2ban") + { + description = "Set fail2ban socket ACLs"; + after = [ "fail2ban.service" ]; + requires = [ "fail2ban.service" ]; + before = [ "prometheus-fail2ban-exporter.service" ]; + wantedBy = [ "prometheus-fail2ban-exporter.service" ]; + path = [ + pkgs.acl + pkgs.coreutils + ]; + script = '' + while [ ! -S ${conf.fail2banSocket} ]; do + sleep 0.1 + done + + setfacl -m u:${conf.user}:x $(dirname ${conf.fail2banSocket}) + setfacl -m u:${conf.user}:rwx ${conf.fail2banSocket} + ''; + serviceConfig = { + Type = "oneshot"; + User = "root"; + }; + }; networking.firewall.extraCommands = mkIf (conf.openFirewall && !nftables) (concatStrings [ "ip46tables -A nixos-fw ${conf.firewallFilter} " "-m comment --comment ${name}-exporter -j nixos-fw-accept" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/fail2ban.nix b/nixos/modules/services/monitoring/prometheus/exporters/fail2ban.nix new file mode 100644 index 000000000000..8e86ccb79605 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/fail2ban.nix @@ -0,0 +1,82 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.prometheus.exporters.fail2ban; + + inherit (lib) + mkOption + types + getExe + optionalString + mkIf + ; +in +{ + port = 9191; + extraOpts = { + host = mkOption { + description = "The host that the fail2ban exporter should listen on"; + type = types.str; + default = "127.0.0.1"; + example = "0.0.0.0"; + }; + fail2banSocket = mkOption { + description = "Path to the fail2ban server socket. Permissions will be set automatically if fail2ban runs on this system."; + type = types.str; + default = config.services.fail2ban.daemonSettings.Definition.socket; + defaultText = "config.services.fail2ban.daemonSettings.Definition.socket"; + }; + exitOnError = mkOption { + description = "When set to true the exporter will immediately exit on a fail2ban socket connection error"; + type = types.bool; + default = true; + example = false; + }; + username = mkOption { + description = "Username to protect endpoints with HTTP basic authentication"; + type = types.nullOr types.str; + default = null; + example = "admin"; + }; + passwordFile = mkOption { + description = "File that contains the password to protect endpoints with HTTP basic authentication"; + type = types.nullOr types.path; + default = null; + example = "/run/secrets/prometheus-fail2ban-exporter-password.txt"; + }; + }; + + assertions = [ + { + assertion = (cfg.username != null) -> (cfg.passwordFile != null); + message = "Setting an http basic auth username requires the password to be non-null"; + } + ]; + + serviceOpts = { + requires = mkIf config.services.fail2ban.enable [ "prometheus-fail2ban-exporter-setup.service" ]; + serviceConfig = { + DynamicUser = false; + ExecStart = '' + ${getExe pkgs.prometheus-fail2ban-exporter} \ + ${optionalString cfg.exitOnError ''--collector.f2b.exit-on-socket-connection-error \''} + ${optionalString (cfg.username != null) '' + --web.basic-auth.username="${cfg.username}" \ + --web.basic-auth.password="$(cat ${cfg.passwordFile})" \ + ''} + --web.listen-address="${cfg.host}:${toString cfg.port}" \ + --collector.f2b.socket=${cfg.fail2banSocket} + ''; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + }; + }; +} diff --git a/nixos/modules/services/web-apps/rsshub.nix b/nixos/modules/services/web-apps/rsshub.nix new file mode 100644 index 000000000000..912a6d36c1d3 --- /dev/null +++ b/nixos/modules/services/web-apps/rsshub.nix @@ -0,0 +1,138 @@ +{ + lib, + config, + pkgs, + ... +}: + +let + cfg = config.services.rsshub; +in +{ + options.services.rsshub = { + enable = lib.mkEnableOption "RSSHub service"; + + package = lib.mkPackageOption pkgs "rsshub" { }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to open the firewall for the specified port."; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = lib.types.attrsOf lib.types.str; + options = { + LISTEN_INADDR_ANY = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Listen to any address"; + apply = x: if x then "1" else "0"; + }; + PORT = lib.mkOption { + type = lib.types.port; + default = 1200; + description = "Listen on port."; + apply = toString; + }; + NO_LOGFILES = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Print logs into stderr."; + apply = x: if x then "1" else "0"; + }; + }; + }; + default = { }; + example = lib.literalExpression '' + { + REQUEST_TIMEOUT = "3000"; + REQUEST_RETRY = "10"; + PUPPETEER_EXECUTABLE_PATH = lib.getExe pkgs.chromium"; + } + ''; + description = '' + Environment variables for RSSHub. + See for available options. + ''; + }; + + secretFiles = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + example = lib.literalExpression '' + [ config.sops.secrets.rsshub.path ] + ''; + description = '' + Environment variables stored in files for secrets. + See for available options. + ''; + }; + + redis = { + enable = lib.mkEnableOption "Redis for RSSHub"; + createLocally = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Create and use a local Redis instance. Sets `services.redis.servers.rsshub`."; + }; + host = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = "The Redis host."; + }; + port = lib.mkOption { + type = lib.types.port; + default = 6379; + description = "The Redis port."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.redis.servers.rsshub = lib.mkIf (cfg.redis.enable && cfg.redis.createLocally) { + enable = true; + port = cfg.redis.port; + }; + + services.rsshub.settings = lib.mkIf cfg.redis.enable { + CACHE_TYPE = "redis"; + REDIS_URL = "redis://${cfg.redis.host}:${toString cfg.redis.port}"; + }; + + systemd.services.rsshub = { + description = "RSSHub - Everything is RSSible"; + wantedBy = [ "multi-user.target" ]; + after = lib.optional (cfg.redis.enable && cfg.redis.createLocally) "redis-rsshub.service"; + requires = lib.optional (cfg.redis.enable && cfg.redis.createLocally) "redis-rsshub.service"; + + environment = cfg.settings; + + serviceConfig = { + Type = "simple"; + User = "rsshub"; + Group = "rsshub"; + DynamicUser = true; + StateDirectory = "rsshub"; + EnvironmentFile = cfg.secretFiles; + ExecStart = lib.getExe cfg.package; + Restart = "on-failure"; + RestartSec = "10s"; + + # Hardening + NoNewPrivileges = true; + PrivateTmp = true; + ProtectSystem = "strict"; + ProtectHome = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + }; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ (lib.toInt cfg.settings.PORT) ]; + }; + + meta.maintainers = with lib.maintainers; [ vonfry ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b6512c99ca01..929e8362e8f3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1432,6 +1432,7 @@ in rspamd-trainer = runTest ./rspamd-trainer.nix; rss-bridge = handleTest ./web-apps/rss-bridge { }; rss2email = handleTest ./rss2email.nix { }; + rsshub = runTest ./web-apps/rsshub.nix; rstp = runTest ./rstp.nix; rstudio-server = runTest ./rstudio-server.nix; rsync = runTest ./rsync.nix; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 5f736f86fdf6..6383f1b54cfd 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -436,6 +436,24 @@ let ''; }; + fail2ban = + { ... }: + { + exporterConfig = { + enable = true; + exitOnError = true; + }; + metricProvider = { + services.fail2ban.enable = true; + }; + exporterTest = '' + wait_for_unit("fail2ban.service") + wait_for_unit("prometheus-fail2ban-exporter.service") + wait_for_open_port(9191) + succeed("curl -sSf http://localhost:9191/metrics | grep 'f2b_errors'") + ''; + }; + fastly = { pkgs, ... }: { diff --git a/nixos/tests/web-apps/rsshub.nix b/nixos/tests/web-apps/rsshub.nix new file mode 100644 index 000000000000..89557aa2ab01 --- /dev/null +++ b/nixos/tests/web-apps/rsshub.nix @@ -0,0 +1,46 @@ +{ lib, ... }: +{ + name = "rsshub"; + + meta.maintainers = with lib.maintainers; [ vonfry ]; + + nodes = { + basic = { + services.rsshub.enable = true; + }; + + redis = { + services.rsshub = { + enable = true; + + redis = { + enable = true; + createLocally = true; + }; + }; + }; + }; + + testScript = + { nodes, ... }: + let + port = nodes.basic.services.rsshub.settings.PORT; + in + '' + def assert_http_200(machine, url): + code = machine.succeed(f"curl -s -o /dev/null -w '%{{http_code}}' {url}").strip() + assert code == "200", f"Expected HTTP 200 from {url}, got {code}" + + def test_node(node): + node.wait_for_unit("rsshub.service") + node.wait_for_open_port(${port}) + assert_http_200(node, "http://localhost:${port}/healthz") + + with subtest("RSSHub works"): + test_node(basic) + + with subtest("RSSHub works with local Redis"): + test_node(redis) + + ''; +} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3207fbc1fa30..4592eed3f5bd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4341,8 +4341,8 @@ let mktplcRef = { publisher = "sonarsource"; name = "sonarlint-vscode"; - version = "5.0.0"; - hash = "sha256-K8EZF7h86ErbIHW05LQSpReXSKa8FTMH6uOD+IczoR4="; + version = "5.1.0"; + hash = "sha256-eGAXjN4Vp6ZlUgUxlE8gfo5OYtL/IO/8ACu3PBwePLQ="; }; meta.license = lib.licenses.lgpl3Only; }; diff --git a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix index 8c571633e6c3..647355dbb00c 100644 --- a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix @@ -12,26 +12,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-XeNdr1nWK4aYTBEgAu3hXotmrDJ31ocg+w4870TuEGA="; + hash = "sha256-IoBA0fuy9XxZgswN1j9DfwDI218h2huapl1Bfs2AscI="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-yC8fBgj8lHR3y7OWUshWYNpn6fgp2SeKLv9WXxhVP0A="; + hash = "sha256-EfoRRJFTNr+0JAkqWJ2pXwhBtmAXs9cANLzXb4obOMs="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-O/SoqC0pNnbNdXylAj0rlKyr7qaJNivw6xhecKFk7JU="; + hash = "sha256-p2AjXFqoptxAwOdsievcjD/WLm0J03Rx/sT4ejUd6xM="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-pwdTllSB4IXDoyFuo2XxZjkS8lnIjp7AwgggBkjv3Y0="; + hash = "sha256-C1nbQxL5YDWenLQ82tABuEWKWl/LoEizTWo/YnBQJFw="; }; }; in { publisher = "kilocode"; name = "Kilo-Code"; - version = "7.1.22"; + version = "7.2.0"; } // sources.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix index 4dbf4e3a7ad9..ea4671ee5f49 100644 --- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix +++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bluemsx"; - version = "0-unstable-2026-03-31"; + version = "0-unstable-2026-04-11"; src = fetchFromGitHub { owner = "libretro"; repo = "bluemsx-libretro"; - rev = "8af516705652d240ef5bc69dea8276d0fdd16323"; - hash = "sha256-QkJicDAfr+hFAlsqSLlonmGJEf/G9XFQ7oe/X4mvAhw="; + rev = "0b23b79f6b8c19f300d2d86958e89fbe2f6d30bc"; + hash = "sha256-/rILuViKZBKZFZkCjuFuuuOE3AvDiHQqHtWq4Q8XSMA="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 60dcc1e0b3bb..9c6d23f2df54 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2026-04-06"; + version = "0-unstable-2026-04-14"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "f659af2c3bec122d3e628e1e1634e746e67005e4"; - hash = "sha256-cK2c611fBEDcRK1I7VMLL+Ih76FMWlEGhmhg53KampU="; + rev = "e869c6a2033b135e7fcbea4a50695e97755feae1"; + hash = "sha256-YIva50UWylsDmAaJZI85LCphrgjh7jDYQZkpAlQr1HM="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix index 7028b41a63b7..22ee3ef17097 100644 --- a/pkgs/applications/emulators/libretro/cores/mame.nix +++ b/pkgs/applications/emulators/libretro/cores/mame.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "mame"; - version = "0-unstable-2026-04-06"; + version = "0-unstable-2026-04-08"; src = fetchFromGitHub { owner = "libretro"; repo = "mame"; - rev = "4162ead798f816b4f08b1af9eafefe3d022331bf"; - hash = "sha256-doujon1GCXrmgYRWf3aGIpOFyOtj2U1DoaClGpaS1L0="; + rev = "a891bc3b98c5a9f00848c953c8768007c6d339cb"; + hash = "sha256-u8vmZY9097h66bsZ71qoq+D+sZDkkgLukEayYVK7UI4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index 81676b82303c..241e304c2fe3 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -54,6 +54,9 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.zlib; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ jlesquembre ]; + maintainers = with lib.maintainers; [ + jlesquembre + mithicspirit + ]; }; }) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index d6e6237f463f..082909847351 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -109,6 +109,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Core component for zathura PDF viewer"; license = lib.licenses.zlib; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mithicspirit ]; }; }) diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index f6a8f4962fa5..0c221739fccd 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.zlib; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mithicspirit ]; }; }) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index e96e5ab6758d..73c166ffe6b3 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.zlib; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mithicspirit ]; }; }) diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 1abd2b07fb5e..0e50ce0a5463 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.zlib; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mithicspirit ]; }; }) diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 1589d938efb9..38188e18306b 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.zlib; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mithicspirit ]; }; }) diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 616f9c647edd..46c602e15563 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -68,6 +68,7 @@ symlinkJoin { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ TethysSvensson + mithicspirit ]; mainProgram = "zathura"; }; diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix index 02ccc9bfb4d4..be730bfed9ca 100644 --- a/pkgs/applications/networking/firehol/iprange.nix +++ b/pkgs/applications/networking/firehol/iprange.nix @@ -1,23 +1,38 @@ { lib, stdenv, - fetchurl, + autoreconfHook, + fetchFromGitHub, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iprange"; - version = "1.0.4"; + version = "2.0.0"; - src = fetchurl { - url = "https://github.com/firehol/iprange/releases/download/v${version}/iprange-${version}.tar.xz"; - sha256 = "0rymw4ydn09dng34q4g5111706fyppzs2gd5br76frgvfj4x2f71"; + src = fetchFromGitHub { + owner = "firehol"; + repo = "iprange"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/rNM/5SmqpNX/yM/9EZdRYsXxgbPLp7+SL/RDtKo3+0="; }; + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = [ "--disable-man" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + versionCheckProgramArg = [ "--version" ]; + meta = { description = "Manage IP ranges"; - mainProgram = "iprange"; homepage = "https://github.com/firehol/iprange"; - license = lib.licenses.gpl2; + changelog = "https://github.com/firehol/iprange/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl2Plus; maintainers = [ ]; + mainProgram = "iprange"; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index be18e03f563d..f4616191e3bd 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -111,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { ; nativeBuildInputs = [ - alsa-lib autoPatchelfHook cups libdrm @@ -122,14 +121,21 @@ stdenv.mkDerivation (finalAttrs: { libxtst libxcb libxshmfence - libgbm - nss wrapGAppsHook3 makeShellWrapper ]; dontWrapGApps = true; + buildInputs = [ + alsa-lib + libgbm + nspr + nss + ]; + + strictDeps = true; + libPath = lib.makeLibraryPath ( [ libcxx diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index cb459e8ef8c0..d7f077670950 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -1,24 +1,27 @@ { stdenv, lib, + billiard, buildPythonApplication, fetchFromGitHub, + fetchpatch, + gnureadline, lxml, matplotlib, numpy, opencv-python, pymavlink, + pynmeagps, pyserial, setuptools, + versionCheckHook, wxpython, - billiard, - gnureadline, }: buildPythonApplication rec { pname = "MAVProxy"; version = "1.8.74"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ArduPilot"; @@ -27,14 +30,25 @@ buildPythonApplication rec { hash = "sha256-1/bp3vlCXt4Hg36zwMKSzPSxW7xlxpfx2o+2uQixdos="; }; - propagatedBuildInputs = [ + patches = [ + # Remove python 2 future imports + (fetchpatch { + url = "https://github.com/ArduPilot/MAVProxy/commit/db52f3f5d1991942026c00b51a3ce1ce85998cbd.patch"; + hash = "sha256-mNhOfXJMiUihsso3fjzlbeXW/3ENvrdkFSLo23dMCY4="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ lxml matplotlib numpy opencv-python pymavlink + pynmeagps pyserial - setuptools + setuptools # Imports `pkg_resources` at runtime wxpython ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -42,12 +56,16 @@ buildPythonApplication rec { gnureadline ]; - # No tests - doCheck = false; + pythonImportsCheck = [ "MAVProxy" ]; + + # No tests, but we can check the version + nativeInstallCheckInputs = [ versionCheckHook ]; meta = { description = "MAVLink proxy and command line ground station"; + mainProgram = "mavproxy.py"; homepage = "https://github.com/ArduPilot/MAVProxy"; + changelog = "https://github.com/ArduPilot/MAVProxy/releases/tag/${src.tag}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ lopsided98 ]; }; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 92e003c64afb..adb13a7f457a 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -592,7 +592,7 @@ rec { in runCommand "${baseNameOf name}.tar${compress.ext}" { inherit (stream) imageName; - passthru = { + passthru = stream.passthru // { inherit (stream) imageTag; inherit stream; }; diff --git a/pkgs/by-name/_3/_3proxy/package.nix b/pkgs/by-name/_3/_3proxy/package.nix index 1236f6ba4077..0592f143d9b6 100644 --- a/pkgs/by-name/_3/_3proxy/package.nix +++ b/pkgs/by-name/_3/_3proxy/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "3proxy"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "3proxy"; repo = "3proxy"; tag = finalAttrs.version; - sha256 = "sha256-uy6flZ1a7o02pr5O0pgl9zCjh8mE9W5JxotJeBMB16A="; + sha256 = "sha256-0rCXz/vKFF5rvBXyvtt9DH0Jz+1i7rIylh07FqKBrZM="; }; # They use 'install -s', that calls the native strip instead of the cross. diff --git a/pkgs/by-name/ac/acli/sources.json b/pkgs/by-name/ac/acli/sources.json index 96fb7bc81d0e..d166f3b4524c 100644 --- a/pkgs/by-name/ac/acli/sources.json +++ b/pkgs/by-name/ac/acli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.3.17-stable", + "version": "1.3.18-stable", "sources": { "aarch64-darwin": { - "url": "https://acli.atlassian.com/darwin/1.3.17-stable/acli_1.3.17-stable_darwin_arm64.tar.gz", - "sha256": "db630d0ce82777d47c5cb647a622cd30f38fedefa6b8e1e6f62c1ca3c0974d1f" + "url": "https://acli.atlassian.com/darwin/1.3.18-stable/acli_1.3.18-stable_darwin_arm64.tar.gz", + "sha256": "9e4890e441e2762adbb6bd94451fdea554177806a6044469ece7b14e603d2040" }, "aarch64-linux": { - "url": "https://acli.atlassian.com/linux/1.3.17-stable/acli_1.3.17-stable_linux_arm64.tar.gz", - "sha256": "59dc9405f6de0a70f8f82e328fdd6db3fc564d28aef38d14c08431a8b130ba36" + "url": "https://acli.atlassian.com/linux/1.3.18-stable/acli_1.3.18-stable_linux_arm64.tar.gz", + "sha256": "ac71711da43649854689ad0f74e44f18b0da3fd0ee776ceb4307ae7eb1e5da85" }, "x86_64-darwin": { - "url": "https://acli.atlassian.com/darwin/1.3.17-stable/acli_1.3.17-stable_darwin_amd64.tar.gz", - "sha256": "043e3b80f08cf4fc09dd52f0432500f5de28902d8c85d848128c5931f766af45" + "url": "https://acli.atlassian.com/darwin/1.3.18-stable/acli_1.3.18-stable_darwin_amd64.tar.gz", + "sha256": "4078846601b2e222ecbbc6b314a1c58ca6c41c18d1b118833814c942be00befe" }, "x86_64-linux": { - "url": "https://acli.atlassian.com/linux/1.3.17-stable/acli_1.3.17-stable_linux_amd64.tar.gz", - "sha256": "6177dd5950b0a27f14e8b2daf41e93cf30a306c2e2ee61b13a22f572cbf2f4ff" + "url": "https://acli.atlassian.com/linux/1.3.18-stable/acli_1.3.18-stable_linux_amd64.tar.gz", + "sha256": "4ad4badc481ac1eff452f531c405a20422eb57513cc898d2a1f8ea945d6c24f6" } } } diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix index 2e985c226733..e9fbecd9eed8 100644 --- a/pkgs/by-name/ac/activemq/package.nix +++ b/pkgs/by-name/ac/activemq/package.nix @@ -5,7 +5,7 @@ }: let - version = "6.2.1"; + version = "6.2.4"; in stdenvNoCC.mkDerivation { pname = "activemq"; @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { src = fetchurl { url = "mirror://apache/activemq/${version}/apache-activemq-${version}-bin.tar.gz"; - hash = "sha256-vBbQMLxTykJAZRxl7BPfonLHN8kPx+NFSa3gwLZwdw0="; + hash = "sha256-/jvyO8cDQ666i8J53SXPS5WyBmN5GZwK6TVaDxXxJhM="; }; installPhase = '' diff --git a/pkgs/by-name/ac/actool/package.nix b/pkgs/by-name/ac/actool/package.nix index 2fea82eb7285..f611e06428b6 100644 --- a/pkgs/by-name/ac/actool/package.nix +++ b/pkgs/by-name/ac/actool/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "actool"; - version = "1.5.1"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "viraptor"; repo = "actool"; tag = finalAttrs.version; - hash = "sha256-HWi+MM0jMfg+nPiNFa3dG3sRuSEnS84+h3s6YRcxcAs="; + hash = "sha256-OJJwEZEz+nNq3W1SDXt76Vx9qvEFUUL4dyem/oc2RA4="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ag/agent-browser/package.nix b/pkgs/by-name/ag/agent-browser/package.nix index ca85222631a4..3a47929d3143 100644 --- a/pkgs/by-name/ag/agent-browser/package.nix +++ b/pkgs/by-name/ag/agent-browser/package.nix @@ -1,25 +1,92 @@ { lib, + stdenv, fetchFromGitHub, + fetchPnpmDeps, rustPlatform, + nodejs, + pnpm, + pnpmConfigHook, + geist-font, nix-update-script, writableTmpDirAsHomeHook, }: -rustPlatform.buildRustPackage (finalAttrs: { - pname = "agent-browser"; - version = "0.23.3"; +let + version = "0.25.4"; src = fetchFromGitHub { owner = "vercel-labs"; repo = "agent-browser"; - tag = "v${finalAttrs.version}"; - hash = "sha256-Q02sJr14zRrVrRJ0M30AD0EG7DGkYtafCH6/kI15/xk="; + tag = "v${version}"; + hash = "sha256-2Dv+ZY9cvcz6EIpI+gkV9w5eqQzpAD2N+yf4dJrmdwg="; }; + # The Rust CLI embeds the dashboard UI via RustEmbed at compile time. + # Build the Next.js static export so it can be placed at the expected path. + dashboard = stdenv.mkDerivation { + pname = "agent-browser-dashboard"; + inherit version src; + + nativeBuildInputs = [ + nodejs + pnpm + pnpmConfigHook + ]; + + __darwinAllowLocalNetworking = true; + + pnpmDeps = fetchPnpmDeps { + pname = "agent-browser-dashboard"; + inherit version src; + pnpmWorkspaces = [ "dashboard" ]; + fetcherVersion = 3; + hash = "sha256-ldxmXpejqVN/xuWcdLYMwNPc1VZ1rdNwRrumy8Is3N4="; + }; + + pnpmWorkspaces = [ "dashboard" ]; + + # Replace Google Fonts fetch with a local font from nixpkgs since + # the nix sandbox has no network access. + postPatch = '' + substituteInPlace packages/dashboard/src/app/layout.tsx --replace-fail \ + '{ Geist } from "next/font/google"' \ + 'localFont from "next/font/local"' + + substituteInPlace packages/dashboard/src/app/layout.tsx --replace-fail \ + 'Geist({ subsets: ["latin"], variable: "--font-sans" })' \ + 'localFont({ src: "./Geist-Regular.otf", variable: "--font-sans" })' + + cp "${geist-font}/share/fonts/opentype/Geist-Regular.otf" \ + packages/dashboard/src/app/Geist-Regular.otf + ''; + + buildPhase = '' + runHook preBuild + pnpm --filter dashboard build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp -r packages/dashboard/out $out + runHook postInstall + ''; + }; +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "agent-browser"; + inherit version src; + sourceRoot = "${finalAttrs.src.name}/cli"; - cargoHash = "sha256-smJ+ODr88moz+16G9fXSz/NNiGngWeoTuQtBn21qu1s="; + cargoHash = "sha256-3vzVVHFo13ZLsbbXw7n9BE/YXBJwoxzhvfjuqOQwdfg="; + + # Place the pre-built dashboard where RustEmbed expects it + postUnpack = '' + chmod u+w source/packages/dashboard + cp -r ${dashboard} source/packages/dashboard/out + ''; nativeCheckInputs = [ writableTmpDirAsHomeHook ]; @@ -31,7 +98,15 @@ rustPlatform.buildRustPackage (finalAttrs: { cp -r ../skills $out/share/agent-browser/ ''; - passthru.updateScript = nix-update-script { }; + passthru = { + inherit dashboard; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "dashboard" + ]; + }; + }; meta = { description = "Headless browser automation CLI for AI agents"; diff --git a/pkgs/by-name/al/alcove/package.nix b/pkgs/by-name/al/alcove/package.nix index 8a1aa894c21b..309d49c52324 100644 --- a/pkgs/by-name/al/alcove/package.nix +++ b/pkgs/by-name/al/alcove/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alcove"; - version = "1.5.1"; + version = "1.7.2"; src = fetchurl { url = "https://github.com/henrikruscon/alcove-releases/releases/download/${finalAttrs.version}/Alcove.zip"; - hash = "sha256-MhwtQDuDKP4vLPvOxSe9pY2W//dHplHlu6YvxfswNOg="; + hash = "sha256-gzV/BdLt0cl490cPHPK5Q6S4HRaHI/e4zcOdnM+MVYg="; }; sourceRoot = "."; diff --git a/pkgs/by-name/al/alt-ergo/package.nix b/pkgs/by-name/al/alt-ergo/package.nix index a29807e8476c..131ed284957f 100644 --- a/pkgs/by-name/al/alt-ergo/package.nix +++ b/pkgs/by-name/al/alt-ergo/package.nix @@ -8,11 +8,11 @@ let pname = "alt-ergo"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; - hash = "sha256-OeLJEop9HonzMuMaJxbzWfO54akl/oHxH6SnSbXSTYI="; + hash = "sha256-SsK12K5sVKEaDMNJ7HahU6qVcnv1fvnLMwmnBqf7G/o="; }; in diff --git a/pkgs/by-name/an/ankama-launcher/package.nix b/pkgs/by-name/an/ankama-launcher/package.nix index 4fe2ec5fb7ea..8b7510c8831e 100644 --- a/pkgs/by-name/an/ankama-launcher/package.nix +++ b/pkgs/by-name/an/ankama-launcher/package.nix @@ -5,15 +5,15 @@ }: let pname = "ankama-launcher"; - version = "3.13.37"; + version = "3.14.8"; # The original URL for the launcher is: # https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage # As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL. # To update the client, head to web.archive.org and create a new snapshot of the download page. src = fetchurl { - url = "https://web.archive.org/web/20260205070121/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; - hash = "sha256-6BGx4eS9H2CmvcncVufRrhruVHk78eBfB5PtVFfK0eg="; + url = "https://web.archive.org/web/20260413125512/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; + hash = "sha256-wHLzF30ZeTgBG1TFlkSt0Tsm82cNb/C/eTUZjjYsgVE="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/aq/aqtinstall/package.nix b/pkgs/by-name/aq/aqtinstall/package.nix new file mode 100644 index 000000000000..978f4c5e48df --- /dev/null +++ b/pkgs/by-name/aq/aqtinstall/package.nix @@ -0,0 +1,55 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + nix-update-script, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "aqtinstall"; + version = "3.3.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "miurahr"; + repo = "aqtinstall"; + tag = "v${finalAttrs.version}"; + hash = "sha256-CXG8GH1MSS2HhDA/SnqQP7mQG+/OfZ5P6JRG8ZIVlLs="; + }; + + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"bs4"' '"beautifulsoup4"' + ''; + + dependencies = with python3Packages; [ + beautifulsoup4 + defusedxml + humanize + patch-ng + py7zr + requests + semantic-version + texttable + ]; + + # Tests require network access + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Unofficial Qt installer"; + homepage = "https://github.com/miurahr/aqtinstall"; + changelog = "https://github.com/miurahr/aqtinstall/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ BatteredBunny ]; + mainProgram = "aqt"; + }; +}) diff --git a/pkgs/by-name/au/ausweisapp/package.nix b/pkgs/by-name/au/ausweisapp/package.nix index 98a92fc9aff6..1392c62ec91e 100644 --- a/pkgs/by-name/au/ausweisapp/package.nix +++ b/pkgs/by-name/au/ausweisapp/package.nix @@ -8,16 +8,17 @@ qt6, pcsclite, gitUpdater, + llhttp, }: stdenv.mkDerivation (finalAttrs: { pname = "ausweisapp"; - version = "2.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-cLKF5QYDPngvN6+3p7B8YO/MYvDfD1fbnyEMZPmjj8w="; + hash = "sha256-R+2swDzIHlgE0kVonoYQih8r8p38RN7bqkbb+WB1hCc="; }; postPatch = '' @@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ''; buildInputs = [ + llhttp pcsclite qt6.qtscxml qt6.qtsvg diff --git a/pkgs/by-name/b4/b4/package.nix b/pkgs/by-name/b4/b4/package.nix index fcc090b9d289..60db5c158137 100644 --- a/pkgs/by-name/b4/b4/package.nix +++ b/pkgs/by-name/b4/b4/package.nix @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dkimpy patatt git-filter-repo + textual ]; meta = { diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix index 07568f1b1556..9ca514735a2a 100644 --- a/pkgs/by-name/bp/bpftop/package.nix +++ b/pkgs/by-name/bp/bpftop/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: { pname = "bpftop"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Netflix"; repo = "bpftop"; tag = "v${finalAttrs.version}"; - hash = "sha256-8vb32+wHOnADpIIfO9mMlGu7GdlA0hS9ij0zSLcrO7A="; + hash = "sha256-2W00L4JudB7D3IBpY9But+I5erU5+Hf/M2h3jERYObc="; }; - cargoHash = "sha256-euiI4R4nCgnwiBA22kzn0c91hjOr0IOOAyFkW5ZadIk="; + cargoHash = "sha256-5VzItvqcBzXGAMEY6ZgvJSDkA+fF7ega4NSEaskhL5w="; buildInputs = [ elfutils diff --git a/pkgs/by-name/bs/bsky-cli/package.nix b/pkgs/by-name/bs/bsky-cli/package.nix index 39be8a00bd54..9d0ec625ec3d 100644 --- a/pkgs/by-name/bs/bsky-cli/package.nix +++ b/pkgs/by-name/bs/bsky-cli/package.nix @@ -8,16 +8,16 @@ }: buildGoModule (finalAttrs: { pname = "bsky-cli"; - version = "0.0.78"; + version = "0.0.79"; src = fetchFromGitHub { owner = "mattn"; repo = "bsky"; tag = "v${finalAttrs.version}"; - hash = "sha256-+LZCVF1slJ7Nypi8MogbqXH5GSfcsKJDGKNm4EfLpFY="; + hash = "sha256-id7+g9NMCSicPbDoDSqnc7OwEMIVXbXw3O8TkeQjfmg="; }; - vendorHash = "sha256-WFGViuC+8Ba6NCU//Z+MTcwNPJbYzpXeCbf4M9mBFPM="; + vendorHash = "sha256-m4kth6r13++53fbceWjKYu4D297meAwnkaSsCiu5zS8="; buildInputs = [ libpcap diff --git a/pkgs/by-name/ca/cargo-audit/package.nix b/pkgs/by-name/ca/cargo-audit/package.nix index fd6fc312778d..d7827e46db66 100644 --- a/pkgs/by-name/ca/cargo-audit/package.nix +++ b/pkgs/by-name/ca/cargo-audit/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-audit"; - version = "0.22.0"; + version = "0.22.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-Ha2yVyu9331NaqiW91NEwCTIeW+3XPiqZzmatN5KOws="; + hash = "sha256-/K84iYr3mRNH8lbqHHa7Tsh7M3ykQ2hs6T1k/qrSsnA="; }; - cargoHash = "sha256-f8nrW1l7UA8sixwqXBD1jCJi9qyKC5tNl/dWwCt41Lk="; + cargoHash = "sha256-Hr3CliJeb9ljHylx8mjkGyf4ybX79Fmt6CaFb6FMRts="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ci/cider/package.nix b/pkgs/by-name/ci/cider/package.nix index 3b31bce8d851..227c507862e8 100644 --- a/pkgs/by-name/ci/cider/package.nix +++ b/pkgs/by-name/ci/cider/package.nix @@ -37,5 +37,6 @@ appimageTools.wrapType2 rec { mainProgram = "cider"; maintainers = [ lib.maintainers.cigrainger ]; platforms = [ "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index 856ad124a900..c66146373447 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "civo"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-6wDF39w82hBdOWQpOXZEVZMlU0nw8vl/h00DPImVTCA="; + hash = "sha256-M9Y7EUa/xlHpMzQSEGOnAlk17Wv2WhMTk8pnfB4hW4Q="; }; - vendorHash = "sha256-b12Bmx2SQLDPgyUGNf9lChp+tA9RGY8Y5W09FraMpTU="; + vendorHash = "sha256-g8JU6mLm1L6zS03QrmQf5u77ekSX/x/U/NXCTXnTuh8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cl/cliairplay/package.nix b/pkgs/by-name/cl/cliairplay/package.nix index 9b5aa51a4fe9..389e973e6cb6 100644 --- a/pkgs/by-name/cl/cliairplay/package.nix +++ b/pkgs/by-name/cl/cliairplay/package.nix @@ -4,7 +4,6 @@ bison, curl, fetchFromGitHub, - fetchpatch, ffmpeg-headless, flex, gperf, @@ -26,26 +25,18 @@ stdenv.mkDerivation { pname = "cliairplay"; # see the beginning of configure.ac for the upstream version number - version = "0.2-unstable-2025-12-30"; + version = "1.1-unstable-2026-03-16"; src = fetchFromGitHub { owner = "music-assistant"; repo = "cliairplay"; # we try to closely match the commit used in the last music-assistant release from # https://github.com/music-assistant/server/tree/stable/music_assistant/providers/airplay/bin - rev = "4660d886585d6bf8f32e889feec2a0e8975c51dc"; + rev = "991c65acc2afa17ffe32e279dbc585b0b7f530f8"; fetchSubmodules = true; - hash = "sha256-oDStn9LdLYWKhZNm7Qfdibs4qsct8gE3RZbTKooQeOM="; + hash = "sha256-m1O4l6gFEGNAyskYcRHcA15cubZnNgkaYjdVThRRX7w="; }; - patches = [ - # Support gettext 0.25 - (fetchpatch { - url = "https://github.com/music-assistant/cliairplay/commit/92a2445d64c476d740feba1f31c7e5bc768701b7.patch"; - hash = "sha256-/YnopvAGHHnQhfr2X1OenLMoF4ZlUq9x8tQZha/XfbQ="; - }) - ]; - nativeBuildInputs = [ autoreconfHook bison diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix index 8ab7bb4e4d40..0d3e6778cf07 100644 --- a/pkgs/by-name/co/copybara/package.nix +++ b/pkgs/by-name/co/copybara/package.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "copybara"; - version = "20260330"; + version = "20260413"; src = fetchurl { url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar"; - hash = "sha256-O/H5eeais4xKAWshC8nZfLqeIYdjVxLVZ5d1sUFnF1w="; + hash = "sha256-8FmXPfxlORbIA0cAcRPGMQ7n1tI/VjJ3uI7PHQHuaZU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/da/darkplaces/package.nix b/pkgs/by-name/da/darkplaces/package.nix index f970515af9c8..66181890271c 100644 --- a/pkgs/by-name/da/darkplaces/package.nix +++ b/pkgs/by-name/da/darkplaces/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation { pname = "darkplaces"; - version = "unstable-2022-05-10"; + version = "20140513-unstable-2026-01-22"; src = fetchFromGitHub { owner = "DarkPlacesEngine"; repo = "darkplaces"; - rev = "f16954a9d40168253ac5d9890dabcf7dbd266cd9"; - hash = "sha256-5KsUcgHbuzFUE6LcclqI8VPSFbXZzBnxzOBB9Kf8krI="; + rev = "d93f9c4292039354a2b8d40d11bc386891e55fe5"; + hash = "sha256-/xbQhQZveRCSnotZz3Wbw+9VwNC+kqoEJ7GuNZTpkLA="; }; buildInputs = [ diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix index e140563ba963..72f3fe621af5 100644 --- a/pkgs/by-name/dd/ddns-go/package.nix +++ b/pkgs/by-name/dd/ddns-go/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "ddns-go"; - version = "6.16.4"; + version = "6.16.6"; src = fetchFromGitHub { owner = "jeessy2"; repo = "ddns-go"; rev = "v${finalAttrs.version}"; - hash = "sha256-0Fcm1KC6hFjjXGdoiFMm19M8Uc7et0F3LeD7pxFQM4s="; + hash = "sha256-t6sxGucolqjDGSkzJUqO0NDeK4oRqq7oG+WD/brh4NA="; }; - vendorHash = "sha256-phMBGjXARuY6qreNy5o06unouyew1Rbj4zo3nK4Xvnw="; + vendorHash = "sha256-MbITJ2MxyTNE6LS9rQZ10IVgQuXpmbPf5HQgoy2OuOc="; ldflags = [ "-X main.version=${finalAttrs.version}" diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index 616a588f6d12..105e7d99a2b6 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "deck"; - version = "1.57.0"; + version = "1.57.3"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; tag = "v${finalAttrs.version}"; - hash = "sha256-0j3/cFRKclyO4mpm+r5lBqM3uTnzUatfLqH2aUMDbUA="; + hash = "sha256-z9piGj46smPRMLOhQNC4zlYj7CeVl9/6VXL0y9/fQwA="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-/Cde+eGOqUsL3Q5jDtZaTzOTMnE72ncgBMQzcIeNVls="; + vendorHash = "sha256-z28b4gg3EgY0OUS/9KZ0Y69nNC2wXRrNQEOYrST9uiY="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd deck \ diff --git a/pkgs/by-name/de/dexter/package.nix b/pkgs/by-name/de/dexter/package.nix new file mode 100644 index 000000000000..eada6fe45cca --- /dev/null +++ b/pkgs/by-name/de/dexter/package.nix @@ -0,0 +1,50 @@ +{ + buildGoModule, + fetchFromGitHub, + installShellFiles, + lib, + stdenv, +}: + +buildGoModule (finalAttrs: { + pname = "dexter"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "remoteoss"; + repo = "dexter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8JjxR7Q+4OgBSIgODxIEU/0mC+bPp9Nz7uCAjfn4HiY="; + }; + + vendorHash = "sha256-1mJ4HdDCsZl/g8F+L+NrW2ACuiHe2aSheJO/1XfKAb4="; + proxyVendor = true; + + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/dexter + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd dexter \ + --bash <($out/bin/dexter completion bash) \ + --fish <($out/bin/dexter completion fish) \ + --zsh <($out/bin/dexter completion zsh) + ''; + + __structuredAttrs = true; + + meta = { + description = "A fast, full-featured Elixir LSP optimized for large codebases"; + homepage = "https://github.com/remoteoss/dexter"; + changelog = "https://github.com/remoteoss/dexter/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ adamcstephens ]; + mainProgram = "dexter"; + }; +}) diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index 175aa294a726..de8b54c469e4 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "dnsproxy"; - version = "0.81.0"; + version = "0.81.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; tag = "v${finalAttrs.version}"; - hash = "sha256-O3ZwH//NpYEg3BS5Yk4MpkIb6PrsIzINs/Kyt5uKspg="; + hash = "sha256-eY4nmaW3jjDb4RcGWcy2l1RScxZwtBGGYQpC1zh5hVE="; }; - vendorHash = "sha256-NS7MsK7QXg8tcAytYd9FGvaYZcReYkO5ESPpLbzL0IQ="; + vendorHash = "sha256-liX+AMxVBkxJSv1Ltt924Hjf10fho4G6tyt82tkzWZA="; ldflags = [ "-s" diff --git a/pkgs/by-name/ea/eas-cli/package.nix b/pkgs/by-name/ea/eas-cli/package.nix index 68020250b2f4..469efd241de5 100644 --- a/pkgs/by-name/ea/eas-cli/package.nix +++ b/pkgs/by-name/ea/eas-cli/package.nix @@ -7,6 +7,7 @@ yarnBuildHook, nodejs, jq, + makeWrapper, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "eas-cli"; @@ -29,6 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { yarnBuildHook nodejs jq + makeWrapper ]; postPatch = '' @@ -52,6 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { postFixup = '' mkdir -p $out/bin ln -sf $out/lib/node_modules/eas-cli-root/packages/eas-cli/bin/run $out/bin/eas + wrapProgram $out/bin/eas --suffix PATH : ${lib.makeBinPath [ nodejs ]} ''; meta = { diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json index 041675c47a17..fc4393bc0200 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json @@ -15,12 +15,83 @@ "com/fasterxml#oss-parent/58": { "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" }, + "com/fasterxml#oss-parent/73": { + "pom": "sha256-SG2NomL0LJwA8+fP/xRxRzNHz8ae3X8GT8lxlN4p1m4=" + }, + "com/fasterxml#oss-parent/75": { + "pom": "sha256-/LvxwYyQR+aRfThPIGTiG0Klj8hfsFI6ni4BXv98YZ0=" + }, + "com/fasterxml/jackson#jackson-base/2.21.0": { + "pom": "sha256-3Ohqkmt2uojZPStl0y2sJSnOhkCXy9d4CPW7YEbI64s=" + }, "com/fasterxml/jackson#jackson-bom/2.17.2": { "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" }, + "com/fasterxml/jackson#jackson-bom/2.21.0": { + "pom": "sha256-KLBsTl9RMwxPztKzvWGUGIz9I3Bo6hflkhORZFN3If8=" + }, "com/fasterxml/jackson#jackson-parent/2.17": { "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" }, + "com/fasterxml/jackson#jackson-parent/2.21": { + "pom": "sha256-OFHfYn+utGiHuVYQRjC3Sou7X33iLpdM8VmC4g4Dc94=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.21": { + "jar": "sha256-U8oIX0oVD3A/SeGqvZNb0DtD4eo9VdE1Q4KSryLO9Ws=", + "module": "sha256-yuj/7OwzKLbsuxOOJ0IY8v4cdymg6CTaVZJogQCVrUQ=", + "pom": "sha256-ccrFOSFR4qUozJoJF58KM0F58FxS+OWWz1jd8Suyfys=" + }, + "com/fasterxml/jackson/core#jackson-core/2.21.0": { + "jar": "sha256-4iYEvNmyTkYtXfECAHywbh7YEehvHOYIHKYvOF8tuHs=", + "module": "sha256-5l6JWHmz/4XewbsriWZJbAHGzU/C7Jr426h4gpeEKwY=", + "pom": "sha256-oK3Z0hmBbU2lCgPWKuISIjKTiIIsuKrItas9CvFqp9Y=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.21.0": { + "jar": "sha256-AFeBfuQLxxVEBy3Co7pXXvkdzlOi2HSJvekcBfOiJiE=", + "module": "sha256-1IfT9FkCvL8TzXLLaHBVC5Z2lr9P8OfPjS4rBCtFzG0=", + "pom": "sha256-3GtWyKkD2LUSeRGDpoZ2mjUXJb1K+410rnASzm8HQLM=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.21.0": { + "jar": "sha256-XRhFeRRHgMOJYqX0de0kheiinzbMWcojcTWxnptkJCA=", + "module": "sha256-RGvZj4UAOzk+/h4PeGYkN8zme+aQofpXRIk4PJDsmAc=", + "pom": "sha256-HQ+AsgUVCcI7UoFDEeBk+FwEW4wm3MXWKFyYH8lHp0U=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.21.0": { + "pom": "sha256-pIBxUDnBwFibVkxlxCSgnlgZniSxnPwBI+PoMa2h+B0=" + }, + "com/google/code/findbugs#annotations/3.0.1u2": { + "jar": "sha256-rMDSwGvnDpCU1wzQXf+gd3Ncj50ahw6v2hMLBZJSggA=", + "pom": "sha256-46APlR6R9rw56yfU6NWQqw+jeUjBAp/qSe8PF2gpRuU=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "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/2.13.2": { + "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=", + "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y=" + }, + "com/google/code/javaparser#javaparser/1.0.11": { + "jar": "sha256-07/l/m/qZK8XuRm58nlY9cMvmRJbuAjMgtEFW5lZfYI=", + "pom": "sha256-3X6lRUWd+GeIiSwv+0ZTXflvVyvAumeVHm5WY4mxSwA=" + }, + "com/google/errorprone#error_prone_annotations/2.41.0": { + "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=", + "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4=" + }, + "com/google/errorprone#error_prone_parent/2.41.0": { + "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI=" + }, + "com/sun/codemodel#codemodel-project/2.6": { + "pom": "sha256-8lrv48rP+RHhQrssqJIzSzfoYDJ2jDSvI6qCUL3IA0c=" + }, + "com/sun/codemodel#codemodel/2.6": { + "jar": "sha256-JzWBbWj4WtyhQReZUYiWU841Wufnq065KjIuoO9nF2c=", + "pom": "sha256-zLydWo8aIDows0R6Ax8OQulTuhTJ3TieFl24lK2zEBw=" + }, "com/zaxxer#SparseBitSet/1.3": { "jar": "sha256-92uFrbDAByGuJnt8/eTaf3HTEhzCFgyfwAwMifjFPIo=", "pom": "sha256-EY1n40Uymhjf9OvRVX+V8MCrS0y51nh0nWZvkjAAF2g=" @@ -30,23 +101,30 @@ "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4=" }, "commons-io#commons-io/2.20.0": { - "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=", "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio=" }, + "commons-io#commons-io/2.21.0": { + "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=", + "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas=" + }, "gradle/plugin/net/rdrei/android/buildtimetracker#build-time-tracker-plugin/0.11.0": { "jar": "sha256-a9QQVOJuuuiLDaWNxj7BEKcO+tXxLYcESTRwx8VJcZA=", "pom": "sha256-uFQ5wq04pYG40n+nWy+zC3HN4dT8A8ZE4yMvhN8kWqE=" }, - "io/freefair/gradle#lombok-plugin/9.1.0": { - "jar": "sha256-m+M3IZ1CTu2TzqYzUaTAeBOFGaZ9hDP6/kgx3nttM/U=", - "module": "sha256-HjFAU3xu8TjyledDzt+GbL/i01S1gVvv5zFY2dzb30c=", - "pom": "sha256-b92sn7rJGFCpFNLpQ8QfslFO8g/WPS4m2YXxCLcKV20=" + "io/freefair/gradle#lombok-plugin/9.2.0": { + "jar": "sha256-5xNJEu4+fzTSO1yNAmwfoJ/slcWthrjq8/+YbLZi7o0=", + "module": "sha256-F1FR52j8fEhIhCwrdQVDa+Cs7fgekT3/2+HaYwkB+Y4=", + "pom": "sha256-jQ/6lxcN0WPP5ZsFI265FpT7qK+o/x8vtcfCRWBhRts=" }, "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": { "pom": "sha256-hoEYwHzaHj3q/o0bF3HzOgyN0lEIEAu/pjFl3hzTvmg=" }, - "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.1.0": { - "pom": "sha256-5CID94FoZkqCjhKblgYpII3eiII0ZncbJQ9cpna38aw=" + "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.2.0": { + "pom": "sha256-TGp8tutFrnTaIQWDG/Z9/hZkSkwLbfrKWc1DNV/0zBM=" + }, + "jakarta/json/bind#jakarta.json.bind-api/2.0.0": { + "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=", + "pom": "sha256-AXlsHbeq949i6pb7CHZalZb8StYYdCxtJk5F4BrmuFU=" }, "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" @@ -54,6 +132,35 @@ "jakarta/platform#jakartaee-api-parent/9.1.0": { "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" }, + "jakarta/validation#jakarta.validation-api/3.1.1": { + "jar": "sha256-Y84AFWOIw2XzrBvnH8+vEUaC/AxFICC1325+wjbhQqs=", + "pom": "sha256-qxnpAKv5Awo3+DI+Ws66WNQK+I47UqBYuOA95II1ync=" + }, + "javax/json/bind#javax.json.bind-api/1.0": { + "jar": "sha256-zTvjkfWZ1L71m/sVUleta5HkUh0ZuOlysN+1LfsMX8E=", + "pom": "sha256-LjhZwbI5E9p6sDuwsY2ITXMKCmPE/xda6ZGJnz/R7h8=" + }, + "javax/validation#validation-api/2.0.1.Final": { + "jar": "sha256-mHO0bfGDPJ7o9bwf9oUzdRFdrdiJe8taDf+1hIg17mw=", + "pom": "sha256-q7nT5k03c0RnMqMO6gsbWmOIi7FDMdKioY8zhdGkw4k=" + }, + "joda-time#joda-time/2.14.0": { + "jar": "sha256-Hi2m+etl8gol2aMYaDHtKz+xT3pI4e+CBhNe5YyxQ9M=", + "pom": "sha256-YvxXQ2db0rn6tYOmQIC2UIVMKYIU084qocCzlL0IndE=" + }, + "net/bytebuddy#byte-buddy-parent/1.18.4": { + "pom": "sha256-6IB4orFQSVcSTTXkL2bVasN8JpwMHJCVI/Nsw+L0WgY=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "net/jcip#jcip-annotations/1.0": { + "jar": "sha256-vlgFOSBgxxR0v2yaZ6CZRxJ00wuD7vhL/E4IiaTx3MA=", + "pom": "sha256-XBnmhIzFUKlWZPsIIwS8X5/Pe2cvrwOvFjXw6TwmgXc=" + }, "net/jsign#jsign-core/7.4": { "jar": "sha256-bf6U0PcZxNCuTZzoR7dIW1TUeHtvQ6ovY3lBzR4TmGk=", "pom": "sha256-WDsKWZ10uJHibbchjHSZ7o6PMm7CEPUXdN0PS92sDTk=" @@ -93,9 +200,12 @@ "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" }, "org/apache/commons#commons-lang3/3.18.0": { - "jar": "sha256-Tu6ujSDAeKu2SwFewVit04OsWBVxzdxFxo8MmuAjByA=", "pom": "sha256-qiVLNztvbUa8ncqGMxsHKoq4brJeqZIf1Dlhg5LpihY=" }, + "org/apache/commons#commons-lang3/3.20.0": { + "jar": "sha256-aeXJ+jXaelGl/SCZ3+VqLY0yzyM+L213DnlhRkQCY/Q=", + "pom": "sha256-fKg7JwnB56ngO1ds1BQiGQN5SJqAhm5UL4yLlVQRoqo=" + }, "org/apache/commons#commons-math3/3.6.1": { "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=", "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA=" @@ -112,14 +222,30 @@ "org/apache/commons#commons-parent/85": { "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U=" }, + "org/apache/commons#commons-parent/91": { + "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI=" + }, + "org/apache/commons#commons-parent/92": { + "pom": "sha256-lPbAJ7FfZAKZXdGyx+o1v+HryItoMrMTQ2i0GZhyGVM=" + }, + "org/apache/commons#commons-parent/93": { + "pom": "sha256-qItfYWWmWb+DVEGDe8xcU+mf3nm5LPu4aYjOKVTNUmc=" + }, "org/apache/commons#commons-text/1.14.0": { - "jar": "sha256-Eh/OIoKRDI8MO6eTpUNrMb63EEI8vi1XSj+3pzxQjpI=", "pom": "sha256-XIDoFE8iu0fay2QvZEYEGOslPwsboD6xQTwvNvChiAU=" }, + "org/apache/commons#commons-text/1.15.0": { + "jar": "sha256-WNLaMPBYUSoef5FOOSQd7KTf9cJ6CFtO0vqp5yCAZ/Y=", + "pom": "sha256-XlFoaHvO2uoqqFVrizL1r6CO/Lwx0RuUfIZ2mHvJ0jk=" + }, "org/apache/groovy#groovy-bom/4.0.22": { "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" }, + "org/apache/groovy#groovy-bom/5.0.4": { + "module": "sha256-HslyzxmAv/g2b6bW0VPimiE7b2Vs6DHIZtKu0kZzcrQ=", + "pom": "sha256-9OFcmq8LR4OcfogcpOo/MFWk1Am/9CFx0C/IMRD9zts=" + }, "org/apache/logging#logging-parent/11.3.0": { "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" }, @@ -137,13 +263,13 @@ "jar": "sha256-2lq/QtpGBMWnvKOJVq9unW8ZbZttTLfqvuT0gLWA1QU=", "pom": "sha256-qoJN6gLaJ4G7a4PhqIChchDewAtdHCWSBuKIFKEJnog=" }, - "org/beryx#badass-jlink-plugin/3.1.3": { - "jar": "sha256-2GievCLcBpg3WsaEHep23em1Q6kgW/fLFNzET/v99gA=", - "module": "sha256-FnogeApeGbRUUJnX/cBRAj0uD9RWwc6qqinRLf0LXvQ=", - "pom": "sha256-hxMC7pW+Z93NTEEgh4sV30fgfZCI2+tMus5iGDdNqx8=" + "org/beryx#badass-jlink-plugin/3.2.1": { + "jar": "sha256-bArtr/xRR7/gMI1+Ksn6ZEK5odgieegguqq2Rp6d6kk=", + "module": "sha256-yNTtqq9WRSq++JTsxFNaebz01nWbe0ei8KwyoeTR6A4=", + "pom": "sha256-AP5U4mGl7w2XTqOnuYgoyV9WOQJpM/P4h4MaATceAmM=" }, - "org/beryx/jlink#org.beryx.jlink.gradle.plugin/3.1.3": { - "pom": "sha256-S9pQnIlx/bxI4ceXuEnuT8tqEMwnOAGzrlSVGEGsSH4=" + "org/beryx/jlink#org.beryx.jlink.gradle.plugin/3.2.1": { + "pom": "sha256-WDsyl9x6uWkPafqKlLlTVha8fdmBrlhW0TzdzeTNjKQ=" }, "org/bouncycastle#bcpkix-lts8on/2.73.9": { "jar": "sha256-1bYV5Zh7H5lqiMTUcSc0hyYyeaQoJqoQ+v1qZyrBW4A=", @@ -157,9 +283,15 @@ "jar": "sha256-R8CyRfHYlX2/nCYLtjAABwX8qfxxfJjwl+Kkidvj3rk=", "pom": "sha256-ozcJh3DKusOS8aMIsHboTgj91DgIWLmWpHIBSFBxHjk=" }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, "org/eclipse/ee4j#project/1.0.7": { "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, "org/gradle/toolchains#foojay-resolver/1.0.0": { "jar": "sha256-eLhqR9/fdpfJvRXaeJg/2A2nJH1uAvwQa98H4DiLYKg=", "module": "sha256-YZDPDkLmZMEeGsCnhWmasCtUnOo0OSxnnzbYosVQ/Lk=", @@ -168,16 +300,27 @@ "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/1.0.0": { "pom": "sha256-8TMkmhh1Suah0nAdANhJsa+6ewaD3bX8GxinAHHOwvo=" }, - "org/gradlex#extra-java-module-info/1.13.1": { - "jar": "sha256-u7wZoNvtKQxcMt17/vhxh+Qn/yGBqKfkcA3XtXrOQbM=", - "module": "sha256-lQeTGglcI3ZzTFxnOo/zK7qBerkAQAivjFdihR1/YaY=", - "pom": "sha256-i4Q6pFeUxi2dsJOBdGrchkKKphFx++KSAqld7WzYN6A=" + "org/gradlex#extra-java-module-info/1.14": { + "jar": "sha256-emjD5kKWPAo2cMnpJnRQb9WBlIeGaU3klacyr1Dvrfo=", + "module": "sha256-yVvdMIOk/I/E0Uzd1Td+QisH2DLPjphqmWD4tHXlt+8=", + "pom": "sha256-gTWpYg5njgE+wBXUVUtnZ/t0QPg91KOwNYszyYoGc04=" }, - "org/gradlex/extra-java-module-info#org.gradlex.extra-java-module-info.gradle.plugin/1.13.1": { - "pom": "sha256-ho1RzTt31f/rmHPol6rnYlphPx2wP60fTiHtBti4vDQ=" + "org/gradlex/extra-java-module-info#org.gradlex.extra-java-module-info.gradle.plugin/1.14": { + "pom": "sha256-RrkfiejAeWTG86q3vo33SCuR93rsVhh+LrpHqzw6b94=" }, - "org/jsonschema2pojo#org.jsonschema2pojo.gradle.plugin/1.2.2": { - "pom": "sha256-OS098xRtN26kokx+XtNhLennIcfT6+T3vzq5oiSVhds=" + "org/jsonschema2pojo#jsonschema2pojo-core/1.3.3": { + "jar": "sha256-TCC4OHbeWrssFOQprheF+ikdmNRgN0uiHY28hoBFDbo=", + "pom": "sha256-/3vz5LqMLIYdA0YiWSNjl14lVllERE4H74XCcSI8F2E=" + }, + "org/jsonschema2pojo#jsonschema2pojo-gradle-plugin/1.3.3": { + "jar": "sha256-inPds/ZU7LfDe38X5bIsCJWiRuvkBYgi0d1yDxnsXyw=", + "pom": "sha256-k9sWLr5x8wAhwUaE7Le5AFu1r6iU/QlHkkgvUQv8Trk=" + }, + "org/jsonschema2pojo#jsonschema2pojo/1.3.3": { + "pom": "sha256-IWUFMvrSEFXfcn2OM+fE1DQp+SwDFSAOFybXV2/liuk=" + }, + "org/jsonschema2pojo#org.jsonschema2pojo.gradle.plugin/1.3.3": { + "pom": "sha256-EYyxs1w6K5SRxheNHpKxWsgUlPpxIlTkLg5sQQgRA00=" }, "org/junit#junit-bom/5.10.3": { "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", @@ -191,15 +334,26 @@ "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=", "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM=" }, + "org/junit#junit-bom/5.13.4": { + "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", + "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" + }, + "org/junit#junit-bom/5.14.1": { + "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=", + "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ=" + }, "org/mockito#mockito-bom/4.11.0": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" }, + "org/mockito#mockito-bom/5.21.0": { + "pom": "sha256-nnTHreXWZeYN+Z1/Ie1LOEVCATAbEszguvioK/kw058=" + }, "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "org/ow2/asm#asm/9.8": { - "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", - "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" + "org/ow2/asm#asm/9.9.1": { + "jar": "sha256-bzgoohXJIAWaXvovtVwjPWxU7FytypnOGxvdEAd8fd0=", + "pom": "sha256-rKaN7pui9s2Q/95yjv3H4+v89Z8/Qfv+JI0tAdW4Zq8=" }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" @@ -207,6 +361,26 @@ "org/springframework#spring-framework-bom/5.3.39": { "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/yaml#snakeyaml/2.4": { + "jar": "sha256-73ea9dKand6MxwzgNB9cb3c14j7f+Whc6qnTU1m3u38=", + "pom": "sha256-4VSjIxzWzeaKq/J0/RiWTUmpwaX16e079HHprnvfCOY=" + }, + "tools/jackson#jackson-base/3.0.2": { + "pom": "sha256-bNfjpxD7/9oYOZzlZe//tviCVICZC7Yxj4Ps8Z28k7I=" + }, + "tools/jackson#jackson-bom/3.0.2": { + "pom": "sha256-j/nmDa1VX3MadR8hSPVo36hhFpZPnofSOOK6m1fI0fQ=" + }, + "tools/jackson/core#jackson-core/3.0.2": { + "jar": "sha256-+nRRW6X8ASgs7Kt+WXD6EqD0/yO9bCBh6cd4MzjQtDY=", + "module": "sha256-ahqDE3aR5sMwIzIHsENnSsV+gohKRgT9erpnPsv4Dok=", + "pom": "sha256-M0PoYpgxJsUq1LGVhV/fKYlwcAFTRWHR5cH3DbrM5SM=" + }, + "tools/jackson/core#jackson-databind/3.0.2": { + "jar": "sha256-9U9pv8eAOAo/TeQvssPoKyLI702EupGM/4HSLGqhBp8=", + "module": "sha256-r8lO4gcAP1TxfepZ1em1DdSPSGl6aDD2XWKtwfJ35Lw=", + "pom": "sha256-Mk6hllrSTyPQU/zkQJ0lBaxZckJGcp1QLpct6f0fxIw=" } }, "https://repo.maven.apache.org/maven2": { @@ -214,109 +388,113 @@ "jar": "sha256-9pwt46aVwRPRJayAU8kqaAo86dAuolhFCVzy1GJqdmM=", "pom": "sha256-WCLfSRg9+SK6Wa53Oi2Mzrhq4eIPQfGYcxMd0YJJT3o=" }, - "ch/qos/logback#logback-classic/1.5.21": { - "jar": "sha256-slI/ew2r9DhsgTEvA3HSZ+Op+85AkEbxawQr9oVxuko=", - "pom": "sha256-2L+25QxBRYd4sAl7bgatXgc5HpbkMjuJSjBaZoHVZbE=" + "ch/qos/logback#logback-classic/1.5.32": { + "jar": "sha256-LUz1ktt4vi3k1hQENML+wXDcsWoJ6Mi3sgfb9eMbhIo=", + "pom": "sha256-0jsnLnBXYPg1cRB2RB5qipsS7QkA4bphigzWvPehYmo=" }, - "ch/qos/logback#logback-core/1.5.21": { - "jar": "sha256-CCWsH8UpY2kSHlQj45fFLRJbDj+udDz8DY5BYVnxT0Q=", - "pom": "sha256-kuYdhik+WPSObO9Xu55qx3sqd57ayaQ/GC8YYUJ0IUM=" + "ch/qos/logback#logback-core/1.5.32": { + "jar": "sha256-apBNV3jQ42GpaS+cvmixsGIK4PPtouwu0JECdVvwNsQ=", + "pom": "sha256-Hzk8RBRFhWm1O1LrMpe/6GGwAGb1nW0rq/In62XaP7g=" }, - "ch/qos/logback#logback-parent/1.5.21": { - "pom": "sha256-3PccPlQ27GTfEIU6bOjEMNARdxCmyPyb6eK7tvLx5KM=" + "ch/qos/logback#logback-parent/1.5.32": { + "pom": "sha256-Cyy+YG4Jm4sADCr14AeTb7OVXQzl5rsIbamyPUjFa6w=" + }, + "com/fasterxml#classmate/1.7.1": { + "jar": "sha256-zDKZ5d9PwkGA5pR3yJDQfTjbed0t7MDvIOdKmGiXwKE=", + "pom": "sha256-z4m9p/hn2IUOK5Ma8VEcCXX2obhVB6oL/0F5ZQHHpkI=" }, "com/fasterxml#oss-parent/30": { "pom": "sha256-0OJUZlIJgf9X7K29yUA00dFpA7kulQvp+dQkQcWU+fA=" }, - "com/fasterxml#oss-parent/58": { - "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" - }, "com/fasterxml#oss-parent/68": { "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc=" }, - "com/fasterxml#oss-parent/70": { - "pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk=" + "com/fasterxml#oss-parent/73": { + "pom": "sha256-SG2NomL0LJwA8+fP/xRxRzNHz8ae3X8GT8lxlN4p1m4=" }, - "com/fasterxml/jackson#jackson-base/2.17.2": { - "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68=" + "com/fasterxml#oss-parent/75": { + "pom": "sha256-/LvxwYyQR+aRfThPIGTiG0Klj8hfsFI6ni4BXv98YZ0=" }, - "com/fasterxml/jackson#jackson-base/2.20.1": { - "pom": "sha256-C3SKsMx/KH21tgGMYUz+Z+fh9NgJQc4vQdMXzMO1tcU=" + "com/fasterxml/jackson#jackson-base/2.21.0": { + "pom": "sha256-3Ohqkmt2uojZPStl0y2sJSnOhkCXy9d4CPW7YEbI64s=" }, - "com/fasterxml/jackson#jackson-bom/2.17.2": { - "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + "com/fasterxml/jackson#jackson-base/2.21.2": { + "pom": "sha256-OMeJjHY7iZH/+9dpRZly4Bdr8MUFxzlRjHD3xX0W7tc=" }, "com/fasterxml/jackson#jackson-bom/2.19.1": { "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4=" }, - "com/fasterxml/jackson#jackson-bom/2.20.1": { - "pom": "sha256-DGRn7UyMc5JSTOcDymzj7YhZbuw5DxOwwmTy+WEwilQ=" + "com/fasterxml/jackson#jackson-bom/2.21.0": { + "pom": "sha256-KLBsTl9RMwxPztKzvWGUGIz9I3Bo6hflkhORZFN3If8=" + }, + "com/fasterxml/jackson#jackson-bom/2.21.2": { + "pom": "sha256-vGxUnmMpJ7udigraIMhGe1AH07eXx/XbA6m2DR3lm+M=" }, "com/fasterxml/jackson#jackson-bom/2.9.4": { "pom": "sha256-ez/Ek1+/U/x5ypo75e1NLIL8pMU/hF0+EzgpMTic4CE=" }, - "com/fasterxml/jackson#jackson-parent/2.17": { - "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" - }, "com/fasterxml/jackson#jackson-parent/2.19.2": { "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U=" }, - "com/fasterxml/jackson#jackson-parent/2.20": { - "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U=" + "com/fasterxml/jackson#jackson-parent/2.21": { + "pom": "sha256-OFHfYn+utGiHuVYQRjC3Sou7X33iLpdM8VmC4g4Dc94=" }, "com/fasterxml/jackson#jackson-parent/2.9.1": { "pom": "sha256-fATwKdKA+7gnTnUCHckPObLGIv40mdrwf8NQgcLZ2f8=" }, - "com/fasterxml/jackson/core#jackson-annotations/2.17.2": { - "jar": "sha256-hzpgbiNQeWn5u76pOdXhknSoh3XqWhabp+LXlapRVuE=", - "module": "sha256-KMxD6Y54gYA+HoKFIeOKt67S+XejbCVR3ReQ9DDz688=", - "pom": "sha256-Q3gYTWCK3Nu7BKd4vGRmhj8HpFUqcgREZckQQD+ewLs=" + "com/fasterxml/jackson/core#jackson-annotations/2.21": { + "jar": "sha256-U8oIX0oVD3A/SeGqvZNb0DtD4eo9VdE1Q4KSryLO9Ws=", + "module": "sha256-yuj/7OwzKLbsuxOOJ0IY8v4cdymg6CTaVZJogQCVrUQ=", + "pom": "sha256-ccrFOSFR4qUozJoJF58KM0F58FxS+OWWz1jd8Suyfys=" }, - "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/core#jackson-core/2.21.0": { + "jar": "sha256-4iYEvNmyTkYtXfECAHywbh7YEehvHOYIHKYvOF8tuHs=", + "module": "sha256-5l6JWHmz/4XewbsriWZJbAHGzU/C7Jr426h4gpeEKwY=", + "pom": "sha256-oK3Z0hmBbU2lCgPWKuISIjKTiIIsuKrItas9CvFqp9Y=" }, - "com/fasterxml/jackson/core#jackson-core/2.17.2": { - "jar": "sha256-choYkkHasFJdnoWOXLYE0+zA7eCB4t531vNPpXeaW0Y=", - "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=", - "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs=" + "com/fasterxml/jackson/core#jackson-core/2.21.2": { + "jar": "sha256-EuhlWxACZ7RNDxTQGx9QgqUQXmFhdNxDB74adh6SQHs=", + "module": "sha256-mO7k69IcgrUmtDiIjgOta245Zvxucizk433UWQ0+Sic=", + "pom": "sha256-urDlWZZJzLWrIanPnS5XGS3h5I5tI1JNwlPWL8c8ljQ=" }, - "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-databind/2.21.0": { + "jar": "sha256-AFeBfuQLxxVEBy3Co7pXXvkdzlOi2HSJvekcBfOiJiE=", + "module": "sha256-1IfT9FkCvL8TzXLLaHBVC5Z2lr9P8OfPjS4rBCtFzG0=", + "pom": "sha256-3GtWyKkD2LUSeRGDpoZ2mjUXJb1K+410rnASzm8HQLM=" }, - "com/fasterxml/jackson/core#jackson-databind/2.17.2": { - "jar": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw=", - "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=", - "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI=" + "com/fasterxml/jackson/core#jackson-databind/2.21.2": { + "jar": "sha256-jJgvAfFI2AXwqqwjOQESRHV+DffG/4lR8vo/QzuO2Ek=", + "module": "sha256-qODdfyv9PgmoyLc0nGEFb96cuGL4ZOvG8jGT5fYIXzg=", + "pom": "sha256-z44OzcNfAtoG4n9BV2ALqddknFJy5Na3le8qQvBwomI=" }, - "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/dataformat#jackson-dataformat-yaml/2.21.0": { + "jar": "sha256-XRhFeRRHgMOJYqX0de0kheiinzbMWcojcTWxnptkJCA=", + "module": "sha256-RGvZj4UAOzk+/h4PeGYkN8zme+aQofpXRIk4PJDsmAc=", + "pom": "sha256-HQ+AsgUVCcI7UoFDEeBk+FwEW4wm3MXWKFyYH8lHp0U=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.2": { - "jar": "sha256-lBvNixOBuzsNcm+rQWJPqOzg7nts8oYK2V6BV85nM3Y=", - "module": "sha256-snbSUVf4i+6mnT9ENGWFZLcfMazeHUsaFPiYS+lTw0M=", - "pom": "sha256-7eVVk8YoXTmdlgc6GQy5v/QlZ5WqjWO5AXcrsxI+SDs=" + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.21.2": { + "jar": "sha256-0lVRgS+gwU83yrqpQB5j6tzqQs42MRGDr1Yi1byKG8c=", + "module": "sha256-Nbv6GN5I02+t9tOAcCICiJ27gVOEFFHTiTs/tZhUkCQ=", + "pom": "sha256-sUrUxGmsJiW4G4TTD/2hSKF0QiUI+DfHIbgIDfqfkYI=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.2": { - "pom": "sha256-5pgyMzCpqCySDlqJtlsPciXI5zPBIqGPeWoEpuMfpcs=" + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.21.0": { + "pom": "sha256-pIBxUDnBwFibVkxlxCSgnlgZniSxnPwBI+PoMa2h+B0=" }, - "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.20.1": { - "jar": "sha256-aCHN1pXpXE5oU+yFWnQyxx8vS+MYs8oZD7v4ouX5gfI=", - "module": "sha256-KXw0AzOai9ZZgmabTXxIKUkIh6XmGpOkwp8fQLxaDvc=", - "pom": "sha256-8wD9EAzEe+2gwdEzUYBk7JUxTro0Gx/ZF4wCFYC5HJ4=" + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.21.2": { + "pom": "sha256-Z6nrQDTygtv09Ht5iBKUG+OJxgFLCdz02MJMp42fPpU=" }, - "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/datatype#jackson-datatype-jdk8/2.21.2": { + "jar": "sha256-5YG78/xWItFrVzZt1B4Q/FaSH7ICh53i70h/h92bMOc=", + "module": "sha256-MkCHqNbUxkhBqe1R7t3lhw8xQnR2wG1QGxTWcRjSZb4=", + "pom": "sha256-kS6F4iGHClCQbJcISkQrJTwJfpbZ8y/Xwk7/XOyAxCs=" }, - "com/fasterxml/jackson/module#jackson-modules-java8/2.20.1": { - "pom": "sha256-ARd18sV1jwGRus7bTlFDj6/crz2rJUi/xLfXlaRUNg0=" + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.21.2": { + "jar": "sha256-oIPVfNHEoo/vzGvQcXQHeet/wcIqPBtARRtUd8RD8C8=", + "module": "sha256-OWVxUJp9tlv6x3emWatjRdujgYbax/yrWuizVVOYy94=", + "pom": "sha256-0Fd4iCjfgV6Y4BjJsAQBoR4boyctNNmEdqc2rG2X734=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.21.2": { + "pom": "sha256-T0KMISebw0vUTVHCeWdB53r9f523/0qTGkPHsBocRZU=" }, "com/github/jai-imageio#jai-imageio-core/1.4.0": { "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=", @@ -333,45 +511,33 @@ "com/github/scribejava#scribejava/8.3.3": { "pom": "sha256-KkpDgAox1XD2wY1TmtgWIZ2xgTuY/gsjq2X4mg4N+lc=" }, - "com/github/spotbugs#spotbugs-annotations/4.8.6": { - "jar": "sha256-RUi3SoFe1E9UgMpPBiBKiwCAncfl9qglqe3xj0A3e2U=", - "module": "sha256-2ye9p0GFWoGc1Q6dYSMMQv4qoqZEuU1zMTwFIXrgUjk=", - "pom": "sha256-3U71+ubjJmCxUtecvHW8uuM0JWxX3ID8TfDhdhWZRWI=" - }, "com/github/virtuald#curvesapi/1.08": { "jar": "sha256-rZWwi4u/nX0X5eAIFImPojMk8yvFti8aN4AealbOAHk=", "pom": "sha256-Ny4ZrFGNWM5atVPKgDiMf+mSDFVU0TYtGGRabdvF0SY=" }, - "com/google/code/findbugs#annotations/1.3.9": { - "jar": "sha256-caURebGKBtZ7JYLc4pM0+hFsS8N8syktVbcIB1FFNm4=", - "pom": "sha256-8RHyLXx/ZkZzjuYxx+43p0HoDhScRLHWmKfXF2OxjrE=" + "com/google/code/findbugs#annotations/3.0.1u2": { + "jar": "sha256-rMDSwGvnDpCU1wzQXf+gd3Ncj50ahw6v2hMLBZJSggA=", + "pom": "sha256-46APlR6R9rw56yfU6NWQqw+jeUjBAp/qSe8PF2gpRuU=" }, "com/google/code/findbugs#jsr305/3.0.2": { "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" }, - "com/google/code/gson#gson-parent/2.11.0": { - "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" + "com/google/code/gson#gson-parent/2.13.2": { + "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0=" }, - "com/google/code/gson#gson/2.11.0": { - "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", - "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + "com/google/code/gson#gson/2.13.2": { + "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=", + "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y=" }, "com/google/code/javaparser#javaparser/1.0.11": { "jar": "sha256-07/l/m/qZK8XuRm58nlY9cMvmRJbuAjMgtEFW5lZfYI=", "pom": "sha256-3X6lRUWd+GeIiSwv+0ZTXflvVyvAumeVHm5WY4mxSwA=" }, - "com/google/errorprone#error_prone_annotations/2.27.0": { - "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", - "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" - }, "com/google/errorprone#error_prone_annotations/2.41.0": { "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=", "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4=" }, - "com/google/errorprone#error_prone_parent/2.27.0": { - "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" - }, "com/google/errorprone#error_prone_parent/2.41.0": { "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI=" }, @@ -417,12 +583,11 @@ "pom": "sha256-EY1n40Uymhjf9OvRVX+V8MCrS0y51nh0nWZvkjAAF2g=" }, "commons-codec#commons-codec/1.19.0": { - "jar": "sha256-XDiB5PVWhV6cUykn7gyd/elMxmdg1YBcAxpZiHBwr18=", "pom": "sha256-4PMmn6I94MgxMMVln1+VFMxUIsC830Xy6uAEp4ufyjQ=" }, - "commons-io#commons-io/2.17.0": { - "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=", - "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek=" + "commons-codec#commons-codec/1.20.0": { + "jar": "sha256-avZllfn2p7tYzmZRjWiI1AtUfDZtImLwZnbu4ZUo/2Y=", + "pom": "sha256-r/ZFxYzUGsUYTZds6O443laU2Zq4dk1u5/FPcOrV+Ys=" }, "commons-io#commons-io/2.21.0": { "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=", @@ -431,10 +596,6 @@ "commons-io#commons-io/2.4": { "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" }, - "commons-lang#commons-lang/2.6": { - "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", - "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" - }, "commons-logging#commons-logging/1.2": { "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" @@ -467,16 +628,16 @@ "module": "sha256-iNmRuo7VjChtey18CPn2Mg/5novWYXPDaDkhAEb8f2I=", "pom": "sha256-oYHFieNi4sRp6IRc/PIKFaiQ9ISUoPny4T9ZSglq0Kk=" }, - "io/freefair/gradle#lombok-plugin/9.1.0": { - "jar": "sha256-m+M3IZ1CTu2TzqYzUaTAeBOFGaZ9hDP6/kgx3nttM/U=", - "module": "sha256-HjFAU3xu8TjyledDzt+GbL/i01S1gVvv5zFY2dzb30c=", - "pom": "sha256-b92sn7rJGFCpFNLpQ8QfslFO8g/WPS4m2YXxCLcKV20=" + "io/freefair/gradle#lombok-plugin/9.2.0": { + "jar": "sha256-5xNJEu4+fzTSO1yNAmwfoJ/slcWthrjq8/+YbLZi7o0=", + "module": "sha256-F1FR52j8fEhIhCwrdQVDa+Cs7fgekT3/2+HaYwkB+Y4=", + "pom": "sha256-jQ/6lxcN0WPP5ZsFI265FpT7qK+o/x8vtcfCRWBhRts=" }, "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": { "pom": "sha256-1C1ePfUKHTe6qhRrpb0ai7I5YZksPt9Fw6M5zqCTLd8=" }, - "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.1.0": { - "pom": "sha256-tpgzWerNrHsvyVyytKMu0Hi4szrLLhwSUXIko57oWoA=" + "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.2.0": { + "pom": "sha256-llDp6qm39M2LKK8quVG0DnHqQDtTzefvAjczjjR0cLI=" }, "io/github/classgraph#classgraph/4.8.184": { "jar": "sha256-blZOKc7JWjkiaKYJ8JBx1WGZOD2QascOkXU6eZjRo+g=", @@ -505,10 +666,14 @@ "module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=", "pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ=" }, - "io/sentry#sentry/8.27.0": { - "jar": "sha256-bVcoMB+ycG8Byn+R5VuwpdMXDrdolV8M+yRDiuEo8ko=", - "module": "sha256-yXd56L8PPZ7vB/vRyrJNyzWpKr82yA86ByykasPmrzc=", - "pom": "sha256-KoUd5Q2Ab1+ER64/NhFXkazWsvN6reaXGy2VxfkmFbM=" + "io/sentry#sentry/8.36.0": { + "jar": "sha256-vRv36xL5zg7z7YFJTVOaLE+wP8/jCCNZSxsIbeRji64=", + "module": "sha256-0GTcXD7I99hlLa1ikXLYpO+VhxVC1DjVcOkV8POL0XU=", + "pom": "sha256-djG/oRgjSC+lzVCOqavzWMTD86rd1+KV3wp/Q40yjhY=" + }, + "jakarta/el#jakarta.el-api/6.0.1": { + "jar": "sha256-foS1vtSd4yt5zF6F2QtvWtsalTrGcoOtu0HB4pf5xgU=", + "pom": "sha256-/MxPuHb+vCFoY/0h6BC8g9LuGLiradxJfHALhPwiukA=" }, "jakarta/json/bind#jakarta.json.bind-api/2.0.0": { "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=", @@ -520,9 +685,9 @@ "jakarta/platform#jakartaee-api-parent/9.1.0": { "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" }, - "jakarta/validation#jakarta.validation-api/3.0.2": { - "jar": "sha256-KRwl5pEMxqfr2W1Ma66/bXw3Z2xUgsLZYUbpAbYsH8k=", - "pom": "sha256-CnucYyeWiv4NgvfPT6y9p+FXloxYCNaby4AZhjspjcQ=" + "jakarta/validation#jakarta.validation-api/3.1.1": { + "jar": "sha256-Y84AFWOIw2XzrBvnH8+vEUaC/AxFICC1325+wjbhQqs=", + "pom": "sha256-qxnpAKv5Awo3+DI+Ws66WNQK+I47UqBYuOA95II1ync=" }, "javax/json/bind#javax.json.bind-api/1.0": { "jar": "sha256-zTvjkfWZ1L71m/sVUleta5HkUh0ZuOlysN+1LfsMX8E=", @@ -536,9 +701,9 @@ "jar": "sha256-mHO0bfGDPJ7o9bwf9oUzdRFdrdiJe8taDf+1hIg17mw=", "pom": "sha256-q7nT5k03c0RnMqMO6gsbWmOIi7FDMdKioY8zhdGkw4k=" }, - "joda-time#joda-time/2.13.0": { - "jar": "sha256-qbRQ2W2QYW+f5WV6KThbTQB3+Z+LyAhB+T4lRaPNYj4=", - "pom": "sha256-z3axJyUkKrwNv2c0z4nMKddt3Itnaklq1/xA0cUVUkM=" + "joda-time#joda-time/2.14.0": { + "jar": "sha256-Hi2m+etl8gol2aMYaDHtKz+xT3pI4e+CBhNe5YyxQ9M=", + "pom": "sha256-YvxXQ2db0rn6tYOmQIC2UIVMKYIU084qocCzlL0IndE=" }, "joda-time#joda-time/2.4": { "pom": "sha256-hvCkCbZaMW7tZ5shz1hLkhe1WzqJLCz8UIZlNOdvXiQ=" @@ -562,9 +727,15 @@ "net/bytebuddy#byte-buddy-parent/1.17.7": { "pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw=" }, - "net/bytebuddy#byte-buddy/1.17.7": { - "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=", - "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M=" + "net/bytebuddy#byte-buddy-parent/1.18.3": { + "pom": "sha256-kOpTFzFQjup1/5KVFBxQjX+aU9GgX0W4D49JmVIUJu8=" + }, + "net/bytebuddy#byte-buddy-parent/1.18.4": { + "pom": "sha256-6IB4orFQSVcSTTXkL2bVasN8JpwMHJCVI/Nsw+L0WgY=" + }, + "net/bytebuddy#byte-buddy/1.18.3": { + "jar": "sha256-14OW48W84/KGXJGGZHSB5VidNMrMYySEcVtoYQjRfGY=", + "pom": "sha256-cVe2IqDWiFy1UmoQ8SIN3wkNu1LKL+OMMsxpxPFTB4g=" }, "net/java#jvnet-parent/1": { "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" @@ -583,6 +754,10 @@ "jar": "sha256-JgxLHiKx254RDuRBxPE84RX4QfpIxB14dQmGIUs5VVc=", "pom": "sha256-mLYq5v8oDXR/s1n8QuSP7RE9Rbw3Kagj3DC4MIqAZkU=" }, + "net/jcip#jcip-annotations/1.0": { + "jar": "sha256-vlgFOSBgxxR0v2yaZ6CZRxJ00wuD7vhL/E4IiaTx3MA=", + "pom": "sha256-XBnmhIzFUKlWZPsIIwS8X5/Pe2cvrwOvFjXw6TwmgXc=" + }, "net/rdrei/android/buildtimetracker#gradle-plugin/0.11.1": { "jar": "sha256-VTLp3rXka/R3KpkXFRrW4TqRLj8jZH8ffuoi/DsLTsg=", "pom": "sha256-7Q14MGZb9YiDq6YmLjFkhd8K1MfrNHPbLVCV3vKN8UE=" @@ -603,17 +778,14 @@ "org/apache#apache/19": { "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" }, - "org/apache#apache/31": { - "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" - }, "org/apache#apache/33": { "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" }, "org/apache#apache/35": { "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" }, - "org/apache#apache/7": { - "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + "org/apache#apache/37": { + "pom": "sha256-Uk7EeHr/c69rOp+voVTH8YgbZIKZtmP9v8rdoShvI1M=" }, "org/apache#apache/9": { "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" @@ -630,21 +802,18 @@ "jar": "sha256-nPUKdbYsyFMU/43jSUkoOwTi3E3KEuWMYoP3M1i3tuQ=", "pom": "sha256-OPhEKHDCaR2YIlGfLP+46JxwQQBQt8RsuhdqiCGeRCk=" }, - "org/apache/commons#commons-lang3/3.17.0": { - "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=", - "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw=" - }, "org/apache/commons#commons-lang3/3.18.0": { "jar": "sha256-Tu6ujSDAeKu2SwFewVit04OsWBVxzdxFxo8MmuAjByA=", "pom": "sha256-qiVLNztvbUa8ncqGMxsHKoq4brJeqZIf1Dlhg5LpihY=" }, + "org/apache/commons#commons-lang3/3.20.0": { + "jar": "sha256-aeXJ+jXaelGl/SCZ3+VqLY0yzyM+L213DnlhRkQCY/Q=", + "pom": "sha256-fKg7JwnB56ngO1ds1BQiGQN5SJqAhm5UL4yLlVQRoqo=" + }, "org/apache/commons#commons-math3/3.6.1": { "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=", "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA=" }, - "org/apache/commons#commons-parent/17": { - "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" - }, "org/apache/commons#commons-parent/25": { "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" }, @@ -657,15 +826,6 @@ "org/apache/commons#commons-parent/39": { "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" }, - "org/apache/commons#commons-parent/69": { - "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" - }, - "org/apache/commons#commons-parent/73": { - "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o=" - }, - "org/apache/commons#commons-parent/74": { - "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss=" - }, "org/apache/commons#commons-parent/81": { "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ=" }, @@ -675,24 +835,34 @@ "org/apache/commons#commons-parent/91": { "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI=" }, - "org/apache/commons#commons-text/1.12.0": { - "jar": "sha256-3gIyV/8WYESla9GqkSToQ80F2sWAbMcFqTEfNVbVoV8=", - "pom": "sha256-stQ0HJIZgcs11VcPT8lzKgijSxUo3uhMBQfH8nGaM08=" + "org/apache/commons#commons-parent/92": { + "pom": "sha256-lPbAJ7FfZAKZXdGyx+o1v+HryItoMrMTQ2i0GZhyGVM=" + }, + "org/apache/commons#commons-parent/93": { + "pom": "sha256-qItfYWWmWb+DVEGDe8xcU+mf3nm5LPu4aYjOKVTNUmc=" + }, + "org/apache/commons#commons-text/1.15.0": { + "jar": "sha256-WNLaMPBYUSoef5FOOSQd7KTf9cJ6CFtO0vqp5yCAZ/Y=", + "pom": "sha256-XlFoaHvO2uoqqFVrizL1r6CO/Lwx0RuUfIZ2mHvJ0jk=" }, "org/apache/groovy#groovy-bom/4.0.27": { "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=", "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs=" }, + "org/apache/groovy#groovy-bom/5.0.4": { + "module": "sha256-HslyzxmAv/g2b6bW0VPimiE7b2Vs6DHIZtKu0kZzcrQ=", + "pom": "sha256-9OFcmq8LR4OcfogcpOo/MFWk1Am/9CFx0C/IMRD9zts=" + }, "org/apache/logging#logging-parent/1": { "pom": "sha256-NLK/T1MagJFolhZy/0GdGr+WcluN/lKYDwDIxOsTS9Y=" }, "org/apache/logging#logging-parent/11.3.0": { "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" }, - "org/apache/logging/log4j#log4j-api/2.25.2": { - "jar": "sha256-n9Zsn+C+oG+pZmwUeYmkbK+qkrSoh1NpfTlFzEMzjLs=", - "module": "sha256-WPeF66u6zDA/Ow5aSF91X9qzKQ9p5JsDT4lj0ngjZV4=", - "pom": "sha256-CVYJaiUCQIyVioMXTytqV9yy5bB7uRTISHMrRLirvcM=" + "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-bom/2.10.0": { "pom": "sha256-8CEjRUmwLxK23xRaaw5ixrl4FCfjDjckmgX2XF3R7WY=" @@ -703,11 +873,21 @@ "org/apache/logging/log4j#log4j-bom/2.24.3": { "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg=" }, - "org/apache/logging/log4j#log4j-bom/2.25.2": { - "pom": "sha256-Tym32cLZcP0qZpcXa/fd3EFQifYNaW0ov98xsk6S8Rw=" + "org/apache/logging/log4j#log4j-bom/2.25.3": { + "pom": "sha256-ZleICHEo/mw6+dAlJEhTKvl4cRdmSB20k5a/AyWibK0=" }, - "org/apache/logging/log4j#log4j/2.25.2": { - "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w=" + "org/apache/logging/log4j#log4j/2.25.3": { + "pom": "sha256-pbdIJFris5b1vKlHpJbtwI29vfeWmuLMsattS0lznn8=" + }, + "org/apache/maven#maven-artifact/3.9.14": { + "jar": "sha256-Hv+nDqy/CqTZStnHsiW+AxzkMX+gfaWeI7ArPk4SMaM=", + "pom": "sha256-5mjJNtIv0sEe3/UurHLG5/wTulfJSQlgSL6N6/D5/9I=" + }, + "org/apache/maven#maven-parent/47": { + "pom": "sha256-gtARK6GQf/X9E6JIWCnJffZsaoHgdTWaVhpCL30VgtM=" + }, + "org/apache/maven#maven/3.9.14": { + "pom": "sha256-b0u5VBmGeKUo38iyiHqEzD9UrkoLi3XBkfoosElj5gc=" }, "org/apache/pdfbox#fontbox/2.0.26": { "jar": "sha256-lGdMfRDqRdmw3BA4eJJjf8jvtcadLnJpTxxm/rm7btc=", @@ -732,17 +912,17 @@ "jar": "sha256-tG67QUA4S0WjnpHiO1lc6dzYujqe6RTxX0CkKp+AU3M=", "pom": "sha256-KNkHvwQvNchyx5J0uBE1zIs9EE0p38twug3vly8oVyg=" }, - "org/apache/poi#poi-ooxml-lite/5.5.0": { - "jar": "sha256-cW/1fJns/UH+PcRawq1kHttMi/ITelkVzf3lqZZxpzU=", - "pom": "sha256-58mJ6rvQwamG/GVIj6SafzqdObsu9uT9TSjNHeu/yiQ=" + "org/apache/poi#poi-ooxml-lite/5.5.1": { + "jar": "sha256-5uN63rbW7otA7Eka2VXZNNj5mCerBQ8QWxgoblmx2ec=", + "pom": "sha256-AsTEOpetgyzwPFQr3l4icb2asR5c1R2E2zzBDVAbxNQ=" }, - "org/apache/poi#poi-ooxml/5.5.0": { - "jar": "sha256-OGnsA0rpm5Om4IkQNXIBH6IrHDQqK21+ekSMTWXq6ic=", - "pom": "sha256-SdxN0/6PicuPyWNFQVErkLSJjD2Xvl8jOh6PVxm/1i0=" + "org/apache/poi#poi-ooxml/5.5.1": { + "jar": "sha256-vXvi/f4/0sFoT6gTNRwnmP1ja0T2I24GdFANT4/xwvk=", + "pom": "sha256-dgJ7I5W96CPm1Tn24ChLdi1gwqjycSzHiLpN1I9WN2w=" }, - "org/apache/poi#poi/5.5.0": { - "jar": "sha256-D9yvwrfWoQeXNYh7jKRtfP+b5Zx6+Q1BLemScDFNTh8=", - "pom": "sha256-oOVRgRC0+5fNcmRXl6J9/5W0iK7mZ7sGO9tebVRJoLE=" + "org/apache/poi#poi/5.5.1": { + "jar": "sha256-bFLodsp1d1oRtW5LNqdUH2goJ/VkBnJfzYdWC3ku49g=", + "pom": "sha256-ndI0iKPuzSzAg3p16elrvf7OhZHOEyKlalO3yZcoMmM=" }, "org/apache/xmlbeans#xmlbeans/5.3.0": { "jar": "sha256-bMado7TTW4PF5HfNTauiBORBCYM+NK8rmoosh4gomRc=", @@ -753,13 +933,20 @@ "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" }, - "org/assertj#assertj-core/3.27.6": { - "jar": "sha256-snhysEmryI4jyFPOWReUXdV9Q70xF12FLjlB0qb9AjE=", - "pom": "sha256-sPgJRcedY8PDPWEL2HVNXppUNpVfev1oPQFg2GErquw=" + "org/assertj#assertj-core/3.27.7": { + "jar": "sha256-xKRFQmw8KGFmaGO4QsxOx7uxxCJv79NwttL+g9bE/w8=", + "pom": "sha256-laENz7O6mq1NC16cUjqNWDN3vuXs1Lo34Z5Vo0Zn8Hk=" }, - "org/controlsfx#controlsfx/11.2.2": { - "jar": "sha256-BDwGYtUmljR9r4T8aQJ0xhIuD4CjFXo1St086oPA3qk=", - "pom": "sha256-1GOhe255/Ti7CtmVmgCcXAdK7BjMncSdqRWsVfxNMXE=" + "org/codehaus/plexus#plexus-utils/3.6.0": { + "jar": "sha256-J+8TDjLCNgkOQI+1SY2Uy56ibRQHD7HImF1ge2LQmNE=", + "pom": "sha256-YTgwBIFHHH/mrrEV+RKWH4huGkbunCvShBtlGEgk2ig=" + }, + "org/codehaus/plexus#plexus/19": { + "pom": "sha256-jT5Rw5Av11luVI6rEh6/aw1KpzhXB38mok/Ib5uEVbQ=" + }, + "org/controlsfx#controlsfx/11.2.3": { + "jar": "sha256-MaeZrV1VIoGVhCiA9MDhxPvMhVwEcNlF0JMywQ+ufbQ=", + "pom": "sha256-LTu74XI8etUnjOXJauVdl7LN+1jhTEI+xl+PMzkIyd0=" }, "org/eclipse/ee4j#project/1.0.6": { "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" @@ -783,6 +970,10 @@ "org/eclipse/parsson#project/1.1.7": { "pom": "sha256-r171oT3deNwLoRUh3IOhKkVytRPILxAbsxDxGGxccU0=" }, + "org/glassfish/expressly#expressly/6.0.0": { + "jar": "sha256-hu5nxwQCeLrFIEtXH3OLi4WfAUzrX4lr2TW6y9rzPLk=", + "pom": "sha256-1fHrAa2xZ1jnWg9ffbPub/bE4W2zEV9GU2SVuXDCNV4=" + }, "org/hamcrest#hamcrest-core/1.3": { "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" @@ -790,52 +981,70 @@ "org/hamcrest#hamcrest-parent/1.3": { "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" }, + "org/hibernate/validator#hibernate-validator/9.1.0.Final": { + "jar": "sha256-Teogx4DRLorW4f59aVRgr3T4Zo3561iRCZGRkZRBIYg=", + "pom": "sha256-1XS291wE5USxv3YAcMLvuDnfufY0SNN19Z/dB+QM4JQ=" + }, "org/jboss#jboss-parent/20": { "pom": "sha256-EPDPw9IEh4JYXQ2yWkN40BAvn0hQy/5v1sWf4tI6gb8=" }, - "org/jboss#jboss-parent/9": { - "pom": "sha256-FMdH0KO7ovUps/hgsHiA+xzvICZW5mSc2iy5jbY+x54=" + "org/jboss#jboss-parent/42": { + "pom": "sha256-5BJ27+NQkFTLpBl7PWNgxR3Ve8ZA3eSM832vqkWgnDs=" }, "org/jboss#jboss-vfs/3.2.16.Final": { "jar": "sha256-UXVXDX63voy3azf//+HSS1w3pqcdWuf82khHM65KdR4=", "pom": "sha256-YUO95rZLf0gG3jFCkvJ508tL8Lb+RWaSbB4iKu4E3Mo=" }, - "org/jboss/logging#jboss-logging/3.1.4.GA": { - "jar": "sha256-SGo2AO/ihtfjgOVw+Ol8rKCxStg2fEo4oyYaCNww3Ug=", - "pom": "sha256-56t6X2Bh4kP/bEvAuTggWhHqyq5+GvNDhpB8jaPOql4=" + "org/jboss/logging#jboss-logging-annotations/3.0.4.Final": { + "jar": "sha256-FrsCMEQ5gwfrhcGCcRMcV93r9/sFPwSQ/bJT5bhN37I=", + "pom": "sha256-UR+Yh8HWYuNufwrfeHFP1KFZz5rCvmxmHTtg/6+2apg=" + }, + "org/jboss/logging#jboss-logging-tools-parent/3.0.4.Final": { + "pom": "sha256-QqUcq2vWVJ3KD+j4LJ14ZgxC64RCw7MARx020ZktIEA=" + }, + "org/jboss/logging#jboss-logging/3.6.1.Final": { + "jar": "sha256-XgiksJLchbM38JEKdAVx2HIM+lZfq9iAqMr5SmV8pBY=", + "pom": "sha256-J82Iq45ZRrinqpJkTrNzLjW+KBQ5qwevcfiYRT7nVA0=" + }, + "org/jboss/logging#logging-parent/1.0.3.Final": { + "pom": "sha256-mXLIlHSc2jVXZiF9Q97XAJse6ybgMBwwkUotslPdaFs=" }, "org/jfxtras#jmetro/11.6.16": { "jar": "sha256-X6v+k5kULSxCzepdifdJ0n1e8N01698l4LYwkspZ3vE=", "pom": "sha256-zRJGTYfPiIZTRNQ12wQtbuNsHgs+C+ik+orKAn4r/Ws=" }, - "org/jsonschema2pojo#jsonschema2pojo-core/1.2.2": { - "jar": "sha256-0epGqRFUHRDrKehIOPdvBmZkoJqOZuHUmPyQzcuyffo=", - "pom": "sha256-mtHVe8hrJzXr7xqJinGIgJR8I7wa95dJ0J702YzRluE=" + "org/jsonschema2pojo#jsonschema2pojo-core/1.3.3": { + "jar": "sha256-TCC4OHbeWrssFOQprheF+ikdmNRgN0uiHY28hoBFDbo=", + "pom": "sha256-/3vz5LqMLIYdA0YiWSNjl14lVllERE4H74XCcSI8F2E=" }, - "org/jsonschema2pojo#jsonschema2pojo-gradle-plugin/1.2.2": { - "jar": "sha256-OBH9Jv72Sa+cgkMzcz3Iy6KiaNjViqr91z98XAMDZJI=", - "pom": "sha256-enXFZUIwx7+kFKQB96w4vzMzuclEZxomD0pOazBFfJA=" + "org/jsonschema2pojo#jsonschema2pojo-gradle-plugin/1.3.3": { + "jar": "sha256-wl5ddYeCwtWjvaHMb/zdnE75IuttuqKyDmIq9GnWzqM=", + "pom": "sha256-BarPZTHZTx+ZLMmnQEOJh9tEQqDS6Xg+fcKhI3hSb7w=" }, - "org/jsonschema2pojo#jsonschema2pojo/1.2.2": { - "pom": "sha256-PEgC9gguyH1+igs206MyaDTRj9c8E5EM8pFrhQvNrDM=" + "org/jsonschema2pojo#jsonschema2pojo/1.3.3": { + "pom": "sha256-IWUFMvrSEFXfcn2OM+fE1DQp+SwDFSAOFybXV2/liuk=" }, "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.10.2": { - "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", - "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" - }, "org/junit#junit-bom/5.11.0": { "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" }, + "org/junit#junit-bom/5.11.1": { + "module": "sha256-42L7gWcgLW8NSlsWcHxTJFEP0pA9U2SYiMRJasgcM34=", + "pom": "sha256-xyEkqcmnmRDBhYdmtyw1Dho5JEy/tLB2NI+/4HgoGWU=" + }, "org/junit#junit-bom/5.11.4": { "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" }, + "org/junit#junit-bom/5.12.0": { + "module": "sha256-v/EC0wjRgUHrv+gdhjsFmaMPe7rK291WmKnUNpL9pi8=", + "pom": "sha256-rhFA2ksa+nWxxD/+oO8MreDDR/r1mWO1xJk/RzJwCNQ=" + }, "org/junit#junit-bom/5.13.1": { "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=", "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM=" @@ -852,71 +1061,79 @@ "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=", "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ=" }, - "org/junit#junit-bom/6.0.1": { - "module": "sha256-xI2Y9e3P2cVeefrLugEB98G6CIY0ib6EqRYrmaGG0cI=", - "pom": "sha256-4xXFzLsIchbc4ErnDDK/F2K+KguKQ++B47p4MXpM1cg=" + "org/junit#junit-bom/5.14.2": { + "module": "sha256-XSb0RAOSMm3SSDz0kBQ+6hSV1QlUWaC5ZRp7GzjiTr8=", + "pom": "sha256-7S3MeFW9RgvMyTob8Mli5jtWb/fY8d7Q8fJZO6gYOq8=" }, - "org/junit/jupiter#junit-jupiter-api/6.0.1": { - "jar": "sha256-o8qMflZ0Ngk+SmcD1dSqwC2+o2EG6jL9E2e1beINTgI=", - "module": "sha256-zK14mBan6wSIQ0ad+9pkHonhhJ5juCSS8kvGCzBQu5s=", - "pom": "sha256-NjNXApnLjlv8KBYedmHSEfODqx4QndQNBWbGr6FDlxo=" + "org/junit#junit-bom/5.14.3": { + "module": "sha256-8lxAv6Usi3tCXVdqiPMQ9kMmFtYrpYkyA/on37yfAl4=", + "pom": "sha256-CKAoVuSHyTV/mynjh0X4roBYSBEectFarQNSM48WMuE=" }, - "org/junit/jupiter#junit-jupiter-engine/6.0.1": { - "jar": "sha256-dHalb0qqtX/C9FmEfNa/txKzvQSprAuJ7ZVz963CxVA=", - "module": "sha256-DNBLxyt1p94NOMErkbE3PcQ3OgP+Iv/3oV6MvRyfXfk=", - "pom": "sha256-w0n6QNgPtJ/b+0TyYlR2zSa4vpWQQP+or4in/bHiSPY=" + "org/junit#junit-bom/6.0.3": { + "module": "sha256-KA48NIVfKhPeJBIZN+TPl+S565IG5g+JHk8KHPDnq6E=", + "pom": "sha256-plW2pdwA0b68kfsrFcDH6K6snWvc+HlZVQU3DidTAoc=" }, - "org/junit/jupiter#junit-jupiter-params/6.0.1": { - "jar": "sha256-lWbiSbTUx9U6bIkI9XeIXOLUxjE8kWvfv3/7xSa4o28=", - "module": "sha256-p9p+0ICwGl76I7bWB/qxxmMhEYc0EXoaVkde/DU7HMA=", - "pom": "sha256-sfUTKYkKt1oPR+kBQNZOJf6z57dM5KEHRZg9YViQbnM=" + "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/6.0.1": { - "jar": "sha256-vXrygd/vjcwdCKUDzpMEWXtl4YUKDbgsmattjLEDGxQ=", - "module": "sha256-iuvBy0oYWd7uRjDJq3S2/KKMAdpl0h6Z7XgEp7ibGMo=", - "pom": "sha256-VICrz2YRG4YweP/+OFMKTcrtJoK9gCtO2VBdrzVleTM=" + "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.1": { - "module": "sha256-SuQSly6ZIp5QFsuYmrio5gGHRdA4kM7DfcBAr4f0dIA=", - "pom": "sha256-AFNyKBaiOCD49xkGajg8/6LbksfbUhEok8nEc790Bhg=" + "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-commons/6.0.1": { - "jar": "sha256-+IU/RcEPOA3bFXz0KrupsHNHTwXMQDNbWFBV+FU43K0=", - "module": "sha256-mS8uNl3Y24i+YC+eXFwI+B/USwxbj6HPFzTzb8fh8f0=", - "pom": "sha256-E6l3Y7CJ0P0kyrrGE/d5pyEmm+5VHz5cHbr+mhzQ6tI=" + "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-engine/6.0.1": { - "jar": "sha256-9JV3Bzp64YTHGNm0OuDY7cuKv8Wsc4c17jM51GUukr8=", - "module": "sha256-2aXeq5puUhW79Aw5/+2pCwZXdPjNAY5Xuyod7OI0VKQ=", - "pom": "sha256-oiRe8nBlLAfVls5x2NZw0KipklHNzvRU85ZRmaycTpo=" + "org/junit/platform#junit-platform-commons/1.14.3": { + "module": "sha256-jSmgMoScAVIwjhniozdHwT2rXzEv/y+IqUI+tHfOPew=", + "pom": "sha256-OwPQael9K60RG+KcAMxakxM1TbZEnSSV6IftDGCay7Q=" }, - "org/junit/platform#junit-platform-launcher/1.14.1": { - "module": "sha256-eI2j5KuAQTvLYylRt/cNtrhRrynQskIowFIcKue1cAI=", - "pom": "sha256-5AYKI9RxXTF6it+vKcZC1O+pgxhANROv0u7pklwAJYs=" + "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-launcher/6.0.1": { - "jar": "sha256-7nWN2wb6sf0aiQwLrkqs+NwATE82fhONv/yxE80J66w=", - "module": "sha256-QGPjXSBE9xraiSUfrtFB8KWvnOwm1uO3znI889Vz29c=", - "pom": "sha256-TNsMG5Lxon57UucN6Buik1shlBgC2MqoiOnZ4V+s/ho=" + "org/junit/platform#junit-platform-engine/6.0.3": { + "jar": "sha256-SR6eT3RfFhuKjkGGoafGpFDqEscJMMmu2uQnIVMB2Uc=", + "module": "sha256-U1qGeP2rxB2/DEHMW3Vh7xINdWUMPcOTAqfWCTdmE5M=", + "pom": "sha256-eofYxqCn2wJgsAzjAxgPb0HQQFYoldaARhnV227iMr4=" }, - "org/junit/platform#junit-platform-runner/1.14.1": { - "jar": "sha256-lkBJCI+E7XAvA3yXGXj5GvVwr2w1dAKpNrGE4WMTiqo=", - "module": "sha256-yQEOM5EEz7Oz4ZJNVu1dok1lvzwdo8GmUIQkWBYGULE=", - "pom": "sha256-VGBGz94VMjxDaNEfYV4TMtu4yb7+/Yuw5wxAH0Ns94U=" + "org/junit/platform#junit-platform-launcher/1.14.3": { + "module": "sha256-HmYSmOheYI5fnH1m5x7u2vZVBgvOtjmgV/Blo+Bb8ko=", + "pom": "sha256-nEiAqHeA2ru2Bb/JXCdJSgq0UPHVo2wdkKDrI2gRQy0=" }, - "org/junit/platform#junit-platform-suite-api/1.14.1": { - "module": "sha256-xDB1DtPJy60WXkgXwhrZmh5sWED9IAzLlfOgC/0a2Ls=", - "pom": "sha256-iD7R5UYZ/OWqR4zxZ7Wsan01xDZdjrnX7yhX5ik9csM=" + "org/junit/platform#junit-platform-launcher/6.0.3": { + "jar": "sha256-MVYINy5NxEvKDMs66KB+zCBrM2cDP6BXSKA8zVY/EwE=", + "module": "sha256-glZnrWqEsMW6dTdSvpqZ4wFL/lKRQ7xmtGdNkbA/pbg=", + "pom": "sha256-TTngPyCTd29BkwccjN8ZgTa5YWbHtDteN+fWFWudmO0=" }, - "org/junit/platform#junit-platform-suite-api/6.0.1": { - "jar": "sha256-15YF6JCgtjxijNcVdFHtwP+U7aqPUn3+U++5sPAwArY=", - "module": "sha256-I3Y94bDaswNBerh+dUsU2zh0TSXjom7zsnElQfcsWxU=", - "pom": "sha256-XeL27RopgZ67ZzLe7MSRIiq1zQ10gGZU2Lc2xFi7RNA=" + "org/junit/platform#junit-platform-runner/1.14.3": { + "jar": "sha256-w2q4cQ+CciL/GGJ7RK/cv8obMxrN5uh2kqVCayToTb0=", + "module": "sha256-E2HHY6mNq2y/NLgsFw1MK8CWbllItUyESRuvd3NfSJw=", + "pom": "sha256-8+7qY1VGhY1IvU5T3KEj6u8B9WFye/NUt1Ismwdmc3c=" }, - "org/junit/platform#junit-platform-suite-commons/1.14.1": { - "jar": "sha256-F6/3EHR5qO68p/w5C5xhHjajLH3CpQsAGJSq4jFiU0I=", - "module": "sha256-1AhdvglATvhkaS1Ee6DGGHulGobZrrwrjOascI6fWF4=", - "pom": "sha256-APg5VtK2l7LAcIj9EwqPGzJx8fDeHHNIkt2kaKnF1nk=" + "org/junit/platform#junit-platform-suite-api/1.14.3": { + "module": "sha256-FBrjawWJHPoGsvbcZ7NPM4cTiEM+l3JStZZEd/7tYs8=", + "pom": "sha256-Wa28L+G9Iqs6ZUfx2n3cXxovJPDwoH4VhZ7BX34kZt8=" + }, + "org/junit/platform#junit-platform-suite-api/6.0.3": { + "jar": "sha256-aH+pls0zuSMR0VaxOshkdy3Y6g8YNmkDzyo7y8Kill4=", + "module": "sha256-EQ7aRwW0pryAmk5W8Ez11aKRArKLedsO7NG75+CKHNM=", + "pom": "sha256-r+jWsXASzM3/MV/hvOqjlch9a5pFKEXMjKjgm+nob8Y=" + }, + "org/junit/platform#junit-platform-suite-commons/1.14.3": { + "jar": "sha256-Ni0BBHdVVpG4OBYyZAG/GTVvt86Z4b3nai3atUHdL3w=", + "module": "sha256-uV/ivjiHQQ81M5IQ6rDyDReNV7/d3UrN1VO5Dp5wJIo=", + "pom": "sha256-lH1BjeQ/t78QQngeXsuRBu8bUyEP4D6r0icqUxEzuBM=" }, "org/leadpony/justify#justify-parent/3.1.0": { "pom": "sha256-ckfhOlVhg4gPqnP7EeWQJ7R+fG1Ghx0sUIg3WwDbJY0=" @@ -928,17 +1145,20 @@ "org/mockito#mockito-bom/4.11.0": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" }, - "org/mockito#mockito-core/5.20.0": { - "jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=", - "pom": "sha256-mQPiB1XAxIh6q5xPEAYft/ERUdOp+t2WTp+6QnIm0TU=" + "org/mockito#mockito-bom/5.21.0": { + "pom": "sha256-nnTHreXWZeYN+Z1/Ie1LOEVCATAbEszguvioK/kw058=" + }, + "org/mockito#mockito-core/5.23.0": { + "jar": "sha256-rilb69XRH6uXqyl4Fdx2FxiLhgA8vOPf1cDVw6bMSgw=", + "pom": "sha256-wC4pALknetv+EnVtfQuUcua55Zcq4fKNGaQaplE3d+M=" }, "org/mockito#mockito-inline/5.2.0": { "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=", "pom": "sha256-cG00cOVtMaO1YwaY0Qeb79uYMUWwGE5LorhNo4eo9oQ=" }, - "org/mockito#mockito-junit-jupiter/5.20.0": { - "jar": "sha256-/WxwPCsAuRTzrbwnsYB3pwjz1pkvGSQsRE5zfGzOAk4=", - "pom": "sha256-gaVJ/8nISoefwe5k1jAHqwClOk75avtTaQ8oRWker5g=" + "org/mockito#mockito-junit-jupiter/5.23.0": { + "jar": "sha256-ZZOFJv3DEbs6HAAV6xyKC+gVFaqZjyK59OkvG2aOT2M=", + "pom": "sha256-tm0N+BqrLtL6U8mQ6pDC8fkVAxvIXkGGAt5M+40q1+g=" }, "org/objenesis#objenesis-parent/3.3": { "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" @@ -957,66 +1177,66 @@ "jar": "sha256-My3AACjoNlsnD7+1rAd7gHfp4OtYdGSiUqjtBHAiV+k=", "pom": "sha256-pxdAoV6nREoA8+5lj8XBLxONl1aqPvHAeq8KImyN+/k=" }, - "org/openjfx#javafx-base/24.0.1": { - "jar": "sha256-wHIERTI2uKfKW6vuyx4hPNaLba8QrfrM8SB3rP2npN8=", - "pom": "sha256-BVO1I7rWnf8ajtnBvoGUUWLVs5umXuEoVdhEpOmk1rI=" + "org/openjfx#javafx-base/26": { + "jar": "sha256-ltbPZZg7Qxo55/bEzZquJF+eyYbnFTfvgANT3GFdFrk=", + "pom": "sha256-OkgHPYhcIVJ+gkASVkhRxHpLAuo8oWSqOmp/LgXcnSc=" }, - "org/openjfx#javafx-base/24.0.1/linux": { - "jar": "sha256-Ow5mkFh5aklnV7sX0U5dl6G0EspcGz8eAVn25djuI9s=" + "org/openjfx#javafx-base/26/linux": { + "jar": "sha256-PDElbJ0pyw/WnhahE76jUO8MJLgMWgrkn1/+fyrSBLs=" }, - "org/openjfx#javafx-base/24.0.1/linux-aarch64": { - "jar": "sha256-gWwvLr4cRmHrQlPk2Ad1Ute+zHQjupLfuEa3oaxISa4=" + "org/openjfx#javafx-base/26/linux-aarch64": { + "jar": "sha256-BjKu3wYHESe+T6LRuamShkloG4MfJ2aLKKgdeKM+sHI=" }, - "org/openjfx#javafx-controls/24.0.1": { - "jar": "sha256-KqsGovwOGUBDgHUvxfykPkl4qD5Qc8dCSVSj950Luik=", - "pom": "sha256-QJ24qT1cQs98ZAWaulclDwlKMHHTpWGwGsBT8SXnEOI=" + "org/openjfx#javafx-controls/26": { + "jar": "sha256-x4RDP/EjAw2s4gJj3ZoZYzN62RP/tEc1M4itdrZtrDA=", + "pom": "sha256-DZtjnvlRPm28+KycKHQsoTLRGuftMkU2JIbm0M2aM9g=" }, - "org/openjfx#javafx-controls/24.0.1/linux": { - "jar": "sha256-aZvOLZNgke0A8Xt/tPKMTwmk6104AF0aZN0xBdjXLTc=" + "org/openjfx#javafx-controls/26/linux": { + "jar": "sha256-4jyyb+Khk3wa8AWoXuLhzpmH/CY+WplB5JEVdIiNcUk=" }, - "org/openjfx#javafx-controls/24.0.1/linux-aarch64": { - "jar": "sha256-OMg3bAYv1h9HSxeCMjodCuDUyXdGi0hfekkMxJSX250=" + "org/openjfx#javafx-controls/26/linux-aarch64": { + "jar": "sha256-n8EZmmtDPxXVwGj4OWksFv9WlDO27Tk2u+5Cu03V4zQ=" }, - "org/openjfx#javafx-fxml/24.0.1": { - "pom": "sha256-cacGG3EfLSD4ETCVr1A2cB42Ki9WI6HKFvAhZiZWuc0=" + "org/openjfx#javafx-fxml/26": { + "pom": "sha256-IK+feoAbGVthnNdnfxAiC45x3jx0zMsYyqR6TiU0bWE=" }, - "org/openjfx#javafx-fxml/24.0.1/linux": { - "jar": "sha256-qIx7ROUks8+lqSH3h6OruJyCdhIm3C8nQ+Xnlxiy+hM=" + "org/openjfx#javafx-fxml/26/linux": { + "jar": "sha256-Ow79u1OgsLjdyKsHy+055S3JWmirPJ9zZaJob7Ulxzo=" }, - "org/openjfx#javafx-fxml/24.0.1/linux-aarch64": { - "jar": "sha256-H9knyjm3bpf2CpY56MJ4VWIJtOOZv/hbjnXC1Lgn0qg=" + "org/openjfx#javafx-fxml/26/linux-aarch64": { + "jar": "sha256-UzW0z45ced2z04AvKOVr6FFBlRrIGOhndZaxrNq2uo0=" }, - "org/openjfx#javafx-graphics/24.0.1": { - "jar": "sha256-IR7gyZPhUMyZQ/VNTMOWjep+WbvE1jGINMW7kq4auaM=", - "pom": "sha256-rG0M+nPdv3iQ2+nsWG0FkbH1tCwDTm2sSo4PBv9povw=" + "org/openjfx#javafx-graphics/26": { + "jar": "sha256-PEkdRr2/LmsmVINLKetvJtopDDWssdWNeN78zs/ou1s=", + "pom": "sha256-VjpUZ1RZNCNoj42I0QYlsWJKYYdFdiSt/btD0rTBg4U=" }, - "org/openjfx#javafx-graphics/24.0.1/linux": { - "jar": "sha256-5vSJuesL4G0GswffYf3wvU2eSmaxjJ0cU85gDgDMZus=" + "org/openjfx#javafx-graphics/26/linux": { + "jar": "sha256-byp9J7sbGDn4fcysZLWE7g4WrgpRV/8SgRQk3UDyDeA=" }, - "org/openjfx#javafx-graphics/24.0.1/linux-aarch64": { - "jar": "sha256-pDQCCBWBgcmsgTiy+9FwO0kXDDgBDatKnme9zG5Wy6k=" + "org/openjfx#javafx-graphics/26/linux-aarch64": { + "jar": "sha256-98Iqjrb9QgrKxey4V8Z4yaAr7kA1IFJkMIpiEdK6eog=" }, - "org/openjfx#javafx-media/24.0.1": { - "pom": "sha256-IRMGcyeEXjmGqA3lH8lM7VvdWpCzU93QYRopgBpX5nk=" + "org/openjfx#javafx-media/26": { + "pom": "sha256-AO6MtryuqQj6WtQ3T+WwBdq+A2s7oHCODbzb1iFd1jU=" }, - "org/openjfx#javafx-media/24.0.1/linux": { - "jar": "sha256-dwOWaWbWi5uuKXYmLFk6fbhP5YWW0pQxTmKtJLj2ZpE=" + "org/openjfx#javafx-media/26/linux": { + "jar": "sha256-VJ5/QMOhOsvRJNGdUBFI0C6EIJiXLBIBtnMKWbP4OXc=" }, - "org/openjfx#javafx-media/24.0.1/linux-aarch64": { - "jar": "sha256-UsRE4Of76C5+VMb5saZz7q1tGHPTuEA01Z1XxHi8R3Y=" + "org/openjfx#javafx-media/26/linux-aarch64": { + "jar": "sha256-sP4/+mxrKvEuDIdA0jiHph29h9X4AvSYQeU/uTXg09o=" }, - "org/openjfx#javafx-swing/24.0.1": { - "jar": "sha256-iUfG6m/V28EDp3yC+7MtfCcUqrgcHr6R1kEw7Gm1vRE=", - "pom": "sha256-EGx2gZJHx6j5+GVYsFDTeVOPdvIi73HEI97ZLyX8eoE=" + "org/openjfx#javafx-swing/26": { + "jar": "sha256-j54QQOkyWokXNN5A82pSBUXl/Iq3Z/Q8peN492M7erk=", + "pom": "sha256-XxxSu5WjpoLxL6SNhhwQY5JmZJVsxFWTVUF4D/UoXsk=" }, - "org/openjfx#javafx-swing/24.0.1/linux": { - "jar": "sha256-DJwwQlC3JBRlO8vaFFIlNCNR6RgwRvzbwTmJO6ljXt0=" + "org/openjfx#javafx-swing/26/linux": { + "jar": "sha256-e9sMol8/8MqJmuo2zPUfZ5DQzNOCOM3J7sEBLsvIqak=" }, - "org/openjfx#javafx-swing/24.0.1/linux-aarch64": { - "jar": "sha256-0Qg1g+yqJ2R0evi9+uoJiTAI8QOzyUyaysWsX/e2HWk=" + "org/openjfx#javafx-swing/26/linux-aarch64": { + "jar": "sha256-f5r6ontEgvnWZ4+YXt4ArLKmOxSJ2e0vE9LVR7XrSFk=" }, - "org/openjfx#javafx/24.0.1": { - "pom": "sha256-+laqYHIYO29Lkkkdi0HzIRIeqtVqH9QFPg6J3Kqr8Zc=" + "org/openjfx#javafx/26": { + "pom": "sha256-C1wmXk0pGGGHRmUK1YIKUbr44KRIXHvPfLKjJXa3vGk=" }, "org/opentest4j#opentest4j/1.3.0": { "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", @@ -1110,9 +1330,29 @@ "jar": "sha256-hvMPqHdfo6Ys2znR7XimAZFkwQWIZASNQsvuJE4m6EA=", "pom": "sha256-Q5HcceKs5oshCpdj6SnnNlNIAD3bXh9g9G7ciAnCLw4=" }, - "org/yaml#snakeyaml/2.2": { - "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", - "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + "org/yaml#snakeyaml/2.4": { + "jar": "sha256-73ea9dKand6MxwzgNB9cb3c14j7f+Whc6qnTU1m3u38=", + "pom": "sha256-4VSjIxzWzeaKq/J0/RiWTUmpwaX16e079HHprnvfCOY=" + }, + "org/yaml#snakeyaml/2.5": { + "jar": "sha256-5mgqzxrOd1CO8TZJy/T40J0s9UV722HSX/tqwCM9eN0=", + "pom": "sha256-ugGuenRMtS/o7POwI8vDLgzMjGvu+fJt53pHgII5RH0=" + }, + "tools/jackson#jackson-base/3.0.2": { + "pom": "sha256-bNfjpxD7/9oYOZzlZe//tviCVICZC7Yxj4Ps8Z28k7I=" + }, + "tools/jackson#jackson-bom/3.0.2": { + "pom": "sha256-j/nmDa1VX3MadR8hSPVo36hhFpZPnofSOOK6m1fI0fQ=" + }, + "tools/jackson/core#jackson-core/3.0.2": { + "jar": "sha256-+nRRW6X8ASgs7Kt+WXD6EqD0/yO9bCBh6cd4MzjQtDY=", + "module": "sha256-ahqDE3aR5sMwIzIHsENnSsV+gohKRgT9erpnPsv4Dok=", + "pom": "sha256-M0PoYpgxJsUq1LGVhV/fKYlwcAFTRWHR5cH3DbrM5SM=" + }, + "tools/jackson/core#jackson-databind/3.0.2": { + "jar": "sha256-9U9pv8eAOAo/TeQvssPoKyLI702EupGM/4HSLGqhBp8=", + "module": "sha256-r8lO4gcAP1TxfepZ1em1DdSPSGl6aDD2XWKtwfJ35Lw=", + "pom": "sha256-Mk6hllrSTyPQU/zkQJ0lBaxZckJGcp1QLpct6f0fxIw=" } }, "https://repo.repsy.io/mvn/jixxed/maven/nl": { diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/disable-broken-features.patch b/pkgs/by-name/ed/ed-odyssey-materials-helper/disable-broken-features.patch new file mode 100644 index 000000000000..bc597650ae0a --- /dev/null +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/disable-broken-features.patch @@ -0,0 +1,35 @@ +diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java +index e6d0e84d..aeaa32af 100644 +--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java ++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/EDDNService.java +@@ -408,7 +408,7 @@ public class EDDNService { + private static void send(final Object message, final Event event, final String schemaName, final int delaySecondsAllowed) { + final boolean isLive = ApplicationState.getInstance().getGameVersion().equals(GameVersion.LIVE); + final boolean isNew = isNew(event, delaySecondsAllowed); +- final Boolean isEnabled = PreferencesService.getPreference(PreferenceConstants.EDDN_ENABLED, Boolean.FALSE); ++ final Boolean isEnabled = false; + if (isLive && isNew && isEnabled) { + final Runnable run = () -> { + try { +diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java +index f39a7a17..0dd77370 100644 +--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java ++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/SettingsTab.java +@@ -43,16 +43,13 @@ public class SettingsTab extends MainTab implements DestroyableTemplate { + new HorizonsWishlist(), + new HorizonsShips(), + new HorizonsColonisation(), +- new Notifications(), +- new FrontierAPI() ++ new Notifications() + ) + .buildVBox(); + //AR + if (OsCheck.isWindows()) { + settings.getNodes().add(new AugmentedReality()); + } +- //Tracking +- settings.getNodes().add(new Tracking()); + + ScrollPane scrollPane = register(ScrollPaneBuilder.builder() + .withStyleClass("settings-tab-content") diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/eula.patch b/pkgs/by-name/ed/ed-odyssey-materials-helper/eula.patch new file mode 100644 index 000000000000..5a38806aef0d --- /dev/null +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/eula.patch @@ -0,0 +1,13 @@ +diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java +index 260ecd78..7b5c5649 100644 +--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java ++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/dialog/StartDialog.java +@@ -61,7 +61,7 @@ public class StartDialog extends DestroyableVBox implements DestroyableTemplate + .withStyleClass("buttons") + .withNodes(createButtons()) + .buildHBox(); +- this.getNodes().addAll(whatsNewTitle, whatsNewContent, policyTitle, policyContent, eulaTitle, eulaContent, buttonsBox); ++ this.getNodes().addAll(whatsNewTitle, whatsNewContent, policyTitle, policyContent, buttonsBox); + if(!VersionService.isDev()){ + PreferencesService.setPreference(PreferenceConstants.WHATS_NEW_VERSION, VersionService.getBuildVersion()); + } diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix index 9b0d051ac310..72b8ac4404d2 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix @@ -15,19 +15,20 @@ copyDesktopItems, makeDesktopItem, writeScript, + writeText, }: let gradle = gradle_9; in stdenv.mkDerivation rec { pname = "ed-odyssey-materials-helper"; - version = "3.1.12"; + version = "3.6.6"; src = fetchFromGitHub { owner = "jixxed"; repo = "ed-odyssey-materials-helper"; tag = version; - hash = "sha256-QqwLM2fiPmtFehB83M3yvLp8M1DKywlCxQcG4mclBkk="; + hash = "sha256-ljCN2tW7iH+kTiSXwUt+OsAhjYKlAy0W5x/JDmQeR6M="; }; nativeBuildInputs = [ @@ -41,6 +42,9 @@ stdenv.mkDerivation rec { # so this removes 1) the popup about it when you first start the program, 2) the option in the settings # and makes the program always know that it is set up ./remove-urlscheme-settings.patch + + ./eula.patch # EULA doesn't apply to nixpkgs build, only the upstream build, don't show it + ./disable-broken-features.patch # some features require things not included in the source code, we'll disable/hide those ]; postPatch = '' # oslib doesn't seem to do releases and hasn't had a change since 2021, so always use commit d6ee6549bb @@ -50,14 +54,15 @@ stdenv.mkDerivation rec { substituteInPlace application/src/main/java/module-info.java \ --replace-fail 'requires oslib.master.SNAPSHOT;' 'requires oslib.d6ee6549bb;' - # remove "new version available" popup + # remove "new version available" (not needed) and eddn question (eddn doesn't work in this build) popups substituteInPlace application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java \ - --replace-fail 'versionPopup();' "" + --replace-fail 'versionPopup();' "" \ + --replace-fail 'eddnPopup();' "" - for f in build.gradle */build.gradle; do - substituteInPlace $f \ - --replace-fail 'vendor = JvmVendorSpec.AZUL' "" - done + substituteInPlace build.gradle bootstrap/build.gradle application/build.gradle \ + --replace-fail 'vendor = JvmVendorSpec.AZUL' "" + + echo "This nixpkgs-packaged version of Elite Dangerous Odyssey Materials Helper doesn't upload any data." > application/src/main/resources/text/privacy.txt ''; mitmCache = gradle.fetchDeps { @@ -70,14 +75,12 @@ stdenv.mkDerivation rec { "--stacktrace" ]; + gradleInitScript = writeText "empty-init-script.gradle" ""; # fixes build by making it possibly not reproducible, though it still seems to be + gradleBuildTask = "application:jpackage"; - env = { - EDDN_SOFTWARE_NAME = "EDO Materials Helper"; - }; - preBuild = '' - # required to make EDDN_SOFTWARE_NAME work and for the program to know its own version + # required for the program to know its own version gradle $gradleFlags application:generateSecrets ''; diff --git a/pkgs/by-name/ei/eiquadprog/package.nix b/pkgs/by-name/ei/eiquadprog/package.nix index 3528b88e5cae..d454b9c1ba42 100644 --- a/pkgs/by-name/ei/eiquadprog/package.nix +++ b/pkgs/by-name/ei/eiquadprog/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eiquadprog"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eiquadprog"; rev = "v${finalAttrs.version}"; - hash = "sha256-FV6A3cMaY7+eDip9YjuX0cYz0X6tdpDRV57eXOb9bKQ="; + hash = "sha256-ukYIc5ZCIDunXMyC44Dd1qac4Ku4pNv9p4ik+xyI0i0="; }; outputs = [ diff --git a/pkgs/by-name/el/elephant/package.nix b/pkgs/by-name/el/elephant/package.nix index f7a9ffff6435..93df5966a194 100644 --- a/pkgs/by-name/el/elephant/package.nix +++ b/pkgs/by-name/el/elephant/package.nix @@ -1,25 +1,7 @@ { - enableArchLinuxPkgs ? false, - enableDnfPackages ? false, - enable1password ? false, - enableBitwarden ? true, - enableBluetooth ? true, - enableBookmarks ? true, - enableCalc ? true, - enableClipboard ? true, - enableDesktopApplications ? true, - enableFiles ? true, - enableMenus ? true, - enableNiriActions ? true, - enableNiriSessions ? true, - enableProviderList ? true, - enableRunner ? true, - enableSnippets ? true, - enableSymbols ? true, - enableTodo ? true, - enableUnicode ? true, - enableWebsearch ? true, - enableWindows ? true, + # list of providers to enable, all are enabled by default + # e.g. enabledProviders = ["files"] will only install the files provider + enabledProviders ? null, bluez, buildGoModule, @@ -35,38 +17,13 @@ wl-clipboard, }: let - providerMap = { - "1password" = enable1password; - "archlinuxpkgs" = enableArchLinuxPkgs; - "bitwarden" = enableBitwarden; - "bluetooth" = enableBluetooth; - "bookmarks" = enableBookmarks; - "calc" = enableCalc; - "clipboard" = enableClipboard; - "desktopapplications" = enableDesktopApplications; - "dnfpackages" = enableDnfPackages; - "files" = enableFiles; - "menus" = enableMenus; - "niriactions" = enableNiriActions; - "nirisessions" = enableNiriSessions; - "providerlist" = enableProviderList; - "runner" = enableRunner; - "snippets" = enableSnippets; - "symbols" = enableSymbols; - "todo" = enableTodo; - "unicode" = enableUnicode; - "websearch" = enableWebsearch; - "windows" = enableWindows; - }; - - enabledProviders = lib.filterAttrs (_: enabled: enabled) providerMap; - enabledProvidersList = lib.concatStringsSep " " (lib.attrNames enabledProviders); + providerEnabled = provider: (enabledProviders == null) || lib.elem provider enabledProviders; runtimeDeps = - lib.optionals enableFiles [ fd ] - ++ lib.optionals enableBluetooth [ bluez ] - ++ lib.optionals enableCalc [ libqalculate ] - ++ lib.optionals enableClipboard [ + lib.optionals (providerEnabled "files") [ fd ] + ++ lib.optionals (providerEnabled "bluetooth") [ bluez ] + ++ lib.optionals (providerEnabled "calc") [ libqalculate ] + ++ lib.optionals (providerEnabled "clipboard") [ wl-clipboard imagemagick ]; @@ -93,18 +50,31 @@ buildGoModule (finalAttrs: { subPackages = [ "cmd/elephant" ]; - postBuild = '' - echo "Building providers: ${enabledProvidersList}" - - mkdir -p $out/lib/elephant/providers - for provider in ${enabledProvidersList}; do - [ -z "$provider" ] && continue - if [ -d "internal/providers/$provider" ]; then - echo "Building provider: $provider" - go build -buildmode=plugin -o "$out/lib/elephant/providers/$provider.so" ./internal/providers/"$provider" || exit 1 - fi - done - ''; + postBuild = + ( + if enabledProviders == null then + '' + PROVIDERS=() + for x in internal/providers/*/; do + PROVIDERS+=("$(basename "$x")") + done + '' + else + '' + PROVIDERS=(${lib.escapeShellArgs enabledProviders}) + '' + ) + + '' + echo "Installing providers" + mkdir -p $out/lib/elephant/providers + for provider in "''${PROVIDERS[@]}"; do + [ -z "$provider" ] && continue + if [ -d "internal/providers/$provider" ]; then + echo "Building provider: $provider" + go build -buildmode=plugin -o "$out/lib/elephant/providers/$provider.so" ./internal/providers/"$provider" || exit 1 + fi + done + ''; postInstall = '' wrapProgram $out/bin/elephant \ diff --git a/pkgs/by-name/eq/equibop/node-modules.nix b/pkgs/by-name/eq/equibop/node-modules.nix index 5b630f0031a6..aa9b6902371d 100644 --- a/pkgs/by-name/eq/equibop/node-modules.nix +++ b/pkgs/by-name/eq/equibop/node-modules.nix @@ -50,8 +50,8 @@ stdenvNoCC.mkDerivation { outputHash = { - x86_64-linux = "sha256-os/+0Xb3N1NMtTMP/G9bhELoQF3kDfqzuKUP5RcelJI="; - aarch64-linux = "sha256-EvHJQGtW62AOyMnWAEK0HsrwU875JrbMeqD+ctBEI3k="; + x86_64-linux = "sha256-pJp4l0QJAg42gj/R4bq4P1iVtMehkvNs7hv9/3RmNsI="; + aarch64-linux = "sha256-POIXQZ3ZruzfwF/6Kg6zRXdSrKtm56cBCMAvB5JTuJM="; } .${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index f04a380bce09..f271c45e9022 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "equibop"; - version = "3.1.8"; + version = "3.1.9"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equibop"; tag = "v${finalAttrs.version}"; - hash = "sha256-OcD4xcD/A48oJcsKuhYBc/UigK+1NfTEuJivL+qdfeA="; + hash = "sha256-4v0NKGmdbEdHyjz35l+QUnXvnVfLzIe1vLxOSmdgbYQ="; }; postPatch = '' diff --git a/pkgs/by-name/fa/fasthenry/package.nix b/pkgs/by-name/fa/fasthenry/package.nix index aaea2c87ae13..4ed15bdff8c0 100644 --- a/pkgs/by-name/fa/fasthenry/package.nix +++ b/pkgs/by-name/fa/fasthenry/package.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: { "-Wno-error=implicit-function-declaration" "-Wno-error=implicit-int" "-Wno-error=return-mismatch" + # gcc15 + "-std=gnu17" ]; makeFlags = [ "all" ]; # need "all" to be explicitely set diff --git a/pkgs/by-name/fd/fdtools/add-skalibs-include.patch b/pkgs/by-name/fd/fdtools/add-skalibs-include.patch new file mode 100644 index 000000000000..3869890cb732 --- /dev/null +++ b/pkgs/by-name/fd/fdtools/add-skalibs-include.patch @@ -0,0 +1,120 @@ +diff --git a/fdtools-2024.12.07/src/check_exit_exec.c b/fdtools-2024.12.07/src/check_exit_exec.c +index 6bb6860..87f26b4 100644 +--- a/fdtools-2024.12.07/src/check_exit_exec.c ++++ b/fdtools-2024.12.07/src/check_exit_exec.c +@@ -3,6 +3,7 @@ + #include + + #include ++#include + #include "prjlibs-c/constants.h" + #include "prjlibs-c/diewarn.h" + #include "check_exit_exec.h" +diff --git a/fdtools-2024.12.07/src/grabconsole.c b/fdtools-2024.12.07/src/grabconsole.c +index 8da1233..316ea95 100644 +--- a/fdtools-2024.12.07/src/grabconsole.c ++++ b/fdtools-2024.12.07/src/grabconsole.c +@@ -4,6 +4,7 @@ + #include + + #include ++#include + #include "prjlibs-c/constants.h" + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" +diff --git a/fdtools-2024.12.07/src/pipecycle.c b/fdtools-2024.12.07/src/pipecycle.c +index 5042a52..652dd69 100644 +--- a/fdtools-2024.12.07/src/pipecycle.c ++++ b/fdtools-2024.12.07/src/pipecycle.c +@@ -5,6 +5,7 @@ + #include + + #include ++#include + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" + #include "prjlibs-c/vec.h" +diff --git a/fdtools-2024.12.07/src/recvfd.c b/fdtools-2024.12.07/src/recvfd.c +index e2de372..197e40e 100644 +--- a/fdtools-2024.12.07/src/recvfd.c ++++ b/fdtools-2024.12.07/src/recvfd.c +@@ -7,6 +7,7 @@ + #include + + #include ++#include + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" + #include "fdtools.h" +diff --git a/fdtools-2024.12.07/src/sendfd.c b/fdtools-2024.12.07/src/sendfd.c +index e5b7236..fc54371 100644 +--- a/fdtools-2024.12.07/src/sendfd.c ++++ b/fdtools-2024.12.07/src/sendfd.c +@@ -7,6 +7,7 @@ + #include + + #include ++#include + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" + #include "fdtools.h" +diff --git a/fdtools-2024.12.07/src/setstate.c b/fdtools-2024.12.07/src/setstate.c +index 723d40f..f6ddcbc 100644 +--- a/fdtools-2024.12.07/src/setstate.c ++++ b/fdtools-2024.12.07/src/setstate.c +@@ -8,6 +8,7 @@ + #include + + #include ++#include + #include "prjlibs-c/constants.h" + #include "prjlibs-c/intattr.h" + #include "prjlibs-c/diewarn.h" +diff --git a/fdtools-2024.12.07/src/statfile.c b/fdtools-2024.12.07/src/statfile.c +index be66988..41131ee 100644 +--- a/fdtools-2024.12.07/src/statfile.c ++++ b/fdtools-2024.12.07/src/statfile.c +@@ -6,6 +6,7 @@ + #include + + #include ++#include + #include "prjlibs-c/constants.h" + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/warn.h" +diff --git a/fdtools-2024.12.07/src/vc-get-linux.c b/fdtools-2024.12.07/src/vc-get-linux.c +index 5263344..52c29ff 100644 +--- a/fdtools-2024.12.07/src/vc-get-linux.c ++++ b/fdtools-2024.12.07/src/vc-get-linux.c +@@ -10,6 +10,7 @@ + #include + + #include ++#include + #include "prjlibs-c/constants.h" + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" +diff --git a/fdtools-2024.12.07/src/vc-lock-linux.c b/fdtools-2024.12.07/src/vc-lock-linux.c +index 0d6cee1..e2112e5 100644 +--- a/fdtools-2024.12.07/src/vc-lock-linux.c ++++ b/fdtools-2024.12.07/src/vc-lock-linux.c +@@ -9,6 +9,7 @@ + #include + + #include ++#include + #include "prjlibs-c/constants.h" + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" +diff --git a/fdtools-2024.12.07/src/vc-switch-linux.c b/fdtools-2024.12.07/src/vc-switch-linux.c +index 6bab00f..59ece24 100644 +--- a/fdtools-2024.12.07/src/vc-switch-linux.c ++++ b/fdtools-2024.12.07/src/vc-switch-linux.c +@@ -10,6 +10,7 @@ + #include + + #include ++#include + #include "prjlibs-c/constants.h" + #include "prjlibs-c/diewarn.h" + #include "prjlibs-c/types.h" diff --git a/pkgs/by-name/fd/fdtools/new-skalibs.patch b/pkgs/by-name/fd/fdtools/new-skalibs.patch deleted file mode 100644 index 76c5396f8a88..000000000000 --- a/pkgs/by-name/fd/fdtools/new-skalibs.patch +++ /dev/null @@ -1,223 +0,0 @@ -diff -Naur misc/fdtools-2020.05.04/src/check_exit_exec.c misc-new/fdtools-2020.05.04/src/check_exit_exec.c ---- misc/fdtools-2020.05.04/src/check_exit_exec.c 2015-03-16 04:55:56.000000000 +0100 -+++ misc-new/fdtools-2020.05.04/src/check_exit_exec.c 2021-01-22 10:50:25.529955213 +0100 -@@ -2,6 +2,7 @@ - #include - #include - -+#include - #include - #include "prjlibs-c/constants.h" - #include "prjlibs-c/diewarn.h" -@@ -14,7 +15,7 @@ - - if (str_equal(arg, ":")) { - ++argv; -- pathexec0((char const**)argv); -+ mexec0((char const**)argv); - DIE1(exec, argv[0]); - } - } -diff -Naur misc/fdtools-2020.05.04/src/grabconsole.c misc-new/fdtools-2020.05.04/src/grabconsole.c ---- misc/fdtools-2020.05.04/src/grabconsole.c 2020-04-24 06:01:22.000000000 +0200 -+++ misc-new/fdtools-2020.05.04/src/grabconsole.c 2021-01-22 10:43:27.887754936 +0100 -@@ -4,6 +4,7 @@ - #include - - #include -+#include - #include "prjlibs-c/constants.h" - #include "prjlibs-c/diewarn.h" - #include "prjlibs-c/types.h" -@@ -26,6 +27,6 @@ - if (fd_grabconsole(fd)!=0) DIE0(tioccons); - - argv+=2; -- pathexec0((char const**)argv); -+ mexec0((char const**)argv); - DIE1(exec, argv[0]); - } -diff -Naur misc/fdtools-2020.05.04/src/pipecycle.c misc-new/fdtools-2020.05.04/src/pipecycle.c ---- misc/fdtools-2020.05.04/src/pipecycle.c 2015-03-16 04:55:56.000000000 +0100 -+++ misc-new/fdtools-2020.05.04/src/pipecycle.c 2021-01-22 10:47:58.033220790 +0100 -@@ -4,6 +4,7 @@ - #include - #include - -+#include - #include - #include "prjlibs-c/diewarn.h" - #include "prjlibs-c/types.h" -@@ -56,7 +57,7 @@ - if (fd_shuffle(2, current, wanted)!=0) DIE0(dup); - } - read(start[0], &j, 1); -- pathexec(args); -+ mexec(args); - DIE1(exec, args[0]); - } - -diff -Naur misc/fdtools-2020.05.04/src/recvfd.c misc-new/fdtools-2020.05.04/src/recvfd.c ---- misc/fdtools-2020.05.04/src/recvfd.c 2020-04-28 09:35:05.000000000 +0200 -+++ misc-new/fdtools-2020.05.04/src/recvfd.c 2021-01-22 10:47:14.180994779 +0100 -@@ -7,6 +7,7 @@ - #include - - #include -+#include - #include "prjlibs-c/diewarn.h" - #include "prjlibs-c/types.h" - #include "fdtools.h" -@@ -69,9 +70,9 @@ - named_fd=duped; - } - buf[int_fmt(buf, named_fd)]='\0'; -- if (pathexec_env(argv[i]+1, buf)==0) DIE0(alloc); -+ if (env_mexec(argv[i]+1, buf)==0) DIE0(alloc); - } - argv+=nfds+1; -- pathexec0((char const**)argv); -+ mexec0((char const**)argv); - DIE1(exec, argv[0]); - } -diff -Naur misc/fdtools-2020.05.04/src/sendfd.c misc-new/fdtools-2020.05.04/src/sendfd.c ---- misc/fdtools-2020.05.04/src/sendfd.c 2015-03-16 06:48:39.000000000 +0100 -+++ misc-new/fdtools-2020.05.04/src/sendfd.c 2021-01-22 10:43:07.207634214 +0100 -@@ -7,6 +7,7 @@ - #include - - #include -+#include - #include "prjlibs-c/diewarn.h" - #include "prjlibs-c/types.h" - #include "fdtools.h" -@@ -40,6 +41,6 @@ - argv+=nfds; - if (*argv==NULL) _exit(0); - ++argv; -- pathexec0((char const**)argv); -+ mexec0((char const**)argv); - DIE1(exec, argv[0]); - } -diff -Naur misc/fdtools-2020.05.04/src/setstate.c misc-new/fdtools-2020.05.04/src/setstate.c ---- misc/fdtools-2020.05.04/src/setstate.c 2020-05-04 10:04:21.000000000 +0200 -+++ misc-new/fdtools-2020.05.04/src/setstate.c 2021-01-22 10:45:05.084304318 +0100 -@@ -8,6 +8,7 @@ - #include - - #include -+#include - #include "prjlibs-c/constants.h" - #include "prjlibs-c/intattr.h" - #include "prjlibs-c/diewarn.h" -@@ -167,6 +168,6 @@ - } - - argv+=2; -- pathexec_run(argv[0], (char const**)argv, (char const**)environ); -+ mexec_ae(argv[0], (char const**)argv, (char const**)environ); - DIE1(exec, argv[0]); - } -diff -Naur misc/fdtools-2020.05.04/src/statfile.c misc-new/fdtools-2020.05.04/src/statfile.c ---- misc/fdtools-2020.05.04/src/statfile.c 2015-03-22 00:33:44.000000000 +0100 -+++ misc-new/fdtools-2020.05.04/src/statfile.c 2021-01-22 10:48:23.673351183 +0100 -@@ -6,6 +6,7 @@ - #include - - #include -+#include - #include "prjlibs-c/constants.h" - #include "prjlibs-c/diewarn.h" - #include "prjlibs-c/warn.h" -@@ -15,7 +16,7 @@ - char const* PROG="statfile"; - - static void set(char const* const var, char const* const val) { -- if (pathexec_env(var, val)==0) DIE0(alloc); -+ if (env_mexec(var, val)==0) DIE0(alloc); - } - - static void set64n(char const* const var, time_t t, unsigned int nsec) { -@@ -178,6 +179,6 @@ - } - - argv+=3; -- pathexec((char const**)argv); -+ mexec((char const**)argv); - DIE1(exec, argv[0]); - } -diff -Naur misc/fdtools-2020.05.04/src/vc-get-linux.c misc-new/fdtools-2020.05.04/src/vc-get-linux.c ---- misc/fdtools-2020.05.04/src/vc-get-linux.c 2020-04-28 07:04:49.000000000 +0200 -+++ misc-new/fdtools-2020.05.04/src/vc-get-linux.c 2021-01-22 10:47:34.649100757 +0100 -@@ -10,6 +10,7 @@ - #include - - #include -+#include - #include "prjlibs-c/constants.h" - #include "prjlibs-c/diewarn.h" - #include "prjlibs-c/types.h" -@@ -38,7 +39,7 @@ - errno=0; - if (ioctl(fd, VT_OPENQRY, &vtnum)<0 || vtnum==-1) DIE0(vt_qry); - bufnum[ulong_fmt(bufnum, vtnum)]='\0'; -- if (pathexec_env("TTY", buf)==0) DIE0(alloc); -+ if (env_mexec("TTY", buf)==0) DIE0(alloc); - } - fd_close(fd); - -@@ -50,12 +51,12 @@ - if (fstat(fd, &statbuf)!=0) DIE1(stat, buf); - buf[ulong_fmt(buf, minor(statbuf.st_rdev))]='\0'; - } -- if (pathexec_env("VCNUM", buf)==0) DIE0(alloc); -+ if (env_mexec("VCNUM", buf)==0) DIE0(alloc); - - buf[ulong_fmt(buf, fd)]='\0'; -- if (pathexec_env("VCFD", buf)==0) DIE0(alloc); -+ if (env_mexec("VCFD", buf)==0) DIE0(alloc); - } - -- pathexec((char const**)argv+2); -+ mexec((char const**)argv+2); - DIE1(exec, argv[2]); - } -diff -Naur misc/fdtools-2020.05.04/src/vc-lock-linux.c misc-new/fdtools-2020.05.04/src/vc-lock-linux.c ---- misc/fdtools-2020.05.04/src/vc-lock-linux.c 2015-03-20 05:59:42.000000000 +0100 -+++ misc-new/fdtools-2020.05.04/src/vc-lock-linux.c 2021-01-22 10:48:36.857417751 +0100 -@@ -8,6 +8,7 @@ - #include - #include - -+#include - #include - #include "prjlibs-c/constants.h" - #include "prjlibs-c/diewarn.h" -@@ -79,7 +80,7 @@ - WARN0(fork); - } else if (pid==0) { - sigprocmask(SIG_SETMASK, &old_set, NULLP); -- pathexec((char const**)argv); -+ mexec((char const**)argv); - DIE1(exec, *argv); - } else { - int status; -diff -Naur misc/fdtools-2020.05.04/src/vc-switch-linux.c misc-new/fdtools-2020.05.04/src/vc-switch-linux.c ---- misc/fdtools-2020.05.04/src/vc-switch-linux.c 2020-04-28 07:14:04.000000000 +0200 -+++ misc-new/fdtools-2020.05.04/src/vc-switch-linux.c 2021-01-22 10:42:41.259480648 +0100 -@@ -10,6 +10,7 @@ - #include - - #include -+#include - #include "prjlibs-c/constants.h" - #include "prjlibs-c/diewarn.h" - #include "prjlibs-c/types.h" -@@ -36,6 +37,6 @@ - if (ioctl(fd, VT_ACTIVATE, ttyno)<0) DIE0(vt_act); - if (!scan) fd_close(fd); - -- pathexec0((char const**)argv+3); -+ mexec0((char const**)argv+3); - DIE1(exec, argv[3]); - } diff --git a/pkgs/by-name/fd/fdtools/package.nix b/pkgs/by-name/fd/fdtools/package.nix index d1a56d54d88f..af7c0e7d3041 100644 --- a/pkgs/by-name/fd/fdtools/package.nix +++ b/pkgs/by-name/fd/fdtools/package.nix @@ -5,53 +5,48 @@ skawarePackages, }: -let +stdenv.mkDerivation (finalAttrs: { pname = "fdtools"; - # When you update, check whether we can drop the skalibs pin. - version = "2020.05.04"; - sha256 = "0lnafcp4yipi0dl8gh33zjs8wlpz0mim8mwmiz9s49id0b0fmlla"; - skalibs = skawarePackages.skalibs_2_10; - -in -stdenv.mkDerivation { - inherit pname version; + version = "2024.12.07"; src = fetchurl { - url = "https://code.dogmap.org/fdtools/releases/fdtools-${version}.tar.bz2"; - inherit sha256; + url = "https://code.dogmap.org/fdtools/releases/fdtools-${finalAttrs.version}.tar.bz2"; + hash = "sha256-URK5FBpCbhcp2haug0lWtc9wOvwJHPTWZe4u8HDeaYc="; }; - patches = [ ./new-skalibs.patch ]; + patches = [ + ./add-skalibs-include.patch + ]; + outputs = [ "bin" "lib" "dev" + "man" "doc" "out" ]; buildInputs = [ - # temporary, until fdtools catches up to skalibs - skalibs + skawarePackages.skalibs ]; configurePhase = '' - cd fdtools-${version} - sed -e 's|gcc|$CC|' \ - conf-compile/defaults/host_link.sh \ - > conf-compile/host_link.sh - sed -e 's|gcc|$CC|' \ - conf-compile/defaults/host_compile.sh \ - > conf-compile/host_compile.sh - - echo "${skalibs.lib}/lib/skalibs/sysdeps" \ - > conf-compile/depend_skalibs_sysdeps + cd fdtools-${finalAttrs.version} + substituteInPlace conf-compile/defaults/host_compile.sh \ + --replace-fail "gcc" "$CC" + substituteInPlace conf-compile/defaults/host_link.sh \ + --replace-fail "gcc" "$CC" + echo "${skawarePackages.skalibs.lib}/lib/skalibs/sysdeps" > conf-compile/defaults/depend_skalibs_sysdeps ''; buildPhase = '' bash package/build ''; + # gcc15 + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + installPhase = '' mkdir -p $bin/bin tools=( grabconsole multitee pipecycle recvfd seek0 sendfd setblock setstate statfile vc-get vc-lock vc-switch ) @@ -62,11 +57,15 @@ stdenv.mkDerivation { mkdir -p $lib/lib mkdir -p $dev/include + mkdir -p $man/share/man/man1 + mkdir -p $man/share/man/man8 docdir=$doc/share/doc/fdtools mkdir -p $docdir mv library/fdtools.a $lib/lib/fdtools.a mv include/fdtools.h $dev/include/fdtools.h + mv man/man1/* $man/share/man/man1/ + mv man/man8/* $man/share/man/man8/ ${ skawarePackages.cleanPackaging.commonFileActions { @@ -98,4 +97,4 @@ stdenv.mkDerivation { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index 3e446b9873c7..c97171567097 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -99,13 +99,13 @@ let in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "fex"; - version = "2603"; + version = "2604"; src = fetchFromGitHub { owner = "FEX-Emu"; repo = "FEX"; tag = "FEX-${finalAttrs.version}"; - hash = "sha256-rQOqziJ7IizJV3VmAWGo5s2xn2/xnp0sx3VfBtH1JK4="; + hash = "sha256-VPlw15vM3wowgba9Z95F/vRYJLaevtt8lJEgw4hYS8w="; leaveDotGit = true; postFetch = '' diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix index 3042d01b5e21..fc4a1e38ebfa 100644 --- a/pkgs/by-name/ff/ffizer/package.nix +++ b/pkgs/by-name/ff/ffizer/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ffizer"; - version = "2.13.8"; + version = "2.13.9"; buildFeatures = [ "cli" ]; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "ffizer"; repo = "ffizer"; rev = finalAttrs.version; - hash = "sha256-TV1+bupdJFmq72F4MbqyyvE/p9PufdeOUo24mPYvuAc="; + hash = "sha256-7nTtyCtppUZ3vEtiDfDMCvDztZRVDFH43bl5fgZtfFM="; }; - cargoHash = "sha256-iEdNyzY4fzfQkayXIKthv4ofl11+U2KfV63VvXrR6HQ="; + cargoHash = "sha256-/BdODBhF+ikre/U1TzB+/DqSs7LYn7NhPKgMJT80TUM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 01cdd4d95fa3..819485de8af4 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -11,17 +11,17 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "15.13.0"; + version = "15.14.0"; nodejs = nodejs_22; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-5uamK+vP4bdkm7uwtVc6MoKR6XJ5vDk3jj3Q4dy5TdM="; + hash = "sha256-0jkeO8S47kxxnBLwaaeoc5QJobZpZjTR85kgkCZyIiQ="; }; - npmDepsHash = "sha256-PdV62ktNB8Tz88ea2rQZ8+y+akmw33zhWMe0L0lHo88="; + npmDepsHash = "sha256-T2tB+kOYYdt048Y6ONrRDWUd4OLJGdOd59LdNIhVLMQ="; # No more package-lock.json in upstream src postPatch = '' diff --git a/pkgs/by-name/fl/fladder/package.nix b/pkgs/by-name/fl/fladder/package.nix index 6d0c5fb6aaf4..f5fd73a3a53e 100644 --- a/pkgs/by-name/fl/fladder/package.nix +++ b/pkgs/by-name/fl/fladder/package.nix @@ -22,13 +22,13 @@ in flutter.buildFlutterApplication (finalAttrs: { pname = "fladder"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "DonutWare"; repo = "Fladder"; tag = "v${finalAttrs.version}"; - hash = "sha256-D2FFIBRWi66TRB4LkUWZu/jc+edVXo70FZDzGFh11Wk="; + hash = "sha256-0eFHylRi2UVaKRG7K3tDZVscgoiL5xFrtFhZiJxj4Mk="; }; inherit targetFlutterPlatform; diff --git a/pkgs/by-name/fl/fladder/pubspec.lock.json b/pkgs/by-name/fl/fladder/pubspec.lock.json index ccddce04be62..272ea5e91c8f 100644 --- a/pkgs/by-name/fl/fladder/pubspec.lock.json +++ b/pkgs/by-name/fl/fladder/pubspec.lock.json @@ -90,6 +90,16 @@ "source": "hosted", "version": "0.18.18" }, + "audio_service_mpris": { + "dependency": "direct main", + "description": { + "name": "audio_service_mpris", + "sha256": "fdab1ae1f659c6db36d5cc396e46e4ee9663caefa6153f8453fcd01d57567c08", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "audio_service_platform_interface": { "dependency": "transitive", "description": { @@ -2968,6 +2978,16 @@ "source": "hosted", "version": "15.0.2" }, + "volume_controller": { + "dependency": "direct main", + "description": { + "name": "volume_controller", + "sha256": "5c1a13d2ea99d2f6753e7c660d0d3fab541f36da3999cafeb17b66fe49759ad7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.1" + }, "wakelock_plus": { "dependency": "direct main", "description": { diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json index 65609014a811..1ea222b79fd7 100644 --- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json @@ -1,21 +1,21 @@ { - "version": "12.12.0", + "version": "12.12.1", "sources": { "aarch64-linux": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.0/floorp-linux-aarch64.tar.xz", - "sha256": "0ca2c2e80ee569a8d2bcbcac64e28e33e6aa5ece91faf8b9755189c34a71af9a" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-linux-aarch64.tar.xz", + "sha256": "07679b57ccb91b00c5de863e7170f89c9f929190b1b10f6a9c449c3d634fed22" }, "x86_64-linux": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.0/floorp-linux-x86_64.tar.xz", - "sha256": "a6f61ad904e8229ca4e709a30d38f2a0e6926dc3f82ddbe24efb8e0c1ba51910" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-linux-x86_64.tar.xz", + "sha256": "7f50d5d805e3acd401b933aa039d01712237d975c5d8306d46006ae2363d3080" }, "aarch64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.0/floorp-macOS-universal.dmg", - "sha256": "d5fc6ea7c98514e304cdfe192d8df6c253b8d6b248b39cb41486f6e67a8b566e" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-macOS-universal.dmg", + "sha256": "5a62aedda78804344ddde080747c9853023f13472db501f6de8b9078734f62dd" }, "x86_64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.0/floorp-macOS-universal.dmg", - "sha256": "d5fc6ea7c98514e304cdfe192d8df6c253b8d6b248b39cb41486f6e67a8b566e" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-macOS-universal.dmg", + "sha256": "5a62aedda78804344ddde080747c9853023f13472db501f6de8b9078734f62dd" } } } diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 7941ab8de3b5..29bdc8b57b96 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -12,6 +12,7 @@ bash, brotli, buildGoModule, + fetchpatch, forgejo, git, gzip, @@ -82,8 +83,15 @@ buildGoModule rec { patches = [ ./static-root-path.patch + ] + ++ lib.optionals (lib.versionAtLeast version "14") [ + # Backport fix for flaky TestBleveDeleteIssue test from v15. + # https://codeberg.org/forgejo/forgejo/pulls/11686 + (fetchpatch { + url = "https://codeberg.org/forgejo/forgejo/commit/a32b0da87c10bb628a9d2203b700f0683e1ae966.patch"; + hash = "sha256-mY1b35aKsiLNU56Ut/qiLrYj+IR8M2W8dZQiDqkDNxg="; + }) ]; - postPatch = '' substituteInPlace modules/setting/server.go --subst-var data ''; diff --git a/pkgs/by-name/ga/gaiasky/deps.json b/pkgs/by-name/ga/gaiasky/deps.json new file mode 100644 index 000000000000..12093fac0c09 --- /dev/null +++ b/pkgs/by-name/ga/gaiasky/deps.json @@ -0,0 +1,705 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/dorongold/task-tree#com.dorongold.task-tree.gradle.plugin/1.5": { + "pom": "sha256-4xyBsV9WhgwF/U9gbLUN2LS/dAKMjFnNxpm2zDkf6P8=" + }, + "com/install4j/gradle#com.install4j.gradle.gradle.plugin/10.0.4": { + "pom": "sha256-5t8tFC+QyevrTTAyLxxvqw5sS1jMf8pEOt7reTZdjlM=" + }, + "de/undercouch#gradle-download-task/4.1.1": { + "jar": "sha256-6wi1cOQI1GRnBecKlJYU1DnqKxFFXxZSqwMw3olU2rk=", + "pom": "sha256-EQnx9xpUJU1ZAzfYudRD+d/AhyjJwdgzVlXMHcyIwLk=" + }, + "de/undercouch/download#de.undercouch.download.gradle.plugin/4.1.1": { + "pom": "sha256-ZL5TPFcSdn44nrLPbMK7AEWaIYKe0GgABNB6m/ZnZxk=" + }, + "gradle/plugin/com/dorongold/plugins#task-tree/1.5": { + "jar": "sha256-2OkT94ZPnHnepZi0Y+jUC8NBGcMfqKDOhn+1ImbgXbE=", + "pom": "sha256-UEdWODez5k6Xo92EIPC1ACNCh5e5ncC3VDwWmRQKuOE=" + }, + "gradle/plugin/install4j/install4j/buildtools#gradle_publish/10.0.4": { + "jar": "sha256-C5ZW/6DU1Ifu90gbn9EjcR8h2a4916qAIhWRqKIBmIs=", + "pom": "sha256-thQQBx7ICgYZ4KaXE1xNHBaooGaNdFbqLd/bdAf5caE=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache/commons#commons-lang3/3.4": { + "jar": "sha256-c0yDVkIMyOMMeV1k/R/NXUTqnZA0KizDJixRWPvG2Ys=", + "pom": "sha256-aG51tWGhPBAx1Dp2R6Nk4u0+RWRnBQ6sRSe5SwbXP9E=" + }, + "org/apache/commons#commons-parent/37": { + "pom": "sha256-7nBaTdaNjc2cyNEknVeQhh6xRc57DG1sBVW6lEidAUs=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/ashley#ashley/1.7.4": { + "jar": "sha256-rWYs2Phggwg9JTFUz2s8iqbVwyZqAdtzC7wVPzgd7AY=", + "pom": "sha256-CFY3K/mrzzG5nEJyvdKVSk/VNREmZoEjU2BXypnIbrk=" + }, + "com/badlogicgames/gdx#gdx-backend-headless/1.14.0": { + "jar": "sha256-SGB+tPWO6Qv71k7R7pVEFdSjpBgeztGBJ8hvzEctReA=", + "module": "sha256-SEk2JSR0I+p4QeM8k+ErfA431tSNtp2IakKWtV4CoRU=", + "pom": "sha256-yr3W7B8wZORINnp0/fSnHeBlEUxXYZjPYNJyPU9adZY=" + }, + "com/badlogicgames/gdx#gdx-backend-lwjgl/1.14.0": { + "jar": "sha256-/nw64TfZPXE/wc8ANpufAr6L8UUDZsA5o72xRGHIhw0=", + "module": "sha256-xo30ns0TsOBARrW6qDU7PVUpn4Fplr7ibZzYIs4Levc=", + "pom": "sha256-SW7lWkTcwyR/IN2al9JrUj1R2OukznTGmD4TYc26qcs=" + }, + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.14.0": { + "jar": "sha256-3pV68nyhyv+3eO2hqNMbmDXcc/AEcB0WduyjOWMHICA=", + "module": "sha256-GJYW7PSrxbXLJMt1Xwc+IsogkUv4ojCdFdJ/fnpoyOU=", + "pom": "sha256-S+xaAWtXxkg0Rruzr4XV0V9f4gedhSpnTcVLMOWd9pY=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.14.0": { + "jar": "sha256-Pr/nUymeEYNLyIzzxMDCzIucJDWsA+VgsKh2QlZYK7Q=", + "module": "sha256-fUf8X7lgc5I5ddUqrgMuACcJ144JKU/wOK6K3R7W44A=", + "pom": "sha256-Rtq9qlQ6ZRDgUGOMNmphRdkGkbIaBiEf+rSbICMyQiw=" + }, + "com/badlogicgames/gdx#gdx-jnigen-loader/2.5.2": { + "jar": "sha256-34HyPP1nhcUtNeEI7qo5MPVZ1NJ3CmEC51ynv6b58no=", + "module": "sha256-jwtii5G9Ez24XxUuFZMprPf0tmeDvR32AcNZfcJRIiQ=", + "pom": "sha256-i0dgu2bbPz+ZuEBj7z6ZDWOhzZx81XSlatf07kvRdoc=" + }, + "com/badlogicgames/gdx#gdx-platform/1.14.0": { + "pom": "sha256-2Ps74A82eRr6thqFkeVCr7qkkQEHoFdUnMlwBu2NoRs=" + }, + "com/badlogicgames/gdx#gdx-platform/1.14.0/natives-desktop": { + "jar": "sha256-qKjJzM9endUYJWs8315raJpdaWoU4EYK9bDLxR218vE=" + }, + "com/badlogicgames/gdx#gdx-tools/1.14.0": { + "jar": "sha256-mFojYX283g1etx+inPrqxhIyKNuO3d7a1dtbrj7zCdk=", + "module": "sha256-WaTmiYUVjiaNYnc1UGg1uUHGArjMjss2qOsTAh3D+kI=", + "pom": "sha256-ekR09L0ek+WK/Dm4QDs8ZptSItbq3E88ZrD1Q8TmG8Q=" + }, + "com/badlogicgames/gdx#gdx/1.14.0": { + "jar": "sha256-owWJXpFfxfWUg95dOZokoMpi/hFQFf/oIQw249ZPgSY=", + "module": "sha256-xJCoyufsdrraEiLaEyJl5fqyyyzc3q51IXrIhkmUWyU=", + "pom": "sha256-CiUFNinRwfRgZMN7orOC0MRmQstKTssVF3jbNXEKmgw=" + }, + "com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.3": { + "jar": "sha256-mONKsUmJoPsqyIG6IaxNEqbOTeQoPzmypPFlumEqOlA=", + "pom": "sha256-UFwJ02ifZMr31qLz/PeKizwEFLIuRH4BlTHJDBCqmGU=" + }, + "com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.3": { + "jar": "sha256-UkirjqKl+0SixFdVEQLsNAP/JYm6hKImCti8cv6X6oM=", + "pom": "sha256-yc9KDEo6Bu+vBLORaza3fL3F71YdCpy6GhdiPxH8Tt8=" + }, + "com/badlogicgames/jamepad#jamepad/2.0.20.0": { + "jar": "sha256-6fFqB9SpRCSs0DiOw6P+TsZLfhiWxlgUwv9rRisTs2Y=", + "module": "sha256-vXFX36GUJsdj2VgYbnHR3+lKnBRgBeEI9pwUameDrmY=", + "pom": "sha256-+gwaoDndosNqw/VslH3vLEOptLnkbCPhrqddHQaZ3eQ=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml#oss-parent/70": { + "pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk=" + }, + "com/fasterxml/jackson#jackson-base/2.20.2": { + "pom": "sha256-2h3M8cF7Sx/XPEiKaRH93ekBcrRvgbbdbUchrAgzDfQ=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-bom/2.20.2": { + "pom": "sha256-izQ6yh3LT3KLlMxzgxmYMOPTorDQdzQ3h+7iIAkYtB4=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/jackson#jackson-parent/2.20": { + "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U=" + }, + "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/core#jackson-core/2.20.2": { + "jar": "sha256-YbhaQbvDM+bbO3ck1an/UBHsX56xzuQeYiQgvG4OQTE=", + "module": "sha256-sYxSWUiGF4L+YKs7Z7fAYj8BCGZdSHPoXKCVwZBMRC4=", + "pom": "sha256-Hvbw4LWflUdfUMcGuUPw9AKZM8KUd1bfV2MVIIJ8n0k=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.20.2": { + "jar": "sha256-EZVz/GzrJbJrsDK7WIjn/YpOkzmHloo4glOgF9rLXlQ=", + "module": "sha256-AZgSiK3esDDuVzZeueuGxmW3QCStl/EhvgaSFV7s6Fw=", + "pom": "sha256-lENiw258gC/9Y7MgVi3skwEMhobnqzRddIGgxBJDdb4=" + }, + "com/fasterxml/jackson/core/jackson-databind/maven-metadata": { + "xml": { + "groupId": "com.fasterxml.jackson.core", + "lastUpdated": "20260320165217", + "release": "2.21.2" + } + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.20.2": { + "jar": "sha256-pitcqgneC5fkMtAMdZuLJBeRJEvqDoLWSxRra0kPd58=", + "module": "sha256-ms2p4hxHgeHIYpjkEpfZvxX7kjJ1qQ+CPux4pcThxzI=", + "pom": "sha256-Sd0bFAMmAn3uHCRqWwjwGZEdaxPCPQC9H/H8cQP6XYI=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.20.2": { + "pom": "sha256-uJ9hJjw2ipUFbIeWVWuZAbupKiZ/fZ2WhL5nJOo4GUI=" + }, + "com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/maven-metadata": { + "xml": { + "groupId": "com.fasterxml.jackson.dataformat", + "lastUpdated": "20260320170529", + "release": "2.21.2" + } + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.20.2": { + "jar": "sha256-/1laPPAJolZwyS0vaTnj/+1M2zfLoNBPYZ5+1Dzouhs=", + "module": "sha256-xE++kmmtbMtw3gmf9fq2d6Te/LtiW7zhQCgFnRS0CHY=", + "pom": "sha256-eW8zaKlRawvRBQ6CiZm3JzhD0FrBOEmATFxDSGlYMEg=" + }, + "com/fasterxml/jackson/datatype/jackson-datatype-jsr310/maven-metadata": { + "xml": { + "groupId": "com.fasterxml.jackson.datatype", + "lastUpdated": "20260320172128", + "release": "2.21.2" + } + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.20.2": { + "pom": "sha256-0TLemnPo0XcwvbbLj1DBJAs4781JX+REDBN6TUmLWPY=" + }, + "com/github/oshi#oshi-core-java11/6.9.3": { + "jar": "sha256-r10YyzErc2Xle85d40vIn/WDv6wZwwdDlZI2Ey+zMUM=", + "pom": "sha256-0U+6Legj2vhW+Fbkl79eYyDdcL10V7+Eiu/wA1fWiZ4=" + }, + "com/github/oshi#oshi-parent/6.9.3": { + "pom": "sha256-LpfRn458Dn6eh5Pe1pPrNQ2OKKdiZ03rRmKTw2B0EA4=" + }, + "com/github/oshi/oshi-core-java11/maven-metadata": { + "xml": { + "groupId": "com.github.oshi", + "lastUpdated": "20260222224520", + "release": "6.10.0" + } + }, + "com/sparkjava#spark-core/2.9.4": { + "jar": "sha256-mfRxdpUYTims4kc1vFOadJd3VFKzgbgIAzWtrjqYXDo=", + "pom": "sha256-AsTWio2fjTTxGyyXUABlkZWfUiKIf8vmxw3PK7S3Yhk=" + }, + "com/sparkjava/spark-core/maven-metadata": { + "xml": { + "groupId": "com.sparkjava", + "lastUpdated": "20220710072313", + "release": "2.9.4" + } + }, + "commons-io#commons-io/2.21.0": { + "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=", + "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas=" + }, + "commons-io/commons-io/maven-metadata": { + "xml": { + "groupId": "commons-io", + "lastUpdated": "20251112172346", + "release": "2.21.0" + } + }, + "javax/servlet#javax.servlet-api/3.1.0": { + "jar": "sha256-r0VrLdQcToLPVPPnQ7xniXPZ/jW9TTBx+gXH5TM7hII=", + "pom": "sha256-sxEJ4i6j8t8a15VUMucYo13vUK5sGWmANK+ooM+ekGk=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "junit/junit/maven-metadata": { + "xml": { + "groupId": "junit", + "lastUpdated": "20210213164433", + "release": "4.13.2" + } + }, + "net/jafama#jafama/2.3.2": { + "jar": "sha256-9VULupxuFHMcRUICQYC0xDCyb48vtwyt9wmk3m8HaZE=", + "pom": "sha256-9MYWz/x0UCwfklUFrjvApInTBlApiWGaRbGqyXzqtAU=" + }, + "net/jafama/jafama/maven-metadata": { + "xml": { + "groupId": "net.jafama", + "lastUpdated": "20200818215213", + "release": "2.3.2" + } + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java/dev/jna#jna-jpms/5.18.1": { + "jar": "sha256-RKxmAoCCMvPelQp9Dum4xrmec3M7aUYeZDV2YHvnTbY=", + "pom": "sha256-WT8axHM+AsCT6K6oru0pgZBPOYzWqJrk7nWd7JgcQHM=" + }, + "net/java/dev/jna#jna-platform-jpms/5.18.1": { + "jar": "sha256-uCN2ZbQ/4Dmq3tgc46+rc+k6xqEz+qYNZ5a8hl0fPVc=", + "pom": "sha256-WIXRZhANaXGGBOmbIVjmUW5gjfnVyuU+pFNGn+G2VQI=" + }, + "net/java/jinput#jinput/2.0.5": { + "jar": "sha256-ebWk9YKeGkmkFXEff7jrW5rSLe+nKSn9otqW7DDT8Bg=", + "pom": "sha256-MZnVR8EnXoBuDHvhnpDcsA2VYew7MfsueA4S19h4WBA=" + }, + "net/java/jutils#jutils/1.0.0": { + "jar": "sha256-wzNP85zwqztUklYZEBBUyQCYt8czseeDTHt15MQehKU=", + "pom": "sha256-rwnq1OskFHPn7E0VKpGnIuoJpxeiAuIOSzherDIXt9Y=" + }, + "net/sf/py4j#py4j/0.10.9.9": { + "jar": "sha256-vExLHnMasYSWzG6rMec1NwGzL8XDBHdkoGVqz1NEpUs=", + "pom": "sha256-31SUmVHkWbGH94AlisBunpPkQExDTOcqKcuBcxcl2YY=" + }, + "net/sf/py4j/py4j/maven-metadata": { + "xml": { + "groupId": "net.sf.py4j", + "lastUpdated": "20250115035634", + "release": "0.10.9.9" + } + }, + "org/apache#apache/3": { + "pom": "sha256-OTxQr7S3qm61flN3pVoaBhCxn3W1Ls4BMI2wShGHog4=" + }, + "org/apache#apache/35": { + "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" + }, + "org/apache/commons#commons-parent/91": { + "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI=" + }, + "org/apache/xmlrpc#xmlrpc/3.0": { + "pom": "sha256-3wCwRZNDpADXSXtc0zlwDrMpm5Ct90iXLOex7mgPxeo=" + }, + "org/eclipse/jetty#jetty-client/9.4.48.v20220622": { + "jar": "sha256-f4n+CQDTaylidZmZkqatdtUjvjVIfWE9j7VkNMNNHRU=", + "pom": "sha256-OSA2kd2VgRwPG+hmGM/WTFAo1p65J9k3J8edC+oxSL4=" + }, + "org/eclipse/jetty#jetty-http/10.0.24": { + "jar": "sha256-mrW9iKZURpoX92j+Yo1j1cZgQJ25y4KhErPzBDzycGM=", + "pom": "sha256-UsL1pGnrzU6zp2+W2y4/E3yY+a7mMi09a4G2gu7PVX0=" + }, + "org/eclipse/jetty#jetty-io/10.0.24": { + "jar": "sha256-KOq4v0K06pwl10uB4QHLDTOThW+v3nKSsP6T5ViDnWk=", + "pom": "sha256-FB5YNJUhWlKd0BhdB4624pBKsX4w2bVZtEL8QJfnTMA=" + }, + "org/eclipse/jetty#jetty-project/10.0.24": { + "pom": "sha256-4tzZrkzDC1n8yU6Se5b4VITwELkgP0csL8ckW/qtpsU=" + }, + "org/eclipse/jetty#jetty-project/9.4.48.v20220622": { + "pom": "sha256-FbdNVsPlVmSwLSTTgVjn0fv3mNByUikGForINWu1MxQ=" + }, + "org/eclipse/jetty#jetty-security/9.4.48.v20220622": { + "jar": "sha256-QwObD1ihVqfxubd1Ctgvf83V26gXF7lww4HLG4YY/3M=", + "pom": "sha256-7uGWWTNHz+4hyRK0miahPdh9XSe9zCXeK5qB4dXTOVw=" + }, + "org/eclipse/jetty#jetty-server/10.0.24": { + "jar": "sha256-Lcda0K0yWtVHcgn1RLCqYSbOPB9dW6ySujN5RiswToo=", + "pom": "sha256-3uTI8hjp1nlA+lUOtr1tZF52xezpL+JYFQWHiZyxjhg=" + }, + "org/eclipse/jetty#jetty-servlet/9.4.48.v20220622": { + "jar": "sha256-6rw29D+0CAt9AuH7ytC0N+A1063Hv9eomzzesiJH5oI=", + "pom": "sha256-X1g2Z8jQ4oFGStAgKC/LKZLwAQYzJ2wjgDdTxv1KB2s=" + }, + "org/eclipse/jetty#jetty-util-ajax/9.4.48.v20220622": { + "jar": "sha256-tdS0C+PPn0iz1fjlkYBmckpiDLkBaEk5yfHdfsG5MMs=", + "pom": "sha256-cAr7YtOLSreYETt8qT95en5/CIdI0TUcxyqWHZjzscc=" + }, + "org/eclipse/jetty#jetty-util/10.0.24": { + "jar": "sha256-DU/TEicDD+RJM7CQUlV7rUHiRzD+MdEe5sVwDPthV8c=", + "pom": "sha256-d1/yq9Nmph9Sy0op6xKSmSNykgJzPtfUoeea2ukIxIU=" + }, + "org/eclipse/jetty#jetty-webapp/9.4.48.v20220622": { + "jar": "sha256-vbM91+mjDqQo8wEBDQjH9ps37HXdo0C3mobpUUn+wLI=", + "pom": "sha256-J80ozVISLXqgXAGJ8NE4T2pD+0a1eNIEFuaA7dpXN6o=" + }, + "org/eclipse/jetty#jetty-xml/10.0.24": { + "jar": "sha256-rJpv6i8HyYA7JQhpYU0hhDBBH8NsuNFst0joR7MGPkw=", + "pom": "sha256-lN23TmF++OX3DARC2xX+9vBF6vVrlhZk3g++yScVTfk=" + }, + "org/eclipse/jetty/toolchain#jetty-servlet-api/4.0.6": { + "jar": "sha256-2Qvx+KnSuon0UQu1HhUW3PlO9twDTgDyM2VKvdePIhA=", + "pom": "sha256-KKIk7vRpg8fQbJBi8LZPd4mS8Pv2vdQWo/mDFi/oe1c=" + }, + "org/eclipse/jetty/toolchain#jetty-toolchain/1.7": { + "pom": "sha256-fBUyYiRwoMyrB+BsbFgpD/GyWDas8txeepGo1th6WO4=" + }, + "org/eclipse/jetty/websocket#websocket-api/9.4.48.v20220622": { + "jar": "sha256-h/sFIyTWxeIvWPtykWmRO7MY2XkhEVZAw9ykU8frGeE=", + "pom": "sha256-2C+ObiJ6QUvCYIhINrcjRoK+ib9ndtRvcgDQq/M/KBY=" + }, + "org/eclipse/jetty/websocket#websocket-client/9.4.48.v20220622": { + "jar": "sha256-Qy2dhXNL6Ky9vDZWIA0rHVQFdMm+vgtPdaP4u+QCovE=", + "pom": "sha256-V6FtOFDeWfQ8EsA/Zowtt25xtklqSSFQoVjXv/3Q4/c=" + }, + "org/eclipse/jetty/websocket#websocket-common/9.4.48.v20220622": { + "jar": "sha256-H2MDOefn9t5df0f5SWSV12ia1B/BFWWq8Rzp4i/2zNo=", + "pom": "sha256-btH5KPia+fgIplY37EKf8KAVH5/SnXYlnR+hs971fqc=" + }, + "org/eclipse/jetty/websocket#websocket-parent/9.4.48.v20220622": { + "pom": "sha256-fvaqA3kZ6pMHcvRo4Tw/P8ZzQ97XnuK33UadWJz2tQ0=" + }, + "org/eclipse/jetty/websocket#websocket-server/9.4.48.v20220622": { + "jar": "sha256-Mq0Ys8YQpQNsM9LmvfdutGdZ+44GdIPXqW+U45CaQoU=", + "pom": "sha256-JvEr9q38ZYrvTOYu0uPoJ500TYQY/+t9W6EF3q3rLQc=" + }, + "org/eclipse/jetty/websocket#websocket-servlet/9.4.48.v20220622": { + "jar": "sha256-KK7qmsM6P20i4x7SpgeavDXOPsHVyA4cwThZ9TZoCyU=", + "pom": "sha256-khaOUN5lPNstvGkW4FRZSuty0KKwuU0NULPga1bV9Lc=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/infinispan#infinispan-bom/11.0.15.Final": { + "pom": "sha256-Bzhu5iyEZGGHcNIJ+MBg2o5R9W52MU0bKcrsnDAhMOk=" + }, + "org/infinispan#infinispan-bom/11.0.19.Final": { + "pom": "sha256-OmBv0rX3f991rPM15brdRnxCQFsR8mjnPBfrkkM+WhE=" + }, + "org/infinispan#infinispan-build-configuration-parent/11.0.15.Final": { + "pom": "sha256-svgt1nDnDzeKeA7+oQU/DmYKgl27/oxsqMqZbf3jqqA=" + }, + "org/infinispan#infinispan-build-configuration-parent/11.0.19.Final": { + "pom": "sha256-EghgxWpNd7zBIjy650Dusm8vk1XUmhfV8WWADuCvqno=" + }, + "org/jboss#jboss-parent/36": { + "pom": "sha256-AA3WFimK69IanVcxh03wg9cphCS5HgN7c8vdB+vIPg4=" + }, + "org/jcommander#jcommander/2.0": { + "jar": "sha256-Yvwe3ArESwM9cGmEQ3UONv/rhzhssdeylLDqNDhOEiw=", + "module": "sha256-cnpzaYXHVZ6A3O6EQqd4SWAuzdb/9wGD5/7jIhaljIA=", + "pom": "sha256-pUoNL5BnLA3bVhrlKYANm1BjcqDNcoWwgm5jwxbC4aA=" + }, + "org/jcommander/jcommander/maven-metadata": { + "xml": { + "groupId": "org.jcommander", + "lastUpdated": "20251005133523", + "release": "3.0" + } + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20231013": { + "jar": "sha256-DxgZLfKJEU4XqhoNCn+DcsyfXH5Pfjmtz4kG/nFPp9M=", + "pom": "sha256-xQBAI9OfVGNbNbvrQOIaKtVR/KDy41Cxzje9DnyypGY=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.13.4": { + "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", + "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" + }, + "org/junit#junit-bom/5.14.3": { + "module": "sha256-8lxAv6Usi3tCXVdqiPMQ9kMmFtYrpYkyA/on37yfAl4=", + "pom": "sha256-CKAoVuSHyTV/mynjh0X4roBYSBEectFarQNSM48WMuE=" + }, + "org/junit#junit-bom/5.8.2": { + "module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=", + "pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI=" + }, + "org/junit/platform#junit-platform-commons/1.14.3": { + "jar": "sha256-nrUkMrrvx96X2931GTlFa5wnLGvcuPtTXgQFxnD5aug=", + "module": "sha256-jSmgMoScAVIwjhniozdHwT2rXzEv/y+IqUI+tHfOPew=", + "pom": "sha256-OwPQael9K60RG+KcAMxakxM1TbZEnSSV6IftDGCay7Q=" + }, + "org/junit/platform#junit-platform-engine/1.14.3": { + "jar": "sha256-Fru/f1wvUxuXxIscbzUdc4pB2ICcc7ETZFfq132lEBk=", + "module": "sha256-fB2knsr3aLbtt3Hpdwz2BuZrYH0laWAIsC/qZNvHmw0=", + "pom": "sha256-DILRT45B5FV9HoyD4xIZv/Q9RPgqYWH92CiyjyGXt6w=" + }, + "org/junit/platform#junit-platform-launcher/1.14.3": { + "jar": "sha256-mysktqj5wR1cuWdoQ9o4JCccjhfIVXtcWHBA5ZiYlxk=", + "module": "sha256-HmYSmOheYI5fnH1m5x7u2vZVBgvOtjmgV/Blo+Bb8ko=", + "pom": "sha256-nEiAqHeA2ru2Bb/JXCdJSgq0UPHVo2wdkKDrI2gRQy0=" + }, + "org/junit/platform/junit-platform-launcher/maven-metadata": { + "xml": { + "groupId": "org.junit.platform", + "lastUpdated": "20260215134929", + "release": "6.1.0-M1" + } + }, + "org/kamranzafar#jtar/2.3": { + "jar": "sha256-Tl1CaBOkQm5ayodKsGzQHF3lOQTgFH84aYtzatUZ3aI=", + "pom": "sha256-OQpqECEhz9A+sxssJUuPFsFLmXxAetrmLGDZ6c82Fx0=" + }, + "org/kamranzafar/jtar/maven-metadata": { + "xml": { + "groupId": "org.kamranzafar", + "lastUpdated": "20150913184343", + "release": "2.3" + } + }, + "org/lwjgl#lwjgl-glfw/3.3.3": { + "jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=", + "pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": { + "jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": { + "jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": { + "jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": { + "jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": { + "jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": { + "jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": { + "jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3": { + "jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=", + "pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": { + "jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": { + "jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": { + "jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": { + "jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": { + "jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": { + "jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": { + "jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3": { + "jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=", + "pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux": { + "jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": { + "jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": { + "jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos": { + "jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": { + "jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows": { + "jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": { + "jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3": { + "jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=", + "pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": { + "jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": { + "jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": { + "jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": { + "jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": { + "jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": { + "jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": { + "jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw=" + }, + "org/lwjgl#lwjgl-openxr/3.3.3": { + "jar": "sha256-E+969MnOTjdYsM5ByI4VLhTEh0vl4tGsppYavczRg9E=", + "pom": "sha256-SkwDiJ3wZ82m8tTNsH4q1iNQjXZWOa1t11anDgjVO5U=" + }, + "org/lwjgl#lwjgl-openxr/3.3.3/natives-linux": { + "jar": "sha256-rDXKthXnXV6cUIK//LePHUkRJSgbZcRgSW37MPPOTQE=" + }, + "org/lwjgl#lwjgl-openxr/3.3.3/natives-windows": { + "jar": "sha256-IiK8TfaQIYjIF/p32/cKve/ILmmhaAryKSiuc+vDJGs=" + }, + "org/lwjgl#lwjgl-stb/3.3.3": { + "jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=", + "pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux": { + "jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": { + "jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": { + "jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos": { + "jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": { + "jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows": { + "jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": { + "jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4=" + }, + "org/lwjgl#lwjgl/3.3.3": { + "jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=", + "pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux": { + "jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": { + "jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": { + "jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos": { + "jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": { + "jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows": { + "jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows-x86": { + "jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k=" + }, + "org/lwjgl/lwjgl#lwjgl-platform/2.9.3": { + "pom": "sha256-nDHMj8YNGCqTE3mllKRBsr3Y3it+I3dVgGO6CRfSH0Q=" + }, + "org/lwjgl/lwjgl#lwjgl-platform/2.9.3/natives-linux": { + "jar": "sha256-veHBUSXWaPShor6ZbI5MwbKZdIgD/o/pzTZ9TfpMBSo=" + }, + "org/lwjgl/lwjgl#lwjgl-platform/2.9.3/natives-osx": { + "jar": "sha256-p+BylNo+tvZ0fC7dTMQ/iTagqhuMa+VlLovsYgRWGew=" + }, + "org/lwjgl/lwjgl#lwjgl-platform/2.9.3/natives-windows": { + "jar": "sha256-fU3ZW+4GTZHhEQkYsKf2OlKU4v2aSIM6E9N9aMnAbSM=" + }, + "org/lwjgl/lwjgl#lwjgl/2.9.3": { + "jar": "sha256-Un1Qn2ATLlsmU8f8D4zymdb2mPSoATNCvvR3BdxX7T8=", + "pom": "sha256-G70Iq2gdmAEhkgaxeLk5UyJCObMH0Jmfzmjp6TuEHCc=" + }, + "org/lwjgl/lwjgl#parent/2.9.3": { + "pom": "sha256-VIRNsV5A2qGAOCwqidyi0STfAizIZ+Lkxax4fqfaVFA=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-bom/9.7": { + "pom": "sha256-jIZR874EOzV43SihXAFhhhsV6wObf1JHZ5wMwNvwd4c=" + }, + "org/slf4j#slf4j-api/2.0.17": { + "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", + "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" + }, + "org/slf4j#slf4j-bom/2.0.17": { + "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" + }, + "org/slf4j#slf4j-nop/2.0.17": { + "jar": "sha256-Nxb4NknsZhYaLt79T0nfNNHdHFHNz5QZlsaYcmDwqCk=", + "pom": "sha256-5eVI3OjByXkTin6WyjVFEPoM4QPwpt9TofWyXpKYubI=" + }, + "org/slf4j#slf4j-parent/2.0.17": { + "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" + }, + "org/slf4j/slf4j-nop/maven-metadata": { + "xml": { + "groupId": "org.slf4j", + "lastUpdated": "20250225165034", + "release": "2.1.0-alpha1" + } + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/testcontainers#testcontainers-bom/1.16.1": { + "pom": "sha256-UGG6hMmFNuWmtM4oD7zssA4zXzsExdSEYpFi/LRiR3g=" + }, + "org/testcontainers#testcontainers-bom/1.20.1": { + "pom": "sha256-CKrS6R3QXKeycG0t/Ap66AxLXFBHAweZyLzbcyfLL0A=" + }, + "org/yaml#snakeyaml/1.25": { + "pom": "sha256-ZrVNtostx64vTFsyMbNP0BSa9PCoh6nerZ1L66CxsJw=" + }, + "org/yaml#snakeyaml/2.4": { + "jar": "sha256-73ea9dKand6MxwzgNB9cb3c14j7f+Whc6qnTU1m3u38=", + "pom": "sha256-4VSjIxzWzeaKq/J0/RiWTUmpwaX16e079HHprnvfCOY=" + }, + "uk/ac/starlink#jarrow/1.0": { + "jar": "sha256-uK2kGx3xwjn1kgcOWfHO7xcRmSkur/TgKsXp5zSllXo=", + "pom": "sha256-QUyAoANpW317oC3+r6NnpjELHVSLRXJEhzIEXObhl0c=" + }, + "uk/ac/starlink#jcdf/1.2.4": { + "jar": "sha256-gQs8iDWThaHUOVE1aCPv72PtLFLN2nV7+CD9zDepgw8=", + "pom": "sha256-fceMCivtxQ1qI3694PQkdOWCEmndpNQEvBIwTcdQTlc=" + }, + "uk/ac/starlink#jsamp/1.3.9": { + "jar": "sha256-oL31nk4lNITfym1Sc3iv9UYM9/bTdat2LFr7MrbBKg4=", + "pom": "sha256-8N2YWLooyeB2eq5Yx661TQ0DZaabm+W47EMxYOgh/i8=" + }, + "uk/ac/starlink#stil/4.3": { + "jar": "sha256-CSYHlmlWwltvQcKpw/05Clip/drfWocJQiY2dANYBwk=", + "pom": "sha256-wAk/CTtOkih7cpoLZAkNN6q18q1vU39cPPVbpxXsK7U=" + }, + "uk/ac/starlink/jsamp/maven-metadata": { + "xml": { + "groupId": "uk.ac.starlink", + "lastUpdated": "20240806101229", + "release": "1.3.9" + } + }, + "xmlrpc#xmlrpc/1.2-b1": { + "jar": "sha256-aKWGIF8iLRU67+DP2HzJm73+L/BYGdvunbin+bEnxgA=", + "pom": "sha256-RdN/QFl5sxRMj3R3X+4TUucZVhRP5jCSWOZYDdjAmJc=" + } + } +} diff --git a/pkgs/by-name/ga/gaiasky/package.nix b/pkgs/by-name/ga/gaiasky/package.nix new file mode 100644 index 000000000000..c1ce0289aace --- /dev/null +++ b/pkgs/by-name/ga/gaiasky/package.nix @@ -0,0 +1,129 @@ +{ + lib, + stdenv, + fetchFromCodeberg, + gradle_9, + makeBinaryWrapper, + jdk25, + jre25_minimal, + libGL, + nix-update-script, + help2man, +}: +let + jre = jre25_minimal.override { + # List of dependencies can be obtained using jdeps + modules = [ + "java.base" + "java.desktop" + "java.instrument" + "java.naming" + "java.net.http" + "java.prefs" + "java.security.jgss" + "java.sql" + "jdk.management" + "jdk.unsupported" + ]; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "gaiasky"; + version = "3.7.1"; + src = fetchFromCodeberg { + owner = "gaiasky"; + repo = "gaiasky"; + tag = finalAttrs.version; + hash = "sha256-UAVuivkeF234hoUyfCv7depspr3dyoyzYJDD0mKGAr4="; + }; + + nativeBuildInputs = [ + gradle_9 + makeBinaryWrapper + help2man + jdk25 + ]; + + buildInputs = [ + jre + libGL + ]; + + __darwinAllowLocalNetworking = true; + + gradleBuildTask = "core:dist"; + + # Gaiasky binary has to be executed to generate manpage. + # However, since since /usr/bin/env bash is hardcoded in the binary + # it errors out. It is generated in postBuild phase instead. + gradleFlags = [ + "-x :core:generateManPage" + "-x :core:gzipManPage" + ]; + + mitmCache = gradle_9.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + # The build output is stored in releases/gaiasky-version-version instead of releases/gaiasky-. + postPatch = '' + substituteInPlace build.gradle \ + --replace-fail "def cmd = \"git describe --abbrev=0 --tags HEAD\"" "def cmd = \"echo ${finalAttrs.version}\"" \ + --replace-fail "cmd = \"git rev-parse --short HEAD\"" "cmd = \"echo ${finalAttrs.version}\"" + ''; + + postBuild = '' + patchShebangs --build "releases/gaiasky-${finalAttrs.version}.${finalAttrs.version}"/gaiasky + + # Exclude copyExecutable so that it doesn't overwrite the patched files. + gradleFlags="" gradle :core:generateManPage -x :core:copyExecutables + + patchShebangs "releases/gaiasky-${finalAttrs.version}.${finalAttrs.version}"/gaiasky + ''; + + installPhase = '' + runHook preInstall + + install -m755 -d $out/bin $out/share/applications $out/share/metainfo $out/share/gaiasky $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/256x256/apps $out/share/man/man6 + + cp -r "releases/gaiasky-${finalAttrs.version}.${finalAttrs.version}"/* $out/share/gaiasky/ + ln -s $out/share/gaiasky/gs_icon.svg $out/share/icons/hicolor/scalable/apps/gaiasky.svg + ln -s $out/share/gaiasky/gs_round_256.png $out/share/icons/hicolor/256x256/apps/gaiasky.png + ln -s $out/share/gaiasky/space.gaiasky.GaiaSky.metainfo.xml $out/share/metainfo/ + ln -s $out/share/gaiasky/gaiasky.6 $out/share/man/man6/ + + substitute $out/share/gaiasky/gaiasky.desktop $out/share/applications/gaiasky.desktop \ + --replace-fail "Icon=/opt/gaiasky/gs_icon.svg" "Icon=gaiasky" + + makeWrapper $out/share/gaiasky/gaiasky \ + $out/bin/gaiasky \ + --set JAVA_HOME ${jre} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Open source 3D universe visualization software for desktop and VR with support for more than a billion objects"; + homepage = "https://gaiasky.space"; + changelog = "https://codeberg.org/gaiasky/gaiasky/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ reputable2772 ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # MITM Cache + binaryNativeCode # LWJGL natives are pulled in. + ]; + platforms = [ + # No aarch64-linux, since upstream does not officially support it. + "x86_64-linux" + # Disable darwin due to daemon networking errors + # "x86_64-darwin" + # "aarch64-darwin" + ]; + mainProgram = "gaiasky"; + }; +}) diff --git a/pkgs/by-name/gd/gdash/package.nix b/pkgs/by-name/gd/gdash/package.nix new file mode 100644 index 000000000000..d844cbb45fbe --- /dev/null +++ b/pkgs/by-name/gd/gdash/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromBitbucket, + pkg-config, + glib, + gtk3, + SDL2_mixer, + SDL2_image, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gdash"; + version = "0-unstable-2023-06-24"; + + src = fetchFromBitbucket { + owner = "czirkoszoltan"; + repo = "gdash"; + rev = "f980da7f4318f5296424720416911876bdb8d6bf"; + hash = "sha256-tYUaWT9cHKgCeu7y0pjHaZ+z4jSr43lAq/jAVE3DSDg="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + glib + gtk3 + SDL2_mixer + SDL2_image + ]; + + env.NIX_CFLAGS_COMPILE = " -I${SDL2_image}/include/SDL2"; + + doCheck = true; + + checkTarget = "check"; + + meta = { + description = "Maze-based puzzle video game, a clone of the original Boulder Dash"; + homepage = "https://bitbucket.org/czirkoszoltan/gdash"; + changelog = "https://bitbucket.org/czirkoszoltan/gdash/src/master/ChangeLog"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.kupac ]; + mainProgram = "gdash"; + platforms = lib.platforms.all; + # Fails on darwin with: + # ld: symbol(s) not found for architecture x86_64 + # clang++: error: linker command failed with exit code 1 + broken = stdenv.hostPlatform.isDarwin; + }; +}) diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix index 874841ff5a13..4ff19e15c911 100644 --- a/pkgs/by-name/gf/gforth/package.nix +++ b/pkgs/by-name/gf/gforth/package.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gforth"; - version = "0.7.9_20260224"; + version = "0.7.9_20260410"; src = fetchFromGitHub { owner = "forthy42"; repo = "gforth"; rev = finalAttrs.version; - hash = "sha256-8qHfoqhzDn3FmKqTCo/72xtjWFUo9+crFFcGvbHxI0E="; + hash = "sha256-Nb5CB2k7gfG3sT+zfHGmj9G/CGccIvSIKcOuP7Altn0="; }; patches = [ ./use-nproc-instead-of-fhs.patch ]; diff --git a/pkgs/by-name/gh/gh-stack/package.nix b/pkgs/by-name/gh/gh-stack/package.nix new file mode 100644 index 000000000000..88ff0cc5a838 --- /dev/null +++ b/pkgs/by-name/gh/gh-stack/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "gh-stack"; + version = "0.0.1"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "github"; + repo = "gh-stack"; + tag = "v${finalAttrs.version}"; + hash = "sha256-om7ekHez08X1YjP0W+3p0PxmjU/za6+/gHX5GPakKAw="; + }; + + vendorHash = "sha256-s85Lz6yfY1TiIFPolU1qESDyw8XoBORyuOMdiHj6Grc="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/github/gh-stack/cmd.Version=${finalAttrs.version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "GitHub CLI extension to use stacked PRs"; + homepage = "https://github.github.com/gh-stack/"; + downloadPage = "https://github.com/github/gh-stack/"; + changelog = "https://github.com/github/gh-stack/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + mainProgram = "gh-stack"; + }; +}) diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix index 7f987e996adb..02950dc8bb42 100644 --- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gitlab-ci-ls"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "alesbrelih"; repo = "gitlab-ci-ls"; rev = "${finalAttrs.version}"; - hash = "sha256-AXiP5v8aquyIdsZcTjTlAZETwTo3LfhvdLA2180uk1E="; + hash = "sha256-ZZjx6VdBZuVuHl42n0iXZkvvUku2CN7x4JCZxZTMOMk="; }; - cargoHash = "sha256-AO45OvyG3eBOaeYEqJT7GM/sqej/k+rNDtXN/+K16/8="; + cargoHash = "sha256-OB44JaekEl1dJB6LGTLWXgcwYac2GA3I9Ab8xt/+rkI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index 8866e5a57ed5..de61b497e4e3 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "gitlab-runner"; - version = "18.9.0"; + version = "18.10.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-U13SouwEfCVy5M8fv6rkCX0F+ecVYdsocvAdt3yxPJA="; + hash = "sha256-qwEzcZuyPqjuGDxNKCHc6AfBgS+Pp/PV1tK/qfofwtA="; }; - vendorHash = "sha256-Ak1Q8FnTD8LKcN9xRc1gpcnUiambGC3CJP84cwQqTtM="; + vendorHash = "sha256-iO5xZAdQPmUpgUGe5CjMHOfzWVXT+eukJ/zLw5BE0NE="; # For patchShebangs buildInputs = [ bash ]; diff --git a/pkgs/by-name/gi/gitlab-runner/remove-bash-test.patch b/pkgs/by-name/gi/gitlab-runner/remove-bash-test.patch index 0365002efec9..b4f349207ac9 100644 --- a/pkgs/by-name/gi/gitlab-runner/remove-bash-test.patch +++ b/pkgs/by-name/gi/gitlab-runner/remove-bash-test.patch @@ -1,8 +1,8 @@ diff --git a/shells/bash_test.go b/shells/bash_test.go -index bbbe949f4..955992d3f 100644 +index ff4734ede..dd68bb7f0 100644 --- a/shells/bash_test.go +++ b/shells/bash_test.go -@@ -4,11 +4,9 @@ package shells +@@ -4,7 +4,6 @@ package shells import ( "path" @@ -10,11 +10,7 @@ index bbbe949f4..955992d3f 100644 "testing" "github.com/stretchr/testify/assert" -- "github.com/stretchr/testify/require" - - "gitlab.com/gitlab-org/gitlab-runner/common" - "gitlab.com/gitlab-org/gitlab-runner/common/spec" -@@ -78,65 +76,6 @@ func TestBash_CheckForErrors(t *testing.T) { +@@ -78,65 +77,6 @@ func TestBash_CheckForErrors(t *testing.T) { } } diff --git a/pkgs/by-name/go/go-containerregistry/package.nix b/pkgs/by-name/go/go-containerregistry/package.nix index 09c2d7631eab..2ff2029a03af 100644 --- a/pkgs/by-name/go/go-containerregistry/package.nix +++ b/pkgs/by-name/go/go-containerregistry/package.nix @@ -15,13 +15,13 @@ in buildGoModule (finalAttrs: { pname = "go-containerregistry"; - version = "0.21.4"; + version = "0.21.5"; src = fetchFromGitHub { owner = "google"; repo = "go-containerregistry"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-TODosgMYXR1StkRC/h5rn84I2R+e0dHnGJxmCisYDNk="; + sha256 = "sha256-2cC2fZe22K8mPIXa8YI1MgUlEn6p1z7RBEQhFjYNsxA="; }; vendorHash = null; diff --git a/pkgs/by-name/go/goaccess/package.nix b/pkgs/by-name/go/goaccess/package.nix index 7cafe38a3ee5..ad32acf68b3c 100644 --- a/pkgs/by-name/go/goaccess/package.nix +++ b/pkgs/by-name/go/goaccess/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goaccess"; - version = "1.9.4"; + version = "1.10.2"; src = fetchFromGitHub { owner = "allinurl"; repo = "goaccess"; tag = "v${finalAttrs.version}"; - hash = "sha256-KevxuZuIrMybNlPZgVDLO0zQe4LfAKxfVBbHnyTUC/o="; + hash = "sha256-n0+Z3kkjMCjPN0Cb0R1QGSzzXH3S9kjDchy9ay6109s="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/go/govulncheck/package.nix b/pkgs/by-name/go/govulncheck/package.nix index a6d2d6e8f365..15d6a566b196 100644 --- a/pkgs/by-name/go/govulncheck/package.nix +++ b/pkgs/by-name/go/govulncheck/package.nix @@ -3,27 +3,28 @@ buildGoLatestModule, fetchFromGitHub, replaceVars, + versionCheckHook, }: -buildGoLatestModule rec { +buildGoLatestModule (finalAttrs: { pname = "govulncheck"; - version = "1.1.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "golang"; repo = "vuln"; - tag = "v${version}"; - hash = "sha256-d1JWh/K+65p0TP5vAQbSyoatjN4L5nm3VEA+qBSrkAA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-15DTxzlK7mkUt7KCwsV5+E5dPopCwFylI0fmVB0LDEo="; }; patches = [ # patch in version information (replaceVars ./version.patch { - inherit version; + inherit (finalAttrs) version; }) ]; - vendorHash = "sha256-MSTKDeWVxD2Fa6fNoku4EwFwC90XZ5acnM67crcgXDg="; + vendorHash = "sha256-+hJtGG9GGDb3D9Cgm7hreySjOlXXsc7HxHcoS2Cxfbs="; subPackages = [ "cmd/govulncheck" @@ -37,10 +38,16 @@ buildGoLatestModule rec { "-w" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + versionCheckProgramArg = [ "--version" ]; + meta = { homepage = "https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck"; downloadPage = "https://github.com/golang/vuln"; - changelog = "https://github.com/golang/vuln/releases/tag/v${version}"; + changelog = "https://github.com/golang/vuln/releases/tag/${finalAttrs.src.tag}"; description = "Database client and tools for the Go vulnerability database, also known as vuln"; mainProgram = "govulncheck"; longDescription = '' @@ -64,10 +71,10 @@ buildGoLatestModule rec { example, a dependency with a Windows-specific vulnerability will not be reported for a Linux build. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jk SuperSandro2000 ]; }; -} +}) diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index a597b66f1310..ac7071c9d71d 100644 --- a/pkgs/by-name/gv/gvm-libs/package.nix +++ b/pkgs/by-name/gv/gvm-libs/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gvm-libs"; - version = "22.40.0"; + version = "22.41.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; tag = "v${finalAttrs.version}"; - hash = "sha256-oAU4yZeVw1rkOhce2bxulfzXux5e0EBh1hKApF7GOHo="; + hash = "sha256-6GYy+51Nw1zlppsMIYv4cH/yEMhxJ1lsLPgpsC4YRG4="; }; postPatch = '' diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix index 25bc2b734586..2e0a6a731606 100644 --- a/pkgs/by-name/ha/hashlink/package.nix +++ b/pkgs/by-name/ha/hashlink/package.nix @@ -10,7 +10,7 @@ libjpeg_turbo, libuv, libvorbis, - mbedtls_2, + mbedtls, openal, pcre, SDL2, @@ -28,12 +28,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-nVr+fDdna8EEHvIiXsccWFRTYzXfb4GG1zrfL+O6zLA="; }; - # incompatible pointer type error: const char ** -> const void ** + # backport of https://github.com/HaxeFoundation/hashlink/pull/767 postPatch = '' - substituteInPlace libs/sqlite/sqlite.c \ + substituteInPlace CMakeLists.txt \ --replace-warn \ - "sqlite3_prepare16_v2(db->db, sql, -1, &r->r, &tl)" \ - "sqlite3_prepare16_v2(db->db, sql, -1, &r->r, (const void**)&tl)" + "cmake_minimum_required(VERSION 3.1)" \ + "cmake_minimum_required(VERSION 3.13)" ''; buildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libpng libuv libvorbis - mbedtls_2 + mbedtls openal pcre SDL2 diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index ae67d53a0fca..ad5c58240a5d 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -8,22 +8,22 @@ let pname = "hoppscotch"; - version = "26.3.0-0"; + version = "26.3.1-0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-nfXk6N4cVp9NCE/kKZsVeEIQ+zYssw8XlBQgcKMHJ2A="; + hash = "sha256-9Ahc/Gi4MRgloWND82lZQhWG2oR85Fytsz2BYi+fVpc="; }; x86_64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-emnwjmBPL/eKAVPmgnpDK/N9hiwTenCCa123fJfXLE4="; + hash = "sha256-YXvLzdm493xAvCRuRg0WwBTJ4VXKO50wzr2TfWN3J84="; }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-V7CI0j1C3UZuhyY6KeL1CAILfpc8N0cJxyI4M5lnRPg="; + hash = "sha256-6dFCCYkof0N4AqWZko741LN6NW2K4F5gpwzzK4U5QCM="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/im/imagemagick/package.nix b/pkgs/by-name/im/imagemagick/package.nix index 8acd23a8cb2c..55c01b0cee14 100644 --- a/pkgs/by-name/im/imagemagick/package.nix +++ b/pkgs/by-name/im/imagemagick/package.nix @@ -88,13 +88,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.2-18"; + version = "7.1.2-19"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; tag = finalAttrs.version; - hash = "sha256-bt8PlCeEWaRsdMe/FP4HSgmzi1OATjH2Kx233OgleyI="; + hash = "sha256-4uASM+GRTe0ES6FdshUMMkVof4IlLV+CMm2l+v5qZN0="; }; outputs = [ diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 8fa5d6c7691f..e94ad087378e 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -115,13 +115,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "immich"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "immich-app"; repo = "immich"; tag = "v${finalAttrs.version}"; - hash = "sha256-cN5MM8lk2UY2gCG4RMryJc4SwbJNYm8IbTcqEmdaNF4="; + hash = "sha256-EC1IXM7KObAWfwG5KEao5VDp79d8WGNEI7E89lLOJ44="; }; pnpmDeps = fetchPnpmDeps { diff --git a/pkgs/by-name/ky/kyverno-chainsaw/go-1.26-testdeps-modulepath.patch b/pkgs/by-name/ky/kyverno-chainsaw/go-1.26-testdeps-modulepath.patch new file mode 100644 index 000000000000..37089cc80a60 --- /dev/null +++ b/pkgs/by-name/ky/kyverno-chainsaw/go-1.26-testdeps-modulepath.patch @@ -0,0 +1,15 @@ +diff --git a/pkg/runner/internal/test_deps.go b/pkg/runner/internal/test_deps.go +index f7728f3..90dbca5 100644 +--- a/pkg/runner/internal/test_deps.go ++++ b/pkg/runner/internal/test_deps.go +@@ -41,6 +41,10 @@ func (*TestDeps) ImportPath() string { + return "" + } + ++func (*TestDeps) ModulePath() string { ++ return "" ++} ++ + func (*TestDeps) StartTestLog(w io.Writer) {} + + func (*TestDeps) StopTestLog() error { diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix index bd1617b07cca..e72190d0e071 100644 --- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -2,7 +2,6 @@ buildGoModule, fetchFromGitHub, installShellFiles, - kyverno-chainsaw, lib, nix-update-script, stdenv, @@ -16,10 +15,12 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wHwjcpcum3ByBGYUxJ38Qi0RliQUmAIBYmE7t3gEonI="; }; + patches = [ ./go-1.26-testdeps-modulepath.patch ]; + vendorHash = "sha256-lG+odKD1TGQ7GTh/y9ogREtY59T8fvN/6FyKsdgsU0M="; subPackages = [ "." ]; @@ -42,7 +43,7 @@ buildGoModule (finalAttrs: { ''; passthru.tests.version = testers.testVersion { - package = kyverno-chainsaw; + package = finalAttrs.finalPackage; command = "chainsaw version"; version = "v${finalAttrs.version}"; }; diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock index 5ab47a96be64..41e5bbbcba2f 100644 --- a/pkgs/by-name/la/laravel/composer.lock +++ b/pkgs/by-name/la/laravel/composer.lock @@ -167,7 +167,7 @@ }, { "name": "illuminate/collections", - "version": "v13.3.0", + "version": "v13.4.0", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", @@ -226,7 +226,7 @@ }, { "name": "illuminate/conditionable", - "version": "v13.3.0", + "version": "v13.4.0", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", @@ -272,7 +272,7 @@ }, { "name": "illuminate/contracts", - "version": "v13.3.0", + "version": "v13.4.0", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", @@ -320,16 +320,16 @@ }, { "name": "illuminate/filesystem", - "version": "v13.3.0", + "version": "v13.4.0", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "fabba6165de958c169eed909a3ec6a6574b33f6b" + "reference": "fb24eafcac8b560ab6aed11acade6b828f06c577" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/fabba6165de958c169eed909a3ec6a6574b33f6b", - "reference": "fabba6165de958c169eed909a3ec6a6574b33f6b", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/fb24eafcac8b560ab6aed11acade6b828f06c577", + "reference": "fb24eafcac8b560ab6aed11acade6b828f06c577", "shasum": "" }, "require": { @@ -383,11 +383,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2026-03-21T01:00:51+00:00" + "time": "2026-04-01T15:20:15+00:00" }, { "name": "illuminate/macroable", - "version": "v13.3.0", + "version": "v13.4.0", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -433,7 +433,7 @@ }, { "name": "illuminate/reflection", - "version": "v13.3.0", + "version": "v13.4.0", "source": { "type": "git", "url": "https://github.com/illuminate/reflection.git", @@ -484,16 +484,16 @@ }, { "name": "illuminate/support", - "version": "v13.3.0", + "version": "v13.4.0", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "f31e168e236a90d96d7894cd1f107b1ba095de69" + "reference": "e7ce0496cae80c3e1aa72e37f09335a6454846dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/f31e168e236a90d96d7894cd1f107b1ba095de69", - "reference": "f31e168e236a90d96d7894cd1f107b1ba095de69", + "url": "https://api.github.com/repos/illuminate/support/zipball/e7ce0496cae80c3e1aa72e37f09335a6454846dc", + "reference": "e7ce0496cae80c3e1aa72e37f09335a6454846dc", "shasum": "" }, "require": { @@ -559,7 +559,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2026-03-30T13:32:27+00:00" + "time": "2026-04-07T13:34:38+00:00" }, { "name": "laravel/prompts", @@ -622,16 +622,16 @@ }, { "name": "nesbot/carbon", - "version": "3.11.3", + "version": "3.11.4", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon.git", - "reference": "6a7e652845bb018c668220c2a545aded8594fbbf" + "reference": "e890471a3494740f7d9326d72ce6a8c559ffee60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/6a7e652845bb018c668220c2a545aded8594fbbf", - "reference": "6a7e652845bb018c668220c2a545aded8594fbbf", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/e890471a3494740f7d9326d72ce6a8c559ffee60", + "reference": "e890471a3494740f7d9326d72ce6a8c559ffee60", "shasum": "" }, "require": { @@ -723,7 +723,7 @@ "type": "tidelift" } ], - "time": "2026-03-11T17:23:39+00:00" + "time": "2026-04-07T09:57:54+00:00" }, { "name": "psr/clock", @@ -1189,16 +1189,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.33.0", + "version": "v1.34.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" + "reference": "141046a8f9477948ff284fa65be2095baafb94f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", - "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/141046a8f9477948ff284fa65be2095baafb94f2", + "reference": "141046a8f9477948ff284fa65be2095baafb94f2", "shasum": "" }, "require": { @@ -1248,7 +1248,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.34.0" }, "funding": [ { @@ -1268,20 +1268,20 @@ "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2026-04-10T16:19:22+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.33.0", + "version": "v1.34.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70" + "reference": "ad1b7b9092976d6c948b8a187cec9faaea9ec1df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70", - "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/ad1b7b9092976d6c948b8a187cec9faaea9ec1df", + "reference": "ad1b7b9092976d6c948b8a187cec9faaea9ec1df", "shasum": "" }, "require": { @@ -1330,7 +1330,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.34.0" }, "funding": [ { @@ -1350,11 +1350,11 @@ "type": "tidelift" } ], - "time": "2025-06-27T09:58:17+00:00" + "time": "2026-04-10T16:19:22+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.33.0", + "version": "v1.34.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -1415,7 +1415,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.34.0" }, "funding": [ { @@ -1439,16 +1439,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.33.0", + "version": "v1.34.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493" + "reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", - "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6a21eb99c6973357967f6ce3708cd55a6bec6315", + "reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315", "shasum": "" }, "require": { @@ -1500,7 +1500,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.34.0" }, "funding": [ { @@ -1520,20 +1520,20 @@ "type": "tidelift" } ], - "time": "2024-12-23T08:48:59+00:00" + "time": "2026-04-10T17:25:58+00:00" }, { "name": "symfony/polyfill-php84", - "version": "v1.33.0", + "version": "v1.34.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php84.git", - "reference": "d8ced4d875142b6a7426000426b8abc631d6b191" + "reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191", - "reference": "d8ced4d875142b6a7426000426b8abc631d6b191", + "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/88486db2c389b290bf87ff1de7ebc1e13e42bb06", + "reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06", "shasum": "" }, "require": { @@ -1580,7 +1580,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-php84/tree/v1.34.0" }, "funding": [ { @@ -1600,20 +1600,20 @@ "type": "tidelift" } ], - "time": "2025-06-24T13:30:11+00:00" + "time": "2026-04-10T18:47:49+00:00" }, { "name": "symfony/polyfill-php85", - "version": "v1.33.0", + "version": "v1.34.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php85.git", - "reference": "d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91" + "reference": "2c408a6bb0313e6001a83628dc5506100474254e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91", - "reference": "d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91", + "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/2c408a6bb0313e6001a83628dc5506100474254e", + "reference": "2c408a6bb0313e6001a83628dc5506100474254e", "shasum": "" }, "require": { @@ -1660,7 +1660,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php85/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-php85/tree/v1.34.0" }, "funding": [ { @@ -1680,7 +1680,7 @@ "type": "tidelift" } ], - "time": "2025-06-23T16:12:55+00:00" + "time": "2026-04-10T16:50:15+00:00" }, { "name": "symfony/process", diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix index 76749b7f24ed..7234fe1ae0bf 100644 --- a/pkgs/by-name/la/laravel/package.nix +++ b/pkgs/by-name/la/laravel/package.nix @@ -7,19 +7,19 @@ }: php.buildComposerProject2 (finalAttrs: { pname = "laravel"; - version = "5.25.2"; + version = "5.25.3"; src = fetchFromGitHub { owner = "laravel"; repo = "installer"; tag = "v${finalAttrs.version}"; - hash = "sha256-tQBJ156KYcCVwf+xNzCL+4rh/ru1imTiD4Uu8vD16sw="; + hash = "sha256-WpBpKCXvfcMXb7Zxvz7fdxVMaaseH0kxr+Fh/vYVb+Y="; }; nativeBuildInputs = [ makeWrapper ]; composerLock = ./composer.lock; - vendorHash = "sha256-nasF4IHxGvOQHVJ6S6+a8DA5iSvDvyH3Oxw8Zw4MdAY="; + vendorHash = "sha256-zm2Xh15l/i7jDL3OasIqLUAWOLM71sQvA4LuszDP4EY="; # Adding npm (nodejs) and php composer to path postInstall = '' diff --git a/pkgs/by-name/li/libraop/package.nix b/pkgs/by-name/li/libraop/package.nix index 036cc1e311da..580213bc0865 100644 --- a/pkgs/by-name/li/libraop/package.nix +++ b/pkgs/by-name/li/libraop/package.nix @@ -16,16 +16,16 @@ let in stdenv.mkDerivation { pname = "libraop"; - version = "0-unstable-2026-02-09"; + version = "0-unstable-2026-02-20"; src = fetchFromGitHub { owner = "music-assistant"; repo = "libraop"; # we try to closely match the commit used in the last music-assistant release from # https://github.com/music-assistant/server/tree/stable/music_assistant/providers/airplay/bin - rev = "f49284282ea4ea740d07fabc230b4182f8c69a74"; + rev = "df3c055674c147eeaa9307b7d554b9d46ed6418a"; fetchSubmodules = true; - hash = "sha256-m1ll5vRZx4d/5IWCG24yY/SWEIIz2k/iU84vQKHlCdo="; + hash = "sha256-zD1DggBQjbiD7B/u0hmogXj8NhrzYgVXMyzvHkaM4Hg="; }; patches = [ diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix index 65d060171836..6f1e9c1b6962 100644 --- a/pkgs/by-name/li/librenms/package.nix +++ b/pkgs/by-name/li/librenms/package.nix @@ -11,13 +11,10 @@ ipmitool, libvirt, monitoring-plugins, - mtr, net-snmp, nfdump, - nmap, rrdtool, system-sendmail, - whois, dataDir ? "/var/lib/librenms", logDir ? "/var/log/librenms", }: @@ -27,16 +24,16 @@ let in phpPackage.buildComposerProject2 rec { pname = "librenms"; - version = "26.2.0"; + version = "26.3.1"; src = fetchFromGitHub { owner = "librenms"; repo = "librenms"; tag = version; - hash = "sha256-cFFAUgUq+AxOdmHI92WYY6h9jSubXRUL4Jp8q+mDdHg="; + hash = "sha256-wLmZHE7W1ulBvUBpwVatdR8etFVhdG/zpggUpNIb65s="; }; - vendorHash = "sha256-73E3fH1JUHxjphF6aPrmNJu3P1DZd28blmBxSiyuCTc="; + vendorHash = "sha256-uJ7DBJGQ4D1UnZXSUnrO3Fy3xEFz6ZxcMQ12E2jKKSM="; php = phpPackage; @@ -45,14 +42,11 @@ phpPackage.buildComposerProject2 rec { ipmitool libvirt monitoring-plugins - mtr net-snmp nfdump - nmap rrdtool system-sendmail unixtools.whereis - whois (python3.withPackages ( ps: with ps; [ pymysql @@ -78,25 +72,26 @@ phpPackage.buildComposerProject2 rec { substituteInPlace \ $out/resources/definitions/config_definitions.json \ - --replace-fail '"default": "/bin/ping",' '"default": "/run/wrappers/bin/ping",' \ --replace-fail '"default": "fping",' '"default": "/run/wrappers/bin/fping",' \ --replace-fail '"default": "fping6",' '"default": "/run/wrappers/bin/fping6",' \ --replace-fail '"default": "rrdtool",' '"default": "${rrdtool}/bin/rrdtool",' \ --replace-fail '"default": "snmpgetnext",' '"default": "${net-snmp}/bin/snmpgetnext",' \ --replace-fail '"default": "traceroute",' '"default": "/run/wrappers/bin/traceroute",' \ --replace-fail '"default": "/usr/bin/ipmitool",' '"default": "${ipmitool}/bin/ipmitool",' \ - --replace-fail '"default": "/usr/bin/mtr",' '"default": "${mtr}/bin/mtr",' \ --replace-fail '"default": "/usr/bin/nfdump",' '"default": "${nfdump}/bin/nfdump",' \ - --replace-fail '"default": "/usr/bin/nmap",' '"default": "${nmap}/bin/nmap",' \ --replace-fail '"default": "/usr/bin/snmpbulkwalk",' '"default": "${net-snmp}/bin/snmpbulkwalk",' \ --replace-fail '"default": "/usr/bin/snmpget",' '"default": "${net-snmp}/bin/snmpget",' \ --replace-fail '"default": "/usr/bin/snmptranslate",' '"default": "${net-snmp}/bin/snmptranslate",' \ --replace-fail '"default": "/usr/bin/snmpwalk",' '"default": "${net-snmp}/bin/snmpwalk",' \ --replace-fail '"default": "/usr/bin/virsh",' '"default": "${libvirt}/bin/virsh",' \ - --replace-fail '"default": "/usr/bin/whois",' '"default": "${whois}/bin/whois",' \ --replace-fail '"default": "/usr/lib/nagios/plugins",' '"default": "${monitoring-plugins}/bin",' \ --replace-fail '"default": "/usr/sbin/sendmail",' '"default": "${system-sendmail}/bin/sendmail",' + if grep -q /usr/bin $out/resources/definitions/config_definitions.json; then + echo "Please patch the extra /usr/bin paths found above!" + exit 1 + fi + substituteInPlace $out/LibreNMS/wrapper.py --replace-fail '/usr/bin/env php' '${phpPackage}/bin/php' substituteInPlace $out/LibreNMS/__init__.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"' substituteInPlace $out/snmp-scan.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"' diff --git a/pkgs/by-name/li/linuxdeploy-plugin-qt/package.nix b/pkgs/by-name/li/linuxdeploy-plugin-qt/package.nix new file mode 100644 index 000000000000..7c0e8889b9d2 --- /dev/null +++ b/pkgs/by-name/li/linuxdeploy-plugin-qt/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + cmake, + pkg-config, + cimg, + libjpeg, + libpng, + nlohmann_json, +}: +let + excludelist = fetchurl { + url = "https://raw.githubusercontent.com/probonopd/AppImages/15a64c20dc23a0154622ba25829364323903b6b5/excludelist"; + sha256 = "sha256-UNsPiU80sWnEely8DBfbq2Hp7evKW8gmmh5qwb9L2tk="; + }; +in +stdenv.mkDerivation { + pname = "linuxdeploy-plugin-qt"; + version = "0-unstable-2026-03-07"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "linuxdeploy"; + repo = "linuxdeploy-plugin-qt"; + rev = "511d51d066f632dfdfbcf0bf7284ec38090812d2"; + hash = "sha256-q/LL7XVtqCGyMxSFtHK7LinKF/TetYRtAfMpxZzPs6M="; + fetchSubmodules = true; + }; + + patches = [ + # Deploy wayland-graphics-integration-client alongside wayland platform plugin + # Without this, wayland EGL rendering fails + # https://github.com/linuxdeploy/linuxdeploy-plugin-qt/issues/160 + ./wayland-fix.patch + ]; + + postPatch = '' + substituteInPlace lib/linuxdeploy/src/core/generate-excludelist.sh \ + --replace-fail "wget --quiet \"\$url\" -O - " "cat ${excludelist}" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + cimg + libjpeg + libpng + nlohmann_json + ]; + + cmakeFlags = [ + "-DBUILD_TESTING=OFF" + ]; + + meta = { + description = "Qt plugin for linuxdeploy to bundle Qt applications into AppImage format"; + homepage = "https://github.com/linuxdeploy/linuxdeploy-plugin-qt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ BatteredBunny ]; + mainProgram = "linuxdeploy-plugin-qt"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/li/linuxdeploy-plugin-qt/wayland-fix.patch b/pkgs/by-name/li/linuxdeploy-plugin-qt/wayland-fix.patch new file mode 100644 index 000000000000..5c6a00002a6f --- /dev/null +++ b/pkgs/by-name/li/linuxdeploy-plugin-qt/wayland-fix.patch @@ -0,0 +1,11 @@ +--- a/src/deployers/PlatformPluginsDeployer.cpp ++++ b/src/deployers/PlatformPluginsDeployer.cpp +@@ -30,7 +30,7 @@ bool PlatformPluginsDeployer::doDeploy() { + + using namespace linuxdeploy::util::misc; + if (stringStartsWith(platformToDeploy, "libqwayland")) { +- if (!deployStandardQtPlugins({"wayland-decoration-client", "wayland-shell-integration"})) { ++ if (!deployStandardQtPlugins({"wayland-decoration-client", "wayland-graphics-integration-client", "wayland-shell-integration"})) { + return false; + } + } diff --git a/pkgs/by-name/li/linuxdeploy/package.nix b/pkgs/by-name/li/linuxdeploy/package.nix new file mode 100644 index 000000000000..aa92e1ebf139 --- /dev/null +++ b/pkgs/by-name/li/linuxdeploy/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + cmake, + pkg-config, + cimg, + libjpeg, + libpng, +}: +let + excludelist = fetchurl { + url = "https://raw.githubusercontent.com/probonopd/AppImages/15a64c20dc23a0154622ba25829364323903b6b5/excludelist"; + sha256 = "sha256-UNsPiU80sWnEely8DBfbq2Hp7evKW8gmmh5qwb9L2tk="; + }; +in +stdenv.mkDerivation { + pname = "linuxdeploy"; + version = "0-unstable-2026-04-12"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "linuxdeploy"; + repo = "linuxdeploy"; + rev = "8dccfe12c273bb598937fcea6da46c0d29d84452"; + hash = "sha256-gP9yZwrgpRZ4BBYvSnC306iWaV+1cOVxdpxlEBE7aHE="; + fetchSubmodules = true; + }; + + postPatch = '' + substituteInPlace src/core/generate-excludelist.sh \ + --replace-fail "wget --quiet \"\$url\" -O - " "cat ${excludelist}" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + cimg + libjpeg + libpng + ]; + + meta = { + description = "Tool to bundle Linux applications into AppImage format"; + homepage = "https://github.com/linuxdeploy/linuxdeploy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ BatteredBunny ]; + mainProgram = "linuxdeploy"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/lo/logisim-evolution/package.nix b/pkgs/by-name/lo/logisim-evolution/package.nix index 864539c8750e..6d8e73e7d2c6 100644 --- a/pkgs/by-name/lo/logisim-evolution/package.nix +++ b/pkgs/by-name/lo/logisim-evolution/package.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "logisim-evolution"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${finalAttrs.version}/logisim-evolution-${finalAttrs.version}-all.jar"; - hash = "sha256-aZ+VekHVLAtPy8KJmhWpGC6RwZBui31lNCCABDhxYfQ="; + hash = "sha256-/mOGoyF6WRvMMRpO2knh9Do4m0md09D29A80T8hfJXc="; }; dontUnpack = true; diff --git a/pkgs/by-name/lo/lout/package.nix b/pkgs/by-name/lo/lout/package.nix index d7172a710f8b..609174be5e5b 100644 --- a/pkgs/by-name/lo/lout/package.nix +++ b/pkgs/by-name/lo/lout/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lout"; - version = "3.43.3"; + version = "3.43.4"; src = fetchFromGitHub { owner = "william8000"; repo = "lout"; rev = finalAttrs.version; - hash = "sha256-kZRc+d6tQGJTR41yNYOyfu/vTMH4mkwru3IQvnHS4yo="; + hash = "sha256-tozvedvIW4e/DRXliEdPmHUCPkMKM7tHNInDXSOrRic="; }; buildInputs = [ ghostscript ]; diff --git a/pkgs/by-name/ma/material-symbols/package.nix b/pkgs/by-name/ma/material-symbols/package.nix index bb736cfbf9a0..f1116b634bcc 100644 --- a/pkgs/by-name/ma/material-symbols/package.nix +++ b/pkgs/by-name/ma/material-symbols/package.nix @@ -2,7 +2,6 @@ lib, stdenvNoCC, fetchFromGitHub, - rename, unstableGitUpdater, }: stdenvNoCC.mkDerivation { @@ -17,12 +16,9 @@ stdenvNoCC.mkDerivation { sparseCheckout = [ "variablefont" ]; }; - nativeBuildInputs = [ rename ]; - installPhase = '' runHook preInstall - rename 's/\[FILL,GRAD,opsz,wght\]//g' variablefont/* install -Dm755 variablefont/*.ttf -t $out/share/fonts/TTF install -Dm755 variablefont/*.woff2 -t $out/share/fonts/woff2 diff --git a/pkgs/by-name/md/mdio-tools/package.nix b/pkgs/by-name/md/mdio-tools/package.nix index 4f797a0fdbc0..e260f660c8b0 100644 --- a/pkgs/by-name/md/mdio-tools/package.nix +++ b/pkgs/by-name/md/mdio-tools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mdio-tools"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "wkz"; repo = "mdio-tools"; tag = finalAttrs.version; - hash = "sha256-NomChJrYwMDPXNw5r2p11kGfYUvJBHCdLXy1SA8kOaM="; + hash = "sha256-QjBNVXrhIfz9l7ysbHlldCP6VknWolvIs4qCGUOCWx8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix index f5c3544abd52..137a750715aa 100644 --- a/pkgs/by-name/me/mediawiki/package.nix +++ b/pkgs/by-name/me/mediawiki/package.nix @@ -1,33 +1,19 @@ { lib, stdenvNoCC, - fetchpatch, fetchurl, nixosTests, }: stdenvNoCC.mkDerivation rec { pname = "mediawiki"; - version = "1.45.1"; + version = "1.45.3"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-4vEmsZrsQiBRoKUODGq36QTzOzmIpHudqK+/0MCiUsw="; + hash = "sha256-XqjB8yHJ+Nuk0aweTsoYJ/sTUZ1KIZDiOfUUMgWKQmk="; }; - patches = [ - # Fix installation with postgres - (fetchpatch { - url = "https://gerrit.wikimedia.org/r/changes/mediawiki%2Fcore~1231289/revisions/4/patch?download"; - decode = "base64 -d"; - postFetch = '' - substituteInPlace $out \ - --replace "/Installer/" "/installer/" - ''; - hash = "sha256-bhfw5CW4EEpr2GTGda3va+EmM/vK6AqBfyoCcsSiqNQ="; - }) - ]; - postPatch = '' substituteInPlace includes/installer/CliInstaller.php \ --replace-fail '$vars = Installer::getExistingLocalSettings();' '$vars = null;' diff --git a/pkgs/by-name/mo/mozhi/go-modules.patch b/pkgs/by-name/mo/mozhi/go-modules.patch new file mode 100644 index 000000000000..40dad36be3cc --- /dev/null +++ b/pkgs/by-name/mo/mozhi/go-modules.patch @@ -0,0 +1,604 @@ +diff --git a/go.mod b/go.mod +index 4e738df..7572688 100644 +--- a/go.mod ++++ b/go.mod +@@ -27,13 +27,11 @@ require ( + github.com/antchfx/xpath v1.3.6 // indirect + github.com/carlmjohnson/requests v0.25.1 // indirect + github.com/clipperhouse/uax29/v2 v2.7.0 // indirect +- github.com/cloudflare/circl v1.6.1 // indirect + github.com/gdamore/encoding v1.0.1 // indirect + github.com/gdamore/tcell/v2 v2.13.8 // indirect + github.com/go-openapi/jsonpointer v0.22.5 // indirect + github.com/go-openapi/jsonreference v0.21.5 // indirect + github.com/go-openapi/spec v0.22.4 // indirect +- github.com/go-openapi/swag v0.25.1 // indirect + github.com/go-openapi/swag/conv v0.25.5 // indirect + github.com/go-openapi/swag/jsonname v0.25.5 // indirect + github.com/go-openapi/swag/jsonutils v0.25.5 // indirect +@@ -41,30 +39,23 @@ require ( + github.com/go-openapi/swag/stringutils v0.25.5 // indirect + github.com/go-openapi/swag/typeutils v0.25.5 // indirect + github.com/go-openapi/swag/yamlutils v0.25.5 // indirect +- github.com/go-task/slim-sprig/v3 v3.0.0 // indirect + github.com/gobwas/glob v0.2.3 // indirect + github.com/gocolly/colly v1.2.0 // indirect + github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/go-querystring v1.2.0 // indirect +- github.com/google/pprof v0.0.0-20250923004556-9e5a51aed1e8 // indirect + github.com/google/uuid v1.6.0 // indirect +- github.com/hashicorp/errwrap v1.1.0 // indirect +- github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/icholy/digest v1.1.0 // indirect + github.com/imroc/req/v3 v3.57.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect +- github.com/josharian/intern v1.0.0 // indirect + github.com/kennygrant/sanitize v1.2.4 // indirect + github.com/klauspost/compress v1.18.5 // indirect + github.com/ktr0731/go-ansisgr v0.1.0 // indirect + github.com/lucasb-eyer/go-colorful v1.4.0 // indirect +- github.com/mailru/easyjson v0.9.1 // indirect + github.com/mattn/go-colorable v0.1.14 // indirect + github.com/mattn/go-isatty v0.0.21 // indirect + github.com/mattn/go-runewidth v0.0.23 // indirect + github.com/nsf/termbox-go v1.1.1 // indirect +- github.com/onsi/ginkgo/v2 v2.25.3 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/quic-go/qpack v0.6.0 // indirect + github.com/quic-go/quic-go v0.59.0 // indirect +@@ -79,11 +70,8 @@ require ( + github.com/tidwall/pretty v1.2.1 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasthttp v1.70.0 // indirect +- go.uber.org/automaxprocs v1.6.0 // indirect +- go.uber.org/mock v0.6.0 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect + golang.org/x/crypto v0.49.0 // indirect +- golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect + golang.org/x/mod v0.34.0 // indirect + golang.org/x/net v0.52.0 // indirect + golang.org/x/sync v0.20.0 // indirect +@@ -93,5 +81,6 @@ require ( + golang.org/x/tools v0.43.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/protobuf v1.36.11 // indirect +- gopkg.in/yaml.v3 v3.0.1 // indirect + ) ++ ++replace github.com/imroc/req/v3 => github.com/CorkCyber/req/v3 v3.0.0-20260129194349-7f08b30eab0e +diff --git a/go.sum b/go.sum +index a4d724d..e309721 100644 +--- a/go.sum ++++ b/go.sum +@@ -45,10 +45,6 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo + cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= + cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= + cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +-codeberg.org/aryak/libmozhi v0.0.0-20250410140317-de8f232ee6e5 h1:+ES8szNmss5vGzt0GIOhqsqPpzwZMKbCJxQLs6zUsJA= +-codeberg.org/aryak/libmozhi v0.0.0-20250410140317-de8f232ee6e5/go.mod h1:CfcKH8GWSdPaV6iZYAbCeTWegpPo+t+fJdihMGAeBU8= +-codeberg.org/aryak/libmozhi v0.0.0-20250929040533-d12d73cfc437 h1:DU/jKqxMHWSekq7zc1OsT8GkU/jj064InSUhOkK0P/s= +-codeberg.org/aryak/libmozhi v0.0.0-20250929040533-d12d73cfc437/go.mod h1:CfcKH8GWSdPaV6iZYAbCeTWegpPo+t+fJdihMGAeBU8= + codeberg.org/aryak/libmozhi v0.0.0-20260409092721-7dfc07322cac h1:xq320n5uOqyq2gy8f9IrZjX2LPThg4NVhHGg6a9RJ44= + codeberg.org/aryak/libmozhi v0.0.0-20260409092721-7dfc07322cac/go.mod h1:CfcKH8GWSdPaV6iZYAbCeTWegpPo+t+fJdihMGAeBU8= + dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +@@ -56,22 +52,16 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 + github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= + github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= + github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= ++github.com/CorkCyber/req/v3 v3.0.0-20260129194349-7f08b30eab0e h1:G+iTvFMJoUWjnfGocxTfkTHBJLpz3IaUeJHIV+GXVFo= ++github.com/CorkCyber/req/v3 v3.0.0-20260129194349-7f08b30eab0e/go.mod h1:cLRP6z4/nEFZFUlNMcbswkMxj6Ah2FfaA7eQKUE4Lds= + github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= + github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= + github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKduM= + github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= + github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= + github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +-github.com/OwO-Network/DeepLX v1.0.7 h1:a5oQ7aJM/bBe7HL27LU7YvbWWakQO888CFw2BSESsw0= +-github.com/OwO-Network/DeepLX v1.0.7/go.mod h1:ZCewUAXEk60YXOTPkBU8XJKt91lL+rVy+9pOC3r9mJQ= +-github.com/OwO-Network/DeepLX v1.0.8 h1:W1s6ldxH+hAcPZqY/qNeazmMLQLWEFre1KCgzF2uOC8= +-github.com/OwO-Network/DeepLX v1.0.8/go.mod h1:soGuwS+87wWmyEYdYjf0csRKVOfaSbOwhOT9M/f9Ntc= + github.com/OwO-Network/DeepLX v1.1.1 h1:S0f1PAun3MPFVlNHvjE+gVR0T6wB7+0fvJi9lPscjJI= + github.com/OwO-Network/DeepLX v1.1.1/go.mod h1:aBWmKGJH6wSGk+PfzLwsMi1csZE5q7A35ZCMjQBRdBU= +-github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8= +-github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU= +-github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo= +-github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y= + github.com/PuerkitoBio/goquery v1.12.0 h1:pAcL4g3WRXekcB9AU/y1mbKez2dbY2AajVhtkO8RIBo= + github.com/PuerkitoBio/goquery v1.12.0/go.mod h1:802ej+gV2y7bbIhOIoPY5sT183ZW0YFofScC4q/hIpQ= + github.com/abadojack/whatlanggo v1.0.1 h1:19N6YogDnf71CTHm3Mp2qhYfkRdyvbgwWdd2EPxJRG4= +@@ -81,27 +71,14 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy + github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= + github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= + github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +-github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= +-github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= +-github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ= +-github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY= + github.com/andybalholm/brotli v1.2.1 h1:R+f5xP285VArJDRgowrfb9DqL18yVK0gKAW/F+eTWro= + github.com/andybalholm/brotli v1.2.1/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY= + github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM= + github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA= +-github.com/antchfx/htmlquery v1.3.4 h1:Isd0srPkni2iNTWCwVj/72t7uCphFeor5Q8nCzj1jdQ= +-github.com/antchfx/htmlquery v1.3.4/go.mod h1:K9os0BwIEmLAvTqaNSua8tXLWRWZpocZIH73OzWQbwM= + github.com/antchfx/htmlquery v1.3.6 h1:RNHHL7YehO5XdO8IM8CynwLKONwRHWkrghbYhQIk9ag= + github.com/antchfx/htmlquery v1.3.6/go.mod h1:kcVUqancxPygm26X2rceEcagZFFVkLEE7xgLkGSDl/4= +-github.com/antchfx/xmlquery v1.4.4 h1:mxMEkdYP3pjKSftxss4nUHfjBhnMk4imGoR96FRY2dg= +-github.com/antchfx/xmlquery v1.4.4/go.mod h1:AEPEEPYE9GnA2mj5Ur2L5Q5/2PycJ0N9Fusrx9b12fc= + github.com/antchfx/xmlquery v1.5.1 h1:T9I4Ns1EXiWHy0IqKupGhnfTQtJwlGrpXtauYOoNv78= + github.com/antchfx/xmlquery v1.5.1/go.mod h1:bVqnl7TaDXSReKINrhZz+2E/PbCu2tUahb+wZ7WZNT8= +-github.com/antchfx/xpath v1.3.3/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= +-github.com/antchfx/xpath v1.3.4 h1:1ixrW1VnXd4HurCj7qnqnR0jo14g8JMe20Fshg1Vgz4= +-github.com/antchfx/xpath v1.3.4/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= +-github.com/antchfx/xpath v1.3.5 h1:PqbXLC3TkfeZyakF5eeh3NTWEbYl4VHNVeufANzDbKQ= +-github.com/antchfx/xpath v1.3.5/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= + github.com/antchfx/xpath v1.3.6 h1:s0y+ElRRtTQdfHP609qFu0+c6bglDv20pqOViQjjdPI= + github.com/antchfx/xpath v1.3.6/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= + github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +@@ -115,8 +92,6 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 + github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= + github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= + github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +-github.com/carlmjohnson/requests v0.24.3 h1:LYcM/jVIVPkioigMjEAnBACXl2vb42TVqiC8EYNoaXQ= +-github.com/carlmjohnson/requests v0.24.3/go.mod h1:duYA/jDnyZ6f3xbcF5PpZ9N8clgopubP2nK5i6MVMhU= + github.com/carlmjohnson/requests v0.25.1 h1:17zNRLecxtAjhtdEIV+F+wrYfe+AGZUjWJtpndcOUYA= + github.com/carlmjohnson/requests v0.25.1/go.mod h1:z3UEf8IE4sZxZ78spW6/tLdqBkfCu1Fn4RaYMnZ8SRM= + github.com/cbroglie/mustache v1.4.0/go.mod h1:SS1FTIghy0sjse4DUVGV1k/40B1qE1XkD9DtDsHo9iM= +@@ -133,8 +108,6 @@ github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp + github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= + github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk= + github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM= +-github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0= +-github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= + github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= + github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= + github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +@@ -170,14 +143,8 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL + github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= + github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= + github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +-github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= + github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw= + github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo= +-github.com/gdamore/tcell/v2 v2.6.0/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y= +-github.com/gdamore/tcell/v2 v2.8.1 h1:KPNxyqclpWpWQlPLx6Xui1pMk8S+7+R37h3g07997NU= +-github.com/gdamore/tcell/v2 v2.8.1/go.mod h1:bj8ori1BG3OYMjmb3IklZVWfZUJ1UBQt9JXrOCOhGWw= +-github.com/gdamore/tcell/v2 v2.9.0 h1:N6t+eqK7/xwtRPwxzs1PXeRWnm0H9l02CrgJ7DLn1ys= +-github.com/gdamore/tcell/v2 v2.9.0/go.mod h1:8/ZoqM9rxzYphT9tH/9LnunhV9oPBqwS8WHGYm5nrmo= + github.com/gdamore/tcell/v2 v2.13.8 h1:Mys/Kl5wfC/GcC5Cx4C2BIQH9dbnhnkPgS9/wF3RlfU= + github.com/gdamore/tcell/v2 v2.13.8/go.mod h1:+Wfe208WDdB7INEtCsNrAN6O2m+wsTPk1RAovjaILlo= + github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +@@ -188,71 +155,40 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 + github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= + github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= + github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +-github.com/go-openapi/jsonpointer v0.21.1 h1:whnzv/pNXtK2FbX/W9yJfRmE2gsmkfahjMKB0fZvcic= +-github.com/go-openapi/jsonpointer v0.21.1/go.mod h1:50I1STOfbY1ycR8jGz8DaMeLCdXiI6aDteEdRNNzpdk= +-github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo92JUxBNk= +-github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM= + github.com/go-openapi/jsonpointer v0.22.5 h1:8on/0Yp4uTb9f4XvTrM2+1CPrV05QPZXu+rvu2o9jcA= + github.com/go-openapi/jsonpointer v0.22.5/go.mod h1:gyUR3sCvGSWchA2sUBJGluYMbe1zazrYWIkWPjjMUY0= +-github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= +-github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= +-github.com/go-openapi/jsonreference v0.21.2 h1:Wxjda4M/BBQllegefXrY/9aq1fxBA8sI5M/lFU6tSWU= +-github.com/go-openapi/jsonreference v0.21.2/go.mod h1:pp3PEjIsJ9CZDGCNOyXIQxsNuroxm8FAJ/+quA0yKzQ= + github.com/go-openapi/jsonreference v0.21.5 h1:6uCGVXU/aNF13AQNggxfysJ+5ZcU4nEAe+pJyVWRdiE= + github.com/go-openapi/jsonreference v0.21.5/go.mod h1:u25Bw85sX4E2jzFodh1FOKMTZLcfifd1Q+iKKOUxExw= +-github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY= +-github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk= +-github.com/go-openapi/spec v0.22.0 h1:xT/EsX4frL3U09QviRIZXvkh80yibxQmtoEvyqug0Tw= +-github.com/go-openapi/spec v0.22.0/go.mod h1:K0FhKxkez8YNS94XzF8YKEMULbFrRw4m15i2YUht4L0= + github.com/go-openapi/spec v0.22.4 h1:4pxGjipMKu0FzFiu/DPwN3CTBRlVM2yLf/YTWorYfDQ= + github.com/go-openapi/spec v0.22.4/go.mod h1:WQ6Ai0VPWMZgMT4XySjlRIE6GP1bGQOtEThn3gcWLtQ= +-github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZU= +-github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0= +-github.com/go-openapi/swag v0.25.1 h1:6uwVsx+/OuvFVPqfQmOOPsqTcm5/GkBhNwLqIR916n8= +-github.com/go-openapi/swag v0.25.1/go.mod h1:bzONdGlT0fkStgGPd3bhZf1MnuPkf2YAys6h+jZipOo= +-github.com/go-openapi/swag/conv v0.25.1 h1:+9o8YUg6QuqqBM5X6rYL/p1dpWeZRhoIt9x7CCP+he0= +-github.com/go-openapi/swag/conv v0.25.1/go.mod h1:Z1mFEGPfyIKPu0806khI3zF+/EUXde+fdeksUl2NiDs= ++github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM= + github.com/go-openapi/swag/conv v0.25.5 h1:wAXBYEXJjoKwE5+vc9YHhpQOFj2JYBMF2DUi+tGu97g= + github.com/go-openapi/swag/conv v0.25.5/go.mod h1:CuJ1eWvh1c4ORKx7unQnFGyvBbNlRKbnRyAvDvzWA4k= +-github.com/go-openapi/swag/jsonname v0.25.1 h1:Sgx+qbwa4ej6AomWC6pEfXrA6uP2RkaNjA9BR8a1RJU= +-github.com/go-openapi/swag/jsonname v0.25.1/go.mod h1:71Tekow6UOLBD3wS7XhdT98g5J5GR13NOTQ9/6Q11Zo= + github.com/go-openapi/swag/jsonname v0.25.5 h1:8p150i44rv/Drip4vWI3kGi9+4W9TdI3US3uUYSFhSo= + github.com/go-openapi/swag/jsonname v0.25.5/go.mod h1:jNqqikyiAK56uS7n8sLkdaNY/uq6+D2m2LANat09pKU= +-github.com/go-openapi/swag/jsonutils v0.25.1 h1:AihLHaD0brrkJoMqEZOBNzTLnk81Kg9cWr+SPtxtgl8= +-github.com/go-openapi/swag/jsonutils v0.25.1/go.mod h1:JpEkAjxQXpiaHmRO04N1zE4qbUEg3b7Udll7AMGTNOo= + github.com/go-openapi/swag/jsonutils v0.25.5 h1:XUZF8awQr75MXeC+/iaw5usY/iM7nXPDwdG3Jbl9vYo= + github.com/go-openapi/swag/jsonutils v0.25.5/go.mod h1:48FXUaz8YsDAA9s5AnaUvAmry1UcLcNVWUjY42XkrN4= +-github.com/go-openapi/swag/loading v0.25.1 h1:6OruqzjWoJyanZOim58iG2vj934TysYVptyaoXS24kw= +-github.com/go-openapi/swag/loading v0.25.1/go.mod h1:xoIe2EG32NOYYbqxvXgPzne989bWvSNoWoyQVWEZicc= ++github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.5 h1:SX6sE4FrGb4sEnnxbFL/25yZBb5Hcg1inLeErd86Y1U= ++github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.5/go.mod h1:/2KvOTrKWjVA5Xli3DZWdMCZDzz3uV/T7bXwrKWPquo= + github.com/go-openapi/swag/loading v0.25.5 h1:odQ/umlIZ1ZVRteI6ckSrvP6e2w9UTF5qgNdemJHjuU= + github.com/go-openapi/swag/loading v0.25.5/go.mod h1:I8A8RaaQ4DApxhPSWLNYWh9NvmX2YKMoB9nwvv6oW6g= +-github.com/go-openapi/swag/stringutils v0.25.1 h1:Xasqgjvk30eUe8VKdmyzKtjkVjeiXx1Iz0zDfMNpPbw= +-github.com/go-openapi/swag/stringutils v0.25.1/go.mod h1:JLdSAq5169HaiDUbTvArA2yQxmgn4D6h4A+4HqVvAYg= + github.com/go-openapi/swag/stringutils v0.25.5 h1:NVkoDOA8YBgtAR/zvCx5rhJKtZF3IzXcDdwOsYzrB6M= + github.com/go-openapi/swag/stringutils v0.25.5/go.mod h1:PKK8EZdu4QJq8iezt17HM8RXnLAzY7gW0O1KKarrZII= +-github.com/go-openapi/swag/typeutils v0.25.1 h1:rD/9HsEQieewNt6/k+JBwkxuAHktFtH3I3ysiFZqukA= +-github.com/go-openapi/swag/typeutils v0.25.1/go.mod h1:9McMC/oCdS4BKwk2shEB7x17P6HmMmA6dQRtAkSnNb8= + github.com/go-openapi/swag/typeutils v0.25.5 h1:EFJ+PCga2HfHGdo8s8VJXEVbeXRCYwzzr9u4rJk7L7E= + github.com/go-openapi/swag/typeutils v0.25.5/go.mod h1:itmFmScAYE1bSD8C4rS0W+0InZUBrB2xSPbWt6DLGuc= +-github.com/go-openapi/swag/yamlutils v0.25.1 h1:mry5ez8joJwzvMbaTGLhw8pXUnhDK91oSJLDPF1bmGk= +-github.com/go-openapi/swag/yamlutils v0.25.1/go.mod h1:cm9ywbzncy3y6uPm/97ysW8+wZ09qsks+9RS8fLWKqg= + github.com/go-openapi/swag/yamlutils v0.25.5 h1:kASCIS+oIeoc55j28T4o8KwlV2S4ZLPT6G0iq2SSbVQ= + github.com/go-openapi/swag/yamlutils v0.25.5/go.mod h1:Gek1/SjjfbYvM+Iq4QGwa/2lEXde9n2j4a3wI3pNuOQ= ++github.com/go-openapi/testify/enable/yaml/v2 v2.4.0 h1:7SgOMTvJkM8yWrQlU8Jm18VeDPuAvB/xWrdxFJkoFag= ++github.com/go-openapi/testify/enable/yaml/v2 v2.4.0/go.mod h1:14iV8jyyQlinc9StD7w1xVPW3CO3q1Gj04Jy//Kw4VM= ++github.com/go-openapi/testify/v2 v2.4.0 h1:8nsPrHVCWkQ4p8h1EsRVymA2XABB4OT40gcvAu+voFM= ++github.com/go-openapi/testify/v2 v2.4.0/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54= + github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +-github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +-github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= + github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= + github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= + github.com/gocolly/colly v1.2.0 h1:qRz9YAn8FIH0qzgNUw+HT9UN7wm1oF9OBAilwEWpyrI= + github.com/gocolly/colly v1.2.0/go.mod h1:Hof5T3ZswNVsOHYmba1u03W65HDWgpV5HifSuueE0EA= + github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= + github.com/gofiber/fiber/v2 v2.43.0/go.mod h1:mpS1ZNE5jU+u+BA4FbM+KKnUzJ4wzTK+FT2tG3tU+6I= +-github.com/gofiber/fiber/v2 v2.52.6 h1:Rfp+ILPiYSvvVuIPvxrBns+HJp8qGLDnLJawAu27XVI= +-github.com/gofiber/fiber/v2 v2.52.6/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw= +-github.com/gofiber/fiber/v2 v2.52.9 h1:YjKl5DOiyP3j0mO61u3NTmK7or8GzzWzCFzkboyP5cw= +-github.com/gofiber/fiber/v2 v2.52.9/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw= + github.com/gofiber/fiber/v2 v2.52.12 h1:0LdToKclcPOj8PktUdIKo9BUohjjwfnQl42Dhw8/WUw= + github.com/gofiber/fiber/v2 v2.52.12/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw= + github.com/gofiber/swagger v1.1.1 h1:FZVhVQQ9s1ZKLHL/O0loLh49bYB5l1HEAgxDlcTtkRA= +@@ -314,8 +250,6 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ + github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= + github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= + github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +-github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +-github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= + github.com/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0= + github.com/google/go-querystring v1.2.0/go.mod h1:8IFJqpSRITyJ8QhQ13bmbeMBDfmeEJZD5A0egEOmkqU= + github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +@@ -339,10 +273,6 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe + github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= + github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= + github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +-github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8= +-github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= +-github.com/google/pprof v0.0.0-20250923004556-9e5a51aed1e8 h1:ZI8gCoCjGzPsum4L21jHdQs8shFBIQih1TM9Rd/c+EQ= +-github.com/google/pprof v0.0.0-20250923004556-9e5a51aed1e8/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U= + github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= + github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= + github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +@@ -356,8 +286,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb + github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= + github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= + github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= + github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= + github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= + github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +@@ -368,8 +296,6 @@ github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh + github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= + github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= + github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= + github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= + github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= + github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +@@ -392,19 +318,11 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: + github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= + github.com/icholy/digest v1.1.0 h1:HfGg9Irj7i+IX1o1QAmPfIBNu/Q5A5Tu3n/MED9k9H4= + github.com/icholy/digest v1.1.0/go.mod h1:QNrsSGQ5v7v9cReDI0+eyjsXGUoRSUZQHeQ5C4XLa0Y= +-github.com/imroc/req/v3 v3.50.0 h1:n3BVnZiTRpvkN5T1IB79LC/THhFU9iXksNRMH4ZNVaY= +-github.com/imroc/req/v3 v3.50.0/go.mod h1:tsOk8K7zI6cU4xu/VWCZVtq9Djw9IWm4MslKzme5woU= +-github.com/imroc/req/v3 v3.55.0 h1:vg2Q33TGU12wZWZyPkiPbCGGTeiOmlEOdOwHLH03//I= +-github.com/imroc/req/v3 v3.55.0/go.mod h1:MOn++r2lE4+du3nuefTaPGQ6pY3/yRP2r1pFK1BUqq0= +-github.com/imroc/req/v3 v3.57.0 h1:LMTUjNRUybUkTPn8oJDq8Kg3JRBOBTcnDhKu7mzupKI= +-github.com/imroc/req/v3 v3.57.0/go.mod h1:JL62ey1nvSLq81HORNcosvlf7SxZStONNqOprg0Pz00= + github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= + github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= + github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= + github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= + github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= + github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= + github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= + github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +@@ -417,8 +335,6 @@ github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2 + github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= + github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= + github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= + github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= + github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= + github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +@@ -434,22 +350,12 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= + github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= + github.com/ktr0731/go-ansisgr v0.1.0 h1:fbuupput8739hQbEmZn1cEKjqQFwtCCZNznnF6ANo5w= + github.com/ktr0731/go-ansisgr v0.1.0/go.mod h1:G9lxwgBwH0iey0Dw5YQd7n6PmQTwTuTM/X5Sgm/UrzE= +-github.com/ktr0731/go-fuzzyfinder v0.8.0 h1:+yobwo9lqZZ7jd1URPdCgZXTE2U1mpIVTkQoo4roi6w= +-github.com/ktr0731/go-fuzzyfinder v0.8.0/go.mod h1:Bjpz5im+tppKE9Ii6UK1h+6RaX/lUvJ0ruO4LIYRkqo= + github.com/ktr0731/go-fuzzyfinder v0.9.0 h1:JV8S118RABzRl3Lh/RsPhXReJWc2q0rbuipzXQH7L4c= + github.com/ktr0731/go-fuzzyfinder v0.9.0/go.mod h1:uybx+5PZFCgMCSDHJDQ9M3nNKx/vccPmGffsXPn2ad8= +-github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +-github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +-github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag= +-github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= + github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4= + github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= + github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= + github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +-github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= +-github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= +-github.com/mailru/easyjson v0.9.1 h1:LbtsOm5WAswyWbvTEOqhypdPeZzHavpZx96/n553mR8= +-github.com/mailru/easyjson v0.9.1/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= + github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= + github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= + github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +@@ -466,17 +372,10 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky + github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= + github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= + github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= + github.com/mattn/go-isatty v0.0.21 h1:xYae+lCNBP7QuW4PUnNG61ffM4hVIfm+zUzDuSzYLGs= + github.com/mattn/go-isatty v0.0.21/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= + github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= + github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +-github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +-github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= +-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +-github.com/mattn/go-runewidth v0.0.17 h1:78v8ZlW0bP43XfmAfPsdXcoNCelfMHsDmd/pkENfrjQ= +-github.com/mattn/go-runewidth v0.0.17/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= + github.com/mattn/go-runewidth v0.0.23 h1:7ykA0T0jkPpzSvMS5i9uoNn2Xy3R383f9HDx3RybWcw= + github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= + github.com/mattn/go-slim v0.0.4/go.mod h1:kXIwPrQbAZrhungtweoDO6qQQpUem6XkBg/mXykpoO0= +@@ -499,13 +398,6 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW + github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= + github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY= + github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo= +-github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus= +-github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8= +-github.com/onsi/ginkgo/v2 v2.25.3 h1:Ty8+Yi/ayDAGtk4XxmmfUy4GabvM+MegeB4cDLRi6nw= +-github.com/onsi/ginkgo/v2 v2.25.3/go.mod h1:43uiyQC4Ed2tkOzLsEYm7hnrb7UJTWHYNsuy3bG/snE= +-github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU= +-github.com/onsi/gomega v1.36.3/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0= +-github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A= + github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= + github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= + github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +@@ -520,8 +412,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb + github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= + github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= + github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +-github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= +-github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= + github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= + github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= + github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +@@ -534,31 +424,19 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b + github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= + github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= + github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +-github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= +-github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= + github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= + github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII= +-github.com/quic-go/quic-go v0.50.1 h1:unsgjFIUqW8a2oopkY7YNONpV1gYND6Nt9hnt1PN94Q= +-github.com/quic-go/quic-go v0.50.1/go.mod h1:Vim6OmUvlYdwBhXP9ZVrtGmCMWa3wEqhq3NgYrI8b4E= +-github.com/quic-go/quic-go v0.54.1 h1:4ZAWm0AhCb6+hE+l5Q1NAL0iRn/ZrMwqHRGQiFwj2eg= +-github.com/quic-go/quic-go v0.54.1/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY= + github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw= + github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU= +-github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM= +-github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0= +-github.com/refraction-networking/utls v1.8.0 h1:L38krhiTAyj9EeiQQa2sg+hYb4qwLCqdMcpZrRfbONE= +-github.com/refraction-networking/utls v1.8.0/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V4EVnelwbMQl4vCWXAM= + github.com/refraction-networking/utls v1.8.2 h1:j4Q1gJj0xngdeH+Ox/qND11aEfhpgoEvV+S9iJ2IdQo= + github.com/refraction-networking/utls v1.8.2/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V4EVnelwbMQl4vCWXAM= + github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +-github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= + github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= + github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= + github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= + github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= + github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +-github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +-github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= ++github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= + github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= + github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= + github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= +@@ -575,16 +453,10 @@ github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY52 + github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= + github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= + github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +-github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= +-github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= +-github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s= +-github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0= + github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= + github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= + github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= + github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +-github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= + github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= + github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= + github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +@@ -597,20 +469,17 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P + github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= + github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= + github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= ++github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= ++github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= + github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= + github.com/swaggo/files/v2 v2.0.2 h1:Bq4tgS/yxLB/3nwOMcul5oLEUKa877Ykgz3CJMVbQKU= + github.com/swaggo/files/v2 v2.0.2/go.mod h1:TVqetIzZsO9OhHX1Am9sRf9LdrFZqoK49N37KON/jr0= +-github.com/swaggo/swag v1.16.4 h1:clWJtd9LStiG3VeijiCfOVODP6VpHtKdQy9ELFG3s1A= +-github.com/swaggo/swag v1.16.4/go.mod h1:VBsHJRsDvfYvqoiMKnsdwhNV9LEMHgEDZcyVYX0sxPg= + github.com/swaggo/swag v1.16.6 h1:qBNcx53ZaX+M5dxVyTrgQ0PJ/ACK+NzhwcbieTt+9yI= + github.com/swaggo/swag v1.16.6/go.mod h1:ngP2etMK5a0P3QBizic5MEwpRmluJZPHjXcMoj4Xesg= + github.com/temoto/robotstxt v1.1.2 h1:W2pOjSJ6SWvldyEuiFXNxz3xZ8aiWX5LbfDiOFd7Fxg= + github.com/temoto/robotstxt v1.1.2/go.mod h1:+1AmkuG3IYkh1kv0d2qEB9Le88ehNO0zwOr3ujewlOo= + github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= + github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +-github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= + github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= + github.com/tidwall/match v1.2.0 h1:0pt8FlkOwjN2fPt4bIl4BoNxb98gGHN2ObFEDkrfZnM= + github.com/tidwall/match v1.2.0/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +@@ -623,10 +492,6 @@ github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqri + github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= + github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= + github.com/valyala/fasthttp v1.45.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= +-github.com/valyala/fasthttp v1.60.0 h1:kBRYS0lOhVJ6V+bYN8PqAHELKHtXqwq9zNMLKx1MBsw= +-github.com/valyala/fasthttp v1.60.0/go.mod h1:iY4kDgV3Gc6EqhRZ8icqcmlG6bqhcDXfuHgTO4FXCvc= +-github.com/valyala/fasthttp v1.66.0 h1:M87A0Z7EayeyNaV6pfO3tUTUiYO0dZfEJnRGXTVNuyU= +-github.com/valyala/fasthttp v1.66.0/go.mod h1:Y4eC+zwoocmXSVCB1JmhNbYtS7tZPRI2ztPB72EVObs= + github.com/valyala/fasthttp v1.70.0 h1:LAhMGcWk13QZWm85+eg8ZBNbrq5mnkWFGbHMUJHIdXA= + github.com/valyala/fasthttp v1.70.0/go.mod h1:oDZEHHkJ/Buyklg6uURmYs19442zFSnCIfX3j1FY3pE= + github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +@@ -652,10 +517,6 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= + go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= + go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= + go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +-go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs= +-go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8= +-go.uber.org/mock v0.5.1 h1:ASgazW/qBmR+A32MYFDB6E2POoTgOwT509VP0CT/fjs= +-go.uber.org/mock v0.5.1/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= + go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= + go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= + go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +@@ -678,10 +539,6 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY + golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= + golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= + golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +-golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= +-golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= +-golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +-golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= + golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= + golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= + golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +@@ -694,10 +551,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 + golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= + golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= + golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +-golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM= +-golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8= +-golang.org/x/exp v0.0.0-20250911091902-df9299821621 h1:2id6c1/gto0kaHYyrixvknJ8tUK/Qs5IsmBtrc+FtgU= +-golang.org/x/exp v0.0.0-20250911091902-df9299821621/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk= + golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= + golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= + golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +@@ -731,10 +584,6 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= + golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= + golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= + golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= +-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= +-golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U= +-golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= + golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI= + golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY= + golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +@@ -789,10 +638,6 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= + golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= + golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= + golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +-golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= +-golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= +-golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= +-golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= + golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= + golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= + golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +@@ -829,10 +674,6 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= + golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= + golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= + golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +-golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610= +-golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +-golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +-golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= + golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= + golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= + golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +@@ -912,11 +753,6 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= + golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= + golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +-golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= +-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +-golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +-golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= + golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= + golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= + golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +@@ -930,11 +766,6 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= + golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= + golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= + golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= +-golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o= +-golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= +-golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ= +-golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= + golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU= + golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A= + golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +@@ -955,18 +786,11 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= + golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= + golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= + golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +-golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= +-golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= +-golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= +-golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= + golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= + golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= + golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= + golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +-golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= + golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +-golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +-golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= + golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +@@ -1028,10 +852,6 @@ golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= + golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= + golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +-golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU= +-golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s= +-golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE= +-golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= + golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s= + golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0= + golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +@@ -1183,10 +1003,6 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba + google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= + google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= + google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= +-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= +-google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw= +-google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= + google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= + google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= + gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +@@ -1209,6 +1025,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= + gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= + gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= ++gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= ++gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= + honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= + honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= + honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/pkgs/by-name/mo/mozhi/package.nix b/pkgs/by-name/mo/mozhi/package.nix index be9f50027abb..5a78c1a8ce76 100644 --- a/pkgs/by-name/mo/mozhi/package.nix +++ b/pkgs/by-name/mo/mozhi/package.nix @@ -6,16 +6,18 @@ }: buildGoModule { pname = "mozhi"; - version = "0-unstable-2026-01-10"; + version = "0-unstable-2026-04-09"; src = fetchFromCodeberg { owner = "aryak"; repo = "mozhi"; - rev = "6b3f675b8d4c8fb852e88f0696d0c4d72516e618"; - hash = "sha256-O+heptNxkckcYxUi1QZUBun0F3zquGp5gPVsuWThajQ="; + rev = "bab94055f993ee64e2320d7e8d1f974d75f5b6e7"; + hash = "sha256-XAz+YkuRXbSIliXrZTvw6ieRaSHd5b9zZqf/NasEys0="; }; - vendorHash = "sha256-PiduR6mEATCKMi1lvKx4lpuSvNAyMhdeI/pRrsgGNx8="; + patches = [ ./go-modules.patch ]; + + vendorHash = "sha256-ZFbgq/zeBTK6wb5VHHyTNrq8RuNhWTy8PyA1mZcbKYc="; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/mu/music-assistant/builtin-snapcast-server.patch b/pkgs/by-name/mu/music-assistant/builtin-snapcast-server.patch index f361e9a7c235..27da1d878827 100644 --- a/pkgs/by-name/mu/music-assistant/builtin-snapcast-server.patch +++ b/pkgs/by-name/mu/music-assistant/builtin-snapcast-server.patch @@ -1,8 +1,8 @@ diff --git a/music_assistant/providers/snapcast/constants.py b/music_assistant/providers/snapcast/constants.py -index eb5ecb1a..92f03212 100644 +index 8c897c72..d89a0cd2 100644 --- a/music_assistant/providers/snapcast/constants.py +++ b/music_assistant/providers/snapcast/constants.py -@@ -43,7 +43,8 @@ CONTROL_SOCKET_PATH_TEMPLATE = "/tmp/ma-snapcast-{queue_id}.sock" # noqa: S108 +@@ -46,7 +46,8 @@ MASS_STREAM_PREFIX = "Music Assistant - " MASS_ANNOUNCEMENT_POSTFIX = " (announcement)" SNAPWEB_DIR = pathlib.Path(__file__).parent.resolve().joinpath("snapweb") @@ -13,18 +13,18 @@ index eb5ecb1a..92f03212 100644 DEFAULT_SNAPCAST_FORMAT = AudioFormat( content_type=ContentType.PCM_S16LE, diff --git a/music_assistant/providers/snapcast/provider.py b/music_assistant/providers/snapcast/provider.py -index 94c197fc..9a344f53 100644 +index 049fb934..316b6cf8 100644 --- a/music_assistant/providers/snapcast/provider.py +++ b/music_assistant/providers/snapcast/provider.py -@@ -32,6 +32,7 @@ from music_assistant.providers.snapcast.constants import ( +@@ -35,6 +35,7 @@ CONF_STREAM_IDLE_THRESHOLD, CONF_USE_EXTERNAL_SERVER, CONTROL_SCRIPT, + CONTROL_SCRIPT_DIR, - CONTROL_SOCKET_PATH_TEMPLATE, + DEFAULT_SNAPSERVER_CONFIG_FILE, + DEFAULT_SNAPSERVER_PLUGIN_DIR, DEFAULT_SNAPSERVER_PORT, - SNAPWEB_DIR, -@@ -215,6 +216,10 @@ class SnapCastProvider(PlayerProvider): +@@ -270,6 +271,10 @@ async def _builtin_server_runner(self) -> None: args = [ "snapserver", @@ -34,23 +34,14 @@ index 94c197fc..9a344f53 100644 + "--config=/dev/null", # config settings taken from # https://raw.githubusercontent.com/badaix/snapcast/86cd4b2b63e750a72e0dfe6a46d47caf01426c8d/server/etc/snapserver.conf - f"--server.datadir={self.mass.storage_path}", -@@ -227,6 +232,7 @@ class SnapCastProvider(PlayerProvider): - f"--stream.buffer={self._snapcast_server_buffer_size}", - f"--stream.chunk_ms={self._snapcast_server_chunk_ms}", - f"--stream.codec={self._snapcast_server_transport_codec}", -+ f"--stream.plugin_dir={CONTROL_SCRIPT_DIR}", + f"--config={self._snapcast_server_config_file}", +@@ -286,8 +291,7 @@ async def _builtin_server_runner(self) -> None: f"--stream.send_to_muted={str(self._snapcast_server_send_to_muted).lower()}", f"--streaming_client.initial_volume={self._snapcast_server_initial_volume}", ] -@@ -243,9 +249,7 @@ class SnapCastProvider(PlayerProvider): - # Copy control script after snapserver starts - # (run in executor to avoid blocking) - loop = asyncio.get_running_loop() -- self._controlscript_available = await loop.run_in_executor( -- None, self._setup_controlscript -- ) -+ self._controlscript_available = True - - def _get_ma_id(self, snap_client_id: str) -> str: - search_dict = self._ids_map.inverse +- loop = asyncio.get_running_loop() +- plugin_dir = await loop.run_in_executor(None, self._setup_controlscript) ++ plugin_dir = CONTROL_SCRIPT_DIR + if plugin_dir is not None: + args.append(f"--stream.plugin_dir={plugin_dir}") + self._controlscript_available = True diff --git a/pkgs/by-name/mu/music-assistant/cliraop-cliap2.patch b/pkgs/by-name/mu/music-assistant/cliraop-cliap2.patch index 33b856711eed..670de7d1bfe8 100644 --- a/pkgs/by-name/mu/music-assistant/cliraop-cliap2.patch +++ b/pkgs/by-name/mu/music-assistant/cliraop-cliap2.patch @@ -1,16 +1,16 @@ diff --git a/music_assistant/providers/airplay/helpers.py b/music_assistant/providers/airplay/helpers.py -index c5fef7eb..a628622d 100644 +index 0d03b2cd..9cd59cf0 100644 --- a/music_assistant/providers/airplay/helpers.py +++ b/music_assistant/providers/airplay/helpers.py -@@ -6,6 +6,7 @@ - import os - import platform +@@ -9,6 +9,7 @@ + import socket import time + from ipaddress import ip_address +from shutil import which from typing import TYPE_CHECKING - from zeroconf import IPVersion -@@ -176,7 +177,6 @@ async def check_binary(cli_path: str) -> str | None: + from music_assistant_models.enums import ContentType +@@ -226,7 +227,6 @@ async def check_binary(cli_path: str) -> str | None: pass return None @@ -18,7 +18,7 @@ index c5fef7eb..a628622d 100644 system = platform.system().lower().replace("darwin", "macos") architecture = platform.machine().lower() -@@ -188,7 +188,7 @@ async def check_binary(cli_path: str) -> str | None: +@@ -238,7 +238,7 @@ async def check_binary(cli_path: str) -> str | None: raise RuntimeError(f"Unsupported streaming protocol requested: {protocol}") if bridge_binary := await check_binary( diff --git a/pkgs/by-name/mu/music-assistant/dont-install-deps.patch b/pkgs/by-name/mu/music-assistant/dont-install-deps.patch index 0c6569078400..d074e18fa67c 100644 --- a/pkgs/by-name/mu/music-assistant/dont-install-deps.patch +++ b/pkgs/by-name/mu/music-assistant/dont-install-deps.patch @@ -1,8 +1,8 @@ diff --git a/music_assistant/helpers/util.py b/music_assistant/helpers/util.py -index bc14912b..0527a831 100644 +index e91cd933..ed96d9b5 100644 --- a/music_assistant/helpers/util.py +++ b/music_assistant/helpers/util.py -@@ -495,30 +495,11 @@ async def load_provider_module(domain: str, requirements: list[str]) -> Provider +@@ -602,30 +602,11 @@ def _get_provider_module(domain: str) -> ProviderModuleType: "ProviderModuleType", importlib.import_module(f".{domain}", "music_assistant.providers") ) @@ -35,10 +35,10 @@ index bc14912b..0527a831 100644 async def has_tmpfs_mount() -> bool: """Check if we have a tmpfs mount.""" diff --git a/music_assistant/providers/ytmusic/__init__.py b/music_assistant/providers/ytmusic/__init__.py -index 9cc5981a..dc424b0b 100644 +index 0ac8a70f..5d74e25b 100644 --- a/music_assistant/providers/ytmusic/__init__.py +++ b/music_assistant/providers/ytmusic/__init__.py -@@ -200,7 +200,6 @@ class YoutubeMusicProvider(MusicProvider): +@@ -203,7 +203,6 @@ class YoutubeMusicProvider(MusicProvider): async def handle_async_init(self) -> None: """Set up the YTMusic provider.""" logging.getLogger("yt_dlp").setLevel(self.logger.level + 10) @@ -46,7 +46,7 @@ index 9cc5981a..dc424b0b 100644 self._cookie = self.config.get_value(CONF_COOKIE) self._po_token_server_url = ( self.config.get_value(CONF_PO_TOKEN_SERVER_URL) or DEFAULT_PO_TOKEN_SERVER_URL -@@ -1091,8 +1090,6 @@ class YoutubeMusicProvider(MusicProvider): +@@ -1103,8 +1102,6 @@ async def _install_packages(self) -> None: # NOTE: Google breaks things quite often which requires us to update # some packages very frequently. Installing them dynamically prevents # us from having to update MA to ensure this provider works. diff --git a/pkgs/by-name/mu/music-assistant/ffmpeg.patch b/pkgs/by-name/mu/music-assistant/ffmpeg.patch index 7f503117877e..a9af5333b828 100644 --- a/pkgs/by-name/mu/music-assistant/ffmpeg.patch +++ b/pkgs/by-name/mu/music-assistant/ffmpeg.patch @@ -1,10 +1,10 @@ diff --git a/music_assistant/controllers/streams/smart_fades/fades.py b/music_assistant/controllers/streams/smart_fades/fades.py -index 03c11ef9..460d53a6 100644 +index 59246cce..673c3a10 100644 --- a/music_assistant/controllers/streams/smart_fades/fades.py +++ b/music_assistant/controllers/streams/smart_fades/fades.py -@@ -76,7 +76,7 @@ class SmartFade(ABC): - async with aiofiles.open(fadeout_filename, "wb") as outfile: +@@ -86,7 +86,7 @@ async def apply( await outfile.write(fade_out_part) + args = [ - "ffmpeg", + "@ffmpeg@", @@ -12,19 +12,19 @@ index 03c11ef9..460d53a6 100644 "-loglevel", "error", diff --git a/music_assistant/helpers/audio.py b/music_assistant/helpers/audio.py -index 0674b009..53158f4d 100644 +index f7828a58..698751f9 100644 --- a/music_assistant/helpers/audio.py +++ b/music_assistant/helpers/audio.py -@@ -103,7 +103,7 @@ async def strip_silence( - reverse: bool = False, - ) -> bytes: - """Strip silence from begin or end of pcm audio using ffmpeg.""" +@@ -114,7 +114,7 @@ async def strip_silence( + :param pcm_format: AudioFormat of the audio data. + :param reverse: If True, strip from end instead of beginning. + """ - args = ["ffmpeg", "-hide_banner", "-loglevel", "quiet"] + args = ["@ffmpeg@", "-hide_banner", "-loglevel", "quiet"] args += [ "-acodec", pcm_format.content_type.name.lower(), -@@ -1134,7 +1134,7 @@ async def get_silence( +@@ -300,7 +300,7 @@ async def get_silence( return # use ffmpeg for all other encodings args = [ @@ -34,10 +34,10 @@ index 0674b009..53158f4d 100644 "-loglevel", "quiet", diff --git a/music_assistant/helpers/ffmpeg.py b/music_assistant/helpers/ffmpeg.py -index 9ea5ea0c..51b1d62b 100644 +index 9b7b1bbb..822424dc 100644 --- a/music_assistant/helpers/ffmpeg.py +++ b/music_assistant/helpers/ffmpeg.py -@@ -249,7 +249,7 @@ def get_ffmpeg_args( # noqa: PLR0915 +@@ -267,7 +267,7 @@ def get_ffmpeg_args( # noqa: PLR0915 extra_output_args = [] # generic args generic_args = [ @@ -46,7 +46,7 @@ index 9ea5ea0c..51b1d62b 100644 "-hide_banner", "-loglevel", loglevel, -@@ -416,7 +416,7 @@ async def check_ffmpeg_version() -> None: +@@ -434,7 +434,7 @@ async def check_ffmpeg_version() -> None: """Check if ffmpeg is present (with libsoxr support).""" # check for FFmpeg presence try: @@ -56,10 +56,10 @@ index 9ea5ea0c..51b1d62b 100644 raise AudioError( "FFmpeg binary is missing from system. " diff --git a/music_assistant/helpers/tags.py b/music_assistant/helpers/tags.py -index fe83301c..d35760b6 100644 +index b50633f0..51e8ec7b 100644 --- a/music_assistant/helpers/tags.py +++ b/music_assistant/helpers/tags.py -@@ -484,7 +484,7 @@ def parse_tags( +@@ -666,7 +666,7 @@ def parse_tags( Input_file may be a (local) filename or URL accessible by ffmpeg. """ args = ( @@ -68,7 +68,7 @@ index fe83301c..d35760b6 100644 "-hide_banner", "-loglevel", "fatal", -@@ -551,7 +551,7 @@ def get_file_duration(input_file: str) -> float: +@@ -737,7 +737,7 @@ def get_file_duration(input_file: str) -> float: NOT Async friendly. """ args = ( @@ -77,7 +77,7 @@ index fe83301c..d35760b6 100644 "-hide_banner", "-loglevel", "info", -@@ -707,7 +707,7 @@ async def get_embedded_image(input_file: str) -> bytes | None: +@@ -1368,7 +1368,7 @@ async def get_embedded_image(input_file: str) -> bytes | None: # Use FFmpeg for all other cases (URLs, ID3 tags, Vorbis comments, etc.) args = [ diff --git a/pkgs/by-name/mu/music-assistant/fix-webserver-tests-in-sandbox.patch b/pkgs/by-name/mu/music-assistant/fix-webserver-tests-in-sandbox.patch index 69b6a0f3f52b..abcc674c972c 100644 --- a/pkgs/by-name/mu/music-assistant/fix-webserver-tests-in-sandbox.patch +++ b/pkgs/by-name/mu/music-assistant/fix-webserver-tests-in-sandbox.patch @@ -1,8 +1,8 @@ diff --git a/music_assistant/helpers/util.py b/music_assistant/helpers/util.py -index 377c7221..aaf6460d 100644 +index e91cd933..088e76b7 100644 --- a/music_assistant/helpers/util.py +++ b/music_assistant/helpers/util.py -@@ -305,7 +305,7 @@ async def get_ip_addresses(include_ipv6: bool = False) -> tuple[str, ...]: +@@ -365,7 +365,7 @@ def call() -> tuple[str, ...]: continue # ifaddr returns IPv6 addresses as (address, flowinfo, scope_id) tuples ip_str = ip.ip[0] if isinstance(ip.ip, tuple) else ip.ip diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix index b401e501ccc1..ab091182c71e 100644 --- a/pkgs/by-name/mu/music-assistant/frontend.nix +++ b/pkgs/by-name/mu/music-assistant/frontend.nix @@ -2,18 +2,19 @@ lib, buildPythonPackage, fetchPypi, + music-assistant, setuptools, }: buildPythonPackage rec { pname = "music-assistant-frontend"; - version = "2.17.73"; + version = "2.17.146"; pyproject = true; src = fetchPypi { pname = "music_assistant_frontend"; inherit version; - hash = "sha256-vmZa98pT5Cg22fa73/KTrMUqP4Axc1y4x710HCxBzIY="; + hash = "sha256-VU2SXL6SLFiKntmJJtCabBOYOeImYFPHYxvMPmnhmEc="; }; build-system = [ setuptools ]; @@ -27,6 +28,6 @@ buildPythonPackage rec { description = "Music Assistant frontend"; homepage = "https://github.com/music-assistant/frontend"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ hexa ]; + inherit (music-assistant.meta) maintainers; }; } diff --git a/pkgs/by-name/mu/music-assistant/librespot.patch b/pkgs/by-name/mu/music-assistant/librespot.patch index 268b7339834c..053d9df434c4 100644 --- a/pkgs/by-name/mu/music-assistant/librespot.patch +++ b/pkgs/by-name/mu/music-assistant/librespot.patch @@ -2,7 +2,7 @@ diff --git a/music_assistant/providers/spotify/helpers.py b/music_assistant/prov index fe7af648..3f5121de 100644 --- a/music_assistant/providers/spotify/helpers.py +++ b/music_assistant/providers/spotify/helpers.py -@@ -6,6 +6,7 @@ import asyncio +@@ -6,6 +6,7 @@ import os import platform import time @@ -10,7 +10,7 @@ index fe7af648..3f5121de 100644 from typing import TYPE_CHECKING, Any from urllib.parse import urlencode -@@ -35,12 +36,8 @@ async def get_librespot_binary() -> str: +@@ -35,12 +36,8 @@ async def check_librespot(librespot_path: str) -> str | None: except OSError: return None diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index bf28c26fbe79..f98fb76bfcce 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -14,20 +14,12 @@ let packageOverrides = self: super: { music-assistant-frontend = self.callPackage ./frontend.nix { }; - music-assistant-models = super.music-assistant-models.overridePythonAttrs (oldAttrs: rec { - version = "1.1.86"; + music-assistant-models = super.music-assistant-models.overridePythonAttrs (oldAttrs: { + version = "1.1.115"; - src = fetchFromGitHub { - owner = "music-assistant"; - repo = "models"; - tag = version; - hash = "sha256-dQwFsuelp/3s2CO/5jxNrZcmWxE9xYhrpx0O37Tq/TQ="; + src = oldAttrs.src.override { + hash = "sha256-oEXL0B8JNH4PcltpES375ov7QGs+gtYKlMGr1B7BlKY="; }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "0.0.0" "${version}" - ''; }); }; }; @@ -40,16 +32,20 @@ let pythonPath = python.pkgs.makePythonPath providerDependencies; in + +assert + (lib.elem "ariacast" providers) -> throw "music-assistant: ariacast has not been packaged, yet."; + python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.7.11"; + version = "2.8.4"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; tag = version; - hash = "sha256-HLd7PAYdBzpzdfCRPc4elPq3KfzusIXYXTV8fRmo1lU="; + hash = "sha256-/yKnUklNQMsumzj68KIfMN/h7Xsr3Brmwpicam9xuAY="; }; patches = [ @@ -86,16 +82,14 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "0.0.0" "${version}" - - # get-mac is a deprecated alias of getmac since 2018 - substituteInPlace pyproject.toml \ - --replace-fail "get-mac" "getmac" + --replace-fail "0.0.0" "${version}" \ + --replace-fail "==" ">=" rm -rv \ music_assistant/providers/airplay/bin/{cliap2-*,cliraop-*} \ music_assistant/providers/airplay_receiver/bin/{build_binaries.sh,shairport-sync-*} \ - music_assistant/providers/spotify/bin + music_assistant/providers/ariacast_receiver/bin/ariacast_* \ + music_assistant/providers/spotify/bin/librespot-* found_bins=$(find music_assistant/ -wholename '*/bin/*' -type f -executable -print0 | tr '\0' ' ') if [[ -n $found_bins ]]; then @@ -109,21 +103,12 @@ python.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ - "aiofiles" "aiohttp" "aiosqlite" - "certifi" - "colorlog" "cryptography" - "getmac" "mashumaro" - "numpy" "orjson" - "pillow" - "podcastparser" - "pycares" "xmltodict" - "zeroconf" ]; pythonRemoveDeps = [ @@ -131,44 +116,50 @@ python.pkgs.buildPythonApplication rec { "uv" ]; - dependencies = with python.pkgs; [ - # Only packages required in pyproject.toml - aiodns - aiofiles - aiohttp - aiohttp-asyncmdnsresolver - aiohttp-fast-zlib - aiortc - aiorun - aiosqlite - awesomeversion - brotli - certifi - chardet - colorlog - cryptography - getmac - gql - ifaddr - librosa - mashumaro - music-assistant-frontend - music-assistant-models - mutagen - orjson - pillow - podcastparser - propcache - python-slugify - shortuuid - unidecode - xmltodict - zeroconf + dependencies = + with python.pkgs; + [ + # Only packages required in pyproject.toml + aiodns + aiofiles + aiohttp + aiohttp-asyncmdnsresolver + aiohttp-fast-zlib + aiohttp-socks + aiortc + aiosqlite + awesomeversion + brotli + certifi + chardet + colorlog + cryptography + getmac + gql + ifaddr + librosa + mashumaro + music-assistant-frontend + music-assistant-models + mutagen + numpy + orjson + pillow + podcastparser + propcache + pyjwt + python-slugify + shortuuid + unidecode + xmltodict + zeroconf - # Used in music_assistant/controllers/webserver/helpers/auth_providers.py - # but somehow not part of pyproject.toml - hass-client - ]; + # Used in music_assistant/controllers/webserver/helpers/auth_providers.py + # but somehow not part of pyproject.toml + hass-client + ] + ++ gql.optional-dependencies.all + ++ pyjwt.optional-dependencies.crypto; optional-dependencies = with python.pkgs; { # Required subset of optional-dependencies in pyproject.toml @@ -185,19 +176,26 @@ python.pkgs.buildPythonApplication rec { pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies + ++ (providerPackages.audible python.pkgs) + ++ (providerPackages.dlna python.pkgs) ++ (providerPackages.jellyfin python.pkgs) ++ (providerPackages.opensubsonic python.pkgs) + ++ (providerPackages.sendspin python.pkgs) ++ (providerPackages.tidal python.pkgs); disabledTestPaths = [ # no multicast support in build sandbox: # "OSError: [Errno 19] No such device" - "tests/providers/jellyfin/test_init.py::test_initial_sync" - "tests/core/test_server_base.py::test_start_and_stop_server" - "tests/core/test_server_base.py::test_events" + "tests/core/test_genres.py" # provider is missing dependencies - "tests/providers/nicovideo" "tests/providers/apple_music" + "tests/providers/bandcamp" + "tests/providers/kion_music" + "tests/providers/nicovideo" + "tests/providers/yandex_music" + "tests/providers/zvuk_music" + # mocking music_assistant.providers.airplay.pairing.AirPlayPairing does not work + "tests/providers/airplay/test_player.py::test_start_pairing__pin_decision" ]; pythonImportsCheck = [ "music_assistant" ]; diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index caac5bb1170b..85b96a55d5de 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.7.11"; + version = "2.8.4"; providers = { airplay = ps: with ps; [ @@ -19,6 +19,8 @@ ps: with ps; [ gql ]; + ariacast_receiver = ps: [ + ]; audible = ps: with ps; [ audible @@ -27,6 +29,8 @@ ps: with ps; [ aioaudiobookshelf ]; + bandcamp = ps: [ + ]; # missing bandcamp-async-api bbc_sounds = ps: with ps; [ pytz @@ -41,6 +45,10 @@ ps: with ps; [ pychromecast ]; + coverartarchive = ps: [ + ]; + dashie_kiosk = ps: [ + ]; deezer = ps: with ps; [ deezer-python-async @@ -51,11 +59,16 @@ dlna = ps: with ps; [ async-upnp-client + defusedxml ]; + emby = ps: [ + ]; fanarttv = ps: [ ]; filesystem_local = ps: [ ]; + filesystem_nfs = ps: [ + ]; filesystem_smb = ps: [ ]; fully_kiosk = @@ -72,6 +85,10 @@ ]; hass_players = ps: [ ]; + heos = + ps: with ps; [ + pyheos + ]; ibroadcast = ps: [ ]; # missing ibroadcastaio internet_archive = ps: [ @@ -82,6 +99,8 @@ ps: with ps; [ aiojellyfin ]; + kion_music = ps: [ + ]; # missing yandex-music lastfm_scrobble = ps: with ps; [ pylast @@ -106,6 +125,12 @@ ps: with ps; [ py-opensonic ]; + orf_radiothek = ps: [ + ]; + pandora = ps: [ + ]; + party = ps: [ + ]; phishin = ps: [ ]; plex = @@ -146,6 +171,8 @@ snapcast websocket-client ]; + somafm = ps: [ + ]; sonos = ps: with ps; [ aiosonos @@ -163,14 +190,18 @@ ps: with ps; [ pkce ]; - spotify_connect = ps: [ - ]; + spotify_connect = + ps: with ps; [ + pkce + ]; squeezelite = ps: with ps; [ aioslimproto ]; subsonic_scrobble = ps: [ ]; + sync_group = ps: [ + ]; test = ps: [ ]; theaudiodb = ps: [ @@ -183,10 +214,16 @@ ]; universal_group = ps: [ ]; + universal_player = ps: [ + ]; vban_receiver = ps: with ps; [ aiovban ]; + yandex_music = ps: [ + ]; # missing yandex-music + yousee = ps: [ + ]; ytmusic = ps: with ps; [ bgutil-ytdlp-pot-provider @@ -194,5 +231,7 @@ yt-dlp ytmusicapi ]; # missing deno + zvuk_music = ps: [ + ]; # missing zvuk-music }; } diff --git a/pkgs/by-name/mu/music-assistant/shairport-sync.patch b/pkgs/by-name/mu/music-assistant/shairport-sync.patch index 298d06f59449..a1bbf8176b67 100644 --- a/pkgs/by-name/mu/music-assistant/shairport-sync.patch +++ b/pkgs/by-name/mu/music-assistant/shairport-sync.patch @@ -1,5 +1,5 @@ diff --git a/music_assistant/providers/airplay_receiver/helpers.py b/music_assistant/providers/airplay_receiver/helpers.py -index 6f2b35df..dd839b73 100644 +index 6f2b35df..d80dd112 100644 --- a/music_assistant/providers/airplay_receiver/helpers.py +++ b/music_assistant/providers/airplay_receiver/helpers.py @@ -22,15 +22,9 @@ async def check_shairport_sync(shairport_path: str) -> str | None: diff --git a/pkgs/by-name/mu/music-assistant/update-providers.py b/pkgs/by-name/mu/music-assistant/update-providers.py index cf581050e43c..c464fc1cd5b1 100755 --- a/pkgs/by-name/mu/music-assistant/update-providers.py +++ b/pkgs/by-name/mu/music-assistant/update-providers.py @@ -222,7 +222,7 @@ async def resolve_providers(manifests) -> Set: version = await get_package_version(attr) if version not in requirement.specifier: - errors.append(f"{requirement} not satisifed by version {version}") + errors.append(f"{requirement} not satisfied by version {version}") providers.add(provider) if errors: print("\n - ", end="") diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 36424b3c7471..95a6d017c147 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "namespace-cli"; - version = "0.0.493"; + version = "0.0.499"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-PMF4bpJ5+XtJrhQMsr33wdEDuufn2d+xcGddWzAR/bs="; + hash = "sha256-LxN4QqgvmpHa7aJPFJU01BrULpiIVFQDilJXClVecOo="; }; - vendorHash = "sha256-03QhO7oIUB9zoL5bfzWezkJ0zDY4buuXWLYhwxvnoig="; + vendorHash = "sha256-TG0Y0hX/v7rgm1yo19zUt3aNrU65X4B7PVySaLeIk+o="; subPackages = [ "cmd/nsc" diff --git a/pkgs/by-name/nd/ndcurves/package.nix b/pkgs/by-name/nd/ndcurves/package.nix index 770fea0fa4b9..ddd3895bc4ad 100644 --- a/pkgs/by-name/nd/ndcurves/package.nix +++ b/pkgs/by-name/nd/ndcurves/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ndcurves"; - version = "2.1.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "loco-3d"; repo = "ndcurves"; rev = "v${finalAttrs.version}"; - hash = "sha256-YnpC2yYEe9VNcHHDyv+glLrue/J/HXbK/VP7DTAE/q0="; + hash = "sha256-X9p01hMoAx6fMSEU/nf/eqyFgy23mZrpBFonjoT1DLo="; }; outputs = [ diff --git a/pkgs/by-name/ne/nexuiz/package.nix b/pkgs/by-name/ne/nexuiz/package.nix index 6fce3a3358f5..be8f6b1135f9 100644 --- a/pkgs/by-name/ne/nexuiz/package.nix +++ b/pkgs/by-name/ne/nexuiz/package.nix @@ -2,28 +2,9 @@ lib, stdenv, fetchurl, - # required for both unzip, - zlib, - curl, - libjpeg, - libpng, - libvorbis, - libtheora, - libogg, - libmodplug, - # glx - libx11, - libGLU, - libGL, - libxpm, - libxext, - libxxf86vm, - libxxf86dga, - alsa-lib, - # sdl - SDL, - # icon + makeBinaryWrapper, + darkplaces, copyDesktopItems, makeDesktopItem, }: @@ -45,19 +26,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ unzip copyDesktopItems - ]; - buildInputs = [ - # glx - libx11 - libGLU - libGL - libxpm - libxext - libxxf86vm - libxxf86dga - alsa-lib - # sdl - SDL + makeBinaryWrapper ]; postUnpack = '' @@ -66,42 +35,24 @@ stdenv.mkDerivation { cd ../../ ''; - env.NIX_LDFLAGS = toString [ - "-rpath ${zlib.out}/lib" - "-rpath ${curl.out}/lib" - "-rpath ${libjpeg.out}/lib" - "-rpath ${libpng.out}/lib" - "-rpath ${libvorbis.out}/lib" - "-rpath ${libtheora.out}/lib" - "-rpath ${libogg.out}/lib" - "-rpath ${libmodplug.out}/lib" - ]; - - buildPhase = '' - cd sources/darkplaces/ - DP_FS_BASEDIR="$out/share/nexuiz" - make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release - make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release - make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release - cd ../../ - ''; + dontBuild = true; installPhase = '' runHook preInstall mkdir -pv "$out/bin/" - cp -v sources/darkplaces/darkplaces-glx "$out/bin/nexuiz-glx" - cp -v sources/darkplaces/darkplaces-sdl "$out/bin/nexuiz-sdl" - cp -v sources/darkplaces/darkplaces-dedicated "$out/bin/nexuiz-dedicated" + makeWrapper ${lib.getBin darkplaces}/bin/darkplaces $out/bin/nexuiz \ + --inherit-argv0 \ + --add-flags "-basedir $out/share/nexuiz" + makeWrapper ${lib.getBin darkplaces}/bin/darkplaces-dedicated $out/bin/nexuiz-dedicated \ + --inherit-argv0 \ + --add-flags "-basedir $out/share/nexuiz" mkdir -pv "$out/share/nexuiz/" cp -rv data/ "$out/share/nexuiz/" - ln -s "$out/bin/nexuiz-sdl" "$out/bin/nexuiz" mkdir -pv $out/share/icon/ cp sources/darkplaces/nexuiz.ico $out/share/icon/nexuiz.ico runHook postInstall ''; - dontPatchELF = true; - desktopItems = [ (makeDesktopItem { name = "Nexuiz"; diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index f020830cf1ba..fe5a418ee95d 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "nfpm"; - version = "2.46.0"; + version = "2.46.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = "nfpm"; rev = "v${finalAttrs.version}"; - hash = "sha256-dzgC8SnGsKdW95xyq7pXacBvCTrte6QQCjYvo5R4D9I="; + hash = "sha256-lwIPwX/2rAOFbzEnEJT8KDzhPOa4I2eirWf8LtQXy7w="; }; - vendorHash = "sha256-HfqPqGpwInTrGjTCA4qJjtngJTCmb+c/sJ1Uhi/CCZ0="; + vendorHash = "sha256-1rtkkIMlaeFih0ZR8YEZMgbAnvoBQgY00p3QML8qVAc="; ldflags = [ "-s" diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix index 4df1fe40de38..1019c211f3c9 100644 --- a/pkgs/by-name/nf/nfs-ganesha/package.nix +++ b/pkgs/by-name/nf/nfs-ganesha/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nfs-ganesha"; - version = "9.10"; + version = "9.11"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "nfs-ganesha"; repo = "nfs-ganesha"; tag = "V${finalAttrs.version}"; - hash = "sha256-9w7EVKTaQ7b3CT/APfvhEMLUE+CAg2L2G4qtrVAgxXc="; + hash = "sha256-5nDYJXOaceghkaTqRjy6DPsbmnyOOiANo3EMrnOgKsY="; }; patches = lib.optional useDbus ./allow-bypassing-dbus-pkg-config-test.patch; diff --git a/pkgs/by-name/no/node-core-utils/package.nix b/pkgs/by-name/no/node-core-utils/package.nix index a7bdeb734cf7..6d505c220ddf 100644 --- a/pkgs/by-name/no/node-core-utils/package.nix +++ b/pkgs/by-name/no/node-core-utils/package.nix @@ -9,16 +9,16 @@ buildNpmPackage (finalAttrs: { pname = "node-core-utils"; - version = "6.3.0"; + version = "6.3.1"; src = fetchFromGitHub { owner = "nodejs"; repo = "node-core-utils"; tag = "v${finalAttrs.version}"; - hash = "sha256-wS3+/JUeIq5r5vp+zOX4AnwmqjCa1KdUH5YYJUM1U70="; + hash = "sha256-n3mAq51b0nAY1q9Mp1tmYwOZ3IVXHTc1grKbPwr0Rfc="; }; - npmDepsHash = "sha256-wtlh9vuvTzP7DJnItyHIzgXb+Y+iMg7tb761HQ1rKeo="; + npmDepsHash = "sha256-4gmxwZHzi4S1ky3fmFy0XzcJKzjPpl891OYtPsKcaPc="; dontNpmBuild = true; dontNpmPrune = true; diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index b8686f327270..4aff6c05f7ea 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.15.1"; + version = "7.15.2"; src = fetchFromGitHub { repo = "oauth2-proxy"; owner = "oauth2-proxy"; - sha256 = "sha256-4PuyX+BbaL1q66LVtLADkOFj1oq49sERmz0igtyOKB8="; + sha256 = "sha256-qhWU6i57WS8TWJ5ggzwmeoIv0osQjA9wdwqnvxMddrc="; rev = "v${version}"; }; - vendorHash = "sha256-PB0x4tRBx6U5ZulFYD16AdH2kHCfse8BEJXuiQCFq3I="; + vendorHash = "sha256-Iu1dm0f3eYJpr9eR8RL7wAV8UGwpOway0aP8r5wci0M="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version.VERSION=v${version}" ]; diff --git a/pkgs/by-name/of/offlineimap/package.nix b/pkgs/by-name/of/offlineimap/package.nix index be6a3f4b5b66..313391fd1a14 100644 --- a/pkgs/by-name/of/offlineimap/package.nix +++ b/pkgs/by-name/of/offlineimap/package.nix @@ -10,30 +10,20 @@ libxslt, testers, offlineimap, - fetchpatch, }: python3.pkgs.buildPythonApplication (finalAttrs: { pname = "offlineimap"; - version = "8.0.1"; + version = "8.0.2"; pyproject = true; src = fetchFromGitHub { owner = "OfflineIMAP"; repo = "offlineimap3"; rev = "v${finalAttrs.version}"; - hash = "sha256-Aigh2B4MTAOeUprtcK9kOx+aG4yCmGZoWTLmYYhrfXA="; + hash = "sha256-mysvqltO4x2dD8V+FAGOnDw5lQ8bgDwXFK9n15fbUdI="; }; - patches = [ - (fetchpatch { - # https://github.com/OfflineIMAP/offlineimap3/pull/225 - name = "duplicate-bin.patch"; - url = "https://github.com/OfflineIMAP/offlineimap3/commit/64557d2251f0d911c215eb743f6bfe8de8dfc042.patch"; - hash = "sha256-Agy38fLt2k9AwPmGBoQxUD7+FD3qJzj89A13SQr0/nU="; - }) - ]; - postPatch = '' # Skip xmllint to stop failures due to no network access sed -i docs/Makefile -e "s|a2x -v -d |a2x -L -v -d |" @@ -64,11 +54,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { urllib3 ]; - # https://github.com/OfflineIMAP/offlineimap3/pull/232 - pythonRelaxDeps = [ - "urllib3" - ]; - postInstall = '' make -C docs man installManPage docs/offlineimap.1 diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix index 85343bd3568d..dba19a8c688e 100644 --- a/pkgs/by-name/oi/oidc-agent/package.nix +++ b/pkgs/by-name/oi/oidc-agent/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "oidc-agent"; - version = "5.3.4"; + version = "5.3.5"; src = fetchFromGitHub { owner = "indigo-dc"; repo = "oidc-agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-hM5Q1xrjFOCIL5BLRvhVMmPiip1bwRo0ikeQXu/Oouk="; + hash = "sha256-BGslxBQWXS65wNs6HEbH7yqxt0+3isAiP51wrGhqKLk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index aa37c6b22f01..a610262ce240 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -140,13 +140,13 @@ let in goBuild (finalAttrs: { pname = "ollama"; - version = "0.20.6"; + version = "0.20.7"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-ol+LsKRxOR37Rpwc9/NouwMg0GOpaeh6zmN5quIBgnA="; + hash = "sha256-a08TZMzoRg1YzqIU6l1Z8JOBh6VSK5lhfA8ggoMl/ss="; }; vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos="; diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index 4d5ea16bbc32..a1299dc6b332 100644 --- a/pkgs/by-name/ol/ols/package.nix +++ b/pkgs/by-name/ol/ols/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ols"; - version = "dev-2026-02"; + version = "dev-2026-03"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; tag = finalAttrs.version; - hash = "sha256-3UoVMQuUol7vfSM57mj644XZ1CKmTz7+VuDSETT9NSE="; + hash = "sha256-QjkzR9Wnc+Poq7dxDlik9k1maEs8xiFuNbwRdv8nqyo="; }; postPatch = '' diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix index a50dcec94865..5d404ea33877 100644 --- a/pkgs/by-name/op/openrct2/package.nix +++ b/pkgs/by-name/op/openrct2/package.nix @@ -30,7 +30,9 @@ openssl, pkg-config, speexdsp, + versionCheckHook, zlib, + withDiscordRpc ? false, # Paths to RCT1 and RCT2 installs can be specified to have them added as a wrapped argument rct1Path ? null, @@ -38,21 +40,17 @@ }: let - openrct2-version = "0.4.31"; - - # Those versions MUST match the pinned versions within the CMakeLists.txt - # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.7.6"; - openmsx-version = "1.6.1"; + objects-version = "1.7.9"; + openmusic-version = "1.6.1"; opensfx-version = "1.0.6"; title-sequences-version = "0.4.26"; objects = fetchurl { url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip"; - hash = "sha256-asoutEH76MAi/4TVn7Ue1+pXd1ZkCXDcmJ6raF/0VpY="; + hash = "sha256-VUYe0gxugvFOmiec2ERlSwJkmZu5QDTVj6kS/e4m6tY="; }; - openmsx = fetchurl { - url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${openmsx-version}/openmusic.zip"; + openmusic = fetchurl { + url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${openmusic-version}/openmusic.zip"; hash = "sha256-mUs1DTsYDuHLlhn+J/frrjoaUjKEDEvUeonzP6id4aE="; }; opensfx = fetchurl { @@ -66,13 +64,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openrct2"; - version = openrct2-version; + version = "0.5.0"; src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; - tag = "v${openrct2-version}"; - hash = "sha256-jXcB2lwf/2O+TMSakp32it6T8Fg0e5QFcbMU89WoMjU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-sGdtiEUmZux6FCXuxefRulfIEO8FY7wYfIBOhdSYtF8="; }; nativeBuildInputs = [ @@ -80,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config unzip makeWrapper + versionCheckHook ]; buildInputs = [ @@ -110,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "DOWNLOAD_OBJECTS" false) - (lib.cmakeBool "DOWNLOAD_OPENMSX" false) + (lib.cmakeBool "DOWNLOAD_OPENMUSIC" false) (lib.cmakeBool "DOWNLOAD_OPENSFX" false) (lib.cmakeBool "DOWNLOAD_TITLE_SEQUENCES" false) (lib.cmakeBool "DISABLE_DISCORD_RPC" (!withDiscordRpc)) @@ -119,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { postUnpack = '' mkdir -p $sourceRoot/data/{object,sequence} unzip -o ${objects} -d $sourceRoot/data/object - unzip -o ${openmsx} -d $sourceRoot/data + unzip -o ${openmusic} -d $sourceRoot/data unzip -o ${opensfx} -d $sourceRoot/data unzip -o ${title-sequences} -d $sourceRoot/data/sequence ''; @@ -134,32 +133,58 @@ stdenv.mkDerivation (finalAttrs: { # Verify that the correct version of each third party repository is used. ( let - versionCheck = cmakeKey: version: '' - grep -q '^set(${cmakeKey}_VERSION "${version}")$' CMakeLists.txt \ - || (echo "${cmakeKey} differs from expected version!"; exit 1) + versionCheck = assetKey: url: '' + grep -qF '"${url}"' assets.json \ + || (echo "${assetKey} differs from expected version!"; exit 1) ''; in - (versionCheck "OBJECTS" objects-version) - + (versionCheck "OPENMSX" openmsx-version) - + (versionCheck "OPENSFX" opensfx-version) - + (versionCheck "TITLE_SEQUENCE" title-sequences-version) + (versionCheck "objects" objects.url) + + (versionCheck "openmusic" openmusic.url) + + (versionCheck "opensfx" opensfx.url) + + (versionCheck "title-sequences" title-sequences.url) ); + doInstallCheck = true; + postInstall = '' wrapProgram $out/bin/openrct2 \ ${lib.optionalString (rct1Path != null) "--add-flags '--rct1-data-path=\"${rct1Path}\"'"} \ ${lib.optionalString (rct2Path != null) "--add-flags '--rct2-data-path=\"${rct2Path}\"'"} ''; + passthru.updateScript = ./update.sh; + meta = { - description = "Open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; - homepage = "https://openrct2.io/"; + description = "Open source re-implementation of RollerCoaster Tycoon 2"; + longDescription = '' + OpenRCT2 is an open source re-implementation of RollerCoaster Tycoon 2, a + construction and management simulation video game that simulates amusement + park management. + + The original RCT2 game data is required to play. + + The path to an existing RCT1 or RCT2 installation can be provided at + build time via the rct1Path and rct2Path arguments respectively: + + openrct2.override { + rct1Path = "/path/to/rct1"; + rct2Path = "/path/to/rct2"; + }; + + Alternatively, if no paths are provided, the game will prompt for the + RCT2 data on first launch. For RCT1, you will then need to go to + the game settings and specify the path to the data directory. + ''; + homepage = "https://openrct2.io"; + changelog = "https://github.com/OpenRCT2/OpenRCT2/releases/tag/v${finalAttrs.version}"; downloadPage = "https://github.com/OpenRCT2/OpenRCT2/releases"; license = lib.licenses.gpl3Only; - platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ keenanweaver kylerisse ]; + mainProgram = "openrct2"; + platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; }; }) diff --git a/pkgs/by-name/op/openrct2/update.sh b/pkgs/by-name/op/openrct2/update.sh new file mode 100755 index 000000000000..348525f907e2 --- /dev/null +++ b/pkgs/by-name/op/openrct2/update.sh @@ -0,0 +1,63 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl common-updater-scripts jq ripgrep + +set -euo pipefail + +package="openrct2" +package_file="$(dirname "$0")/package.nix" + +current_version="$(nix eval --raw -f . $package.version)" +latest_version=$(curl -fsSL ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/OpenRCT2/OpenRCT2/releases/latest" | jq -r '.tag_name | ltrimstr("v")') + +if [[ "$current_version" == "$latest_version" ]]; then + echo "$package is already up-to-date: $current_version" + exit 0 +fi + +echo "$package updating from $current_version to $latest_version" + +echo "Getting new asset versions ..." + +latest_assets=$(curl -fsSL "https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/refs/tags/v${latest_version}/assets.json") + +current_objects_version="$(rg -oP 'objects-version\s*=\s*"\K[^"]+' "$package_file")" +current_openmusic_version="$(rg -oP 'openmusic-version\s*=\s*"\K[^"]+' "$package_file")" +current_opensfx_version="$(rg -oP 'opensfx-version\s*=\s*"\K[^"]+' "$package_file")" +current_title_sequences_version="$(rg -oP 'title-sequences-version\s*=\s*"\K[^"]+' "$package_file")" + +declare -A new_versions +declare -A new_sris + +for asset in objects openmusic opensfx title-sequences; do + url=$(echo "$latest_assets" | jq -r --arg a "$asset" '.[$a].url') + hex=$(echo "$latest_assets" | jq -r --arg a "$asset" '.[$a].sha256') + version=$(echo "$url" | grep -oP '(?<=/download/v)[^/]+') + sri=$(nix hash convert --hash-algo sha256 --from base16 --to sri "$hex") + + new_versions[$asset]="$version" + new_sris[$asset]="$sri" + + echo "$asset version: $version | sri: $sri" +done + +# Update version strings +sed -i \ + -e "s|objects-version = \"${current_objects_version}\"|objects-version = \"${new_versions[objects]}\"|" \ + -e "s|openmusic-version = \"${current_openmusic_version}\"|openmusic-version = \"${new_versions[openmusic]}\"|" \ + -e "s|opensfx-version = \"${current_opensfx_version}\"|opensfx-version = \"${new_versions[opensfx]}\"|" \ + -e "s|title-sequences-version = \"${current_title_sequences_version}\"|title-sequences-version = \"${new_versions[title-sequences]}\"|" \ + "$package_file" + +declare -A asset_url_fragments +asset_url_fragments[objects]="objects.zip" +asset_url_fragments[openmusic]="openmusic.zip" +asset_url_fragments[opensfx]="opensound.zip" +asset_url_fragments[title-sequences]="title-sequences.zip" + +for asset in objects openmusic opensfx title-sequences; do + old_sri=$(rg -A2 "${asset_url_fragments[$asset]}" "$package_file" | rg -oP 'sha256-[^"]+') + sed -i "s|$old_sri|${new_sris[$asset]}|" "$package_file" +done + +echo "Updating $package from $current_version to $latest_version ..." +update-source-version "$package" "$latest_version" diff --git a/pkgs/by-name/op/opus/package.nix b/pkgs/by-name/op/opus/package.nix new file mode 100644 index 000000000000..fdfe0cf2640a --- /dev/null +++ b/pkgs/by-name/op/opus/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + meson, + ninja, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "opus"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "xiph"; + repo = "opus"; + tag = "v${finalAttrs.version}"; + hash = "sha256-M1G7ypcfs7nJmXgkyoG96jT/CkgN5BOzy+DGO4LVCvA="; + }; + + __structuredAttrs = true; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + meson + ninja + ]; + + meta = { + description = "Modern audio compression for the internet"; + homepage = "https://github.com/xiph/opus"; + changelog = "https://github.com/xiph/opus/blob/${finalAttrs.src.rev}/NEWS"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "opus"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/os/oscar64/package.nix b/pkgs/by-name/os/oscar64/package.nix index dfa3c434b94a..f5a8cb816f11 100644 --- a/pkgs/by-name/os/oscar64/package.nix +++ b/pkgs/by-name/os/oscar64/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "oscar64"; - version = "1.32.270"; + version = "1.32.271"; src = fetchFromGitHub { owner = "drmortalwombat"; repo = "oscar64"; tag = "v${finalAttrs.version}"; - hash = "sha256-KOXX+utLRhU9Zls28uXdbmBRMJ3AVM1sjyLq+wLrls8="; + hash = "sha256-dVLpzYiGZA2qP2jrSj9Ijc8lJP8kSyWO3pdpLJ2pHJg="; }; postPatch = '' diff --git a/pkgs/by-name/pd/pdfding/frontend.nix b/pkgs/by-name/pd/pdfding/frontend.nix index 7e10dda1567c..13df27f63e66 100644 --- a/pkgs/by-name/pd/pdfding/frontend.nix +++ b/pkgs/by-name/pd/pdfding/frontend.nix @@ -7,6 +7,8 @@ tailwindcss_4, nodejs, + + pdfding, }: let pdfjsVersion = "5.5.207"; # see update script @@ -26,19 +28,13 @@ let }; in stdenv.mkDerivation (finalAttrs: { - pname = "pdfding-frontend"; - version = "1.7.1"; - src = fetchFromGitHub { - owner = "mrmn2"; - repo = "PdfDing"; - tag = "v${finalAttrs.version}"; - hash = "sha256-T3Y9eWwBVxGPISZ3EZndAR6mwsq4g67RRCPpoZPuh+0="; - }; + pname = "${pdfding.pname}-frontend"; + inherit (pdfding) src version; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - name = "pdfding-frontend-${finalAttrs.version}-npm-deps"; - hash = "sha256-an4KKKx65ehCm1YAlwLWYAW8pQMgB4HdDERqC/hfQi0="; + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + hash = "sha256-HOGnzDKg1ca/27u1oQEtOkOl6Cg/7k+aLJEJhbypUhE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pd/pdfding/package.nix b/pkgs/by-name/pd/pdfding/package.nix index fcc50b33aa0e..494924814094 100644 --- a/pkgs/by-name/pd/pdfding/package.nix +++ b/pkgs/by-name/pd/pdfding/package.nix @@ -12,12 +12,12 @@ let in python.pkgs.buildPythonPackage (finalAttrs: { pname = "pdfding"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "mrmn2"; repo = "PdfDing"; tag = "v${finalAttrs.version}"; - hash = "sha256-T3Y9eWwBVxGPISZ3EZndAR6mwsq4g67RRCPpoZPuh+0="; + hash = "sha256-a12Rq4fd3XEW6ZTsm8ISklpMu0ZKpeBrZXNh9My3vUQ="; }; pyproject = true; @@ -125,12 +125,12 @@ python.pkgs.buildPythonPackage (finalAttrs: { ''; pythonRelaxDeps = [ + "rapidfuzz" "django" - "django-allauth" "gunicorn" - "markdown" "nh3" "pypdf" + "pypdfium2" "whitenoise" ]; diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index b56f6007947d..aaeac90585dc 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.66.0"; + version = "0.67.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-1towGuRa9CHtq6IdOekHhrbQ0m8XiN9ATg3seY6nUtM="; + hash = "sha256-GGQsFyVWZe/rA7DAqLoTWNOAM0ntTXFHZ92rvyRBr7c="; }; - cargoHash = "sha256-UpFjJfIDe/n/BVFljTEVAzxQ3E0/tOicfNcitiDlCOo="; + cargoHash = "sha256-2lfV+ZRsqpu4AXeDFp/PuJRBPUZxR44rvBa7u94t0kE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index 9ce6c3a6e724..b8ef0e1c4d86 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "poetry"; - version = "2.3.3"; + version = "2.3.4"; pyproject = true; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry"; tag = version; - hash = "sha256-+8zVe2JeQbbqmKOydQw1tZM2PYa5H/5ImBcVpoxYC5w="; + hash = "sha256-2qREmUJpoOPh8QHQErLwn9M5TuEzjoruHJ8qmwlEjyI="; }; build-system = [ diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 8d38fdb324b4..5b87e9d0fe1f 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -35,11 +35,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.82.1"; + version = "0.83.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-3uzVNQ4Es08teM45U4QBXLChDaBvcnG9vR4qI22TemU="; + hash = "sha256-C67cbOX4AQyl6rcWo+LVDEVuD+k59pJy9mbytrKt1Ls="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix index 92f49f283b30..3132b5cbed28 100644 --- a/pkgs/by-name/po/poutine/package.nix +++ b/pkgs/by-name/po/poutine/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "poutine"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "boostsecurityio"; repo = "poutine"; tag = "v${finalAttrs.version}"; - hash = "sha256-DyxV8GlNbU/g6GMdOEt++oXFDq7+K4FeWTVJPUAFKk8="; + hash = "sha256-kQGq6AzU/M/8mxZMS/ExwN8356sVWCyPmfnRnfpqFAk="; }; vendorHash = "sha256-Ktsk01YqBHVZDOu+Xp1p3sVDwqozl35iLYbVavpiWq0="; diff --git a/pkgs/by-name/pr/prometheus-fail2ban-exporter/package.nix b/pkgs/by-name/pr/prometheus-fail2ban-exporter/package.nix new file mode 100644 index 000000000000..115b97b10d41 --- /dev/null +++ b/pkgs/by-name/pr/prometheus-fail2ban-exporter/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildGoModule, + fetchFromGitLab, +}: + +buildGoModule (finalAttrs: { + pname = "prometheus-fail2ban-exporter"; + version = "0.10.3"; + + src = fetchFromGitLab { + owner = "hctrdev"; + repo = "fail2ban-prometheus-exporter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-CyYGY6SovnvgExB22G+LEKRDRzbDZWhWUjctJMkprYs="; + }; + + vendorHash = "sha256-ogdRXbS1EG402qlnj5SfuI/1P/Pi0+xwJrJsc6vwdds="; + + ldflags = [ "-s" ]; + + meta = { + description = "Collect and export metrics on Fail2Ban"; + homepage = "https://gitlab.com/hctrdev/fail2ban-prometheus-exporter"; + license = lib.licenses.mit; + mainProgram = "fail2ban-prometheus-exporter"; + maintainers = with lib.maintainers; [ + bartoostveen + ]; + }; +}) diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index b4101f7be124..b9b7a3618580 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -10,17 +10,17 @@ }: let pname = "proton-pass"; - version = "1.35.0"; + version = "1.36.0"; passthru = { sources = { "x86_64-linux" = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${version}_amd64.deb"; - hash = "sha256-o85PSfZ0wN+QwjzKLb0/RThfTFsa9xY7r4YesLIWlPI="; + hash = "sha256-bJgPY0iSRyxsvQ9S9ZL4HyvO8iNY+W4g3ya6L30WIm0="; }; "aarch64-darwin" = fetchurl { url = "https://proton.me/download/pass/macos/ProtonPass_${version}.dmg"; - hash = "sha256-zwV1jBbtplM7TdS1KkEi813Z2ex45z3BP2ZA72s6pxE="; + hash = "sha256-PVj629W6n7weKkAJW8xqOAzAlc9jJbsvGL23Yuzc+AQ="; }; "x86_64-darwin" = passthru.sources."aarch64-darwin"; }; diff --git a/pkgs/by-name/ps/ps3-disc-dumper/deps.json b/pkgs/by-name/ps/ps3-disc-dumper/deps.json index 0598d6ae9cde..82e7157ba15b 100644 --- a/pkgs/by-name/ps/ps3-disc-dumper/deps.json +++ b/pkgs/by-name/ps/ps3-disc-dumper/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Avalonia", - "version": "11.3.12", - "hash": "sha256-T2y8aoKUSfXqmV2RL1QStytzJkc/SZYfIdJihB5UWR0=" + "version": "11.3.13", + "hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -16,53 +16,53 @@ }, { "pname": "Avalonia.Desktop", - "version": "11.3.12", - "hash": "sha256-IY6TkpVh0GiCkKbestdwH8KEJ0Embxy+JYe7lww0xBA=" + "version": "11.3.13", + "hash": "sha256-NTwCJzVSyUXbobwgsHI3jOwc27eFAIYzQnXXueS86LI=" }, { "pname": "Avalonia.Fonts.Inter", - "version": "11.3.12", - "hash": "sha256-yr4/zpUbmQuVzdupV5v87qNO24sPOVhnnJ1SeiLxMx8=" + "version": "11.3.13", + "hash": "sha256-cP7mpGsk+qAMzsfbrq42pujN8ZLsD+PSjXGDnMIjVp4=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.3.12", - "hash": "sha256-NTcYVHn13lFQjTNezmpmPGjxsBzryXorK0K6hl4ZZto=" + "version": "11.3.13", + "hash": "sha256-YLAdQj/8zmrKJp7+7EQY6bmDXfCiBtUHYrVw0KPpXNw=" }, { "pname": "Avalonia.Native", - "version": "11.3.12", - "hash": "sha256-1ujLmYaL1zTgtlsNerBDtTuoaJX7c7HukNLJIalrB4Q=" + "version": "11.3.13", + "hash": "sha256-vRrv5uLH3XLGo8FelJz8kYxcp5sdMakkK02k+xjDsaE=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.3.12", - "hash": "sha256-dF93nP1Cd7ZdzrO7ScGHchxYxCjWN45AjiqiO1J+cmU=" + "version": "11.3.13", + "hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc=" }, { "pname": "Avalonia.Skia", - "version": "11.3.12", - "hash": "sha256-gRMjH7igRIm22zQV0WxtwFHe8AiMTcaPlR0sC5lJy+w=" + "version": "11.3.13", + "hash": "sha256-kNIZ8HpNiQIqEyYYlJ/ND/tBGT5KY3jeL8W6GFTJIvU=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.3.12", - "hash": "sha256-4TTsW7zLF0Z9C1lzPsPfekHpHrSx7RB7I63j/cKUX8U=" + "version": "11.3.13", + "hash": "sha256-bAIaj72UKH5Lxv1bLcXt5bPuB51pYGOJHO1gGs1uGrM=" }, { "pname": "Avalonia.Win32", - "version": "11.3.12", - "hash": "sha256-haIKvJ1SD17+EUJHILoFJMy+WJJtXr9I+ZYMFtwEuTc=" + "version": "11.3.13", + "hash": "sha256-JNQ2kmrjAvwN8pboT66HVi1r28Cc9WG+8cnxL/AYCWs=" }, { "pname": "Avalonia.X11", - "version": "11.3.12", - "hash": "sha256-SEc0GaZTh1eGNFWHT6lGiN6LD0qE+ubTK7Efl0H/Q2w=" + "version": "11.3.13", + "hash": "sha256-Eeeq4K4q2GihIVFhCKFjTc+di/M39OgfFyF7aaZOJdg=" }, { "pname": "CommunityToolkit.Mvvm", - "version": "8.4.0", - "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI=" + "version": "8.4.2", + "hash": "sha256-jLS1vo6V+fHsJs80HYT77oJE6IEC68fIgkLpYODjWAU=" }, { "pname": "HarfBuzzSharp", @@ -176,12 +176,12 @@ }, { "pname": "Tmds.DBus.Protocol", - "version": "0.90.3", - "hash": "sha256-jK/98C0WrkVqPPNMx+xkdGK7vhcFmDsMqX7hUmALAWM=" + "version": "0.92.0", + "hash": "sha256-WZSB9eqSOIzsBfnpOJDIIopIhNxAH+UcZuD6W94PIN4=" }, { "pname": "WmiLight", - "version": "7.1.0", - "hash": "sha256-tEMgIkptFVfMEqOce4aawypWpVveaynJC/lKJiat8nU=" + "version": "7.2.0", + "hash": "sha256-BRKL6XL8KV8XFrpZX7O4bVe74dN5qaOd6CxzBMQKT8k=" } ] diff --git a/pkgs/by-name/ps/ps3-disc-dumper/package.nix b/pkgs/by-name/ps/ps3-disc-dumper/package.nix index 5bc5a4b73afb..f8d0f143380d 100644 --- a/pkgs/by-name/ps/ps3-disc-dumper/package.nix +++ b/pkgs/by-name/ps/ps3-disc-dumper/package.nix @@ -10,13 +10,13 @@ buildDotnetModule rec { pname = "ps3-disc-dumper"; - version = "4.4.3"; + version = "4.4.4"; src = fetchFromGitHub { owner = "13xforever"; repo = "ps3-disc-dumper"; tag = "v${version}"; - hash = "sha256-9NfEBDLFhDqYzds48bVgrqUnXPZjS3xGk9j/OKz98OE="; + hash = "sha256-9Df22dh9wlBD4ktfGilimleN2W3GGikOt7mIAddHuKg="; }; dotnet-sdk = dotnetCorePackages.sdk_10_0; diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix index a1c4907809d1..095fa838a695 100644 --- a/pkgs/by-name/pu/pulumi-bin/data.nix +++ b/pkgs/by-name/pu/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.229.0"; + version = "3.230.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.229.0-linux-x64.tar.gz"; - sha256 = "1wc8ci70vnxfgw0b1zf6nl40ji58f6yyi1wwx5pd8vsksbspggbj"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.230.0-linux-x64.tar.gz"; + sha256 = "1v78xqs66aqgw02dqxnnrjksh2jcypvdr738k2jnyqw5vc974csj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-linux-amd64.tar.gz"; @@ -17,20 +17,20 @@ sha256 = "139h210ixh4s46sa90p9ga9nl1bqb1m36hbr1ylcr80nx5hjh42p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.98.0-linux-amd64.tar.gz"; - sha256 = "12lpvryc1iw90d2mbyx0kixw99w1adibmqh6svnpiiip0ijkdbfy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.99.0-linux-amd64.tar.gz"; + sha256 = "113vdmi9y47c85rjps8p79g8knbpskq24raiwikiqr0y4qb94ml7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-linux-amd64.tar.gz"; - sha256 = "1zwi4h5kj4ncxzphdsbh5yg48wq4m65kjmyhrkv0jii99nfqn3l7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.4-linux-amd64.tar.gz"; + sha256 = "1j80sayzic63ahyv2x9k7kpisi7rvjml7cid1xzzcac8z7s2nhxq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.39.0-linux-amd64.tar.gz"; sha256 = "1hfxg058jcbxfigl8a5sbapfm09hcyjrm2h63ksaw0gn7ny26y46"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.24.0-linux-amd64.tar.gz"; - sha256 = "032zcfzdx8f9k6lsz3kqwqy9vyap6h0vqyg0gx83lbc3b6j17dkk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.25.0-linux-amd64.tar.gz"; + sha256 = "0p694pdhhklcjx8dx7jl7n7a7x9j0yria137irrs3hqxijrgvjzq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.0-linux-amd64.tar.gz"; @@ -73,12 +73,12 @@ sha256 = "08mwfxjmmdka6ka1qx9p09zigkj6lw4vjb4b3zm6599rgzzxgcs1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.18.0-linux-amd64.tar.gz"; - sha256 = "1yab8zgxccvmv44pixax8iy27ggmd3r19957ivaw9lckccnx9sav"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.19.0-linux-amd64.tar.gz"; + sha256 = "0bbac1gmrg4gprzwginwqqh7jz7n8xf4gikdbmg8wh1lwx6pnfjx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-amd64.tar.gz"; - sha256 = "1034nn6npg84frva90fj5fi1mz3ir7blcnkgffsh4vjcbgki6xix"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.2-linux-amd64.tar.gz"; + sha256 = "000fpr8w20z3nq1mxjvlpi34xvc0klg69zivrxfhv9y9qmbnn5dq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.10.0-linux-amd64.tar.gz"; @@ -109,24 +109,24 @@ sha256 = "123m6fxv6zvmpxr3yva595wfda5ca1fkqjsrizgdl6br9jfqmvcl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.4.1-linux-amd64.tar.gz"; - sha256 = "1rp062lhsain83hy0w411fhpdkg7vmrrfm0w8b6vr5j7rkwy1d43"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.4.2-linux-amd64.tar.gz"; + sha256 = "0hd5djg3p9q2iikm8d1d2pkrmqid39ydgs4zdzwfss7bkfc4c0sy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.2-linux-amd64.tar.gz"; - sha256 = "08j0wnd2yzf5qj3n56kl0lbs7jhhy3s0xcg73vz5zfr98nj64mrf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.3-linux-amd64.tar.gz"; + sha256 = "0hmynpkjfa30bx6dcf98mfvh4m9djkihkksmgwamvpmdsqfq8ll5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.2-linux-amd64.tar.gz"; sha256 = "12jjgcnjkmyyl09zr3wlc0acp2xnsv1pwz51dhh3v9hfjm4541l9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.13.1-linux-amd64.tar.gz"; - sha256 = "02kj74nmwn4axd8jhs8fr4fk71nn2b83byfqdx037cpz2crb8wdq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.14.0-linux-amd64.tar.gz"; + sha256 = "1ind8360irxnnang0jw6dwm5m6bmn4f162yj7w4l6vi91k5d1s20"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.129.0-linux-amd64.tar.gz"; - sha256 = "1wvvi5s3rkw78b4lv76a60vibwj3hxwn8az0axwnq4qjxcy9v495"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.130.0-linux-amd64.tar.gz"; + sha256 = "1c5wi6f94x86qvjjhlrnvicghp1nr5phil7mxn4kjj983fsi50qg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.229.0-darwin-x64.tar.gz"; - sha256 = "0fvfyy3fnki9vsvaf7c3vsz9q9r1118iqc7g7882cl2j3pqn2yfn"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.230.0-darwin-x64.tar.gz"; + sha256 = "0yh8jz8fawch5zr0k0wg2k4nkkdkjp4hmabs8m7kzb87b6f0i75j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-darwin-amd64.tar.gz"; @@ -175,20 +175,20 @@ sha256 = "1r1j115bii4hv22z5pwp1yvcbi41j4mdcvwbn04xjridvrpsp63b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.98.0-darwin-amd64.tar.gz"; - sha256 = "0a0j0m8n7smwzapsa7y49fj4qkbr1h5djfd2g6dvzdi66x2w8s1k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.99.0-darwin-amd64.tar.gz"; + sha256 = "184v0cw24dwqs116ql8jbskbp9ckljwq5967dxc6rxj7z5cnsnrx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-darwin-amd64.tar.gz"; - sha256 = "09yv8i5hlivgm3fm3a8s0xaapwz2pxayfj20vbjv1bpf4ckgin7a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.4-darwin-amd64.tar.gz"; + sha256 = "142ydaywi8xw3k8w2c2py0x88sxf55v9z26yjkjhn2izcr9yv3fg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.39.0-darwin-amd64.tar.gz"; sha256 = "0f2z8iwma6xlnwdi126sixbf0cd4fni3c0r18x6jczbpxhci8j9m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.24.0-darwin-amd64.tar.gz"; - sha256 = "1c4wkmqjd8mfgrn2gr5l2jjfvwq4ailifq532fjrcqfwj740qmhk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.25.0-darwin-amd64.tar.gz"; + sha256 = "1rfliksj9x1qaigd16xdi5xycwwxsnd4v037zpjygi562c6dpxhq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.0-darwin-amd64.tar.gz"; @@ -231,12 +231,12 @@ sha256 = "0ydbgr1p0bxh19qjvayzcw46sw21s7nj0g3r2bh7jgcanbf599vi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.18.0-darwin-amd64.tar.gz"; - sha256 = "0im4zkcdchxd3qa129d8bg6j6kli3n2d6z6djg2j51bxba0x91j4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.19.0-darwin-amd64.tar.gz"; + sha256 = "0dnz2s6g8hc0750l2wd1nsdi7wsyyw352d3acm9af6vqclg986vm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-amd64.tar.gz"; - sha256 = "15yk1v96q0gnd01hdbqp2vfdvw1fvv310kghafmw3imbdb942nr2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.2-darwin-amd64.tar.gz"; + sha256 = "109czcvbzv17l5wdbiksknn554d3p6jc18d8gqp8qx24ha01nl3z"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.10.0-darwin-amd64.tar.gz"; @@ -267,24 +267,24 @@ sha256 = "0v48i2y4rk5b2mnnfhs8n4gbz7izvs0fmp2bipmmvd0cfki6ckzp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.4.1-darwin-amd64.tar.gz"; - sha256 = "0fg43qqf34gp74qyby2ilhbv3rv126k4dfkmaxgjk37jx7393sdl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.4.2-darwin-amd64.tar.gz"; + sha256 = "1mm67hnkanbr0w93f034j03ajmw0k7dfvx5nv414sclbrcr59m2b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.2-darwin-amd64.tar.gz"; - sha256 = "1x7ba78w0rq990d6fc9flnzac4l0j0lkwf1lqn3v9i2m42a42pgn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.3-darwin-amd64.tar.gz"; + sha256 = "095f1sl593q7rc4h5wmzg04mzb0wqqzsya1jxhhkbfkhgnm31rjl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.2-darwin-amd64.tar.gz"; sha256 = "0qglyxagy5djccykcyp75b32vaf8mxswfjxk5wqq1p6wlgdb0mm5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.13.1-darwin-amd64.tar.gz"; - sha256 = "1l5x01pv3q9pxg4qrbd0vrh0ssn4an9jabbb7yyjg67gndpz7ns4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.14.0-darwin-amd64.tar.gz"; + sha256 = "16347ib8lq81v9vmc6953g293zqvqpfg6g6ggw7q5chbjlfkvzhr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.129.0-darwin-amd64.tar.gz"; - sha256 = "1g7vyqfbfiqzryxyqc651wd8c562j3hg03yvfnw8dbraz9dnz636"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.130.0-darwin-amd64.tar.gz"; + sha256 = "1l5r5bggkkkbn9j1i1p7hplyllskwrm2zxdl34pywc3g23hqil5y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.229.0-linux-arm64.tar.gz"; - sha256 = "1vd9grcw1wl4b687nknkjnkf5spbxfs6fv7377xkxn0fwz3z4yi5"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.230.0-linux-arm64.tar.gz"; + sha256 = "09938ryq8figzy53g67hksh8za06sri6w03wcnaysnik15llys79"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-linux-arm64.tar.gz"; @@ -333,20 +333,20 @@ sha256 = "0v84z83y56lnvrgsmla4qnig8cs57ynilib4ah29wb0dwkxvzamf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.98.0-linux-arm64.tar.gz"; - sha256 = "1l7yikjh34ll1jyqx8bhqmh27nf7253yy6sknhnyd5mv8ajkv8cv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.99.0-linux-arm64.tar.gz"; + sha256 = "107pwj3774fqr2gkz2r3aawsm0fklh9f3lgr721f7l1hnd7wjjb9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-linux-arm64.tar.gz"; - sha256 = "0bnai1xlbf465ilhnl7pgjh3gyqh34f96z4nw5m0g04913dij05j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.4-linux-arm64.tar.gz"; + sha256 = "0xfa9p3dhnmlq5vpdwgsb73mcp8ckkw17pkgjmlsb54nfayj687d"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.39.0-linux-arm64.tar.gz"; sha256 = "1gaa61y3wflz5g2i0k0iv8k0rvxc22zm6c4w2pj4139yj174ysll"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.24.0-linux-arm64.tar.gz"; - sha256 = "0z6qaw3icdbclmld9nzmvbb1qm55vn2iwjdbs9r95h57jh5hazar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.25.0-linux-arm64.tar.gz"; + sha256 = "1kkmdyg41l18ffchz66hk24ql9s8bsrgv9zy2l5730kkg6g5j9d7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.0-linux-arm64.tar.gz"; @@ -389,12 +389,12 @@ sha256 = "0lqr69v6wvqbsmy2xgr4nz6dqcpirwzqasdz831hg5xdg37mbhjh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.18.0-linux-arm64.tar.gz"; - sha256 = "1cijwc3zxivz6s7cj15c28nqlvl6k3liqplrcpx21csfw8f8xxid"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.19.0-linux-arm64.tar.gz"; + sha256 = "1j4znsk8cdmfa53l80jbbrc8gbm4282sw489kal23j36va3alnzg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-arm64.tar.gz"; - sha256 = "00957ilw2fiad51rgfzc06jb53i4rf3d3siga5kqnphpm93bq2yq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.2-linux-arm64.tar.gz"; + sha256 = "1wnj70pj5s4fdyxcljr6ryrdp0z47l9n5792s70fj2535l60mfz7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.10.0-linux-arm64.tar.gz"; @@ -425,24 +425,24 @@ sha256 = "10b1vgmc9n4vdbm3q7d15a3q2x0hgbgyb3mfgi0gpbvvargljm1g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.4.1-linux-arm64.tar.gz"; - sha256 = "1bkmjdv9gvylkxiv6bzzn615axw111kqr18hs270iay5kc3z0hb2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.4.2-linux-arm64.tar.gz"; + sha256 = "1kjj0sxy6702jj754nibijnjdmrgpr4qkfbyfqcbcw58f992y834"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.2-linux-arm64.tar.gz"; - sha256 = "1d23jy8987sm0vxyx74kljs5a5jj4lizi1qssa4729inn7z5293w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.3-linux-arm64.tar.gz"; + sha256 = "0hhhz1rq35wzgn2gdqy66w2xx7f2cs81d6q39d14plhxfwxz6a9c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.2-linux-arm64.tar.gz"; sha256 = "035czawc26f09ihcnvcqfjkwrm5zr502yhs3wdqmh4c7kba7f8a6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.13.1-linux-arm64.tar.gz"; - sha256 = "1nwkbj76hr23i3s76fxkqnb7hx1d48mzyxmaizgisas6w93r73h7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.14.0-linux-arm64.tar.gz"; + sha256 = "16jl5fbzb7w93bksfnk32h2hqfdnr6qb9722jfbpzv5ksdw8f7g9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.129.0-linux-arm64.tar.gz"; - sha256 = "1x7sbjh711nwflg5ncphqcl7wc9lfpzw47lbk7391jc5s7ihn00y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.130.0-linux-arm64.tar.gz"; + sha256 = "135kfkyg8kki6rsc097i8ssj6vl4nxkn5rk3id7b0nw734c4k0hm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.229.0-darwin-arm64.tar.gz"; - sha256 = "0n1kcpgvrj3b0bm207ylf99yy7ixcx5frhcarwz19s3ssbfsynxh"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.230.0-darwin-arm64.tar.gz"; + sha256 = "0dfmfq7h2hmk8w00yak3y1rlq53w6af6b48cvj9aalwh36l9y9wf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-darwin-arm64.tar.gz"; @@ -491,20 +491,20 @@ sha256 = "0zsa46x3fqmbicfm6lg10k9ghj40pjq0v889ksqpws2d4jlhbwp7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.98.0-darwin-arm64.tar.gz"; - sha256 = "05n74cdhvl0rm3kmvdrbwx1mr350hcrp8ic21986wlfk23axd53y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.99.0-darwin-arm64.tar.gz"; + sha256 = "1840mp4vq1ag50jgnhwld68dcfai6xgcvbbbgjybp97s12fhy2k8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-darwin-arm64.tar.gz"; - sha256 = "0f173h5sw4q9w3wswy7p7h2g692fds9m9zzrmim02riqshwgqwwm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.4-darwin-arm64.tar.gz"; + sha256 = "14dwhd8d6683babl6399yqn6dwihxmjs7fa2p40d071ibmpsx307"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.39.0-darwin-arm64.tar.gz"; sha256 = "0l7ipd0fha3qdi4454hizs91s7cwwhk6irq0rg0xhfvnsg4mkyd8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.24.0-darwin-arm64.tar.gz"; - sha256 = "0235p54p2vbb1mdshiqxi20bq5pcdjg58nmy38khagyd60bbj3g5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.25.0-darwin-arm64.tar.gz"; + sha256 = "0n1favn4px0librir24gnwkz8g32471ybc5vkm3h3vzyy5x5dlgx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.0-darwin-arm64.tar.gz"; @@ -547,12 +547,12 @@ sha256 = "03ps0dfznmw918mi89v8zflq5fzwv716sax8wka32j4b9nwlmg5v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.18.0-darwin-arm64.tar.gz"; - sha256 = "0jvd148w3inbzb4l695nwp2ygagr62y2j3izgq2lf3ikaiwvddvx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.19.0-darwin-arm64.tar.gz"; + sha256 = "042a2y6sr1z7v9ky6dkjkqgzqawdlvl1wrd34n3vbhhwxvjl1zjl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-arm64.tar.gz"; - sha256 = "00vcz92fz9mvacfrpn0lv19kcrv69m3ni5s2kxqympgc77wcvpgb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.2-darwin-arm64.tar.gz"; + sha256 = "0gzzzfs65pq3j05k39j3n4vxlpqi3v5v3jxvcj273gvh369cq1sq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.10.0-darwin-arm64.tar.gz"; @@ -583,24 +583,24 @@ sha256 = "0f31jv8akf96lx310s79siqas29lymlx20di49i8h1mydnqm0fix"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.4.1-darwin-arm64.tar.gz"; - sha256 = "1bbz75zw7zbiv8fq1y6g25fxkx3k89060izf5j40gnnhwlfrjsha"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.4.2-darwin-arm64.tar.gz"; + sha256 = "1s0cvgp728654dfvhk524w10rws77xapxwigaqrciba5cwasp069"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.2-darwin-arm64.tar.gz"; - sha256 = "16sfcji3ynn02bm6rlyqwdsd61cfrzc9cmdn22wx5rzf9yvs19s3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.3-darwin-arm64.tar.gz"; + sha256 = "1ypdjf341vq48q9icpxf1fz3am1f8kdjfcmzr9xx5zsvl6dhciv2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.2-darwin-arm64.tar.gz"; sha256 = "1bzw8zl11n9kqn8lz7m42rx3yahagi2r3l153146yi080ndvpsbq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.13.1-darwin-arm64.tar.gz"; - sha256 = "05d8pl6yd0vs7hl2af1pnrp8kim7m8fy15iw4xjffj93lwb6a1sc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.14.0-darwin-arm64.tar.gz"; + sha256 = "0bdvm3lgihf4nn8l1r9cla23ww9vxqb2km8z02argsms14ry0dg6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.129.0-darwin-arm64.tar.gz"; - sha256 = "1f8m2bczgbmilny71vp9k6vmcz3x2aicafz3nrc6q1lsjadcmbx8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.130.0-darwin-arm64.tar.gz"; + sha256 = "0v8l25zsm5zfwyfl90p9cxbawi1ym2kl27djlfmd19srgad01jhw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz"; diff --git a/pkgs/by-name/qu/quantlib/package.nix b/pkgs/by-name/qu/quantlib/package.nix index 012b6301dab1..7b36c381be05 100644 --- a/pkgs/by-name/qu/quantlib/package.nix +++ b/pkgs/by-name/qu/quantlib/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "quantlib"; - version = "1.41"; + version = "1.42"; outputs = [ "out" @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "lballabio"; repo = "QuantLib"; rev = "v${finalAttrs.version}"; - hash = "sha256-dHXITHP0SBrBXf5hrVhjSD4n2EtVvEkBDfE2NbT0/sc="; + hash = "sha256-we+8+Te7ii0z1z9PkHkMwFuAZ6t+AYm5oc5sbme3knY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ra/rapid-photo-downloader/package.nix b/pkgs/by-name/ra/rapid-photo-downloader/package.nix index 64fbe6d31621..fd4d1d4f2a43 100644 --- a/pkgs/by-name/ra/rapid-photo-downloader/package.nix +++ b/pkgs/by-name/ra/rapid-photo-downloader/package.nix @@ -17,60 +17,53 @@ gdk-pixbuf, libmediainfo, vmtouch, - gitUpdater, + versionCheckHook, + nix-update-script, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "rapid-photo-downloader"; - version = "0.9.36"; + version = "0.9.37"; pyproject = true; src = fetchFromGitHub { owner = "damonlynch"; repo = "rapid-photo-downloader"; - rev = "v${finalAttrs.version}"; - hash = "sha256-fFmIbqymYkg2Z1/x0mNsCNlDCOyqVg65CM4a67t+kPQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-De4qe3LZm8fe5mu3teQzeP74mdgetCPRJrBzq9fad2s="; }; build-system = with python3Packages; [ - setuptools + hatchling + hatch-argparse-manpage + hatch-gettext ]; dependencies = with python3Packages; [ ifuse libimobiledevice # Python dependencies - pyqt5 - pygobject3 - gphoto2 - pyzmq - tornado - psutil - pyxdg arrow - python-dateutil - easygui babel colour + gphoto2 + packaging pillow + psutil + pygobject3 pymediainfo - sortedcontainers - requests - colorlog - pyprind - setuptools + pyqt5 + python-dateutil + pyxdg + pyzmq show-in-file-manager + sortedcontainers tenacity + tornado + # Optional dependencies + colorlog ]; - postPatch = '' - # Drop broken version specifier - sed -i '/python_requires/d' setup.py - # Disable version check - substituteInPlace raphodo/constants.py \ - --replace "disable_version_check = False" "disable_version_check = True" - ''; - nativeBuildInputs = [ libsForQt5.wrapQtAppsHook file @@ -78,15 +71,6 @@ python3Packages.buildPythonApplication (finalAttrs: { gobject-introspection ]; - # Package has no generally usable unit tests. - # The included doctests expect specific, hardcoded hardware to be present. - # Instead, we just make sure the program runs enough to report its version. - checkPhase = '' - export XDG_DATA_HOME=$(mktemp -d) - export QT_QPA_PLATFORM=offscreen - $out/bin/rapid-photo-downloader --detailed-version - ''; - buildInputs = [ gdk-pixbuf gexiv2 @@ -100,11 +84,23 @@ python3Packages.buildPythonApplication (finalAttrs: { udisks ]; - # NOTE: Check if strictDeps can be renabled - # at the time of writing this the dependency easygui fails to build - # launching fails with: - # "Namespace [Notify / GExiv2 / GUdev] not available" - strictDeps = false; + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--detailed-version"; + # Keep and setup environment such that the detailed version check + # can run successfully without a screen. + # Next to that, set the XDG_CACHE_HOME to stop generating errors + # about unwritable cache directories. + versionCheckKeepEnvironment = [ + "QT_QPA_PLATFORM" + "XDG_CACHE_HOME" + ]; + preVersionCheck = '' + export QT_QPA_PLATFORM=offscreen + export XDG_CACHE_HOME=$(mktemp -d) + ''; + + strictDeps = true; preFixup = '' makeWrapperArgs+=( @@ -122,9 +118,8 @@ python3Packages.buildPythonApplication (finalAttrs: { ) ''; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - ignoredVersions = "a.*"; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; }; meta = { diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix index 296b7a30c33d..50018378b463 100644 --- a/pkgs/by-name/ra/rapidraw/package.nix +++ b/pkgs/by-name/ra/rapidraw/package.nix @@ -42,27 +42,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rapidraw"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "CyberTimon"; repo = "RapidRAW"; tag = "v${finalAttrs.version}"; - hash = "sha256-GCmaPNgPn6xTdvRTkXlrSasULlxWFTwuBlbqmMD4O8s="; - fetchSubmodules = true; - - # darwin/linux hash mismatch in rawler submodule - # Same fix as is used in dnglab packaging - postFetch = '' - rm -rf $out/src-tauri/rawler/rawler/data/testdata/cameras/Canon/{"EOS REBEL T7i","EOS Rebel T7i"} - ''; + hash = "sha256-NYns/hpa8E4oko3qxyrJaTpgH5b+dwr0dTFw+K3IBDo="; }; - cargoHash = "sha256-IIl4BSEMpyLiiZQGRlQaIPpXNQKGg6GrGQmnHDzDAdc="; + cargoHash = "sha256-wuTbUPkPJTg6WZYrffrfPm+Asr0PuL5UAsZL+qWM4Oo="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-PLwefGi6p6rJLvLonHXszA74wqySyoE3xxRPDlrfgUQ="; + hash = "sha256-CBCj1R6ClnRh5Y4liKNiewRPb2lIb17TSB9eumVcKkY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rc/rclone-ui/package.nix b/pkgs/by-name/rc/rclone-ui/package.nix index c39ce507afce..76e12d105d69 100644 --- a/pkgs/by-name/rc/rclone-ui/package.nix +++ b/pkgs/by-name/rc/rclone-ui/package.nix @@ -20,31 +20,29 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rclone-ui"; - version = "3.5.0"; + version = "3.5.3"; src = fetchFromGitHub { owner = "rclone-ui"; repo = "rclone-ui"; tag = "v${finalAttrs.version}"; - hash = "sha256-U2bhhNqw2dWqyd5You1L8vTe30Q81DQd7YwHf6KcdBQ="; + hash = "sha256-QswFZJDWPASyqyqzYepS2bzd4K3JulA4UmK/dT9ryVo="; }; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; forceGitDeps = true; - hash = "sha256-omZprG5ozCrwkxB7G9n82wvpF7wXz+IWPEI8FEnOJvk="; + hash = "sha256-SZhxTgYKfU1I/wzlktgsaMk+em7ly4ekiMvxb0ge+ZM="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-5JlqhhrHyHGTQ+9gYLgSQm+jF8th5UYdnLvXMRPKCTY="; + cargoHash = "sha256-bBkFMixt7Wrchlg/odjDMdHEp7omOofcPqDwacIFyOc="; # Disable tauri bundle updater, can be removed when #389107 is merged patches = [ ./remove_updater.patch ]; - # Remove duplicate tao-macros dependency causing fetchCargoVendor failure. - cargoPatches = [ ./remove_duplicate_dependency.patch ]; postPatch = '' substituteInPlace src-tauri/tauri.conf.json \ diff --git a/pkgs/by-name/rc/rclone-ui/remove_duplicate_dependency.patch b/pkgs/by-name/rc/rclone-ui/remove_duplicate_dependency.patch deleted file mode 100644 index 3ca1903867c0..000000000000 --- a/pkgs/by-name/rc/rclone-ui/remove_duplicate_dependency.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock -index a6862ca..ab56106 100644 ---- a/src-tauri/Cargo.lock -+++ b/src-tauri/Cargo.lock -@@ -5890,17 +5890,6 @@ dependencies = [ - "x11-dl", - ] - --[[package]] --name = "tao-macros" --version = "0.1.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" --dependencies = [ -- "proc-macro2", -- "quote", -- "syn 2.0.111", --] -- - [[package]] - name = "tao-macros" - version = "0.1.3" diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix index 2ecb994d634b..8db468fde490 100644 --- a/pkgs/by-name/re/rectangle/package.nix +++ b/pkgs/by-name/re/rectangle/package.nix @@ -1,29 +1,300 @@ { lib, - stdenvNoCC, - fetchurl, - undmg, + swiftPackages, + fetchFromGitHub, + darwin, + actool, + ibtool, + makeWrapper, nix-update-script, }: -stdenvNoCC.mkDerivation (finalAttrs: { +let + inherit (swiftPackages) stdenv swift; + + masShortcutSrc = fetchFromGitHub { + owner = "rxhanson"; + repo = "MASShortcut"; + rev = "2f9fbb3f959b7a683c6faaf9638d22afad37a235"; + hash = "sha256-EZLt7ph24L1wwFEMlltuPutId09RBug/y9OtDhixIig="; + }; + + masShortcutSources = [ + "Model/MASShortcut.m" + "Model/MASShortcutValidator.m" + "Monitoring/MASHotKey.m" + "Monitoring/MASShortcutMonitor.m" + "UI/MASLocalization.m" + "UI/MASShortcutView.m" + "UI/MASShortcutView+Bindings.m" + "UI/MASShortcutViewButtonCell.m" + "User Defaults Storage/MASDictionaryTransformer.m" + "User Defaults Storage/MASShortcutBinder.m" + ]; + + # Derive object file name from source path: "UI/MASShortcutView.m" -> "MASShortcutView" + objName = src: lib.removeSuffix ".m" (baseNameOf src); + + toPlist = lib.generators.toPlist { escape = true; }; + + # Standard macOS app plist fields. Pass app-specific attrs to override/extend. + mkAppPlist = + attrs: + toPlist ( + { + CFBundleInfoDictionaryVersion = "6.0"; + CFBundlePackageType = "APPL"; + LSMinimumSystemVersion = "10.15"; + NSMainStoryboardFile = "Main"; + NSPrincipalClass = "NSApplication"; + } + // attrs + ); + + mkFrameworkPlist = + name: + toPlist { + CFBundleExecutable = name; + CFBundleIdentifier = "com.knollsoft.Rectangle.${name}"; + CFBundleInfoDictionaryVersion = "6.0"; + CFBundleName = name; + CFBundlePackageType = "FMWK"; + CFBundleVersion = "1"; + }; + + # Generate shell to assemble a .app bundle: directory structure, binary, + # frameworks (with plists and optional localizations), auto-discovered IB + # resources, localizations, and Info.plist + # Requires compileIB and installLocalizations shell functions in scope + mkAppBundle = + { + name, + binary, + sourceDir, + plist, + destDir, + frameworks ? [ ], + }: + let + app = "${destDir}/${name}.app"; + in + '' + nixLog "assembling ${name}.app" + mkdir -p "${app}/Contents/"{MacOS,Resources} + cp "${binary}" "${app}/Contents/MacOS/${name}" + + ${lib.concatMapStrings (fw: '' + nixLog "installing framework: ${fw.name}" + mkdir -p "${app}/Contents/Frameworks/${fw.name}.framework/Resources" + cp "${fw.dylib}" "${app}/Contents/Frameworks/${fw.name}.framework/${fw.name}" + printf '%s' ${lib.escapeShellArg (mkFrameworkPlist fw.name)} \ + > "${app}/Contents/Frameworks/${fw.name}.framework/Resources/Info.plist" + ${lib.optionalString (fw ? localizations) '' + find "${fw.localizations}" -name '*.lproj' -type d \ + -exec cp -r {} "${app}/Contents/Frameworks/${fw.name}.framework/Resources/" \; + ''} + '') frameworks} + + while IFS= read -r -d "" f; do + compileIB "$f" "${app}/Contents/Resources" + done < <(find ${sourceDir} \( -name '*.storyboard' -o -name '*.xib' \) -print0) + + installLocalizations ${sourceDir} "${app}/Contents/Resources" + printf '%s' ${lib.escapeShellArg plist} > "${app}/Contents/Info.plist" + ''; + + mainInfoPlist = + version: + mkAppPlist { + CFBundleDevelopmentRegion = "en"; + CFBundleExecutable = "Rectangle"; + CFBundleIdentifier = "com.knollsoft.Rectangle"; + CFBundleName = "Rectangle"; + CFBundleShortVersionString = version; + CFBundleVersion = "100"; + CFBundleURLTypes = [ { CFBundleURLSchemes = [ "rectangle" ]; } ]; + CFBundleIconFile = "AppIcon"; + CFBundleIconName = "AppIcon"; + LSApplicationCategoryType = "public.app-category.productivity"; + LSUIElement = true; + NSHumanReadableCopyright = "Copyright © 2019-2026 Ryan Hanson. All rights reserved."; + SUFeedURL = "https://rectangleapp.com/downloads/updates.xml"; + SUPublicEDKey = "lpt9M3PhocbZ3MZiLH+crEqRfU11kfoNzGxSqiEIdvM="; + SUScheduledCheckInterval = 172800; + }; + + launcherInfoPlist = mkAppPlist { + CFBundleExecutable = "RectangleLauncher"; + CFBundleIdentifier = "com.knollsoft.RectangleLauncher"; + CFBundleName = "RectangleLauncher"; + CFBundleShortVersionString = "1.0"; + CFBundleVersion = "1"; + LSBackgroundOnly = true; + }; +in +stdenv.mkDerivation (finalAttrs: { pname = "rectangle"; version = "0.95"; - src = fetchurl { - url = "https://github.com/rxhanson/Rectangle/releases/download/v${finalAttrs.version}/Rectangle${finalAttrs.version}.dmg"; - hash = "sha256-fykSgXAGxouBHAlcW4rcKthApQVkYfRiuw5GnI6hIAA="; + src = fetchFromGitHub { + owner = "rxhanson"; + repo = "Rectangle"; + tag = "v${finalAttrs.version}"; + hash = "sha256-M/qZo2dWsFQxiBD5ypKh0M7AdHdLkY/rx4Lx01OBSlc="; }; - sourceRoot = "."; + nativeBuildInputs = [ + swift + actool + ibtool + darwin.autoSignDarwinBinariesHook + makeWrapper + ]; - nativeBuildInputs = [ undmg ]; + dontConfigure = true; + + buildPhase = '' + runHook preBuild + buildDir="$PWD/build" + mkdir -p "$buildDir" + + commonSwiftFlags=( + -O -disable-bridging-pch + -Xlinker -platform_version -Xlinker macos -Xlinker 14.0 -Xlinker 26.0 + ) + + nixLog "building Sparkle stub framework" + swiftc "''${commonSwiftFlags[@]}" -emit-module -emit-library \ + -module-name Sparkle -module-link-name Sparkle \ + -emit-module-path "$buildDir/Sparkle.swiftmodule" \ + -Xlinker -install_name -Xlinker "@rpath/Sparkle.framework/Sparkle" \ + ${./stubs/SparkleStub.swift} -o "$buildDir/libSparkle.dylib" + + nixLog "building MASShortcut framework" + masDir="${masShortcutSrc}/Framework" + mkdir -p "$buildDir/MAS_headers/MASShortcut" + for h in "$masDir"/include/*.h; do + ln -sf "$h" "$buildDir/MAS_headers/MASShortcut/$(basename "$h")" + done + cp ${./stubs/MASShortcut.modulemap} "$buildDir/MAS_headers/MASShortcut/module.modulemap" + + masObjFiles=() + ${lib.concatMapStrings ( + src: + let + name = objName src; + in + '' + nixLog "compiling ${name}" + clang -fobjc-arc -O2 -I "$masDir/include" -include Foundation/Foundation.h \ + -c "$masDir/${src}" -o "$buildDir/MAS_${name}.o" + masObjFiles+=("$buildDir/MAS_${name}.o") + '' + ) masShortcutSources} + + nixLog "linking MASShortcut dylib" + clang -dynamiclib "''${masObjFiles[@]}" \ + -framework AppKit -framework Carbon -framework Foundation \ + -install_name "@rpath/MASShortcut.framework/MASShortcut" \ + -o "$buildDir/libMASShortcut.dylib" + + rectSwiftFiles=() + while IFS= read -r -d "" f; do + rectSwiftFiles+=("$f") + done < <(find Rectangle -name '*.swift' -print0) + + nixLog "compiling Rectangle (''${#rectSwiftFiles[@]} swift files)" + swiftc "''${commonSwiftFlags[@]}" -emit-executable \ + -module-name Rectangle \ + -import-objc-header Rectangle/Rectangle-Bridging-Header.h \ + -I "$buildDir" -L "$buildDir" \ + -Xcc -fmodule-map-file="$buildDir/MAS_headers/MASShortcut/module.modulemap" \ + -Xcc -I"$buildDir/MAS_headers" \ + -lSparkle -lMASShortcut \ + -framework AppKit -framework Cocoa -framework Carbon \ + -framework ServiceManagement -framework IOKit \ + -F /System/Library/PrivateFrameworks \ + -Xlinker -rpath -Xlinker "@executable_path/../Frameworks" \ + "''${rectSwiftFiles[@]}" -o "$buildDir/Rectangle" + + nixLog "compiling RectangleLauncher" + swiftc "''${commonSwiftFlags[@]}" -emit-executable \ + -module-name RectangleLauncher \ + -parse-as-library \ + -framework AppKit \ + RectangleLauncher/AppDelegate.swift \ + -o "$buildDir/RectangleLauncher" + + runHook postBuild + ''; installPhase = '' runHook preInstall - mkdir -p "$out/Applications" - mv Rectangle.app "$out/Applications" + # Compile a .storyboard or .xib into a target resource directory + # Preserves .lproj subdirectory structure automatically + compileIB() { + local src="$1" destDir="$2" + local filename="$(basename "$src")" + local name="''${filename%.*}" ext="''${filename##*.}" + local outExt; if [[ "$ext" == "storyboard" ]]; then outExt="storyboardc"; else outExt="nib"; fi + + local parentDir="$(basename "$(dirname "$src")")" + nixLog "compiling IB resource: $src" + if [[ "$parentDir" == *.lproj ]]; then + mkdir -p "$destDir/$parentDir" + ibtool --compile "$destDir/$parentDir/$name.$outExt" "$src" + else + ibtool --compile "$destDir/$name.$outExt" "$src" + fi + } + + # Copy .lproj dirs (for .strings localization files) and strip source IB files + installLocalizations() { + local srcDir="$1" destDir="$2" + nixLog "installing localizations from $srcDir" + find "$srcDir" -name '*.lproj' -type d -exec cp -r {} "$destDir/" \; + find "$destDir" \( -name '*.storyboard' -o -name '*.xib' \) -delete + } + + # Rectangle.app + app="$out/Applications/Rectangle.app" + ${mkAppBundle { + name = "Rectangle"; + binary = "$buildDir/Rectangle"; + sourceDir = "Rectangle"; + plist = mainInfoPlist finalAttrs.version; + destDir = "$out/Applications"; + frameworks = [ + { + name = "Sparkle"; + dylib = "$buildDir/libSparkle.dylib"; + } + { + name = "MASShortcut"; + dylib = "$buildDir/libMASShortcut.dylib"; + localizations = "${masShortcutSrc}/Framework/Resources"; + } + ]; + }} + + # Asset catalog + nixLog "compiling asset catalog" + actool --compile "$app/Contents/Resources" \ + --platform macosx --minimum-deployment-target 14.0 \ + --app-icon AppIcon --output-partial-info-plist /dev/null \ + Rectangle/Assets.xcassets + + # RectangleLauncher.app + ${mkAppBundle { + name = "RectangleLauncher"; + binary = "$buildDir/RectangleLauncher"; + sourceDir = "RectangleLauncher"; + plist = launcherInfoPlist; + destDir = "$app/Contents/Library/LoginItems"; + }} + + makeWrapper "$app/Contents/MacOS/Rectangle" "$out/bin/rectangle" runHook postInstall ''; @@ -35,10 +306,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://rectangleapp.com/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + FlameFlag Intuinewin wegank ]; platforms = lib.platforms.darwin; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) diff --git a/pkgs/by-name/re/rectangle/stubs/MASShortcut.modulemap b/pkgs/by-name/re/rectangle/stubs/MASShortcut.modulemap new file mode 100644 index 000000000000..e28ae99fa753 --- /dev/null +++ b/pkgs/by-name/re/rectangle/stubs/MASShortcut.modulemap @@ -0,0 +1,4 @@ +module MASShortcut { + header "Shortcut.h" + export * +} diff --git a/pkgs/by-name/re/rectangle/stubs/SparkleStub.swift b/pkgs/by-name/re/rectangle/stubs/SparkleStub.swift new file mode 100644 index 000000000000..e37228ee3902 --- /dev/null +++ b/pkgs/by-name/re/rectangle/stubs/SparkleStub.swift @@ -0,0 +1,16 @@ +import Foundation +import AppKit + +public protocol SPUStandardUserDriverDelegate: AnyObject {} + +public class SUAppcastItem: NSObject {} + +public class SPUUpdater: NSObject { + @objc dynamic public var automaticallyChecksForUpdates: Bool = false +} + +public class SPUStandardUpdaterController: NSObject { + public let updater = SPUUpdater() + public init(updaterDelegate: Any?, userDriverDelegate: Any?) {} + @objc public func checkForUpdates(_ sender: Any?) {} +} diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix index 7975e253be52..b9523760a021 100644 --- a/pkgs/by-name/ru/runit/package.nix +++ b/pkgs/by-name/ru/runit/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "runit"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { url = "https://smarden.org/runit/${pname}-${version}.tar.gz"; - sha256 = "sha256-le9NKGi5eMcXn+R5AeXFeOEc8nPSkr1iCL06fMsCkpA="; + sha256 = "sha256-Y08jyMTR1EAEO+D+ko3fkEYmKJ6Xv+fFgm6TqvLMb+k="; }; patches = [ diff --git a/pkgs/by-name/sb/sbom-tool/deps.json b/pkgs/by-name/sb/sbom-tool/deps.json index 50be4215a524..57257e248a7a 100644 --- a/pkgs/by-name/sb/sbom-tool/deps.json +++ b/pkgs/by-name/sb/sbom-tool/deps.json @@ -1,14 +1,4 @@ [ - { - "pname": "AutoMapper", - "version": "10.1.1", - "hash": "sha256-yJm2/zW6aInMjADHQyjXYBbCBDx10akoyja6485LN9A=" - }, - { - "pname": "AutoMapper.Extensions.Microsoft.DependencyInjection", - "version": "8.1.1", - "hash": "sha256-gp+BRjzaOEScjYtS2LAJRtEtUGWC2kz8IPW57hFuR7o=" - }, { "pname": "CommandLineParser", "version": "2.9.1", @@ -49,11 +39,6 @@ "version": "6.3.0", "hash": "sha256-vlB4uWMIVMgaPYYkHvDRR77DCxLQbNl6M0TQiDV6ZoE=" }, - { - "pname": "Microsoft.CSharp", - "version": "4.7.0", - "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" - }, { "pname": "Microsoft.Extensions.Caching.Abstractions", "version": "8.0.0", @@ -119,11 +104,6 @@ "version": "8.0.1", "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU=" }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "3.0.0", - "hash": "sha256-dGTb6sHsjZ86fiLnwbauGf9CQdN7G96lCM4ADjaSSBs=" - }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "8.0.0", @@ -234,11 +214,6 @@ "version": "8.0.1", "hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA=" }, - { - "pname": "Microsoft.Extensions.Options", - "version": "3.0.0", - "hash": "sha256-43Unnj57IA5OzebT6XMAXylzDDBuk8KNFaR4chRE/e8=" - }, { "pname": "Microsoft.Extensions.Options", "version": "8.0.0", @@ -254,11 +229,6 @@ "version": "8.0.0", "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "3.0.0", - "hash": "sha256-cwlj0X19gngcOB7kpODhF/h96/L6psMLBIOd2pf3CbU=" - }, { "pname": "Microsoft.Extensions.Primitives", "version": "8.0.0", @@ -899,11 +869,6 @@ "version": "4.3.0", "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" }, - { - "pname": "System.Reflection.Emit", - "version": "4.7.0", - "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" - }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.3.0", diff --git a/pkgs/by-name/sb/sbom-tool/package.nix b/pkgs/by-name/sb/sbom-tool/package.nix index 4b21ab9270c0..0cd0a358361c 100644 --- a/pkgs/by-name/sb/sbom-tool/package.nix +++ b/pkgs/by-name/sb/sbom-tool/package.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "sbom-tool"; - version = "4.1.8"; + version = "4.1.9"; src = fetchFromGitHub { owner = "microsoft"; repo = "sbom-tool"; tag = "v${version}"; - hash = "sha256-nPZ1xBGUmcWaTrcCHVX1CLuEnhvkO2ifdIhrlwL/f9M="; + hash = "sha256-Jm/gWHlEr+Sowh657jLAp50uvR60dMbONJQSKEDe9Ow="; }; projectFile = "src/Microsoft.Sbom.Tool/Microsoft.Sbom.Tool.csproj"; diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index 5deee66cbb84..beb8c46044c2 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.43.3"; + version = "1.44.0"; src = fetchFromGitHub { owner = "scalingo"; repo = "cli"; rev = version; - hash = "sha256-2MKlE1NFllMgZM5Nq1SNB55PgkDiAJXdNZjmcfIgie4="; + hash = "sha256-2E7tHdj74G+vZbkWL0e0E2Deayg5WANVUVIuYBPEBvo="; }; vendorHash = null; diff --git a/pkgs/by-name/se/sendspin-go/package.nix b/pkgs/by-name/se/sendspin-go/package.nix new file mode 100644 index 000000000000..2f0ef02fbb91 --- /dev/null +++ b/pkgs/by-name/se/sendspin-go/package.nix @@ -0,0 +1,56 @@ +{ + lib, + alsa-lib, + buildGoModule, + fetchFromGitHub, + ffmpeg, + libogg, + opus, + opusfile, + pkg-config, +}: + +buildGoModule (finalAttrs: { + pname = "sendspin-go"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "Sendspin"; + repo = "sendspin-go"; + tag = "v${finalAttrs.version}"; + hash = "sha256-37qTAjEgA6m9aYSt47z2jhnJwvI2Gk86bdPX+5m8hLw="; + }; + + __structuredAttrs = true; + + vendorHash = "sha256-l1fHIkyZ513wroyB4Lsn76r+WzijG2ahKVid5ujkTyA="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + alsa-lib + libogg + opus + opusfile + ffmpeg + ]; + + env.CGO_LDFLAGS = "-lm"; + + ldflags = [ "-s" ]; + + preCheck = '' + # Tests require network features that are not available in the sandbox + substituteInPlace pkg/discovery/mdns_test.go \ + --replace-fail "TestGetLocalIPs" "Skip_TestGetLocalIPs" + ''; + + meta = { + description = "Sendspin server and client"; + homepage = "https://github.com/Sendspin/sendspin-go"; + changelog = "https://github.com/Sendspin/sendspin-go/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "sendspin-go"; + }; +}) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 04206a38e8bd..12e133a58c9b 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "supabase-cli"; - version = "2.88.1"; + version = "2.90.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-v4H+sABhR53vKreq+yX9iJK7+5xlM+KXcuEUawDFZto="; + hash = "sha256-JaI5I+1rAdyHoct+ac6hayptfC5CK0otI1bIfr9s3CA="; }; - vendorHash = "sha256-5DWsFaZ700FGb6AnqTs3ewhieHuTl4SrnQHdbiNZBY4="; + vendorHash = "sha256-cVnhOmkhbhMh+1faFDJz/yGfYsqubHXglVUJXVZKfAQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix index 2a861e4c5dde..11d2d437779f 100644 --- a/pkgs/by-name/sw/swiftlint/package.nix +++ b/pkgs/by-name/sw/swiftlint/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "swiftlint"; - version = "0.62.1"; + version = "0.63.2"; src = fetchurl { url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip"; - hash = "sha256-VB20vZT4z4+6q3YvWX5/DkkBan+MpccNhrQ3CnzSNkE="; + hash = "sha256-xZpAXIX5W5LO1nelAIBOCBWWpMrkpqSFr3YGVVfW7Sk="; }; dontPatch = true; diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix index 18db2519ebd3..feca251c6f39 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -1,23 +1,23 @@ { - version = "1.25.2"; + version = "1.26.0"; x86_64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.25.2/linux/amd64/sysdig-cli-scanner"; - hash = "sha256-hSK1tCCIgMebYIi9e7XCkASHYsZ3GvniMubJxUdHyT8="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.26.0/linux/amd64/sysdig-cli-scanner"; + hash = "sha256-Hd3apIXVYEj42LM+Q9HWL06bZijux/wayfdppkFZapQ="; }; aarch64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.25.2/linux/arm64/sysdig-cli-scanner"; - hash = "sha256-IxcW/tBU0YR8FRAKU4Tzq19/dGuYn5QMqNjG27ABo0I="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.26.0/linux/arm64/sysdig-cli-scanner"; + hash = "sha256-pI1xwcifWoMDSwEDphGD4S2UbgFH43BmLpusIWlNMwA="; }; x86_64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.25.2/darwin/amd64/sysdig-cli-scanner"; - hash = "sha256-lS6O5c7MYmRepea6MdrVa8+EzrjcMjBCnmHdem6f2AE="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.26.0/darwin/amd64/sysdig-cli-scanner"; + hash = "sha256-X6m0pqsfZIHSQQCA5sUeG9LrPkoC2s3nPMmYtTj4mwY="; }; aarch64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.25.2/darwin/arm64/sysdig-cli-scanner"; - hash = "sha256-H1HWvGL++3/SqSjmSbqU+tHx8Zxh47NAdFRWw/qJqVY="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.26.0/darwin/arm64/sysdig-cli-scanner"; + hash = "sha256-ahFiiIucXJBoxqLlcjLbFI9olekNJYSJMjcfBWvaGrQ="; }; } diff --git a/pkgs/by-name/ta/tagref/package.nix b/pkgs/by-name/ta/tagref/package.nix index d4165f220a2d..cf1979f0f06d 100644 --- a/pkgs/by-name/ta/tagref/package.nix +++ b/pkgs/by-name/ta/tagref/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tagref"; - version = "1.11.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "stepchowfun"; repo = "tagref"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-DjxRK3Ih58vzxvPM0YmRkFU4fogiFsI/WrdHyAonQ7A="; + sha256 = "sha256-tsiotSQsf3wlp5wlzV0MHavCieW9LMb3Ei+eKve0O/4="; }; - cargoHash = "sha256-Pj86GQoIAf20F7z18Er7frX0aRacGNDQpeyUdr5kwz4="; + cargoHash = "sha256-3nGdM3Qv3y5byQI1Txv0VNi2cQZ7RP5tEXFWuom2SOY="; meta = { description = "Manage cross-references in your code"; diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 6e166ef6a815..4ecab22c5a35 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "terragrunt"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-BtgjfRKqFw18pQd0Ktr6w6qhHq5Qp5Lxc8buu8nxKnA="; + hash = "sha256-+IAf5g7jMfY6IAyQvOeALOOL4DuxdvxsZR+UAcxiXA4="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { make generate-mocks ''; - vendorHash = "sha256-ZAVUnQv67HREFTsjbB7+oB73fST384Di4TcM3zDOOR8="; + vendorHash = "sha256-VpFJexddHfPm0UY2xFOGdPmkEALZD4FwpbnII+QBHs8="; excludedPackages = [ "test/flake" ]; diff --git a/pkgs/by-name/ti/tidb/package.nix b/pkgs/by-name/ti/tidb/package.nix index 6a1c4e63f95c..04e4d1756a2f 100644 --- a/pkgs/by-name/ti/tidb/package.nix +++ b/pkgs/by-name/ti/tidb/package.nix @@ -1,18 +1,18 @@ { lib, - buildGoModule, + buildGo125Module, fetchFromGitHub, }: -buildGoModule (finalAttrs: { +buildGo125Module (finalAttrs: { pname = "tidb"; version = "8.5.5"; src = fetchFromGitHub { owner = "pingcap"; repo = "tidb"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-wrCdclS9qpc0mq5QZ6u5/APZyOTWvCJNCPCzM385MBM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-wrCdclS9qpc0mq5QZ6u5/APZyOTWvCJNCPCzM385MBM="; }; vendorHash = "sha256-7g8U0gbG46AC4h1SyOTKKuNc5eVRqJsimzshj4O5FYw="; diff --git a/pkgs/by-name/ti/tinyproxy/package.nix b/pkgs/by-name/ti/tinyproxy/package.nix index 2875acff42cc..035c3194b91e 100644 --- a/pkgs/by-name/ti/tinyproxy/package.nix +++ b/pkgs/by-name/ti/tinyproxy/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, autoreconfHook, perl, nixosTests, @@ -10,15 +11,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinyproxy"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { - hash = "sha256-bpr/O723FmW2gb+85aJrwW5/U7R2HwbePTx15i3rpsE="; + hash = "sha256-In/ZG50i2jKl0x7yfSs3KHlBdm8NdXtspMJPiv4BW6g="; rev = finalAttrs.version; repo = "tinyproxy"; owner = "tinyproxy"; }; + patches = [ + # Fix case-sensitive matching of "chunked" (CVE-2026-31842) + (fetchpatch2 { + name = "fix-chunked-case-sensitivity.patch"; + url = "https://github.com/tinyproxy/tinyproxy/commit/879bf844abffa0bf5fae6aff0c73179024dd9f98.patch"; + hash = "sha256-Nav3nXyxdoM/tIvfyPJHEYEjAtrRrJlvkMXzsQCZan4="; + }) + ]; + # perl is needed for man page generation. nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/by-name/ts/tsid/package.nix b/pkgs/by-name/ts/tsid/package.nix index d9d38e929fcd..bab941e3b92e 100644 --- a/pkgs/by-name/ts/tsid/package.nix +++ b/pkgs/by-name/ts/tsid/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tsid"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "tsid"; rev = "v${finalAttrs.version}"; - hash = "sha256-enSYneV/Av7lF8ADdLqU1Wj2z8/ePocgecFtOBXS0EY="; + hash = "sha256-f/SecQfEmrlelVR5584KIHFwwrp5Cy2aBMKI/rxuPmc="; }; cmakeFlags = [ diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 7fd4f4b2df47..9639925e8cad 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.29"; + version = "0.0.30"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-rOkh6HgZ5F/1wJr0iZwaqqYmcEONioz7jeebp19xxXs="; + hash = "sha256-EpCIU4RAYbcZA63tsKiUhnXdZVIBV1oZwPgNGw0xRr0="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-ajuhF+jpx+9U9swrd8HF3ZH7ovSwz0nDNRiQzcrttwg="; + cargoHash = "sha256-juX/Xc53X5OpK3XhcubUkcbDJVyMSTjloUfSPMoMb7M="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/us/usque/package.nix b/pkgs/by-name/us/usque/package.nix index 913f14282e88..ad80fab032f1 100644 --- a/pkgs/by-name/us/usque/package.nix +++ b/pkgs/by-name/us/usque/package.nix @@ -1,6 +1,6 @@ { lib, - buildGoModule, + buildGo125Module, fetchFromGitHub, stdenv, nix-update-script, @@ -8,7 +8,7 @@ installShellFiles, versionCheckHook, }: -buildGoModule (finalAttrs: { +buildGo125Module (finalAttrs: { pname = "usque"; version = "2.0.1"; src = fetchFromGitHub { diff --git a/pkgs/by-name/va/vaultwarden/package.nix b/pkgs/by-name/va/vaultwarden/package.nix index 734613e0a079..c2f7c17a0ac5 100644 --- a/pkgs/by-name/va/vaultwarden/package.nix +++ b/pkgs/by-name/va/vaultwarden/package.nix @@ -19,13 +19,13 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "vaultwarden"; - version = "1.35.6"; + version = "1.35.7"; src = fetchFromGitHub { owner = "dani-garcia"; repo = "vaultwarden"; tag = finalAttrs.version; - hash = "sha256-Q5D/tDE7rC9/iIaD0WlGr2AaoCdAEJQs++8uOdYgRXo="; + hash = "sha256-HJDpGsKLsVbeUPqTAph5luROpz7ioJXs/PV5nwtmAz8="; }; cargoHash = "sha256-LSmzR3X04i2dmPwj1ivPm/YeNtxGhfwsEXG93iVvhrI="; diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_117/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_117/package.nix new file mode 100644 index 000000000000..8f047d6f7f35 --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_117/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.117"; + hash = "sha256-vtDQXL8FSgdutqXG7/rBUWgrYCtzdmeVQQkWkjasvZU="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-eKe7uwneUYxejSbG/1hKqg6bSmtL0KQ9ojlazeqTi88="; + }; +} diff --git a/pkgs/by-name/wh/whatweb/package.nix b/pkgs/by-name/wh/whatweb/package.nix index 2b84a0da7f2a..6b82e6cda43d 100644 --- a/pkgs/by-name/wh/whatweb/package.nix +++ b/pkgs/by-name/wh/whatweb/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, bundlerEnv, ruby_3_4, + versionCheckHook, withMongo ? false, withRchardet ? false, }: @@ -52,13 +53,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "whatweb"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "urbanadventurer"; repo = "whatweb"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-EFQ4RHI1+kmlz/Bm+9KXbmY0iEBJnKfdQL5YGDWCfJQ="; + sha256 = "sha256-0oU3DAAwJRGUrrzxZUm8TZ1dlsufzTlonkgdVYsh4mQ="; }; prePatch = '' @@ -70,6 +71,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gems ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + installPhase = '' runHook preInstall @@ -77,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { rm $out/bin/whatweb cat << EOF >> $out/bin/whatweb #!/bin/sh -e - export GEM_PATH="${gems}/lib/ruby/gems/3.3.0" + export GEM_PATH="${gems}/lib/ruby/gems/3.4.0" export RUBYOPT="-W0" exec ${ruby_3_4}/bin/ruby "$raw" "\$@" EOF @@ -91,6 +94,8 @@ stdenv.mkDerivation (finalAttrs: { withRchardet = withRchardet; }; + doInstallCheck = true; + meta = { description = "Next generation web scanner"; longDescription = '' diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index 18d375a420c1..cfc9d0c7d9ed 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.9577.43", - "vscodeVersion": "1.108.2", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/745a6c1ac471cc11f782a05d2c3ceacbc1de308f/Windsurf-darwin-arm64-1.9577.43.zip", - "sha256": "05c30794bf6f11a1f4bc8ca860dcc3220b8700acf23f3ae97100a31e6ccbc58a" + "version": "1.9600.41", + "vscodeVersion": "1.110.1", + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/f90ca8311d630b9b77e7537222ecfce0a0ac990b/Windsurf-darwin-arm64-1.9600.41.zip", + "sha256": "db935596cf4f27018eca94529c807f1d3e42fb040b75ee99726a0bd9089fcf0b" }, "x86_64-darwin": { - "version": "1.9577.43", - "vscodeVersion": "1.108.2", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/745a6c1ac471cc11f782a05d2c3ceacbc1de308f/Windsurf-darwin-x64-1.9577.43.zip", - "sha256": "b4d64719fa87f490b310bceb2b0613db7e03479719ded5c3778cbc4eb693f9b4" + "version": "1.9600.41", + "vscodeVersion": "1.110.1", + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/f90ca8311d630b9b77e7537222ecfce0a0ac990b/Windsurf-darwin-x64-1.9600.41.zip", + "sha256": "6b7403b6405b9961f5a5d004120da7991ca3b35f140437b6b4ee4ac8d3e72795" }, "x86_64-linux": { - "version": "1.9577.43", - "vscodeVersion": "1.108.2", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/745a6c1ac471cc11f782a05d2c3ceacbc1de308f/Windsurf-linux-x64-1.9577.43.tar.gz", - "sha256": "6e28ab2b9e593493b937af8b4e5c704d8a350a886363a1495562dac37f122b9c" + "version": "1.9600.41", + "vscodeVersion": "1.110.1", + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/f90ca8311d630b9b77e7537222ecfce0a0ac990b/Windsurf-linux-x64-1.9600.41.tar.gz", + "sha256": "b8c9e9dad0bc51e40e393f5a16e8c20cedefcd91d0bd879c15200039f0933962" } } diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix index 283236222890..6f67b7f4f269 100644 --- a/pkgs/by-name/wi/wivrn/package.nix +++ b/pkgs/by-name/wi/wivrn/package.nix @@ -41,6 +41,7 @@ pkg-config, python3, qt6, + sdl2-compat, shaderc, systemd, udev, @@ -180,6 +181,13 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; preFixup = lib.optional (!clientLibOnly) '' + wrapProgram "$out/bin/wivrn-server" \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + sdl2-compat + udev + ] + } wrapQtApp "$out/bin/wivrn-dashboard" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} \ --prefix PATH : ${lib.makeBinPath [ android-tools ]} diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix index 961b2dade1a8..3ed0d5691ad1 100644 --- a/pkgs/by-name/wo/wootility/package.nix +++ b/pkgs/by-name/wo/wootility/package.nix @@ -7,10 +7,10 @@ let pname = "wootility"; - version = "5.2.4"; + version = "5.2.5"; src = fetchurl { url = "https://wootility-updates.ams3.cdn.digitaloceanspaces.com/wootility-linux/Wootility-${version}.AppImage"; - sha256 = "sha256-cmZX6E1Z2RdrB+uDJWeBm3woyVArmLl2+NvWhyEB3BI="; + sha256 = "sha256-bDhwlI+zi13xdMXqT5ztzR7RNOLgTBxNtjGkEFezZsw="; }; in @@ -27,9 +27,9 @@ appimageTools.wrapType2 { wrapProgram $out/bin/wootility \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - install -Dm444 ${contents}/Wootility.desktop -t $out/share/applications - install -Dm444 ${contents}/Wootility.png -t $out/share/icons/hicolor/1024x1024/apps - substituteInPlace $out/share/applications/Wootility.desktop \ + install -Dm444 ${contents}/wootility.desktop -t $out/share/applications + install -Dm444 ${contents}/wootility.png -t $out/share/icons/hicolor/1024x1024/apps + substituteInPlace $out/share/applications/wootility.desktop \ --replace-fail 'Exec=AppRun --no-sandbox' 'Exec=wootility' ''; diff --git a/pkgs/by-name/xb/xbyak/package.nix b/pkgs/by-name/xb/xbyak/package.nix index b2b416d25385..fc2f9d68ee18 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.35.4"; + version = "7.36"; src = fetchFromGitHub { owner = "herumi"; repo = "xbyak"; tag = "v${finalAttrs.version}"; - hash = "sha256-UPqqsG7GeWelOO9AKzveLNa1AYcHFBU6eLjOghDuS1s="; + hash = "sha256-Mpo+T9zk6JE8HcwUg0hfUmQc/62tM2lmEoA5ElaLmnw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/xc/xchm/package.nix b/pkgs/by-name/xc/xchm/package.nix index 449e266a34ff..e002bb16081b 100644 --- a/pkgs/by-name/xc/xchm/package.nix +++ b/pkgs/by-name/xc/xchm/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xchm"; - version = "1.38"; + version = "1.39"; src = fetchFromGitHub { owner = "rzvncj"; repo = "xCHM"; rev = finalAttrs.version; - sha256 = "sha256-ZZ3cTUCeXbQSDF2ioMsmZYy6jLnQPw5C3KP+wYSvmVk="; + sha256 = "sha256-u/7f3yGWvCjmYhd5fs5TcSccz8Wr+WFQlHqUqgriUc0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xw/xwayland/package.nix b/pkgs/by-name/xw/xwayland/package.nix index 23702f67bc55..4a26bc6945f3 100644 --- a/pkgs/by-name/xw/xwayland/package.nix +++ b/pkgs/by-name/xw/xwayland/package.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xwayland"; - version = "24.1.9"; + version = "24.1.10"; src = fetchurl { url = "mirror://xorg/individual/xserver/xwayland-${finalAttrs.version}.tar.xz"; - hash = "sha256-8pevJ6hFCNubgNHLvMacOAHaOOtkxy87W1D1gkWa/dA="; + hash = "sha256-RZdivo6gRslDhmh9d6h63WBzhovuFPApE+r+u5RbeqA="; }; postPatch = '' diff --git a/pkgs/by-name/yo/yo/package.nix b/pkgs/by-name/yo/yo/package.nix index 92debbdcc52d..f8dd66a02a15 100644 --- a/pkgs/by-name/yo/yo/package.nix +++ b/pkgs/by-name/yo/yo/package.nix @@ -1,43 +1,36 @@ { lib, buildNpmPackage, - fetchNpmDeps, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "yo"; - version = "5.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "yeoman"; repo = "yo"; - tag = "v${version}"; - hash = "sha256-twV5vmQ5loR8j9guf0w5DG4sU4BQYz22GjqjsUkqE4U="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tTT+KjJ8Fol2IjPzuWpkd3SymODe8Jmge9sreSxBU5M="; }; - # needed to fix https://github.com/NixOS/nixpkgs/issues/367282 - # once yo gets a new lockfile upstream, we can go back to regular - # `npmDepsHash` and remove the `postPatch`. - npmDeps = fetchNpmDeps { - src = fetchFromGitHub { - owner = "yeoman"; - repo = "yo"; - rev = "96ebb14020a7f3f10699b3f88eadfa063a9e6b07"; - hash = "sha256-wMxH9Er+gb6rsSEgmH0zA4d6yvP2PSpsV+A0nBTIxBI="; - }; - hash = "sha256-7TAH4Im+H7fbjI0xUxYZficcFQNZbweK2U0hGCZV+lQ="; - }; - - postPatch = "cp -v ${npmDeps.src}/package-lock.json ./package-lock.json"; + npmDepsHash = "sha256-bBGGZ5O4Nkw+nMZ5VAz7wjm8tIrCCvtv6TaXTwUCLPk="; dontNpmBuild = true; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "CLI tool for running Yeoman generators"; homepage = "https://github.com/yeoman/yo"; license = lib.licenses.bsd2; mainProgram = "yo"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ chillcicada ]; }; -} +}) diff --git a/pkgs/by-name/za/zapper/package.nix b/pkgs/by-name/za/zapper/package.nix new file mode 100644 index 000000000000..fe22cfa0cae6 --- /dev/null +++ b/pkgs/by-name/za/zapper/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + glibc, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zapper"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "hackerschoice"; + repo = "zapper"; + tag = "v${finalAttrs.version}"; + hash = "sha256-k8tkM3/hRSWwsgLiv9+n06INYpk6tz0hMZtOcOlQfLw="; + }; + + __structuredAttrs = true; + + strictDeps = true; + + buildInputs = [ glibc.static ]; + + buildFlags = [ "zapper" ]; + + installPhase = '' + runHook preInstall + + install -Dm755 zapper $out/bin/zapper + + runHook postInstall + ''; + + meta = { + description = "Zaps arguments and environment from the process list"; + homepage = "https://github.com/hackerschoice/zapper"; + changelog = "https://github.com/hackerschoice/zapper/releases/tag/v${finalAttrs.src.tag}"; + # https://github.com/hackerschoice/zapper/issues/4 + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "zapper"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/za/zapret2/package.nix b/pkgs/by-name/za/zapret2/package.nix new file mode 100644 index 000000000000..d6c2729bd30e --- /dev/null +++ b/pkgs/by-name/za/zapret2/package.nix @@ -0,0 +1,145 @@ +{ + stdenv, + fetchFromGitHub, + lib, + makeWrapper, + pkg-config, + curl, + netcat, + gawk, + gnugrep, + luajit, + ipset, + libcap, + libmnl, + libnfnetlink, + libnetfilter_queue, + systemdLibs, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zapret2"; + version = "0.9.5"; + + outputs = [ + "out" + "doc" + ]; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "bol-van"; + repo = "zapret2"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KdkUCfxxe2ddcYebvKsslIUBkl5g7Rc/f+xY00hy5JM="; + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse --short=12 HEAD > COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + + buildInputs = [ + luajit + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libcap + libmnl + libnfnetlink + libnetfilter_queue + ipset + systemdLibs + ]; + + postPatch = '' + substituteInPlace "init.d/systemd/nfqws2@.service" \ + --replace-fail "ExecSearchPath=/opt/zapret2/nfq2" "ExecSearchPath=$out/bin" + ''; + + preBuild = '' + makeFlagsArray+=("CFLAGS=-DZAPRET_GH_VER=${finalAttrs.src.tag} -DZAPRET_GH_HASH=`cat $src/COMMIT`") + ''; + + makeFlags = [ + (if stdenv.hostPlatform.isLinux then "systemd" else "bsd") + "TGT=${placeholder "out"}/bin" + ]; + + env = { + ZAPRET_BASE = "${placeholder "out"}/share/zapret2"; + ZAPRET_RW = "/etc/zapret2"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$ZAPRET_BASE" + for spec in "blockcheck2.sh" "blockcheck2.d" "common" "ipset" "lua"; do + cp -R "$spec" "$ZAPRET_BASE/" + done + + pushd docs + mkdir -p "$doc/share/doc/zapret2" + cp *.md changes*.txt "$doc/share/doc/zapret2" + popd + + wrapProgram "$ZAPRET_BASE/blockcheck2.sh" \ + --set ZAPRET_BASE "$ZAPRET_BASE" \ + --set ZAPRET_RW "$ZAPRET_RW" \ + --set NFQWS2 "$out/bin/nfqws2" \ + --set DVTWS2 "$out/bin/dvtws2" \ + --set MDIG "$out/bin/mdig" \ + --prefix "PATH" : "${ + lib.makeBinPath [ + curl + netcat + # don't wrap with iptables/nftables so that it uses the one from the + # system path (depending on the networking firewall backend) + ] + }" + + for file in "$ZAPRET_BASE/ipset"/*.sh; do + if [ -x "$file" ]; then + wrapProgram "$file" \ + --set ZAPRET_BASE "$ZAPRET_BASE" \ + --set ZAPRET_RW "$ZAPRET_RW" \ + --prefix "PATH" : "${ + lib.makeBinPath [ + gawk + gnugrep + ] + }" + fi + done + + ln -s "$ZAPRET_BASE/blockcheck2.sh" "$out/bin/blockcheck2" + + ${lib.optionalString stdenv.hostPlatform.isLinux '' + install -Dm644 "init.d/systemd/nfqws2@.service" -t "$out/lib/systemd/system" + ''} + + runHook postInstall + ''; + + meta = { + description = "Anti-DPI software for bypassing DPI systems"; + homepage = "https://github.com/bol-van/zapret2"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + # Darwin lacks ipdivert in kernel (making dvtws2 unusable) and zapret2 + # doesn't include tpws + broken = stdenv.hostPlatform.isDarwin; + maintainers = with lib.maintainers; [ andre4ik3 ]; + mainProgram = if stdenv.hostPlatform.isLinux then "nfqws2" else "dvtws2"; + }; +}) diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index 8e9091292f35..4281495471df 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.passthru.prettyName}-unwrapped"; # nixpkgs-update: no auto update - version = "0-unstable-2025-11-15"; + version = "0-unstable-2026-04-11"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "fe2ddbd2e5833a85d9ccd3937b304f3f41e44f98"; - hash = "sha256-jv7d5DopGZDnVFQX/t0D9cZSTwgMvcb4kqCnLJSWmNI="; + rev = "e724d4a0e7cc1593ae2430e07a62352b7852dd68"; + hash = "sha256-Xu0oCNO8WyIwe12CjDWXP+2LUzexZcw6Rgzpb80M5cA="; }; postPatch = '' @@ -51,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '-static' "" ''; + # https://github.com/open-watcom/open-watcom-v2/issues/1608 + hardeningDisable = [ "strictflexarrays1" ]; + nativeBuildInputs = lib.optionals withDocs [ dosbox # running prebuilt WGML tool to create docs ghostscript diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index e7eba7011a5e..6bb134ee1c9c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -77,8 +77,8 @@ in hash = "sha256-gAt7btULc8jueETuXy98xhL6p4daCqfEUp6O1YZqUDA="; }; php84 = mkPhp { - version = "8.4.19"; - hash = "sha256-vOt3mO03tEL+Ujrn7zRczCIx2wsCLTBzXC43jTJUoNQ="; + version = "8.4.20"; + hash = "sha256-ziXSYQpflSKsj1P7t7goC1wCGZHpvZE3BoycYp2f+1Y="; }; php85 = mkPhp { version = "8.5.4"; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index f31caa40438d..d9310de861cd 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -4645,19 +4645,20 @@ final: prev: { nui-nvim, nvim-nio, pathlib-nvim, - plenary-nvim, + tree-sitter-norg, + tree-sitter-norg-meta, }: buildLuarocksPackage { pname = "neorg"; - version = "9.4.0-1"; + version = "9.6.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/neorg-9.4.0-1.rockspec"; - sha256 = "0gm91iv0a5lpch6n92cnrcbpn525gxl735cgqwlldbrdfjwxv4y2"; + url = "mirror://luarocks/neorg-9.6.4-1.rockspec"; + sha256 = "11k7qwr7430wk3j5kf7isn3d9i4y0drmq6d0dwdx62s4cy9c3pvm"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorg/neorg/archive/d4e6b3665504baa88685c9d2e79446d336dc0594.zip"; - sha256 = "0gjyn9csw3rngnjxq6hyh7zl20ks6ibqvb5kggmkr9qhi3a8kiaj"; + url = "https://github.com/nvim-neorg/neorg/archive/1f14d72aad7165eac307a2a2f6be0fb97a04b3c2.zip"; + sha256 = "0l7hc1w4j00csv8i6dgbdhx0jcf0017b7hhs8gcldvsyka50xkx5"; }; disabled = luaOlder "5.1"; @@ -4666,7 +4667,8 @@ final: prev: { nui-nvim nvim-nio pathlib-nvim - plenary-nvim + tree-sitter-norg + tree-sitter-norg-meta ]; meta = { @@ -6108,6 +6110,36 @@ final: prev: { } ) { }; + tree-sitter-norg-meta = callPackage ( + { + buildLuarocksPackage, + fetchurl, + fetchzip, + luarocks-build-treesitter-parser, + }: + buildLuarocksPackage { + pname = "tree-sitter-norg-meta"; + version = "0.1.0-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/tree-sitter-norg-meta-0.1.0-1.rockspec"; + sha256 = "0vngnyvdad6n36r37sc96asl7h5mph691a0638523mffbg8zdfvr"; + }).outPath; + src = fetchzip { + url = "https://github.com/nvim-neorg/tree-sitter-norg-meta/archive/v0.1.0.zip"; + sha256 = "1vz74wc5yy5fykl9c3b16k6fsvskxp93acsy81p337jzg709v97j"; + }; + + nativeBuildInputs = [ luarocks-build-treesitter-parser ]; + + meta = { + homepage = "https://github.com/nvim-neorg/tree-sitter-norg-meta"; + license.fullName = "MIT"; + description = "Treesitter parser for Norg's `@document.meta` blocks."; + }; + } + ) { }; + tree-sitter-orgmode = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 91083ad0a63d..c3983d8fe62a 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -889,9 +889,7 @@ in postConfigure = '' substituteInPlace ''${rockspecFilename} \ --replace-fail "'nvim-nio ~> 1.7'," "'nvim-nio >= 1.7'," \ - --replace-fail "'plenary.nvim == 0.1.4'," "'plenary.nvim'," \ - --replace-fail "'nui.nvim == 0.3.0'," "'nui.nvim'," \ - --replace-fail ", 'nvim-treesitter-legacy-api == 0.9.2'" "" + --replace-fail "'nui.nvim == 0.3.0'," "'nui.nvim'," ''; }; @@ -1252,6 +1250,13 @@ in }; }); + tree-sitter-norg-meta = prev.tree-sitter-norg-meta.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ + writableTmpDirAsHomeHook + tree-sitter + ]; + }); + tree-sitter-orgmode = prev.tree-sitter-orgmode.overrideAttrs (old: { nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ writableTmpDirAsHomeHook diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix deleted file mode 100644 index 417869d4508e..000000000000 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - fetchpatch, - ocaml, - findlib, - libmysqlclient, -}: - -# TODO: la versione stabile da' un errore di compilazione dovuto a -# qualche cambiamento negli header .h -# TODO: compilazione di moduli dipendenti da zip, ssl, tcl, gtk, gtk2 - -stdenv.mkDerivation (finalAttrs: { - name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}"; - pname = "ocaml-mysql"; - version = "1.2.1"; - - src = fetchurl { - url = "http://ygrek.org.ua/p/release/ocaml-mysql/ocaml-mysql-${finalAttrs.version}.tar.gz"; - sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2"; - }; - - configureFlags = [ - "--prefix=$out" - "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql" - ]; - - nativeBuildInputs = [ - ocaml - findlib - ]; - - createFindlibDestdir = true; - - propagatedBuildInputs = [ libmysqlclient ]; - - strictDeps = true; - - patches = [ - (fetchpatch { - url = "https://github.com/ygrek/ocaml-mysql/compare/v1.2.1...d6d1b3b262ae2cf493ef56f1dd7afcf663a70a26.diff?full_index=1"; - hash = "sha256-MuiCsXglb+8kNAreytr4ajaU2Kh08R2QWTKDUZJHSlY="; - }) - ]; - - meta = { - homepage = "http://ocaml-mysql.forge.ocamlcore.org"; - description = "Bindings for interacting with MySQL databases from ocaml"; - license = lib.licenses.lgpl21Plus; - maintainers = [ lib.maintainers.roconnor ]; - }; -}) diff --git a/pkgs/development/python-modules/aioaudiobookshelf/default.nix b/pkgs/development/python-modules/aioaudiobookshelf/default.nix index d3fc84314876..ca0e964e5674 100644 --- a/pkgs/development/python-modules/aioaudiobookshelf/default.nix +++ b/pkgs/development/python-modules/aioaudiobookshelf/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aioaudiobookshelf"; - version = "0.1.13"; + version = "0.1.20"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "aioaudiobookshelf"; tag = version; - hash = "sha256-63QqoINXY9gKZnyB0at+2C7c6epuda3UQ1/XwzLKnS0="; + hash = "sha256-MEkIcPtNNHvWUBLGRhJGbMnS5cMclGqINuLqvGK8Ivg="; }; build-system = [ diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 289f9a16c06d..11cc614d17a5 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,14 +26,14 @@ buildPythonPackage (finalAttrs: { pname = "aioesphomeapi"; - version = "44.9.0"; + version = "44.13.3"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${finalAttrs.version}"; - hash = "sha256-k6yK0aBHA/BpM6uU93Z47kPvduwSlFTG7Upm0SFXcTg="; + hash = "sha256-PCCz12AAZuhDzqgJGhYpncr2ICN6xWefi/s9icbMSck="; }; build-system = [ diff --git a/pkgs/development/python-modules/aiosendspin/default.nix b/pkgs/development/python-modules/aiosendspin/default.nix index f9c5f4a92c0f..c7cf72fbf1fd 100644 --- a/pkgs/development/python-modules/aiosendspin/default.nix +++ b/pkgs/development/python-modules/aiosendspin/default.nix @@ -10,27 +10,37 @@ aiohttp, av, mashumaro, + numpy, orjson, pillow, zeroconf, + # test dependencies + pytest-aiohttp, + pytest-cov-stub, + pytest-timeout, + pytest-xdist, + pytestCheckHook, + # meta music-assistant, + + nixosTests, }: buildPythonPackage rec { pname = "aiosendspin"; - version = "2.1.0"; + version = "4.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Sendspin"; repo = "aiosendspin"; tag = version; - hash = "sha256-9VhNtfXH2r/cGkscz51PIK2/66pPOGv0S0IpO0wFvO4="; + hash = "sha256-7edFCGNbECW5rrTbF7vJ4lJUc2IrQZD9VTR3IxJRP08="; }; - # https://github.com/Sendspin/aiosendspin/blob/1.2.0/pyproject.toml#L7 + # https://github.com/Sendspin/aiosendspin/blob/4.4.0/pyproject.toml#L7 postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'version = "0.0.0"' 'version = "${version}"' @@ -44,19 +54,29 @@ buildPythonPackage rec { aiohttp av mashumaro + numpy orjson pillow zeroconf ]; - doCheck = false; # no tests + nativeCheckInputs = [ + pytest-aiohttp + pytest-cov-stub + pytest-timeout + pytest-xdist + pytestCheckHook + ]; pythonImportsCheck = [ "aiosendspin" ]; - # needs manual compat testing with music-assistant (sendspin provider) - passthru.skipBulkUpdate = true; # nixpkgs-update: no auto update + passthru = { + # needs manual compat testing with music-assistant (sendspin provider) + skipBulkUpdate = true; # nixpkgs-update: no auto update + tests = nixosTests.music-assistant; + }; meta = { changelog = "https://github.com/Sendspin/aiosendspin/releases/tag/${src.tag}"; diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index a1418bfa0c2d..d24dee524f2c 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -44,9 +44,6 @@ buildPythonPackage (finalAttrs: { hash = "sha256-7KsxZH1d5FfdnsYfKSNGCmdYuBi8KzZxyZbG2WNAM9Y="; }; - # ansible_connection is already wrapped, so don't pass it through - # the python interpreter again, as it would break execution of - # connection plugins. postPatch = '' patchShebangs --build packaging/cli-doc/build.py @@ -98,6 +95,10 @@ buildPythonPackage (finalAttrs: { installManPage man/* ''; + postFixup = '' + patchPythonScript $out/${python.sitePackages}/ansible/cli/scripts/ansible_connection_cli_stub.py + ''; + # internal import errors, missing dependencies doCheck = false; diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index 931a780564fe..9e929da5d5f1 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -19,14 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "bleak-esphome"; - version = "3.7.1"; + version = "3.7.3"; pyproject = true; src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "bleak-esphome"; tag = "v${finalAttrs.version}"; - hash = "sha256-drNMU0Ka5e3uQ9UHXP5O+I4l4jOxUdq2Bf0WcsGk9IM="; + hash = "sha256-zEa8l3ob05BoT/GHhwClzOreZyC3uPaG05VIJV7ZZ00="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 8863c76bc48b..afd81e072b27 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -7,6 +7,7 @@ setuptools, webob, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -21,11 +22,6 @@ buildPythonPackage rec { hash = "sha256-WXBdlgUoWdptv1weJf82qyH8TTqNCC1rYFEa972TqDY="; }; - postPatch = '' - substituteInPlace tox.ini --replace-fail \ - "--cov=bugsnag --cov-report html --cov-append --cov-report term" "" - ''; - build-system = [ setuptools ]; dependencies = [ webob ]; @@ -39,7 +35,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "bugsnag" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; disabledTestPaths = [ # Extra dependencies diff --git a/pkgs/development/python-modules/dnsight/default.nix b/pkgs/development/python-modules/dnsight/default.nix index b62625bad763..0da61c71b7d6 100644 --- a/pkgs/development/python-modules/dnsight/default.nix +++ b/pkgs/development/python-modules/dnsight/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "dnsight"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "dnsight"; repo = "dnsight"; tag = "v${finalAttrs.version}"; - hash = "sha256-WoYLAqNTbMVe+kd/cG1MPRSlYMMYPWP8wm96qr3IdY8="; + hash = "sha256-TirYLziPa1xRm7D54Unl5oVjsnsv6Gl0LRVUXzd9o/E="; }; pythonRelaxDeps = [ "typer" ]; diff --git a/pkgs/development/python-modules/hatch-argparse-manpage/default.nix b/pkgs/development/python-modules/hatch-argparse-manpage/default.nix new file mode 100644 index 000000000000..a0efb0bac9f6 --- /dev/null +++ b/pkgs/development/python-modules/hatch-argparse-manpage/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + # Build system + hatchling, + # Dependencies + argparse-manpage, + rich, +}: + +buildPythonPackage (finalAttrs: { + pname = "hatch-argparse-manpage"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "damonlynch"; + repo = "hatch-argparse-manpage"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wkMLbbOkIRO83byUTJRYAS7uTYc2weL/viH1fI8xYh0="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + argparse-manpage + rich + ]; + + pythonImportsCheck = [ + "hatch_argparse_manpage" + ]; + + meta = { + description = "Hatch build hook plugin to automatically generate manual pages"; + homepage = "https://github.com/damonlynch/hatch-argparse-manpage"; + changelog = "https://github.com/damonlynch/hatch-argparse-manpage/blob/${finalAttrs.src.tag}/CHANGES.md"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ philipdb ]; + }; +}) diff --git a/pkgs/development/python-modules/hatch-gettext/default.nix b/pkgs/development/python-modules/hatch-gettext/default.nix new file mode 100644 index 000000000000..743cdbaf3f63 --- /dev/null +++ b/pkgs/development/python-modules/hatch-gettext/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + # Build system + hatchling, + # Dependencies + rich, +}: + +buildPythonPackage (finalAttrs: { + pname = "hatch-gettext"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "damonlynch"; + repo = "hatch-gettext"; + tag = "v${finalAttrs.version}"; + hash = "sha256-hdYwDKRzv3iRoKUtPssOL2t4iPPsK+wlSydbMOeFyUs="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + rich + ]; + + pythonImportsCheck = [ + "hatch_gettext" + ]; + + meta = { + description = "Hatch build hook plugin for GNU gettext"; + homepage = "https://github.com/damonlynch/hatch-gettext"; + changelog = "https://github.com/damonlynch/hatch-gettext/blob/${finalAttrs.src.tag}/CHANGES.md"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ philipdb ]; + }; +}) diff --git a/pkgs/development/python-modules/liblistenbrainz/default.nix b/pkgs/development/python-modules/liblistenbrainz/default.nix index 867fc84fa7d5..4a067f9a4849 100644 --- a/pkgs/development/python-modules/liblistenbrainz/default.nix +++ b/pkgs/development/python-modules/liblistenbrainz/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "liblistenbrainz"; - version = "0.6.1"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "metabrainz"; repo = "liblistenbrainz"; - tag = "v${version}"; - hash = "sha256-2/EUzkC+8u6SQZYstIqJnlWcz74f5UpuXh/r4ImNd0g="; + tag = version; + hash = "sha256-fZgIVGDUJ4Dh/7CIOugvpRP7FoijpsgA3bBKJMmDd7o="; }; build-system = [ diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix index 15482f676b2c..46e0e5d56f68 100644 --- a/pkgs/development/python-modules/magicgui/default.nix +++ b/pkgs/development/python-modules/magicgui/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "magicgui"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; src = fetchFromGitHub { owner = "pyapp-kit"; repo = "magicgui"; tag = "v${version}"; - hash = "sha256-jpM5OpQ10cF+HBhAI9cI/gXdHMzYsgY9vtpfNq+5fIw="; + hash = "sha256-5etnug947C+Ewk1QLxsxEeaSa9djIlM/PGdNnJZiND8="; }; build-system = [ diff --git a/pkgs/development/python-modules/music-assistant-models/default.nix b/pkgs/development/python-modules/music-assistant-models/default.nix index 2f9ebf8addda..74607350c725 100644 --- a/pkgs/development/python-modules/music-assistant-models/default.nix +++ b/pkgs/development/python-modules/music-assistant-models/default.nix @@ -15,10 +15,11 @@ pytest-cov-stub, # reverse dependencies + music-assistant, music-assistant-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "music-assistant-models"; # Must be compatible with music-assistant-client package # nixpkgs-update: no auto update @@ -28,13 +29,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "music-assistant"; repo = "models"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/eNCgAB5G8g1r2fcW27lySEqg+q/1bJvwwyntigGWjo="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "0.0.0" "${version}" + --replace-fail "0.0.0" "${finalAttrs.version}" ''; build-system = [ setuptools ]; @@ -54,14 +55,14 @@ buildPythonPackage rec { ]; passthru.tests = { - inherit music-assistant-client; + inherit music-assistant music-assistant-client; }; meta = { - description = "Models used by Music Assistant (shared by client and server"; + description = "Models used by Music Assistant (shared by client and server)"; homepage = "https://github.com/music-assistant/models"; - changelog = "https://github.com/music-assistant/models/releases/tag/${src.tag}"; + changelog = "https://github.com/music-assistant/models/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index 43572d94e53c..d06bb21395ce 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchPypi, pytestCheckHook, + pytest-cov-stub, cython, setuptools, setuptools-scm, @@ -40,10 +41,22 @@ buildPythonPackage rec { nibabel ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; doCheck = !stdenv.hostPlatform.isDarwin; # tests hang indefinitely + disabledTests = [ + # [doctest] nitime.tests.test_timeseries.test_UniformTime_repr + # Expected: + # UniformTime([ 0., 1000., 2000., 3000., 4000.], time_unit='ms') + # Got: + # UniformTime([ 0., 1000., 2000., 3000., 4000.], time_unit='ms') + "test_UniformTime_repr" + ]; + pythonImportsCheck = [ "nitime" ]; meta = { diff --git a/pkgs/development/python-modules/openevsewifi/default.nix b/pkgs/development/python-modules/openevsewifi/default.nix index 53934a98d819..48ca148b5563 100644 --- a/pkgs/development/python-modules/openevsewifi/default.nix +++ b/pkgs/development/python-modules/openevsewifi/default.nix @@ -6,6 +6,7 @@ fetchpatch, poetry-core, pytestCheckHook, + pytest-cov-stub, requests, requests-mock, }: @@ -32,6 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ requests-mock pytestCheckHook + pytest-cov-stub ]; patches = [ @@ -43,11 +45,6 @@ buildPythonPackage rec { }) ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pytest-cov = "^2.8.1"' "" - ''; - pythonImportsCheck = [ "openevsewifi" ]; meta = { diff --git a/pkgs/development/python-modules/ossapi/default.nix b/pkgs/development/python-modules/ossapi/default.nix index 15d0053d42d9..aaacaad29164 100644 --- a/pkgs/development/python-modules/ossapi/default.nix +++ b/pkgs/development/python-modules/ossapi/default.nix @@ -10,16 +10,16 @@ typing-utils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ossapi"; - version = "5.3.2"; + version = "5.3.4"; pyproject = true; src = fetchFromGitHub { owner = "Liam-DeVoe"; repo = "ossapi"; - tag = "v${version}"; - hash = "sha256-sLzw/0RsA0PGxxQeVz4TGIpTMMlrZ0i4ZGolrz5S16E="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Favez9YcEHgAPNxJg9L4J8BpEUYIx9IFhSeNToT7sv4="; }; build-system = [ setuptools ]; @@ -45,8 +45,8 @@ buildPythonPackage rec { meta = { description = "Python wrapper for the osu! API"; homepage = "https://github.com/Liam-DeVoe/ossapi"; - changelog = "https://github.com/Liam-DeVoe/ossapi/releases/tag/${src.tag}"; + changelog = "https://github.com/Liam-DeVoe/ossapi/releases/tag/v${finalAttrs.version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ wulpine ]; }; -} +}) diff --git a/pkgs/development/python-modules/philipstv/default.nix b/pkgs/development/python-modules/philipstv/default.nix index 6e4e0177cf9a..9a99a9062af7 100644 --- a/pkgs/development/python-modules/philipstv/default.nix +++ b/pkgs/development/python-modules/philipstv/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "philipstv"; - version = "3.0.2"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "bcyran"; repo = "philipstv"; tag = version; - hash = "sha256-UJYxQ3R1bEoNkhm5FiFqQC4PbeEqsBKZYdqv5i5H7rg="; + hash = "sha256-AShWm9dsA9+HKuvQ7JzFjN9sn5V13MDyoxtufST4hJA="; }; build-system = [ diff --git a/pkgs/development/python-modules/prometheus-api-client/default.nix b/pkgs/development/python-modules/prometheus-api-client/default.nix index f0a8db7f0dbe..63480aa9dc01 100644 --- a/pkgs/development/python-modules/prometheus-api-client/default.nix +++ b/pkgs/development/python-modules/prometheus-api-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "prometheus-api-client"; - version = "0.7.0"; + version = "0.7.2"; pyproject = true; src = fetchFromGitHub { owner = "4n4nd"; repo = "prometheus-api-client-python"; tag = "v${version}"; - hash = "sha256-dpvGvI37jMoWvMrVSCwiyendGCDLCw+s2TI04y8akx8="; + hash = "sha256-aoaydE1e+Ng3XiyqRFCgnlFIsLRitss4A0pUZdYeHak="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pueblo/default.nix b/pkgs/development/python-modules/pueblo/default.nix index 8698138b68bf..35861f596154 100644 --- a/pkgs/development/python-modules/pueblo/default.nix +++ b/pkgs/development/python-modules/pueblo/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pueblo"; - version = "0.0.17"; + version = "0.0.18"; pyproject = true; # This tarball doesn't include tests unfortunately, and the GitHub tarball @@ -22,7 +22,7 @@ buildPythonPackage rec { # should work for us as well. src = fetchPypi { inherit pname version; - hash = "sha256-8JQo581zJ47omJJkJ1dMmkKY+ycddJ3cKI2v3lxk0Ys="; + hash = "sha256-N1a9oROZo8Ka0LKxDDOlZqOba6PfLVtDHB8Gypp+iC8="; }; build-system = [ diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix index a753d84b06fa..f67b8bfc7c02 100644 --- a/pkgs/development/python-modules/py-opensonic/default.nix +++ b/pkgs/development/python-modules/py-opensonic/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "py-opensonic"; - version = "8.1.2"; + version = "8.1.3"; pyproject = true; src = fetchFromGitHub { owner = "khers"; repo = "py-opensonic"; tag = "v${version}"; - hash = "sha256-lpPRkPLWHzsXhpZ1PVvgNWTQUuuU8N0g7ntqyOAbPlM="; + hash = "sha256-p8vcH0rL2ebFzZCouIEJ1EZCJaxpjQeOUtQug3B88T8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyairtable/default.nix b/pkgs/development/python-modules/pyairtable/default.nix index 75a314bb50ed..07c312d832e1 100644 --- a/pkgs/development/python-modules/pyairtable/default.nix +++ b/pkgs/development/python-modules/pyairtable/default.nix @@ -11,7 +11,7 @@ click, pytest, - pytest-cov, + pytest-cov-stub, mock, requests-mock, tox, @@ -42,7 +42,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest - pytest-cov + pytest-cov-stub mock requests-mock tox diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix index 25ab8dff73f9..370e67715223 100644 --- a/pkgs/development/python-modules/pyghmi/default.nix +++ b/pkgs/development/python-modules/pyghmi/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pyghmi"; - version = "1.6.14"; + version = "1.6.15"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-p6Rb+ltGeGHZFDhzTqln1MmZVSJzvwDg+liBPtgbVNU="; + hash = "sha256-dautNibA/fg/ZMqn1iPXCIVVcnr4Eq33Ueg5vjM59TU="; }; build-system = [ diff --git a/pkgs/development/python-modules/pymitsubishi/default.nix b/pkgs/development/python-modules/pymitsubishi/default.nix index 7fdf2047d722..ef6db94b7d90 100644 --- a/pkgs/development/python-modules/pymitsubishi/default.nix +++ b/pkgs/development/python-modules/pymitsubishi/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pymitsubishi"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "pymitsubishi"; repo = "pymitsubishi"; tag = "v${version}"; - hash = "sha256-Y+peVtaPWuvgM+2x7bIuwCicscv6xkZHzqpFSyiJQWQ="; + hash = "sha256-aF/EV09b+UYDL7PMK2cFTpq7DsY+xmjWycSs8jKt8GQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-openevse-http/default.nix b/pkgs/development/python-modules/python-openevse-http/default.nix index 66b35a03ee44..dda7f836c0f0 100644 --- a/pkgs/development/python-modules/python-openevse-http/default.nix +++ b/pkgs/development/python-modules/python-openevse-http/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "python-openevse-http"; - version = "0.2.6"; + version = "0.3.0b0"; pyproject = true; src = fetchFromGitHub { owner = "firstof9"; repo = "python-openevse-http"; tag = finalAttrs.version; - hash = "sha256-09oucP0xbgHzQXLpBFlr/dbjGKBkKw+UND3srGtgfTI="; + hash = "sha256-r99ai+tSTtzW5Khi1dnIYYSaF4+XwFXSPn8o2Sd0dVs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/realtime/default.nix b/pkgs/development/python-modules/realtime/default.nix index 9b4a95b66703..345d00f17c4b 100644 --- a/pkgs/development/python-modules/realtime/default.nix +++ b/pkgs/development/python-modules/realtime/default.nix @@ -1,51 +1,48 @@ { + lib, + aiohttp, buildPythonPackage, fetchFromGitHub, - lib, poetry-core, - aiohttp, - websockets, - typing-extensions, pydantic, pytest-asyncio, pytest-cov-stub, - python-dotenv, pytestCheckHook, - pythonRelaxDepsHook, + python-dotenv, + typing-extensions, + websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "realtime"; - version = "2.28.3"; + version = "3.0.0a1"; pyproject = true; src = fetchFromGitHub { owner = "supabase"; repo = "supabase-py"; - tag = "v${version}"; - hash = "sha256-Ra7Ig9IMWouMIadx6mg/pe8GlgLCavR6OsPjqgySTCw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Pvu2zyRKS99/KEIWwQXBR7Moegt0KITiaMWi5mi+CL4="; }; - sourceRoot = "${src.name}/src/realtime"; + sourceRoot = "${finalAttrs.src.name}/src/realtime"; + + pythonRelaxDeps = [ "websockets" ]; build-system = [ poetry-core ]; dependencies = [ - websockets - typing-extensions pydantic + typing-extensions + websockets ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - - pythonRelaxDeps = [ "websockets" ]; - nativeCheckInputs = [ aiohttp - pytestCheckHook - pytest-cov-stub - python-dotenv pytest-asyncio + pytest-cov-stub + pytestCheckHook + python-dotenv ]; pythonImportsCheck = [ "realtime" ]; @@ -58,8 +55,8 @@ buildPythonPackage rec { meta = { description = "Client library for Supabase Functions"; homepage = "https://github.com/supabase/supabase-py"; - changelog = "https://github.com/supabase/supabase-py/blob/v${src.tag}/CHANGELOG.md"; - maintainers = with lib.maintainers; [ siegema ]; + changelog = "https://github.com/supabase/supabase-py/blob/v${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ siegema ]; }; -} +}) diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix index e0129305e666..d64ace0f1a24 100644 --- a/pkgs/development/python-modules/returns/default.nix +++ b/pkgs/development/python-modules/returns/default.nix @@ -8,6 +8,7 @@ mypy, poetry-core, pytest-aio, + pytest-cov-stub, pytest-mypy, pytest-mypy-plugins, pytestCheckHook, @@ -28,11 +29,6 @@ buildPythonPackage rec { hash = "sha256-VQzsa/uNTQVND0kc20d25to/6LELEiS3cqvG7a1kDw4="; }; - postPatch = '' - sed -i setup.cfg \ - -e '/--cov.*/d' - ''; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ typing-extensions ]; @@ -45,6 +41,7 @@ buildPythonPackage rec { mypy pytestCheckHook pytest-aio + pytest-cov-stub pytest-mypy pytest-mypy-plugins setuptools diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index a15214ba69f7..2f40862c9b11 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.14.0"; + version = "0.14.1"; pyproject = true; src = fetchFromGitHub { owner = "scottbonline"; repo = "sense"; tag = version; - hash = "sha256-he/Ti15H2JBngvNCBSwJQWa0LBIBFa+x38TW9g2CQ44="; + hash = "sha256-xHI4HuPZFVqBNCC9+bILRVLoZ1LFBW9N0tVT8UzYClw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/static3/default.nix b/pkgs/development/python-modules/static3/default.nix index a834bc313453..45de611df216 100644 --- a/pkgs/development/python-modules/static3/default.nix +++ b/pkgs/development/python-modules/static3/default.nix @@ -8,6 +8,7 @@ # tests pytestCheckHook, + pytest-cov-stub, webtest, }: @@ -23,11 +24,6 @@ buildPythonPackage rec { hash = "sha256-uFgv+57/UZs4KoOdkFxbvTEDQrJbb0iYJ5JoWWN4yFY="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace ", 'pytest-cov'" "" - ''; - optional-dependencies = { KidMagic = [ # TODO: kid @@ -39,6 +35,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub webtest ] ++ lib.concatAttrValues optional-dependencies; diff --git a/pkgs/development/python-modules/uncalled-for/default.nix b/pkgs/development/python-modules/uncalled-for/default.nix new file mode 100644 index 000000000000..7c426ae9ecce --- /dev/null +++ b/pkgs/development/python-modules/uncalled-for/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatch-vcs, + hatchling, + + # tests + pytest-asyncio, + pytest-cov-stub, + pytest-timeout, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "uncalled-for"; + version = "0.3.1"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "chrisguidry"; + repo = "uncalled-for"; + tag = finalAttrs.version; + hash = "sha256-+akXLsfto3FNbkpsPPwN1DQmvu3BpTafRbqLmLwtqek="; + }; + + build-system = [ + hatch-vcs + hatchling + ]; + + pythonImportsCheck = [ "uncalled_for" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-cov-stub + pytest-timeout + pytestCheckHook + ]; + + meta = { + description = "Async dependency injection for Python functions"; + homepage = "https://github.com/chrisguidry/uncalled-for"; + changelog = "https://github.com/chrisguidry/uncalled-for/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ squat ]; + }; +}) diff --git a/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix b/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix index 27d7af4b0b95..f742f4743807 100644 --- a/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix +++ b/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix @@ -133,6 +133,16 @@ let --replace-fail '$(top_srcdir)/../LICENSE' "$NIX_BUILD_TOP/source/icu/LICENSE" substituteInPlace config/dist-data.sh \ --replace-fail "\''${top_srcdir}/../LICENSE" "$NIX_BUILD_TOP/source/icu/LICENSE" + + # Make sure this ICU build puts C++ symbols in a distinct namespace to avoid symbol clashes with other ICU + # implementations (including both the system ICU and builds of the upstream ICU). + # This breaks binary compatibility for the C++ API, but it’s not ABI stable anyway. Without doing this, + # `dotnet` crashes on macOS 26.4 when linked against `libicucore.A.dylib` from Nixpkgs. + substituteInPlace common/unicode/uvernum.h \ + --replace-fail 'U_ICU_VERSION_SUFFIX ' 'U_ICU_VERSION_SUFFIX _nix' + # Only enable symbol renaming for C++ symbols. C symbols need to remain unversioned for compatibility. + substituteInPlace common/unicode/uversion.h \ + --replace-fail U_DISABLE_RENAMING 0 ''; # remove dependency on bootstrap-tools in early stdenv build diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 5e22d26a0262..136b7baeb6d9 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -127,6 +127,8 @@ lib.makeExtensible (self: { xcode_26_2_Apple_silicon = requireXcode "26.2_Apple_silicon" "sha256-YxMVppJwRzTA6xWOILxVjLdl0bNmtZSifG/KQx6inRE="; xcode_26_3 = requireXcode "26.3_Universal" "sha256-qrPSc036x3tW1TWWfX10+IS2c08dRCa6KFc+++35ueM="; xcode_26_3_Apple_silicon = requireXcode "26.3_Apple_silicon" "sha256-q2p45zqAZUH6Z1Q3DHbZgpuuFTjZoMPhEfFdeIUvclw="; + xcode_26_4 = requireXcode "26.4_Universal" "sha256-0Cg4Ytu2+JOLEqw1ZZoB6hxFXNA2KriTLwLpT8bmA7I="; + xcode_26_4_Apple_silicon = requireXcode "26.4_Apple_silicon" "sha256-urkJVqUY6+5z0YiEqCru9M/OneDLAMzdGfOt7i3d1WI="; xcode = self."xcode_${ lib.replaceStrings [ "." ] [ "_" ] ( diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix index abf137879d50..f3f7c019e09b 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "material-you-utilities"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "material-you-utilities"; tag = version; - hash = "sha256-Z4O7HsV20/5aUvblzR7SLLONr3PrV1Jk91D2badaDl8="; + hash = "sha256-NIOPETbuEPlf7wIvDGh0580jmIkzy1DRLwgSrOC6S60="; }; - npmDepsHash = "sha256-omcnqwwJPYWF2A0hn4ob+mro6cX/ohIh15MrWoLcSzU="; + npmDepsHash = "sha256-S+2A098T3kRMOfznbwR2mOX9zCvYQGR+HsIjAjd55wg="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix index 93a5db0a52cd..336e86dfbd2d 100644 --- a/pkgs/servers/nextcloud/packages/apps/recognize.nix +++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix @@ -17,16 +17,16 @@ let nodejs = nodejs_22; latestVersionForNc = { - "31" = { - version = "9.0.9"; - appHash = "sha256-JyxECdAjg+f62hccPUuQ7dFknzETs/JvTB6y5hkbH1M="; - modelHash = "sha256-xqCYMJYCk1fZ9ZnIW+hmB0AWrn9APNdu1hk6id6MQQY="; - }; "32" = { version = "10.0.7"; appHash = "sha256-quuH9ZNQhvlJ6SsFeboVIrMtF9K6ckpQkXb9OXDvFm8="; modelHash = "sha256-Q862f4mNWE6V4ZUpfNFZrs4kwRF/29uETCroyie0+zA="; }; + "33" = { + version = "11.0.1"; + appHash = "sha256-x3LXZKDWmzCYLTaNqSvgu4Gvrn6w2c/jifNCx1oaw1U="; + modelHash = "sha256-Yx/NJwtD4ltETpkzlcadZsFKqEmMneoZaXiHVSB1WoE="; + }; }; currentVersionInfo = latestVersionForNc.${ncVersion} @@ -81,6 +81,11 @@ stdenv.mkDerivation rec { sed -i '/public function run/areturn ; //skip' recognize/lib/Migration/InstallDeps.php ln -s ${lib.getExe ffmpeg-headless} recognize/node_modules/ffmpeg-static/ffmpeg + + substituteInPlace recognize/lib/Classifiers/Classifier.php \ + --replace-fail \ + 'taskset' \ + '${lib.getExe' util-linux "taskset"}' ''; nativeBuildInputs = lib.optionals useLibTensorflow [ diff --git a/pkgs/tools/package-management/nix/modular/tests/functional/package.nix b/pkgs/tools/package-management/nix/modular/tests/functional/package.nix index 64db0d629795..b8bf89d99f7f 100644 --- a/pkgs/tools/package-management/nix/modular/tests/functional/package.nix +++ b/pkgs/tools/package-management/nix/modular/tests/functional/package.nix @@ -27,74 +27,72 @@ test-daemon ? null, }: -mkMesonDerivation ( - finalAttrs: - { - inherit pname version; +mkMesonDerivation (finalAttrs: { + inherit pname version; - workDir = ./.; + workDir = ./.; - nativeBuildInputs = [ - meson - ninja - pkg-config + nativeBuildInputs = [ + meson + ninja + pkg-config - jq - git - mercurial - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - # For various sandboxing tests that needs a statically-linked shell, - # etc. - busybox-sandbox-shell - # For Overlay FS tests need `mount`, `umount`, and `unshare`. - # For `script` command (ensuring a TTY) - # TODO use `unixtools` to be precise over which executables instead? - util-linux - ] - ++ [ - nix-cli - ]; + jq + git + mercurial + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # For various sandboxing tests that needs a statically-linked shell, + # etc. + busybox-sandbox-shell + # For Overlay FS tests need `mount`, `umount`, and `unshare`. + # For `script` command (ensuring a TTY) + # TODO use `unixtools` to be precise over which executables instead? + util-linux + ] + ++ [ + nix-cli + ]; - buildInputs = [ - nix-store - nix-expr - ]; + buildInputs = [ + nix-store + nix-expr + ]; - preConfigure = - # TEMP hack for Meson before make is gone, where - # `src/nix-functional-tests` is during the transition a symlink and - # not the actual directory directory. - '' - cd $(readlink -e $PWD) - echo $PWD | grep tests/functional - ''; - - # Test contains invocation of `script` broken by util-linux regression: - # https://github.com/util-linux/util-linux/commit/70507ab9eaed10b8dd77b77d4ea25c11ee726bed - preCheck = - assert util-linux.version == "2.42"; - '' - echo "exit 77" > ../json.sh - ''; - - mesonCheckFlags = [ - "--print-errorlogs" - ]; - - doCheck = true; - - installPhase = '' - mkdir $out - ''; - - meta = { - platforms = lib.platforms.unix; - }; - - } - // lib.optionalAttrs (test-daemon != null) { + env = lib.optionalAttrs (test-daemon != null) { NIX_DAEMON_PACKAGE = test-daemon; _NIX_TEST_CLIENT_VERSION = nix-cli.version; - } -) + }; + + preConfigure = + # TEMP hack for Meson before make is gone, where + # `src/nix-functional-tests` is during the transition a symlink and + # not the actual directory directory. + '' + cd $(readlink -e $PWD) + echo $PWD | grep tests/functional + ''; + + # Test contains invocation of `script` broken by util-linux regression: + # https://github.com/util-linux/util-linux/commit/70507ab9eaed10b8dd77b77d4ea25c11ee726bed + preCheck = + assert util-linux.version == "2.42"; + '' + echo "exit 77" > ../json.sh + ''; + + mesonCheckFlags = [ + "--print-errorlogs" + ]; + + doCheck = true; + + installPhase = '' + mkdir $out + ''; + + meta = { + platforms = lib.platforms.unix; + }; + +}) diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix index e5a55df9fa2c..8b081f53525c 100644 --- a/pkgs/tools/security/bitwarden-directory-connector/default.nix +++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix @@ -19,14 +19,14 @@ let }: buildNpmPackage rec { pname = name; - version = "2026.2.0"; + version = "2026.3.0"; nodejs = nodejs_22; src = fetchFromGitHub { owner = "bitwarden"; repo = "directory-connector"; rev = "v${version}"; - hash = "sha256-frlBYdyAuqHBDsxweVpbgHuwCpLkH60RIA1vDRb+Mv8="; + hash = "sha256-MfYFxcK0pqwIGBJFMVbmSUaGyrwLhMzdSoO6q46F9l8="; }; postPatch = '' @@ -38,7 +38,7 @@ let --replace-fail "AppImage" "dir" ''; - npmDepsHash = "sha256-KlNveZmDv8YrcDpZG7aWQ9h1ONQ1E3ZZVfyFZAOELXE="; + npmDepsHash = "sha256-c3Q+b+ZS6nXPuSPq8CZliDYfpN/HIH49tIcGj3bVmLg="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c735ecddbdc2..1ea26be9b8b7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2087,7 +2087,7 @@ mapAliases { warmux = throw "'warmux' has been removed as it is unmaintained and broken"; # Added 2025-11-03 warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 - wasm-bindgen-cli = wasm-bindgen-cli_0_2_114; + wasm-bindgen-cli = wasm-bindgen-cli_0_2_117; wasm-strip = throw "'wasm-strip' has been removed due to upstream deprecation. Use 'wabt' instead."; # Added 2025-11-06 wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24 wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 36830090754b..51680985fa64 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -158,6 +158,8 @@ makeScopeWithSplicing' { xcode_26_2_Apple_silicon xcode_26_3 xcode_26_3_Apple_silicon + xcode_26_4 + xcode_26_4_Apple_silicon xcode requireXcode ; diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index 7ec445402772..1c7e60655985 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -57,7 +57,7 @@ pkgs.runCommand "nixpkgs-release-checks" nix-env -f $src \ --show-trace --argstr system "$platform" \ --arg config '{ allowAliases = false; allowDeprecatedx86_64Darwin = true; }' \ - --option experimental-features 'no-url-literals' \ + --option lint-url-literals fatal \ -qa --drv-path --system-filter \* --system \ "''${opts[@]}" 2> eval-warnings.log > packages1 ) @@ -73,7 +73,7 @@ pkgs.runCommand "nixpkgs-release-checks" nix-env -f $src2 \ --show-trace --argstr system "$platform" \ --arg config '{ allowAliases = false; allowDeprecatedx86_64Darwin = true; }' \ - --option experimental-features 'no-url-literals' \ + --option lint-url-literals fatal \ -qa --drv-path --system-filter \* --system \ "''${opts[@]}" > packages2 @@ -96,7 +96,7 @@ pkgs.runCommand "nixpkgs-release-checks" nix-env -f $src \ --show-trace --argstr system "$platform" \ --arg config '{ allowAliases = false; allowDeprecatedx86_64Darwin = true; }' \ - --option experimental-features 'no-url-literals' \ + --option lint-url-literals fatal \ -qa --drv-path --system-filter \* --system --meta --xml \ "''${opts[@]}" > /dev/null done diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 85a8b5df2a14..37710dc75461 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1478,8 +1478,6 @@ let ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { }; - ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; - ocaml_oasis = callPackage ../development/tools/ocaml/oasis { }; ocaml_pcre = callPackage ../development/ocaml-modules/pcre { }; @@ -2358,6 +2356,7 @@ let ocaml-freestanding = throw "ocamlPackages.ocaml-freestanding has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom"; ocaml_lwt = throw "ocamlPackages.ocaml_lwt has been renamed to ocamlPackages.lwt"; # Added 2025-12-05 + ocaml_mysql = throw "ocamlPackages.ocaml_mysql is not maintained, use ocamlPackages.mariadb instead"; torch = throw "ocamlPackages.torch has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 } )).overrideScope diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da35e79f2895..a0a7ba92696b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6914,6 +6914,8 @@ self: super: with self; { hatch = callPackage ../development/python-modules/hatch/default.nix { }; + hatch-argparse-manpage = callPackage ../development/python-modules/hatch-argparse-manpage { }; + hatch-autorun = callPackage ../development/python-modules/hatch-autorun { }; hatch-babel = callPackage ../development/python-modules/hatch-babel { }; @@ -6928,6 +6930,8 @@ self: super: with self; { hatch-fancy-pypi-readme = callPackage ../development/python-modules/hatch-fancy-pypi-readme { }; + hatch-gettext = callPackage ../development/python-modules/hatch-gettext { }; + hatch-jupyter-builder = callPackage ../development/python-modules/hatch-jupyter-builder { }; hatch-min-requirements = callPackage ../development/python-modules/hatch-min-requirements { }; @@ -20519,6 +20523,8 @@ self: super: with self; { unasync = callPackage ../development/python-modules/unasync { }; + uncalled-for = callPackage ../development/python-modules/uncalled-for { }; + uncertainties = callPackage ../development/python-modules/uncertainties { }; uncompresspy = callPackage ../development/python-modules/uncompresspy { };