diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index ed68560d37fc..437e4187fc3f 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -4,6 +4,10 @@ +- `services.rippled` has been removed, as `rippled` was broken and had not been updated since 2022. + +- `services.rippleDataApi` has been removed, as `ripple-data-api` was broken and had not been updated since 2022. + ### Titanium removed {#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a8286a5562da..a26e5c1c7106 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14701,6 +14701,14 @@ githubId = 8263431; name = "Matt Miemiec"; }; + mel = { + email = "mel@rnrd.eu"; + github = "melnary"; + githubId = 10659529; + matrix = "@mel:rnrd.eu"; + name = "Mel G."; + keys = [ { fingerprint = "D75A C286 ACA7 00B4 D8EC 377D 2082 F8EC 11CC 009B"; } ]; + }; melchips = { email = "truphemus.francois@gmail.com"; github = "melchips"; @@ -24536,6 +24544,17 @@ github = "waynr"; githubId = 1441126; }; + wbondanza_devoteam = { + name = "Wilson Bondanza"; + email = "wilson.bondanza@devoteam.com"; + github = "wbondanza-devoteam"; + githubId = 195292349; + keys = [ + { + fingerprint = "61F3 9F46 606D 655F 4E8D 6C82 B623 05E6 1563 8A9E"; + } + ]; + }; wchresta = { email = "wchresta.nix@chrummibei.ch"; github = "wchresta"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 63cfe03299e4..4b8b3caecba6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -864,8 +864,6 @@ ./services/misc/redlib.nix ./services/misc/redmine.nix ./services/misc/renovate.nix - ./services/misc/ripple-data-api.nix - ./services/misc/rippled.nix ./services/misc/rmfakecloud.nix ./services/misc/rkvm.nix ./services/misc/rshim.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index d175a6954c6e..0276208e8a1c 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -295,6 +295,12 @@ in (mkRemovedOptionModule [ "services" "tedicross" ] '' The corresponding package was broken and removed from nixpkgs. '') + (mkRemovedOptionModule [ "services" "rippled" ] '' + The corresponding package was broken, abandoned upstream and thus removed from nixpkgs. + '') + (mkRemovedOptionModule [ "services" "rippleDataApi" ] '' + The corresponding package was broken, abandoned upstream and thus removed from nixpkgs. + '') # Do NOT add any option renames here, see top of the file ]; diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 6ef9c1a4e01a..8f04e33291ac 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -100,13 +100,13 @@ in lomiri-session # wrappers to properly launch the session lomiri-sounds lomiri-system-settings + lomiri-telephony-service lomiri-terminal-app lomiri-thumbnailer lomiri-url-dispatcher mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target morph-browser qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session - telephony-service teleports ]); }; @@ -152,7 +152,7 @@ in ) ++ ( with pkgs.lomiri; - [ telephony-service ] + [ lomiri-telephony-service ] ++ lib.optionals config.networking.networkmanager.enable [ lomiri-indicator-network ] ); }; diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix deleted file mode 100644 index dd48cdeead07..000000000000 --- a/nixos/modules/services/misc/ripple-data-api.nix +++ /dev/null @@ -1,209 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.services.rippleDataApi; - - deployment_env_config = builtins.toJSON { - production = { - port = toString cfg.port; - maxSockets = 150; - batchSize = 100; - startIndex = 32570; - rippleds = cfg.rippleds; - redis = { - enable = cfg.redis.enable; - host = cfg.redis.host; - port = cfg.redis.port; - options.auth_pass = null; - }; - }; - }; - - db_config = builtins.toJSON { - production = { - username = lib.optional (cfg.couchdb.pass != "") cfg.couchdb.user; - password = lib.optional (cfg.couchdb.pass != "") cfg.couchdb.pass; - host = cfg.couchdb.host; - port = cfg.couchdb.port; - database = cfg.couchdb.db; - protocol = "http"; - }; - }; - -in -{ - options = { - services.rippleDataApi = { - enable = lib.mkEnableOption "ripple data api"; - - port = lib.mkOption { - description = "Ripple data api port"; - default = 5993; - type = lib.types.port; - }; - - importMode = lib.mkOption { - description = "Ripple data api import mode."; - default = "liveOnly"; - type = lib.types.enum [ - "live" - "liveOnly" - ]; - }; - - minLedger = lib.mkOption { - description = "Ripple data api minimal ledger to fetch."; - default = null; - type = lib.types.nullOr lib.types.int; - }; - - maxLedger = lib.mkOption { - description = "Ripple data api maximal ledger to fetch."; - default = null; - type = lib.types.nullOr lib.types.int; - }; - - redis = { - enable = lib.mkOption { - description = "Whether to enable caching of ripple data to redis."; - default = true; - type = lib.types.bool; - }; - - host = lib.mkOption { - description = "Ripple data api redis host."; - default = "localhost"; - type = lib.types.str; - }; - - port = lib.mkOption { - description = "Ripple data api redis port."; - default = 5984; - type = lib.types.port; - }; - }; - - couchdb = { - host = lib.mkOption { - description = "Ripple data api couchdb host."; - default = "localhost"; - type = lib.types.str; - }; - - port = lib.mkOption { - description = "Ripple data api couchdb port."; - default = 5984; - type = lib.types.port; - }; - - db = lib.mkOption { - description = "Ripple data api couchdb database."; - default = "rippled"; - type = lib.types.str; - }; - - user = lib.mkOption { - description = "Ripple data api couchdb username."; - default = "rippled"; - type = lib.types.str; - }; - - pass = lib.mkOption { - description = "Ripple data api couchdb password."; - default = ""; - type = lib.types.str; - }; - - create = lib.mkOption { - description = "Whether to create couchdb database needed by ripple data api."; - type = lib.types.bool; - default = true; - }; - }; - - rippleds = lib.mkOption { - description = "List of rippleds to be used by ripple data api."; - default = [ - "http://s_east.ripple.com:51234" - "http://s_west.ripple.com:51234" - ]; - type = lib.types.listOf lib.types.str; - }; - }; - }; - - config = lib.mkIf (cfg.enable) { - services.couchdb.enable = lib.mkDefault true; - services.couchdb.bindAddress = lib.mkDefault "0.0.0.0"; - services.redis.enable = lib.mkDefault true; - - systemd.services.ripple-data-api = { - after = [ - "couchdb.service" - "redis.service" - "ripple-data-api-importer.service" - ]; - wantedBy = [ "multi-user.target" ]; - - environment = { - NODE_ENV = "production"; - DEPLOYMENT_ENVS_CONFIG = pkgs.writeText "deployment.environment.json" deployment_env_config; - DB_CONFIG = pkgs.writeText "db.config.json" db_config; - }; - - serviceConfig = { - ExecStart = "${pkgs.ripple-data-api}/bin/api"; - Restart = "always"; - User = "ripple-data-api"; - }; - }; - - systemd.services.ripple-data-importer = { - after = [ "couchdb.service" ]; - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.curl ]; - - environment = { - NODE_ENV = "production"; - DEPLOYMENT_ENVS_CONFIG = pkgs.writeText "deployment.environment.json" deployment_env_config; - DB_CONFIG = pkgs.writeText "db.config.json" db_config; - LOG_FILE = "/dev/null"; - }; - - serviceConfig = - let - importMode = - if cfg.minLedger != null && cfg.maxLedger != null then - "${toString cfg.minLedger} ${toString cfg.maxLedger}" - else - cfg.importMode; - in - { - ExecStart = "${pkgs.ripple-data-api}/bin/importer ${importMode} debug"; - Restart = "always"; - User = "ripple-data-api"; - }; - - preStart = lib.mkMerge [ - (lib.mkIf (cfg.couchdb.create) '' - HOST="http://${ - lib.optionalString (cfg.couchdb.pass != "") "${cfg.couchdb.user}:${cfg.couchdb.pass}@" - }${cfg.couchdb.host}:${toString cfg.couchdb.port}" - curl -X PUT $HOST/${cfg.couchdb.db} || true - '') - "${pkgs.ripple-data-api}/bin/update-views" - ]; - }; - - users.users.ripple-data-api = { - description = "Ripple data api user"; - isSystemUser = true; - group = "ripple-data-api"; - }; - users.groups.ripple-data-api = { }; - }; -} diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix deleted file mode 100644 index 8b1f3c7df117..000000000000 --- a/nixos/modules/services/misc/rippled.nix +++ /dev/null @@ -1,463 +0,0 @@ -{ - config, - lib, - options, - pkgs, - ... -}: -let - cfg = config.services.rippled; - opt = options.services.rippled; - - b2i = val: if val then "1" else "0"; - - dbCfg = db: '' - type=${db.type} - path=${db.path} - ${lib.optionalString (db.compression != null) ("compression=${b2i db.compression}")} - ${lib.optionalString (db.onlineDelete != null) ("online_delete=${toString db.onlineDelete}")} - ${lib.optionalString (db.advisoryDelete != null) ("advisory_delete=${b2i db.advisoryDelete}")} - ${db.extraOpts} - ''; - - rippledCfg = - '' - [server] - ${lib.concatMapStringsSep "\n" (n: "port_${n}") (lib.attrNames cfg.ports)} - - ${lib.concatMapStrings (p: '' - [port_${p.name}] - ip=${p.ip} - port=${toString p.port} - protocol=${lib.concatStringsSep "," p.protocol} - ${lib.optionalString (p.user != "") "user=${p.user}"} - ${lib.optionalString (p.password != "") "user=${p.password}"} - admin=${lib.concatStringsSep "," p.admin} - ${lib.optionalString (p.ssl.key != null) "ssl_key=${p.ssl.key}"} - ${lib.optionalString (p.ssl.cert != null) "ssl_cert=${p.ssl.cert}"} - ${lib.optionalString (p.ssl.chain != null) "ssl_chain=${p.ssl.chain}"} - '') (lib.attrValues cfg.ports)} - - [database_path] - ${cfg.databasePath} - - [node_db] - ${dbCfg cfg.nodeDb} - - ${lib.optionalString (cfg.tempDb != null) '' - [temp_db] - ${dbCfg cfg.tempDb}''} - - ${lib.optionalString (cfg.importDb != null) '' - [import_db] - ${dbCfg cfg.importDb}''} - - [ips] - ${lib.concatStringsSep "\n" cfg.ips} - - [ips_fixed] - ${lib.concatStringsSep "\n" cfg.ipsFixed} - - [validators] - ${lib.concatStringsSep "\n" cfg.validators} - - [node_size] - ${cfg.nodeSize} - - [ledger_history] - ${toString cfg.ledgerHistory} - - [fetch_depth] - ${toString cfg.fetchDepth} - - [validation_quorum] - ${toString cfg.validationQuorum} - - [sntp_servers] - ${lib.concatStringsSep "\n" cfg.sntpServers} - - ${lib.optionalString cfg.statsd.enable '' - [insight] - server=statsd - address=${cfg.statsd.address} - prefix=${cfg.statsd.prefix} - ''} - - [rpc_startup] - { "command": "log_level", "severity": "${cfg.logLevel}" } - '' - + cfg.extraConfig; - - portOptions = - { name, ... }: - { - options = { - name = lib.mkOption { - internal = true; - default = name; - }; - - ip = lib.mkOption { - default = "127.0.0.1"; - description = "Ip where rippled listens."; - type = lib.types.str; - }; - - port = lib.mkOption { - description = "Port where rippled listens."; - type = lib.types.port; - }; - - protocol = lib.mkOption { - description = "Protocols expose by rippled."; - type = lib.types.listOf ( - lib.types.enum [ - "http" - "https" - "ws" - "wss" - "peer" - ] - ); - }; - - user = lib.mkOption { - description = "When set, these credentials will be required on HTTP/S requests."; - type = lib.types.str; - default = ""; - }; - - password = lib.mkOption { - description = "When set, these credentials will be required on HTTP/S requests."; - type = lib.types.str; - default = ""; - }; - - admin = lib.mkOption { - description = "A comma-separated list of admin IP addresses."; - type = lib.types.listOf lib.types.str; - default = [ "127.0.0.1" ]; - }; - - ssl = { - key = lib.mkOption { - description = '' - Specifies the filename holding the SSL key in PEM format. - ''; - default = null; - type = lib.types.nullOr lib.types.path; - }; - - cert = lib.mkOption { - description = '' - Specifies the path to the SSL certificate file in PEM format. - This is not needed if the chain includes it. - ''; - default = null; - type = lib.types.nullOr lib.types.path; - }; - - chain = lib.mkOption { - description = '' - If you need a certificate chain, specify the path to the - certificate chain here. The chain may include the end certificate. - ''; - default = null; - type = lib.types.nullOr lib.types.path; - }; - }; - }; - }; - - dbOptions = { - options = { - type = lib.mkOption { - description = "Rippled database type."; - type = lib.types.enum [ - "rocksdb" - "nudb" - ]; - default = "rocksdb"; - }; - - path = lib.mkOption { - description = "Location to store the database."; - type = lib.types.path; - default = cfg.databasePath; - defaultText = lib.literalExpression "config.${opt.databasePath}"; - }; - - compression = lib.mkOption { - description = "Whether to enable snappy compression."; - type = lib.types.nullOr lib.types.bool; - default = null; - }; - - onlineDelete = lib.mkOption { - description = "Enable automatic purging of older ledger information."; - type = lib.types.nullOr (lib.types.addCheck lib.types.int (v: v > 256)); - default = cfg.ledgerHistory; - defaultText = lib.literalExpression "config.${opt.ledgerHistory}"; - }; - - advisoryDelete = lib.mkOption { - description = '' - If set, then require administrative RPC call "can_delete" - to enable online deletion of ledger records. - ''; - type = lib.types.nullOr lib.types.bool; - default = null; - }; - - extraOpts = lib.mkOption { - description = "Extra database options."; - type = lib.types.lines; - default = ""; - }; - }; - }; - -in - -{ - - ###### interface - - options = { - services.rippled = { - enable = lib.mkEnableOption "rippled, a decentralized cryptocurrency blockchain daemon implementing the XRP Ledger protocol in C++"; - - package = lib.mkPackageOption pkgs "rippled" { }; - - ports = lib.mkOption { - description = "Ports exposed by rippled"; - type = with lib.types; attrsOf (submodule portOptions); - default = { - rpc = { - port = 5005; - admin = [ "127.0.0.1" ]; - protocol = [ "http" ]; - }; - - peer = { - port = 51235; - ip = "0.0.0.0"; - protocol = [ "peer" ]; - }; - - ws_public = { - port = 5006; - ip = "0.0.0.0"; - protocol = [ - "ws" - "wss" - ]; - }; - }; - }; - - nodeDb = lib.mkOption { - description = "Rippled main database options."; - type = with lib.types; nullOr (submodule dbOptions); - default = { - type = "rocksdb"; - extraOpts = '' - open_files=2000 - filter_bits=12 - cache_mb=256 - file_size_pb=8 - file_size_mult=2; - ''; - }; - }; - - tempDb = lib.mkOption { - description = "Rippled temporary database options."; - type = with lib.types; nullOr (submodule dbOptions); - default = null; - }; - - importDb = lib.mkOption { - description = "Settings for performing a one-time import."; - type = with lib.types; nullOr (submodule dbOptions); - default = null; - }; - - nodeSize = lib.mkOption { - description = '' - Rippled size of the node you are running. - "tiny", "small", "medium", "large", and "huge" - ''; - type = lib.types.enum [ - "tiny" - "small" - "medium" - "large" - "huge" - ]; - default = "small"; - }; - - ips = lib.mkOption { - description = '' - List of hostnames or ips where the Ripple protocol is served. - For a starter list, you can either copy entries from: - https://ripple.com/ripple.txt or if you prefer you can let it - default to r.ripple.com 51235 - - A port may optionally be specified after adding a space to the - address. By convention, if known, IPs are listed in from most - to least trusted. - ''; - type = lib.types.listOf lib.types.str; - default = [ "r.ripple.com 51235" ]; - }; - - ipsFixed = lib.mkOption { - description = '' - List of IP addresses or hostnames to which rippled should always - attempt to maintain peer connections with. This is useful for - manually forming private networks, for example to configure a - validation server that connects to the Ripple network through a - public-facing server, or for building a set of cluster peers. - - A port may optionally be specified after adding a space to the address - ''; - type = lib.types.listOf lib.types.str; - default = [ ]; - }; - - validators = lib.mkOption { - description = '' - List of nodes to always accept as validators. Nodes are specified by domain - or public key. - ''; - type = lib.types.listOf lib.types.str; - default = [ - "n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7 RL1" - "n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj RL2" - "n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C RL3" - "n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS RL4" - "n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA RL5" - ]; - }; - - databasePath = lib.mkOption { - description = '' - Path to the ripple database. - ''; - type = lib.types.path; - default = "/var/lib/rippled"; - }; - - validationQuorum = lib.mkOption { - description = '' - The minimum number of trusted validations a ledger must have before - the server considers it fully validated. - ''; - type = lib.types.int; - default = 3; - }; - - ledgerHistory = lib.mkOption { - description = '' - The number of past ledgers to acquire on server startup and the minimum - to maintain while running. - ''; - type = lib.types.either lib.types.int (lib.types.enum [ "full" ]); - default = 1296000; # 1 month - }; - - fetchDepth = lib.mkOption { - description = '' - The number of past ledgers to serve to other peers that request historical - ledger data (or "full" for no limit). - ''; - type = lib.types.either lib.types.int (lib.types.enum [ "full" ]); - default = "full"; - }; - - sntpServers = lib.mkOption { - description = '' - IP address or domain of NTP servers to use for time synchronization.; - ''; - type = lib.types.listOf lib.types.str; - default = [ - "time.windows.com" - "time.apple.com" - "time.nist.gov" - "pool.ntp.org" - ]; - }; - - logLevel = lib.mkOption { - description = "Logging verbosity."; - type = lib.types.enum [ - "debug" - "error" - "info" - ]; - default = "error"; - }; - - statsd = { - enable = lib.mkEnableOption "statsd monitoring for rippled"; - - address = lib.mkOption { - description = "The UDP address and port of the listening StatsD server."; - default = "127.0.0.1:8125"; - type = lib.types.str; - }; - - prefix = lib.mkOption { - description = "A string prepended to each collected metric."; - default = ""; - type = lib.types.str; - }; - }; - - extraConfig = lib.mkOption { - default = ""; - type = lib.types.lines; - description = '' - Extra lines to be added verbatim to the rippled.cfg configuration file. - ''; - }; - - config = lib.mkOption { - internal = true; - default = pkgs.writeText "rippled.conf" rippledCfg; - defaultText = lib.literalMD "generated config file"; - }; - }; - }; - - ###### implementation - - config = lib.mkIf cfg.enable { - - users.users.rippled = { - description = "Ripple server user"; - isSystemUser = true; - group = "rippled"; - home = cfg.databasePath; - createHome = true; - }; - users.groups.rippled = { }; - - systemd.services.rippled = { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - ExecStart = "${cfg.package}/bin/rippled --fg --conf ${cfg.config}"; - User = "rippled"; - Restart = "on-failure"; - LimitNOFILE = 10000; - }; - }; - - environment.systemPackages = [ cfg.package ]; - - }; -} diff --git a/nixos/modules/system/activation/pre-switch-check.nix b/nixos/modules/system/activation/pre-switch-check.nix index 2cbd539a74c8..e8640a0db3f2 100644 --- a/nixos/modules/system/activation/pre-switch-check.nix +++ b/nixos/modules/system/activation/pre-switch-check.nix @@ -1,21 +1,35 @@ -{ lib, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let - preSwitchCheckScript = - set: - lib.concatLines ( - lib.mapAttrsToList (name: text: '' - # pre-switch check ${name} - ( - ${text} - ) - if [[ $? != 0 ]]; then - echo "Pre-switch check '${name}' failed" - exit 1 - fi - '') set - ); + preSwitchCheckScript = lib.concatLines ( + lib.mapAttrsToList (name: text: '' + # pre-switch check ${name} + if ! ( + ${text} + ) >&2 ; then + echo "Pre-switch check '${name}' failed" >&2 + exit 1 + fi + '') config.system.preSwitchChecks + ); in { + options.system.preSwitchChecksScript = lib.mkOption { + type = lib.types.pathInStore; + internal = true; + readOnly = true; + default = lib.getExe ( + pkgs.writeShellApplication { + name = "pre-switch-checks"; + text = preSwitchCheckScript; + } + ); + }; + options.system.preSwitchChecks = lib.mkOption { default = { }; example = lib.literalExpression '' @@ -33,12 +47,5 @@ in ''; type = lib.types.attrsOf lib.types.str; - - apply = - set: - set - // { - script = pkgs.writeShellScript "pre-switch-checks" (preSwitchCheckScript set); - }; }; } diff --git a/nixos/modules/system/activation/switchable-system.nix b/nixos/modules/system/activation/switchable-system.nix index b4f153f7755e..4783a0704740 100644 --- a/nixos/modules/system/activation/switchable-system.nix +++ b/nixos/modules/system/activation/switchable-system.nix @@ -61,7 +61,7 @@ in --subst-var-by coreutils "${pkgs.coreutils}" \ --subst-var-by distroId ${lib.escapeShellArg config.system.nixos.distroId} \ --subst-var-by installBootLoader ${lib.escapeShellArg config.system.build.installBootLoader} \ - --subst-var-by preSwitchCheck ${lib.escapeShellArg config.system.preSwitchChecks.script} \ + --subst-var-by preSwitchCheck ${lib.escapeShellArg config.system.preSwitchChecksScript} \ --subst-var-by localeArchive "${config.i18n.glibcLocales}/lib/locale/locale-archive" \ --subst-var-by perl "${perlWrapped}" \ --subst-var-by shell "${pkgs.bash}/bin/sh" \ @@ -94,7 +94,7 @@ in --set TOPLEVEL ''${!toplevelVar} \ --set DISTRO_ID ${lib.escapeShellArg config.system.nixos.distroId} \ --set INSTALL_BOOTLOADER ${lib.escapeShellArg config.system.build.installBootLoader} \ - --set PRE_SWITCH_CHECK ${lib.escapeShellArg config.system.preSwitchChecks.script} \ + --set PRE_SWITCH_CHECK ${lib.escapeShellArg config.system.preSwitchChecksScript} \ --set LOCALE_ARCHIVE ${config.i18n.glibcLocales}/lib/locale/locale-archive \ --set SYSTEMD ${config.systemd.package} ) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 3c42e6c04a48..6e12b63054ef 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -343,7 +343,7 @@ in perl = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]); # End if legacy environment variables - preSwitchCheck = config.system.preSwitchChecks.script; + preSwitchCheck = config.system.preSwitchChecksScript; # Not actually used in the builder. `passedChecks` is just here to create # the build dependencies. Checks are similar to build dependencies in the diff --git a/nixos/tests/ayatana-indicators.nix b/nixos/tests/ayatana-indicators.nix index 12223e52a0c5..3c11740ae036 100644 --- a/nixos/tests/ayatana-indicators.nix +++ b/nixos/tests/ayatana-indicators.nix @@ -43,7 +43,7 @@ in ] ++ (with pkgs.lomiri; [ lomiri-indicator-network - telephony-service + lomiri-telephony-service ]); }; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 54224302e008..6be3346d9850 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -734,6 +734,7 @@ let texinfo unionfs-fuse xorg.lndir + shellcheck-minimal # add curl so that rather than seeing the test attempt to download # curl's tarball, we see what it's trying to download diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 1f5574cfd704..37a808c3c471 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -611,6 +611,10 @@ in { other = { system.switch.enable = true; users.mutableUsers = true; + system.preSwitchChecks.succeeds = '' + echo this will succeed + true + ''; specialisation.failingCheck.configuration.system.preSwitchChecks.failEveryTime = '' echo this will fail false diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index 7580bf86dfb0..492f1e8fafd5 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { if isStereo then "2.77" # stereo else - "2.76"; # normal + "2.77"; # normal src = fetchurl { url = "mirror://sourceforge/goattracker2/GoatTracker_${finalAttrs.version}${lib.optionalString isStereo "_Stereo"}.zip"; @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { if isStereo then "1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo else - "0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal + "sha256-lsK9amqzrKL1uxixx2SsbqaawkXK4UACpyzYfFVFYe8="; # normal }; sourceRoot = "src"; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 41e0b78d6088..9a10067fe1e7 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,12 +13,12 @@ let sha256Hash = "sha256-t/4e1KeVm9rKeo/VdGHbv5ogXrI8whjtgo7YjouZjLU="; }; betaVersion = { - version = "2024.2.2.12"; # "Android Studio Ladybug Feature Drop | 2024.2.2 RC 2" - sha256Hash = "sha256-zfiTjyD2bMIJ+GVQyg7qUT7306roqYsdRkPECZ/Rdnc="; + version = "2024.3.1.10"; # "Android Studio Meerkat | 2024.3.1 Beta 1" + sha256Hash = "sha256-UxxofUCJGhQTLMwHGaSdNDqWnjkpRVwm2oqLLp3jR8E="; }; latestVersion = { - version = "2024.3.1.8"; # "Android Studio Meerkat | 2024.3.1 Canary 8" - sha256Hash = "sha256-ujxVxTO7rbCPEjzO2cPwdxipAgPW+urYNFHDGJOfRQg="; + version = "2024.3.2.1"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Canary 1" + sha256Hash = "sha256-qJKkuB8v4wOqEQwnDyMegLbRLzxVwCq/hS1TQ3lhBKk="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index af82ec225bc4..6cf9976d9c6f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5219,6 +5219,18 @@ final: prev: meta.homepage = "https://github.com/pimalaya/himalaya-vim/"; }; + hlchunk-nvim = buildVimPlugin { + pname = "hlchunk.nvim"; + version = "2024-11-23"; + src = fetchFromGitHub { + owner = "shellRaining"; + repo = "hlchunk.nvim"; + rev = "5465dd33ade8676d63f6e8493252283060cd72ca"; + sha256 = "0vksi1idliaxk5l3hksfhhbps4sw6d8lk58m5ja4wrnmjxz5b5bz"; + }; + meta.homepage = "https://github.com/shellRaining/hlchunk.nvim/"; + }; + hlint-refactor-vim = buildVimPlugin { pname = "hlint-refactor-vim"; version = "2015-12-05"; @@ -6290,6 +6302,18 @@ final: prev: meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; + llama-vim = buildVimPlugin { + pname = "llama.vim"; + version = "2025-01-24"; + src = fetchFromGitHub { + owner = "ggml-org"; + repo = "llama.vim"; + rev = "81e6802ebd00f177a8db73d62c7eeaf14a30819a"; + sha256 = "0fcg0xmdjc9z25ssjmg9pl5q0vk1h1k65ipd4dfzxchvmfzirl5j"; + }; + meta.homepage = "https://github.com/ggml-org/llama.vim/"; + }; + llm-nvim = buildVimPlugin { pname = "llm.nvim"; version = "2025-01-09"; @@ -10458,7 +10482,7 @@ final: prev: meta.homepage = "https://github.com/salkin-mada/openscad.nvim/"; }; - orgmode = buildVimPlugin { + orgmode = buildNeovimPlugin { pname = "orgmode"; version = "2025-01-19"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix index d2b29aaf5feb..047c08161334 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix @@ -7,12 +7,12 @@ vimUtils, }: let - version = "0-unstable-2024-10-27"; + version = "0-unstable-2025-01-13"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "08be31c104df3b4b049607694ebb2b6ced4f928b"; - sha256 = "04v1gypga9fhmkddis5yyppvmpq0b1b7zpvbfjlxfp2z498l5n2v"; + rev = "ddd7383e856a7c939cb4f5143278fe041bbb8cb9"; + sha256 = "sha256-pZ7AH1U95IWMmhk/uBO0Lsxx78H5H9ygPxk/HIqFFlY="; }; spectre_oxi = rustPlatform.buildRustPackage { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix index cca4bb6633ad..8331a506f9f1 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix @@ -9,12 +9,12 @@ vimUtils, }: let - version = "1.1.0-unstable-2024-12-15"; + version = "1.1.0-unstable-2025-01-21"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "7c423ebeb028b3534eb20fe54972825384dbe7d6"; - hash = "sha256-ALAYX/1MTk0fCA8THunoHz8QTlWkg+pgiSp2n3B4KrU="; + rev = "775f22b75a9826eabf69b0094dd1d51d619fe552"; + hash = "sha256-i5g+pzxB8pAORLbr1wlYWUTsrJJmVj9UwlCg8pU3Suw="; }; sg-nvim-rust = rustPlatform.buildRustPackage { diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b97ec9349a3b..1b682954f6c1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3822,6 +3822,7 @@ in maintainers = with maintainers; [ marcweber jagajaga + mel ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 0a373bd6064a..4ebe4530e035 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -432,6 +432,7 @@ https://github.com/RaafatTurki/hex.nvim/,HEAD, https://github.com/Yggdroot/hiPairs/,, https://github.com/tzachar/highlight-undo.nvim/,HEAD, https://github.com/pimalaya/himalaya-vim/,, +https://github.com/shellRaining/hlchunk.nvim/,HEAD, https://github.com/mpickering/hlint-refactor-vim/,, https://github.com/calops/hmts.nvim/,, https://github.com/edluffy/hologram.nvim/,, @@ -521,6 +522,7 @@ https://github.com/ldelossa/litee-filetree.nvim/,, https://github.com/ldelossa/litee-symboltree.nvim/,, https://github.com/ldelossa/litee.nvim/,, https://github.com/smjonas/live-command.nvim/,HEAD, +https://github.com/ggml-org/llama.vim/,HEAD, https://github.com/huggingface/llm.nvim/,HEAD, https://github.com/folke/lsp-colors.nvim/,, https://github.com/lukas-reineke/lsp-format.nvim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json index 18be5d2a051b..9e8262714b99 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json @@ -1,7 +1,7 @@ { - "version": "1.14.14", + "version": "1.15.34", "linux-x64": { - "hash": "sha256-kblLJbiDSYC9uVhzKLgcdck1TJZa4vI6Rwvc9ZNSDEg=", + "hash": "sha256-QoITLhgIYcoYpYzDqvss+aSh0/ZQc9V6+QSSBRGg1wc=", "binaries": [ "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller", "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost", @@ -10,7 +10,7 @@ ] }, "linux-arm64": { - "hash": "sha256-yvmcAtb1t1jq3zLsvIrSZLBIGAy/OkOy8LabFgbl04o=", + "hash": "sha256-aluG7CfqG5CNKG7FZqdp5vNa9bZ+OYQa5y7JoVvCSh0=", "binaries": [ "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller", "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost", @@ -19,7 +19,7 @@ ] }, "darwin-x64": { - "hash": "sha256-CABphtcOMxCFYUfzRBcBx3tgL5aKTtEiZj4dikIni50=", + "hash": "sha256-nm3qEpVfzpVhZCrCtrjYSYNDCSGmmIE/uufh/n6yZ+M=", "binaries": [ "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller", "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost", @@ -28,7 +28,7 @@ ] }, "darwin-arm64": { - "hash": "sha256-dGoLB9bmEUsbF18Mp7DZfMp18BHBKmyVAGFjjKm9J58=", + "hash": "sha256-1AHY13x77au2MjUEKbzuIyukKXLwmEYZwh4sFyApcbI=", "binaries": [ "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller", "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost", diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json index 631e2520f818..0807d5d30d5d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json @@ -1,7 +1,7 @@ { - "version": "2.55.29", + "version": "2.61.28", "linux-x64": { - "hash": "sha256-3RQk5VNrI2sSUBCBfRTEsxjLqZkpoTELt/v+CIp94QU=", + "hash": "sha256-lyP/NCvpaVW8dbZp/8OS9qrBa7yuO4rTo8Wwo/7wD7g=", "binaries": [ ".debugger/createdump", ".debugger/vsdbg", @@ -11,7 +11,7 @@ ] }, "linux-arm64": { - "hash": "sha256-p8VbpeLtGDO3TKpjY9EuqDVyCDvZaQe9+KeAMTMulDc=", + "hash": "sha256-bZ5ABDh3MnO33MQEXhLlF4UVGTCrcj5pCYgQDS6AP58=", "binaries": [ ".debugger/createdump", ".debugger/vsdbg", @@ -21,7 +21,7 @@ ] }, "darwin-x64": { - "hash": "sha256-r85BNsxIXuQD20kjgqBvCLzTof4ExYDfbKG0zHaR86o=", + "hash": "sha256-5yDTJp3GDb7HYAG9q8wvr4QKwjGJ214ifUjwxZMwIts=", "binaries": [ ".debugger/x86_64/createdump", ".debugger/x86_64/vsdbg", @@ -31,7 +31,7 @@ ] }, "darwin-arm64": { - "hash": "sha256-p56EkUDxsukTx0FCCE2OrUBk3t2zj/kU6cdUVqdpfb8=", + "hash": "sha256-58fz7IFzYgvC9Eruz1JgF4/ftHQV4FGdcfOODlCmGBA=", "binaries": [ ".debugger/arm64/createdump", ".debugger/arm64/vsdbg", diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix index 4ab79810dc2a..b5487fa68c45 100644 --- a/pkgs/applications/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg="; }; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 959fdf6e5c4c..c3606b9ef831 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -158,8 +158,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20240105"; - hash = "sha256-YTEgb19aoM54KK8/IjrspoChzVnWAEItDlTxpfpS52w="; + version = "20250102"; + hash = "sha256-Km2vVTYsLs091cjmNTW8Kqku3vdsEA0imTtZfqZWDQo="; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 16d4cc923b5f..f6d038f3a984 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -14,7 +14,6 @@ , flann , gettext , glew -, ilmbase , lcms2 , lensfun , libjpeg @@ -25,7 +24,7 @@ , libXmu , libGLU , libGL -, openexr_3 +, openexr , panotools , perlPackages , sqlite @@ -52,7 +51,6 @@ stdenv.mkDerivation rec { flann gettext glew - ilmbase lcms2 lensfun libjpeg @@ -63,7 +61,7 @@ stdenv.mkDerivation rec { libXmu libGLU libGL - openexr_3 + openexr panotools sqlite vigra @@ -78,8 +76,6 @@ stdenv.mkDerivation rec { # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; - env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - postInstall = '' for p in $out/bin/*; do wrapProgram "$p" \ diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index f82e788578c9..6948cd5897c7 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,9 +1,9 @@ { "chromium": { - "version": "132.0.6834.83", + "version": "132.0.6834.110", "chromedriver": { - "hash_darwin": "sha256-gLpWPzuJXnYatvRFDdssgB7rMSUCFv2GIPaV+YRNiZ0=", - "hash_darwin_aarch64": "sha256-8uhDySh2cWogVFX6LzCRTTHTUHTk+vxdbVxyOIHHLxA=" + "hash_darwin": "sha256-TEy3go3cMHlv8+XRUWJhPVlLSgk+2DifW1LNStqh+nU=", + "hash_darwin_aarch64": "sha256-gpqA5zYbhrdVoaAH1m6xHmH0k7jiC7sGicqpKhVaytw=" }, "deps": { "depot_tools": { @@ -19,8 +19,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "03d59cf5ecf1d8444838ff9a1e96231304d4ff9c", - "hash": "sha256-2FuT20iW8Mp4AehdEFT5Ua3La5z8bmT1FdLaUZRL0CE=", + "rev": "df453a35f099772fdb954e33551388add2ca3cde", + "hash": "sha256-deLCukHvNv6mUp33hHHFgeKD45SQs517xoRfCfReLAA=", "recompress": true }, "src/third_party/clang-format/script": { @@ -760,13 +760,13 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "e51f1d7dbd113aa01ddfb30890c8a89b11fcd96c", - "hash": "sha256-KJirPTvmC6vRTvrl6Nl0SQSieX/OhgfIiTblMxgoAvU=" + "rev": "625e932f21c984db3f9fba8b56b9afa4e977994c", + "hash": "sha256-19uEppABiuh+zHjgwAj/BPee/ClB/FKfzHxLKrdNhOE=" } } }, "ungoogled-chromium": { - "version": "132.0.6834.83", + "version": "132.0.6834.110", "deps": { "depot_tools": { "rev": "41d43a2a2290450aeab946883542f8049b155c87", @@ -777,16 +777,16 @@ "hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg=" }, "ungoogled-patches": { - "rev": "132.0.6834.83-1", - "hash": "sha256-yL7eMNTL1FDoqXcwuHx5BzjjESjzsIfdzHCTZW9jXUo=" + "rev": "132.0.6834.110-1", + "hash": "sha256-pFuRsGnOXAECat5B0fUi9aw8Wdqbu1EBwyHNCBMoOpw=" }, "npmHash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "03d59cf5ecf1d8444838ff9a1e96231304d4ff9c", - "hash": "sha256-2FuT20iW8Mp4AehdEFT5Ua3La5z8bmT1FdLaUZRL0CE=", + "rev": "df453a35f099772fdb954e33551388add2ca3cde", + "hash": "sha256-deLCukHvNv6mUp33hHHFgeKD45SQs517xoRfCfReLAA=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1526,8 +1526,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "e51f1d7dbd113aa01ddfb30890c8a89b11fcd96c", - "hash": "sha256-KJirPTvmC6vRTvrl6Nl0SQSieX/OhgfIiTblMxgoAvU=" + "rev": "625e932f21c984db3f9fba8b56b9afa4e977994c", + "hash": "sha256-19uEppABiuh+zHjgwAj/BPee/ClB/FKfzHxLKrdNhOE=" } } } diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index a1912256547d..3e1c6eadb3a8 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,8 +1,9 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.2.1) + activesupport (8.0.1) base64 + benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) @@ -12,30 +13,35 @@ GEM minitest (>= 5.1) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - bigdecimal (3.1.8) + benchmark (0.4.0) + bigdecimal (3.1.9) colorize (0.8.1) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) domain_name (0.6.20240107) drb (2.2.1) - ejson (1.4.1) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + ejson (1.5.3) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-net_http (3.3.0) - net-http - ffi (1.17.0) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + ffi (1.17.1) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake - google-cloud-env (2.2.0) + google-cloud-env (2.2.1) faraday (>= 1.0, < 3.a) - googleauth (1.11.0) + google-logging-utils (0.1.0) + googleauth (1.12.2) faraday (>= 1.0, < 3.a) - google-cloud-env (~> 2.1) + google-cloud-env (~> 2.2) + google-logging-utils (~> 0.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) @@ -47,16 +53,17 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) + json (2.9.1) jsonpath (1.1.5) multi_json - jwt (2.8.2) + jwt (2.10.1) base64 - krane (3.6.2) + krane (3.7.0) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -75,25 +82,28 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) - mime-types (3.5.2) + logger (1.6.5) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - minitest (5.25.1) + mime-types-data (3.2025.0107) + minitest (5.25.4) multi_json (1.15.0) - net-http (0.4.1) + net-http (0.6.0) uri netrc (0.11.0) os (1.1.4) + ostruct (0.6.1) public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - securerandom (0.3.1) + securerandom (0.4.1) signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) @@ -103,7 +113,7 @@ GEM thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uri (0.13.1) + uri (1.0.2) PLATFORMS ruby @@ -112,4 +122,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.5.16 + 2.5.22 diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index 11f284202101..7544db57537a 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -2,6 +2,7 @@ activesupport = { dependencies = [ "base64" + "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" @@ -11,15 +12,16 @@ "minitest" "securerandom" "tzinfo" + "uri" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "094cv9kxa8hwlsw3c0njkvvayd0wszcz9b6xywv4yajrg83zlmvm"; + sha256 = "0drfj44a16r86clrrqz3vqmg93qri6bqghjm21ac6jn2853cfnzx"; type = "gem"; }; - version = "7.2.1"; + version = "8.0.1"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -42,15 +44,25 @@ }; version = "0.2.0"; }; + benchmark = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + type = "gem"; + }; + version = "0.4.0"; + }; bigdecimal = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; type = "gem"; }; - version = "3.1.8"; + version = "3.1.9"; }; colorize = { groups = [ "default" ]; @@ -67,20 +79,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; connection_pool = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.0"; }; domain_name = { groups = [ "default" ]; @@ -107,24 +119,25 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bpry4i9ajh2h8fyljp0cb17iy03ar36yc9mpfxflmdznl7dwsjf"; + sha256 = "07ar8rhfinn965danfj6bqqsx0vr9gbl8jxyc0c6r10bcmf97wip"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.3"; }; faraday = { dependencies = [ "faraday-net_http" + "json" "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00pd34pnfmij5iw1xv73f6d68zng63wyjhmk7dyi010kmb4x5sp6"; + sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.2"; }; faraday-net_http = { dependencies = [ "net-http" ]; @@ -132,20 +145,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rg54k4skaz8z7j358p6pdzc9pr84fjq7sdlpicf7s5ig7vb1rlk"; + sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; type = "gem"; }; - version = "3.3.0"; + version = "3.4.0"; }; ffi = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; + sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6"; type = "gem"; }; - version = "1.17.0"; + version = "1.17.1"; }; ffi-compiler = { dependencies = [ @@ -167,15 +180,26 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vlwifnhih8nq5441pfbnzc7w4z8rmy7j54pfixpm9yvlq11428j"; + sha256 = "1ks9yv21d8bl9cw0sz5gy6npll1ig3m2bq9w7yw67j5mw2p64q1w"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; + }; + google-logging-utils = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1mgw0n97prlvgvd81dci8rx93xranr3xnyhn5v7p6hii94g0p5bh"; + type = "gem"; + }; + version = "0.1.0"; }; googleauth = { dependencies = [ "faraday" "google-cloud-env" + "google-logging-utils" "jwt" "multi_json" "os" @@ -185,10 +209,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15knmk2fcyqxdpppc3wb5lc6xapbx5hax4lma0iclc2p55aa2kkl"; + sha256 = "0zynv2s6s6i5d8x84p1axin21bfgmgy92ai2jb7a7aaknaqpfc9x"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.2"; }; http = { dependencies = [ @@ -223,10 +247,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lr2yk5g5vvf9nzlmkn3p7mhh9mn55gpdc7kl2w21xs46fgkjynb"; + sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi"; type = "gem"; }; - version = "1.0.7"; + version = "1.0.8"; }; http-form_data = { groups = [ "default" ]; @@ -244,10 +268,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.5"; + version = "1.14.6"; + }; + json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj"; + type = "gem"; + }; + version = "2.9.1"; }; jsonpath = { dependencies = [ "multi_json" ]; @@ -266,10 +300,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04mw326i9vsdcqwm4bf0zvnqw237f8l7022nhlbmak92bqqpg62s"; + sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6"; type = "gem"; }; - version = "2.8.2"; + version = "2.10.1"; }; krane = { dependencies = [ @@ -288,10 +322,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07f87rzlr0yamji5ns2isf5f554jal5b9v62lijhsafmq9545f42"; + sha256 = "032b8fk23jpmmslnhn351as9irykpa40sjz6yxibjpglj4w7wnqz"; type = "gem"; }; - version = "3.6.2"; + version = "3.7.0"; }; kubeclient = { dependencies = [ @@ -328,41 +362,44 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + sha256 = "0sz584vw17pwrrc5zg6yd8lqcgfpjf4qplq3s7fr0r3505nybky3"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.5"; }; mime-types = { - dependencies = [ "mime-types-data" ]; + dependencies = [ + "logger" + "mime-types-data" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; + sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; type = "gem"; }; - version = "3.5.2"; + version = "3.6.0"; }; mime-types-data = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0d5bmxcq87nj6h5rx6b1fkdzq8256yba97s2vlkszpwhc47m9rfs"; + sha256 = "1jixfirdang1lx9iqkcw03mz43pi4vxlfpb8ha4sbz4cqry4jai3"; type = "gem"; }; - version = "3.2024.0903"; + version = "3.2025.0107"; }; minitest = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; + sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw"; type = "gem"; }; - version = "5.25.1"; + version = "5.25.4"; }; multi_json = { groups = [ "default" ]; @@ -380,10 +417,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; type = "gem"; }; - version = "0.4.1"; + version = "0.6.0"; }; netrc = { groups = [ "default" ]; @@ -405,6 +442,16 @@ }; version = "1.1.4"; }; + ostruct = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; + }; public_suffix = { groups = [ "default" ]; platforms = [ ]; @@ -426,14 +473,15 @@ version = "13.2.1"; }; recursive-open-struct = { + dependencies = [ "ostruct" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rjs8804zn5v39mklmqy65xwdji7iq598lkw876zspclziy4h2c3"; + sha256 = "0847mn846fddfmm6vpdpz4ds9azbbcdxnnjw4zs31fqpi2f4l6ql"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.1"; }; rest-client = { dependencies = [ @@ -456,10 +504,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; + sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc"; type = "gem"; }; - version = "0.3.1"; + version = "0.4.1"; }; signet = { dependencies = [ @@ -513,9 +561,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz"; + sha256 = "09qyg6a29cfgd46qid8qvx4sjbv596v19ym73xvhanbyxd6500xk"; type = "gem"; }; - version = "0.13.1"; + version = "1.0.2"; }; } diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index c0fab98d6102..7cd4d9349997 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -21,11 +21,11 @@ assert lib.assertOneOf "sslLibrary" sslLibrary [ stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.20"; + version = "1.4.21"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-Ncx94X492spHQ4Y0ZEiPjIKoOsGzdk/d1/QjiBQ1v0s="; + sha256 = "sha256-TKDR4NATZv4+DPSQ2I0VTfURJ4+1lWOHE748pnVmWFU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 8c1cedc9ef7d..40547a2f664c 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -8,7 +8,7 @@ rubber, hevea, emacs, - version ? "1.7.2", + version ? "1.8.0", ideSupport ? true, wrapGAppsHook3, }: @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; hash = { + "1.8.0" = "sha256-gDe4OI0AuoYmJSCg/SMRQYcgelX/SM28ClQfKhnw88E="; "1.7.2" = "sha256-VaSG/FiO2MDdSSFXGJJrIylQx0LPwtT8AF7TpPVZhCQ="; "1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw="; } diff --git a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix index 45c6e25afec1..e59fce3b9cec 100644 --- a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix +++ b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernx-zydezu"; - version = "0.4.0"; + version = "0.4.1"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "zydezu"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-EIsvaOH9QiswGYZKa5g1Xvpbnep2V0Q0RhDqWCX5ZeI="; + hash = "sha256-tm1vsHEFX2YnQ1w3DcLd/zHASetkqQ4wYcYT9w8HVok="; }; postInstall = '' diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index f9ecceb226de..ff014dc0aa5a 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -253,6 +253,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { prefix = "${finalAttrs.finalPackage.fd}/FV/${fwPrefix}"; in { + mergedFirmware = "${prefix}.fd"; firmware = "${prefix}_CODE.fd"; variables = "${prefix}_VARS.fd"; variablesMs = diff --git a/pkgs/build-support/xen/default.nix b/pkgs/build-support/xen/default.nix index ebeb8b98d4ca..f5d127c15796 100644 --- a/pkgs/build-support/xen/default.nix +++ b/pkgs/build-support/xen/default.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-qemu-traditional" "--with-system-qemu" (if withSeaBIOS then "--with-system-seabios=${systemSeaBIOS.firmware}" else "--disable-seabios") - (if withOVMF then "--with-system-ovmf=${OVMF.firmware}" else "--disable-ovmf") + (if withOVMF then "--with-system-ovmf=${OVMF.mergedFirmware}" else "--disable-ovmf") (if withIPXE then "--with-system-ipxe=${ipxe.firmware}" else "--disable-ipxe") (enableFeature withFlask "xsmpolicy") ]; diff --git a/pkgs/by-name/ac/actionlint/package.nix b/pkgs/by-name/ac/actionlint/package.nix index 7bdec394417b..72cda1076f42 100644 --- a/pkgs/by-name/ac/actionlint/package.nix +++ b/pkgs/by-name/ac/actionlint/package.nix @@ -9,23 +9,20 @@ shellcheck, }: -let - version = "1.7.6"; -in -buildGoModule { +buildGoModule rec { pname = "actionlint"; - inherit version; + version = "1.7.7"; subPackages = [ "cmd/actionlint" ]; src = fetchFromGitHub { owner = "rhysd"; repo = "actionlint"; - rev = "v${version}"; - hash = "sha256-NHmz+r7xO84eSQFBNwaI+ctzIgd014rRQtqvi8hOWPE="; + tag = "v${version}"; + hash = "sha256-dmd6AWL96sG+Cb+CVtCUhaStfsx8qRnvpcB2OjfLenU="; }; - vendorHash = "sha256-4hBIDrFOADGo3gsTRW8hjBYzmWRo/5yyoM7Ylv3KJBk="; + vendorHash = "sha256-4SkhMRDXHKYxKK3POqtti/esj2cqx0Dl92q/qzzaqH0="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/al/almanah/package.nix b/pkgs/by-name/al/almanah/package.nix index 6cb95674d289..038127c1395c 100644 --- a/pkgs/by-name/al/almanah/package.nix +++ b/pkgs/by-name/al/almanah/package.nix @@ -28,44 +28,13 @@ stdenv.mkDerivation rec { pname = "almanah"; - version = "0.12.3"; + version = "0.12.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "lMpDQOxlGljP66APR49aPbTZnfrGakbQ2ZcFvmiPMFo="; + url = "mirror://gnome/sources/almanah/${lib.versions.majorMinor version}/almanah-${version}.tar.xz"; + sha256 = "DywW6Gkohf0lrX3Mw/UawrS4h2JOaOfqH2SulHkxlFI="; }; - patches = [ - # Fix build with meson 0.61 - # data/meson.build:2:5: ERROR: Function does not take positional arguments. - # Patch taken from https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/13 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/8c42a67695621d1e30cec933a04e633e6030bbaf.patch"; - sha256 = "qyqFgYSu4emFDG/Mjwz1bZb3v3/4gwQSKmGCoPPNYCQ="; - }) - - # Port to Gcr 4 - # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/14 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/cd44b476f4ffbf37c5d5f5b996ecd711db925576.patch"; - sha256 = "wJ1035NxgeTwUa0LoNcB6TSLxffoXBR3WbGAGkfggYY="; - }) - - # Port to GtkSourceView 4 - # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/15 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/0ba7f05cba7feaf2ae2c220596aead5dfc676675.patch"; - sha256 = "5uvHTPzQloEq8SVt3EnZ+8mziBdXsDmu/e92/RtyFzE="; - }) - - # Add missing GtkSourceView include - # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/23 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/533f30c7e60437cbea7ca5ae901e768922c1a710.patch"; - hash = "sha256-Ekhn4nRMC+fXLn4kqNwyCAg2cZru5QUcdzR1yJbcZGc="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext @@ -94,7 +63,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "almanah"; versionPolicy = "none"; # it is quite odd }; }; diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index 83065ff554ed..242b6e772a65 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -14,18 +14,20 @@ xdg-utils, ollama, vte-gtk4, + libspelling, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "3.2.0"; + version = "3.5.0"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; tag = version; - hash = "sha256-Mh+LYslVmb4l+ZCB1Si7hxugzHPz/mULUMBNeJI12r0="; + hash = "sha256-YheyeT9KiH9LphFfExie7RU7q/qVni5pFdpz32rM8RQ="; }; nativeBuildInputs = [ @@ -42,6 +44,7 @@ python3Packages.buildPythonApplication rec { libadwaita gtksourceview5 vte-gtk4 + libspelling ]; dependencies = with python3Packages; [ @@ -54,6 +57,7 @@ python3Packages.buildPythonApplication rec { pydbus odfpy pyicu + matplotlib ]; dontWrapGApps = true; @@ -71,6 +75,8 @@ python3Packages.buildPythonApplication rec { "--set FLATPAK_DEST ${placeholder "out"}" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Ollama client made with GTK4 and Adwaita"; longDescription = '' diff --git a/pkgs/by-name/ar/ares-rs/package.nix b/pkgs/by-name/ar/ares-rs/package.nix index a40dfacb5abc..29c9b9d26fc2 100644 --- a/pkgs/by-name/ar/ares-rs/package.nix +++ b/pkgs/by-name/ar/ares-rs/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + pkg-config, + openssl, }: rustPlatform.buildRustPackage rec { @@ -12,10 +14,17 @@ rustPlatform.buildRustPackage rec { owner = "bee-san"; repo = "ares"; tag = "v${version}"; - hash = "sha256-F+uBGRL1G8kiNZUCsiPbISBfId5BPwShenusqkcsHug="; + hash = "sha256-J+q7KeBthF9Wd08MNv0aHyLHgLUKg3mzQ8ic6+ashto="; }; - cargoHash = "sha256-c50HCwWwW4Fyg6hC1JqBfKtwq6kgReSOIBYXvwm04yA="; + cargoHash = "sha256-iJ04WPViqtafINkjn3PD8cE55LVdJZQXodAl3KlxweA="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; meta = with lib; { description = "Automated decoding of encrypted text without knowing the key or ciphers used"; diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 07fb922f1ed5..c894d159138b 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -24,13 +24,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.38.1"; + version = "3.4.38.2"; src = fetchFromGitHub { owner = "ATLauncher"; repo = "ATLauncher"; rev = "v${finalAttrs.version}"; - hash = "sha256-u9t+0MgmEyDJkdjv+89wJkK74NKBlxNEy2F+3zz7kLI="; + hash = "sha256-x8ch8BdUckweuwEvsOxYG2M5UmbW4fRjF/jJ6feIjIA="; }; postPatch = '' diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index c207ffc32335..254ad69d2c23 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -63,9 +63,9 @@ confcom = mkAzExtension rec { pname = "confcom"; - version = "1.0.0"; + version = "1.2.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl"; - hash = "sha256-c4I+EJWKEUtKyoTDMLTevMZQxGNedMVoZ5tsMsNWQR0="; + hash = "sha256-D78WwrOKbc8RNAa9Q3wgZRjVOUy/012+KIlTtk5NeTM="; description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension"; nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ openssl_1_1 ]; diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py index 74e58723a099..d3a23fb2cc78 100644 --- a/pkgs/by-name/az/azure-cli/extensions-tool.py +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -6,7 +6,9 @@ import datetime import json import logging import os +import subprocess import sys +from collections.abc import Callable from dataclasses import asdict, dataclass, replace from pathlib import Path from typing import Any, Dict, Iterable, List, Optional, Set, Tuple @@ -42,20 +44,20 @@ def _read_cached_index(path: Path) -> Tuple[datetime.datetime, Any]: return cache_date, data -def _write_index_to_cache(data: Any, path: Path): +def _write_index_to_cache(data: Any, path: Path) -> None: j = json.loads(data) j["cache_date"] = datetime.datetime.now().isoformat() with open(path, "w") as f: json.dump(j, f, indent=2) -def _fetch_remote_index(): +def _fetch_remote_index() -> Any: r = Request(INDEX_URL) with urlopen(r) as resp: return resp.read() -def get_extension_index(cache_dir: Path) -> Set[Ext]: +def get_extension_index(cache_dir: Path) -> Any: index_file = cache_dir / "index.json" os.makedirs(cache_dir, exist_ok=True) @@ -154,7 +156,7 @@ def _filter_invalid(o: Dict[str, Any]) -> bool: def _filter_compatible(o: Dict[str, Any], cli_version: Version) -> bool: minCliVersion = parse(o["metadata"]["azext.minCliCoreVersion"]) - return cli_version >= minCliVersion + return bool(cli_version >= minCliVersion) def _transform_dict_to_obj(o: Dict[str, Any]) -> Ext: @@ -211,6 +213,93 @@ def _filter_updated(e: Tuple[Ext, Ext]) -> bool: return prev != new +@dataclass(frozen=True) +class AttrPos: + file: str + line: int + column: int + + +def nix_get_value(attr_path: str) -> Optional[str]: + try: + output = ( + subprocess.run( + [ + "nix-instantiate", + "--eval", + "--strict", + "--json", + "-E", + f"with import ./. {{ }}; {attr_path}", + ], + stdout=subprocess.PIPE, + text=True, + check=True, + ) + .stdout.rstrip() + .strip('"') + ) + except subprocess.CalledProcessError as e: + logger.error("failed to nix-instantiate: %s", e) + return None + return output + + +def nix_unsafe_get_attr_pos(attr: str, attr_path: str) -> Optional[AttrPos]: + try: + output = subprocess.run( + [ + "nix-instantiate", + "--eval", + "--strict", + "--json", + "-E", + f'with import ./. {{ }}; (builtins.unsafeGetAttrPos "{attr}" {attr_path})', + ], + stdout=subprocess.PIPE, + text=True, + check=True, + ).stdout.rstrip() + except subprocess.CalledProcessError as e: + logger.error("failed to unsafeGetAttrPos: %s", e) + return None + if output == "null": + logger.error("failed to unsafeGetAttrPos: nix-instantiate returned 'null'") + return None + pos = json.loads(output) + return AttrPos(pos["file"], pos["line"] - 1, pos["column"]) + + +def edit_file(file: str, rewrite: Callable[[str], str]) -> None: + with open(file, "r") as f: + lines = f.readlines() + lines = [rewrite(line) for line in lines] + with open(file, "w") as f: + f.writelines(lines) + + +def edit_file_at_pos(pos: AttrPos, rewrite: Callable[[str], str]) -> None: + with open(pos.file, "r") as f: + lines = f.readlines() + lines[pos.line] = rewrite(lines[pos.line]) + with open(pos.file, "w") as f: + f.writelines(lines) + + +def read_value_at_pos(pos: AttrPos) -> str: + with open(pos.file, "r") as f: + lines = f.readlines() + return value_from_nix_line(lines[pos.line]) + + +def value_from_nix_line(line: str) -> str: + return line.split("=")[1].strip().strip(";").strip('"') + + +def replace_value_in_nix_line(new: str) -> Callable[[str], str]: + return lambda line: line.replace(value_from_nix_line(line), new) + + def main() -> None: sh = logging.StreamHandler(sys.stderr) sh.setFormatter( @@ -247,6 +336,7 @@ def main() -> None: help="whether to commit changes to git", ) args = parser.parse_args() + cli_version = parse(args.cli_version) repo = git.Repo(Path(".").resolve(), search_parent_directories=True) # Workaround for https://github.com/gitpython-developers/GitPython/issues/1923 @@ -258,7 +348,57 @@ def main() -> None: assert index["formatVersion"] == "1" # only support formatVersion 1 extensions_remote = index["extensions"] - cli_version = parse(args.cli_version) + if args.extension: + logger.info(f"updating extension: {args.extension}") + + ext = Optional[Ext] + for _ext_name, extension in extensions_remote.items(): + extension = processExtension( + extension, cli_version, args.extension, requirements=True + ) + if extension: + ext = extension + break + if not ext: + logger.error(f"Extension {args.extension} not found in index") + exit(1) + + version_pos = nix_unsafe_get_attr_pos( + "version", f"azure-cli-extensions.{ext.pname}" + ) + if not version_pos: + logger.error( + f"no position for attribute 'version' found on attribute path {ext.pname}" + ) + exit(1) + version = read_value_at_pos(version_pos) + current_version = parse(version) + + if ext.version == current_version: + logger.info( + f"no update needed for {ext.pname}, latest version is {ext.version}" + ) + return + logger.info("updated extensions:") + logger.info(f" {ext.pname} {current_version} -> {ext.version}") + edit_file_at_pos(version_pos, replace_value_in_nix_line(str(ext.version))) + + current_hash = nix_get_value(f"azure-cli-extensions.{ext.pname}.src.outputHash") + if not current_hash: + logger.error( + f"no attribute 'src.outputHash' found on attribute path {ext.pname}" + ) + exit(1) + edit_file(version_pos.file, lambda line: line.replace(current_hash, ext.hash)) + + if args.commit: + commit_msg = ( + f"azure-cli-extensions.{ext.pname}: {current_version} -> {ext.version}" + ) + _commit(repo, commit_msg, [Path(version_pos.file)], actor) + return + + logger.info("updating generated extension set") extensions_remote_filtered = set() for _ext_name, extension in extensions_remote.items(): diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 0ed7f51f6ebc..b4d6294758e3 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -54,6 +54,9 @@ let { format = "wheel"; src = fetchurl { inherit url hash; }; + passthru = { + updateScript = extensionUpdateScript { inherit pname; }; + } // args.passthru or { }; meta = { inherit description; inherit (azure-cli.meta) platforms maintainers; @@ -67,13 +70,24 @@ let "url" "hash" "description" + "passthru" "meta" ]) ); + # Update script for azure cli extensions. Currently only works for manual extensions. + extensionUpdateScript = + { pname }: + [ + "${lib.getExe azure-cli.extensions-tool}" + "--cli-version" + "${azure-cli.version}" + "--extension" + "${pname}" + ]; - extensions-generated = lib.mapAttrs (name: ext: mkAzExtension ext) ( - builtins.fromJSON (builtins.readFile ./extensions-generated.json) - ); + extensions-generated = lib.mapAttrs ( + name: ext: mkAzExtension (ext // { passthru.updateScript = [ ]; }) + ) (builtins.fromJSON (builtins.readFile ./extensions-generated.json)); extensions-manual = callPackages ./extensions-manual.nix { inherit mkAzExtension; python3Packages = python3.pkgs; @@ -408,7 +422,6 @@ py.pkgs.toPythonApplication ( } '' black --check --diff $src - # mypy --strict $src isort --profile=black --check --diff $src install -Dm755 $src $out/bin/extensions-tool diff --git a/pkgs/by-name/be/bespokesynth/2001-bespokesynth-fix-pipewire-jack.patch b/pkgs/by-name/be/bespokesynth/2001-bespokesynth-fix-pipewire-jack.patch new file mode 100644 index 000000000000..c14848843bdc --- /dev/null +++ b/pkgs/by-name/be/bespokesynth/2001-bespokesynth-fix-pipewire-jack.patch @@ -0,0 +1,30 @@ +diff --git a/libs/JUCE/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp b/libs/JUCE/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp +index 4cce7016f..25554a7cd 100644 +--- a/libs/JUCE/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp ++++ b/libs/JUCE/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp +@@ -291,7 +291,6 @@ public: + juce::jack_on_info_shutdown (client, infoShutdownCallback, this); + juce::jack_set_xrun_callback (client, xrunCallback, this); + juce::jack_activate (client); +- deviceIsOpen = true; + + if (! inputChannels.isZero()) + { +@@ -336,6 +335,7 @@ public: + } + + updateActivePorts(); ++ deviceIsOpen = true; + + return lastError; + } +@@ -525,7 +525,8 @@ private: + static void portConnectCallback (jack_port_id_t, jack_port_id_t, int, void* arg) + { + if (JackAudioIODevice* device = static_cast (arg)) +- device->mainThreadDispatcher.updateActivePorts(); ++ if (device->isOpen()) ++ device->mainThreadDispatcher.updateActivePorts(); + } + + static void threadInitCallback (void* /* callbackArgument */) diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/by-name/be/bespokesynth/package.nix similarity index 66% rename from pkgs/applications/audio/bespokesynth/default.nix rename to pkgs/by-name/be/bespokesynth/package.nix index 8eb63539040c..29ff82de7e2f 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -3,6 +3,8 @@ stdenv, fetchFromGitHub, fetchzip, + gitUpdater, + apple-sdk_11, cmake, pkg-config, ninja, @@ -11,6 +13,7 @@ alsa-lib, alsa-tools, freetype, + jsoncpp, libusb1, libX11, libXrandr, @@ -31,13 +34,6 @@ pcre, mount, zenity, - Accelerate, - Cocoa, - WebKit, - CoreServices, - CoreAudioKit, - IOBluetooth, - MetalKit, # It is not allowed to distribute binaries with the VST2 SDK plugin without a license # (the author of Bespoke has such a licence but not Nix). VST3 should work out of the box. # Read more in https://github.com/NixOS/nixpkgs/issues/145607 @@ -58,24 +54,47 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bespokesynth"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "BespokeSynth"; - repo = pname; - rev = "v${version}"; - hash = "sha256-vDvNm9sW9BfWloB0CA+JHTp/bfDWAP/T0hDXjoMZ3X4="; + repo = "bespokesynth"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ad8wdLos3jM0gRMpcfRKeaiUxJsPGqWd/7XeDz87ToQ="; fetchSubmodules = true; }; + patches = [ + # Fix compatibility with pipewire's JACK emulation + # https://github.com/BespokeSynth/BespokeSynth/issues/1405#issuecomment-1721437868 + ./2001-bespokesynth-fix-pipewire-jack.patch + ]; + + # Linux builds are sandboxed properly, this always returns "localhost" there. + # Darwin builds doesn't have the same amount of sandboxing by default, and the builder's hostname is returned. + # In case this ever gets embedded into VersionInfoBld.cpp, hardcode it to the Linux value + postPatch = '' + substituteInPlace Source/cmake/versiontools.cmake \ + --replace-fail 'cmake_host_system_information(RESULT BESPOKE_BUILD_FQDN QUERY FQDN)' 'set(BESPOKE_BUILD_FQDN "localhost")' + ''; + cmakeBuildType = "Release"; - cmakeFlags = lib.optionals enableVST2 [ "-DBESPOKE_VST2_SDK_LOCATION=${vst-sdk}/VST2_SDK" ]; + cmakeFlags = + [ + (lib.cmakeBool "BESPOKE_SYSTEM_PYBIND11" true) + (lib.cmakeBool "BESPOKE_SYSTEM_JSONCPP" true) + ] + ++ lib.optionals enableVST2 [ + (lib.cmakeFeature "BESPOKE_VST2_SDK_LOCATION" "${vst-sdk}/VST2_SDK") + ]; + + strictDeps = true; nativeBuildInputs = [ - python3 + python3 # interpreter makeWrapper cmake pkg-config @@ -83,7 +102,16 @@ stdenv.mkDerivation rec { ]; buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ + [ + jsoncpp + # library & headers + (python3.withPackages ( + ps: with ps; [ + pybind11 + ] + )) + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ # List obtained from https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml libX11 libXrandr @@ -110,25 +138,14 @@ stdenv.mkDerivation rec { mount ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - Cocoa - WebKit - CoreServices - CoreAudioKit - IOBluetooth - MetalKit + apple-sdk_11 ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ - # Fails to find fp.h on its own - "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/" - ]); - postInstall = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/{Applications,bin} - mv Source/BespokeSynth_artefacts/${cmakeBuildType}/BespokeSynth.app $out/Applications/ + mv Source/BespokeSynth_artefacts/${finalAttrs.cmakeBuildType}/BespokeSynth.app $out/Applications/ # Symlinking confuses the resource finding about the actual location of the binary # Resources are looked up relative to the executed file's location makeWrapper $out/{Applications/BespokeSynth.app/Contents/MacOS,bin}/BespokeSynth @@ -158,24 +175,29 @@ stdenv.mkDerivation rec { libXScrnSaver ]) }"; + dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath - meta = with lib; { + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = { description = "Software modular synth with controllers support, scripting and VST"; homepage = "https://www.bespokesynth.com/"; license = - with licenses; + with lib.licenses; [ gpl3Plus ] ++ lib.optional enableVST2 unfree; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ astro tobiasBora OPNA2608 PowerUser64 ]; mainProgram = "BespokeSynth"; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/bu/butt/package.nix b/pkgs/by-name/bu/butt/package.nix index 15044904ddea..dcbc83ed0c3f 100644 --- a/pkgs/by-name/bu/butt/package.nix +++ b/pkgs/by-name/bu/butt/package.nix @@ -16,6 +16,7 @@ openssl, curl, portmidi, + autoPatchelfHook, }: stdenv.mkDerivation (finalAttrs: { @@ -36,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'live365_logo, 124, 61, 4,' 'nullptr, 0, 0, 0,' ''; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + ]; buildInputs = [ fltk13 @@ -54,6 +58,10 @@ stdenv.mkDerivation (finalAttrs: { portmidi ]; + runtimeDependencies = [ + fdk_aac + ]; + postInstall = '' cp -r usr/share $out/ ''; diff --git a/pkgs/by-name/ca/cabinpkg/package.nix b/pkgs/by-name/ca/cabinpkg/package.nix index 7829fb65ccf0..8c7b9e7542cb 100644 --- a/pkgs/by-name/ca/cabinpkg/package.nix +++ b/pkgs/by-name/ca/cabinpkg/package.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "cabinpkg"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "cabinpkg"; repo = "cabin"; tag = version; - sha256 = "sha256-LIP99Shxu/lOdZ31KVA8RYawZ6dRLtXEGKZs1mUFCus="; + sha256 = "sha256-qMmfViu3ol8+Tpyy8hn0j5r+bql0SFeKPVVj/ox4AGQ="; }; strictDeps = true; diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix index a63b9e5bbcd5..62de16aef0d8 100644 --- a/pkgs/by-name/ce/cedar/package.nix +++ b/pkgs/by-name/ce/cedar/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "cedar"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "cedar-policy"; repo = "cedar"; tag = "v${version}"; - hash = "sha256-p8idQx3HGO/ikL0pDTPXx5+rD2sRpXANqs/g51BL554="; + hash = "sha256-E3x+FfjLNUpfu00D+UALc73STodNW2Kvfo/4x6hORiY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-puVPSPPpKAlawN4OXrehIdqlJ6gmZxP/tiFzn1V/o4A="; + cargoHash = "sha256-vkJjUmzuYwR/GI/7h0S2AOXJ8Im074a7QzXDs23rIak="; passthru = { tests.version = testers.testVersion { package = cedar; }; diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 721ddd3c0ad8..83b1fb8451f1 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.101.0"; + version = "1.102.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-4pGdb7CZTYjaGgrwRwI9mtmqJaFY7AwGk36PLASUDFU="; + hash = "sha256-hnmQR9Buu+2z1UkeStVFazbl/czUhV8E7sZrkcPGKFo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/cl/clifm/package.nix b/pkgs/by-name/cl/clifm/package.nix index 523314fa8b42..a2f6ec187ad4 100644 --- a/pkgs/by-name/cl/clifm/package.nix +++ b/pkgs/by-name/cl/clifm/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - hash = "sha256-keoQUfRQA77+1ArVRKYiWGACXAi505jLXSVXUpuMlMc="; + hash = "sha256-FtlLz77yy/QfRyAhJSh5juCSPCZ921sTGhuYJzCusus="; }; buildInputs = [ diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index 869ce53a5255..36158765e733 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.36.0"; + version = "11.37.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-LISy9xMAv9Wal+iRF9qoCLrQnq0r4HOqCir/w0uTrAA="; + hash = "sha256-H8qilsIlXA9NdPrdJYmkX+Ccc5fJHcEZThzPUo6Vi4M="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-JweIdmjnybaOyL5GOxCmP8TpyMYTG9qD5aFbabAJ4h8="; + vendorHash = "sha256-rqWGaENzFoC4+VhH1FRX9veLOXxXEAxdhcvrd2OoZY8="; ldflags = [ "-w" diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 9fbcada3199e..747d90807aaf 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -23,10 +23,10 @@ let hash = { - x86_64-linux = "sha256-/VkobDCai9+Lac0TCzm9gg/pNFDA1T2OJiad3qdz/2o="; - aarch64-linux = "sha256-glJRQIFSs5D7b3BVblaL0o8Rndh3QuCup45AfRWymG0="; - x86_64-darwin = "sha256-TBCgbaJ5Yyp+I8VCljYf3tlNnVaLkfwusJMlfY+Rggo="; - aarch64-darwin = "sha256-MfJ/zIfmKJN4Fe6a50NwAqvetxB/W+BriQ+5mEIhWMg="; + x86_64-linux = "sha256-+u1WLD/EPkbFcpjMhJqAMzsh4DaaykfPUIzH7D0OLS8="; + aarch64-linux = "sha256-7gbevNNvvf03oVy1wcnD8b1hj5ccPyyMDfPEZyL6cdM="; + x86_64-darwin = "sha256-aQdOaenIv5+7dqRPvChU5UeWwll75/qQXwP7mbZxFXg="; + aarch64-darwin = "sha256-xKqKHEc4DSymmZ12dcs1dqhVhyYB97tdUX1pQFyJpuE="; } .${system} or throwSystem; @@ -35,7 +35,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.30.18"; + version = "1.32.1"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; diff --git a/pkgs/by-name/co/connman-gtk/package.nix b/pkgs/by-name/co/connman-gtk/package.nix index 9475a30d849f..fb784c8aae7a 100644 --- a/pkgs/by-name/co/connman-gtk/package.nix +++ b/pkgs/by-name/co/connman-gtk/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, autoconf, automake, intltool, @@ -37,6 +38,13 @@ stdenv.mkDerivation rec { connman ]; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/nickm/connman-gtk/-/raw/ef01b52fa02c5cca199b2e47c0cf360691266fd8/debian/patches/incompatible-pointer-type"; + hash = "sha256-T+N9FfDyROBA4/HLK+l/fpnju2imDU4y6nGSbF+JDiA="; + }) + ]; + preConfigure = '' # m4/intltool.m4 is an invalid symbolic link rm m4/intltool.m4 diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index b7f8911e1a27..202ce48cb5c5 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "cue"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-CLWPRVrfFQUwoLbZttetuq1T/Gb7vVEcrD7dxMzfgjA="; + hash = "sha256-OSsDgwjtjQw5YRuXi1K/HQtHyLh1aHtYDlQDAtdYeZM="; }; vendorHash = "sha256-jl8TR1kxame30l7DkfOEioWA9wK/ACTNofiTi++vjuI="; diff --git a/pkgs/by-name/cu/cunicu/package.nix b/pkgs/by-name/cu/cunicu/package.nix index 618d908ae9db..ea6e16c32300 100644 --- a/pkgs/by-name/cu/cunicu/package.nix +++ b/pkgs/by-name/cu/cunicu/package.nix @@ -12,13 +12,13 @@ }: buildGoModule rec { pname = "cunicu"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "cunicu"; repo = "cunicu"; rev = "v${version}"; - hash = "sha256-rUUJMvT3JkIehoWLOtruUSU8YbKd6mS7Wp2TXwn9aVE="; + hash = "sha256-1y9olRSPu2akvE728oXBr70Pt03xj65R2GaOlZ/7RTg="; }; vendorHash = "sha256-yFpkYI6ue5LXwRCj4EqWDBaO3TYzZ3Ov/39PRQWMWzk="; diff --git a/pkgs/by-name/da/dayon/package.nix b/pkgs/by-name/da/dayon/package.nix index 11a171c2bb08..e53120b7d160 100644 --- a/pkgs/by-name/da/dayon/package.nix +++ b/pkgs/by-name/da/dayon/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dayon"; - version = "15.0.1"; + version = "15.0.2"; src = fetchFromGitHub { owner = "RetGal"; repo = "dayon"; rev = "v${finalAttrs.version}"; - hash = "sha256-3/A8aAWnaPg0sgzWJKU4Ys/R3nXYQj8aFuEVMgzauqQ="; + hash = "sha256-5gpST5c3UGutrGuysBEHWqbj9O5+XagA6fTZ7D/R7Oo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/debootstrap/package.nix b/pkgs/by-name/de/debootstrap/package.nix index 520fd3f97b46..4b695797117d 100644 --- a/pkgs/by-name/de/debootstrap/package.nix +++ b/pkgs/by-name/de/debootstrap/package.nix @@ -43,14 +43,14 @@ let in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.140"; + version = "1.0.140_bpo12+1"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "debootstrap"; rev = "refs/tags/${version}"; - hash = "sha256-kusY42HwyMFuzwJimdVzuwx9XGjKssGAR7guB4E0TbQ="; + hash = "sha256-4vINaMRo6IrZ6e2/DAJ06ODy2BWm4COR1JDSY52upUc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ds/dsda-launcher/package.nix b/pkgs/by-name/ds/dsda-launcher/package.nix index b384911a9c35..7ebc3178172b 100644 --- a/pkgs/by-name/ds/dsda-launcher/package.nix +++ b/pkgs/by-name/ds/dsda-launcher/package.nix @@ -3,16 +3,17 @@ stdenv, fetchFromGitHub, qt6, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dsda-launcher"; - version = "1.3.1-hotfix"; + version = "1.4"; src = fetchFromGitHub { owner = "Pedro-Beirao"; repo = "dsda-launcher"; - rev = "v${version}"; - hash = "sha256-V6VLUl148L47LjKnPe5MZCuhZSMtI0wd18i8b+7jCvk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-OMgxhb+9GdLK00nl/df9QiYYewr+YEjdX2KjQWvu1mk="; }; nativeBuildInputs = [ qt6.wrapQtAppsHook ]; @@ -24,8 +25,8 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - mkdir -p "./dsda-launcher/build" - cd "./dsda-launcher/build" + mkdir -p "./src/build" + cd "./src/build" qmake6 .. make runHook postBuild @@ -35,18 +36,19 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin cp ./dsda-launcher $out/bin - install -Dm444 ../icons/dsda-Launcher.desktop $out/share/applications/dsda-Launcher.desktop install -Dm444 ../icons/dsda-launcher.png $out/share/pixmaps/dsda-launcher.png runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://github.com/Pedro-Beirao/dsda-launcher"; description = "This is a launcher GUI for the dsda-doom source port"; mainProgram = "dsda-launcher"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.Gliczy ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ Gliczy ]; }; -} +}) diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index 7fe5a1aaedf3..4a3410ecde67 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "easytier"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "EasyTier"; repo = "EasyTier"; tag = "v${version}"; - hash = "sha256-qWICiY2g/wXT0Bt7lrCg7GgL1futOhelViB59UCLPro="; + hash = "sha256-iY4HluL5TlYuKDBrz0fvLwJg/aX9lKiCyFs4V5WhQZs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SpGW/RAbQUFdxqEKRPrTp5MXng7BLiSnofoJG8NsjsU="; + cargoHash = "sha256-KV7CdSEbmR7HIfKsS1sKsPqMz9Ku/rfbV8WmFkMC9oI="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index 091c65abdaf4..c28ba718d735 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -16,18 +16,19 @@ mariadb, openssl, bash, + zsh, nix-update-script, }: buildGoModule rec { pname = "ecapture"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; tag = "v${version}"; - hash = "sha256-UPWREeyB2YLYU3B4Rxr5oPoOfksL/lnllWyaFxhAe/0="; + hash = "sha256-nqNFbZrmCleWcRM2HsbgmCHqsar3KmiGYxt55ZqhY+U="; fetchSubmodules = true; }; @@ -73,6 +74,12 @@ buildGoModule rec { substituteInPlace user/config/config_nspr_linux.go \ --replace-fail '/usr/lib/firefox/libnspr4.so' '${lib.getLib nspr}/lib/libnspr4.so' + substituteInPlace user/config/config_zsh.go \ + --replace-fail '/bin/zsh' '${lib.getExe zsh}' + + substituteInPlace user/module/probe_zsh.go \ + --replace-fail '/bin/zsh' '${lib.getExe zsh}' + substituteInPlace cli/cmd/postgres.go \ --replace-fail '/usr/bin/postgres' '${postgresql}/bin/postgres' diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix index 39f9538b1100..d106725a4067 100644 --- a/pkgs/by-name/er/erlang-language-platform/package.nix +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -14,14 +14,14 @@ let hashes = { linux-aarch64-unknown-linux-gnu = "sha256-Fte7oZD5+aFph5xGrKtbSimb3aHewkjsJRXB+64IW5A="; - linux-x86_64-unknown-linux-gnu = "sha256-GFf1YybZRyZ3D6ZnLf+op6KRPYbwBHSPh1groxdNZks="; + linux-x86_64-unknown-linux-gnu = "sha256-slnXUEtHJjq6wRQTt1EwqlOO/2zIGmGwa/HCi3F0YMA="; macos-aarch64-apple-darwin = "sha256-3K3sPizBR/+DJIX67GsYqm2X5k7kq3kBRg8P2WALTZs="; macos-x86_64-apple-darwin = "sha256-j+AVmLfe/yCvKvYhL5ikhXA1g+zQ1CDlMl1FYO6q1yA="; }; in stdenv.mkDerivation rec { pname = "erlang-language-platform"; - version = "2024-12-09"; + version = "2025-01-21"; src = fetchurl { url = "https://github.com/WhatsApp/erlang-language-platform/releases/download/${version}/elp-${release}-otp-26.2.tar.gz"; diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix index f501c4891ac4..2c147db9a429 100644 --- a/pkgs/by-name/fl/flare-signal/package.nix +++ b/pkgs/by-name/fl/flare-signal/package.nix @@ -22,19 +22,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "flare"; - version = "0.15.6"; + version = "0.15.7"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = "flare"; rev = finalAttrs.version; - hash = "sha256-xpjxOaCN5UVBBIB6WMLCMspRWkzz4DQEcjiSL8uM2RQ="; + hash = "sha256-KFxBdWNN7LYQ5jiDZhAs4pqX2cRLvEGaAhYabaQh1n0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-iuK68GLU/4wsOLQz+7pGVDZwCuc6cwcUKn6teFuYJco="; + hash = "sha256-bZL9/0MYGxXefrj9whG+N7iMaBpaZSeBVAWR0AKKEvo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix index 67e3f25c2e01..79ad4b5c6899 100644 --- a/pkgs/by-name/fl/fly/package.nix +++ b/pkgs/by-name/fl/fly/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "fly"; - version = "7.12.0"; + version = "7.12.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - hash = "sha256-lAx9TZVRkPMa5swB74zI0xJ7pbRDApZoens747XcuJk="; + hash = "sha256-3RsFtU2C3XxBddyW5liAwia9I7Fc8f2+TsziiJy6rHg="; }; - vendorHash = "sha256-dXjee2rZn1lVEmL8Cy8rrdpSX1OpS9GHKZo53ur3kew="; + vendorHash = "sha256-up77TV/A/C39LjgQ+1uQExWfMlbruLhY3H6820cRnt0="; subPackages = [ "fly" ]; diff --git a/pkgs/by-name/fr/frigate/web.nix b/pkgs/by-name/fr/frigate/web.nix index 959157df6703..fb194d89ffce 100644 --- a/pkgs/by-name/fr/frigate/web.nix +++ b/pkgs/by-name/fr/frigate/web.nix @@ -1,5 +1,6 @@ { buildNpmPackage, + frigate, src, version, }: @@ -28,7 +29,11 @@ buildNpmPackage { npmDepsHash = "sha256-PLs3oCWQjK38eHgdQt2Qkj7YqkfanC8JnLMpzMjNfxU="; + env.NODE_OPTIONS = "--no-experimental-require-module"; + installPhase = '' cp -rv dist/ $out ''; + + inherit (frigate) meta; } diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix index 91479e062755..9ed5943cdfea 100644 --- a/pkgs/by-name/fu/fulcio/package.nix +++ b/pkgs/by-name/fu/fulcio/package.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-TCWZrTqNXTcTsLqTnwnJPXN+kMYVVwLm2J3Y6gd2CV8="; + hash = "sha256-CfkHGHxeDUxHWX98FgmA4RNCVlgi9XA9eYkb+G5cZTA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -33,7 +33,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-3E2Y0UlJMjTiM4ILEiaNqVmt4fWMvCRAqzm//CvRIl4="; + vendorHash = "sha256-qQsaX/xaqD1qb9wH6riohm+NU49cN3EkO012oz9n4tw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix index fc9b54a84b27..f69ccbe8c76b 100644 --- a/pkgs/by-name/gc/gcli/package.nix +++ b/pkgs/by-name/gc/gcli/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "gcli"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "herrhotzenplotz"; repo = "gcli"; rev = "v${version}"; - hash = "sha256-60B1XRoeSjSEo5nxrCJL9lizq7ELGe8+hdmC4lkMhis="; + hash = "sha256-pAnDxcQLRF97OzO7/P7eRXv/BUJwbuEveEVUBQuNJBE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ge/gerbera/package.nix b/pkgs/by-name/ge/gerbera/package.nix index 0df7921246d3..5f0583822079 100644 --- a/pkgs/by-name/ge/gerbera/package.nix +++ b/pkgs/by-name/ge/gerbera/package.nix @@ -121,13 +121,13 @@ let in stdenv.mkDerivation rec { pname = "gerbera"; - version = "2.3.0"; + version = "2.4.1"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "sha256-SUMXnVCmrxoEbKKuzh+b7uvIanxilvpDDiH5ihjAm38="; + sha256 = "sha256-bqqD6juae0+plX6kEtHhWYgMd0KDz/1N7jJf7F6dMgQ="; }; postPatch = diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix index 1ebcacfc5869..6a0650b9b069 100644 --- a/pkgs/by-name/ge/getmail6/package.nix +++ b/pkgs/by-name/ge/getmail6/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.19.05"; + version = "6.19.06"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; tag = "v${version}"; - hash = "sha256-GjB53bl2gh3SA+kqC9rrQ9I4rP0z69G/bamInmq8W+I="; + hash = "sha256-F4FS6d8XDPlJ7ysShFRb45hZainKljKRg+q4yA18HaI="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 6b9bf2a6d8a8..568f7f658ba4 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-25Ik5VsTYLssI9u235pBWD1XNABvWCzbXma04pJX2nQ="; + hash = "sha256-n0+I1URuIOKqBj+BSE6bD3wOxpaKWM9t1X3PkPhawKY="; }; vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE="; diff --git a/pkgs/by-name/gl/glom/package.nix b/pkgs/by-name/gl/glom/package.nix index 6e617032bedf..a7e532ea116b 100644 --- a/pkgs/by-name/gl/glom/package.nix +++ b/pkgs/by-name/gl/glom/package.nix @@ -155,11 +155,9 @@ stdenv.mkDerivation (finalAttrs: { gpl2 ]; homepage = "https://gitlab.gnome.org/Archive/glom"; - maintainers = - lib.teams.gnome.members - ++ (with lib.maintainers; [ - bot-wxt1221 - ]); + maintainers = with lib.maintainers; [ + bot-wxt1221 + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index 981cd76dcdbe..7381547e0a4d 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -74,11 +74,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "47.2"; + version = "47.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-Q0oyLcN0OFi4nYFl2J+J3AWWi2t740AJRM7UJxJQ0+k="; + hash = "sha256-eDgdWn8dWyl8mhlhEUXuXgWE8GrFde0IrQcKDAe76qI="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-podcasts/package.nix b/pkgs/by-name/gn/gnome-podcasts/package.nix index bc69273c4869..d5927edfe385 100644 --- a/pkgs/by-name/gn/gnome-podcasts/package.nix +++ b/pkgs/by-name/gn/gnome-podcasts/package.nix @@ -25,19 +25,19 @@ stdenv.mkDerivation rec { pname = "gnome-podcasts"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "podcasts"; rev = version; - hash = "sha256-KCjHT/4AeJ+RXCtawkhs6f4D8NCJotYIPk3tGr5YG9M="; + hash = "sha256-xPB1ieOgnHe2R5ORK0Hl61V+iDZ7WsJEnsAJGZvQUVI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-L9/PCYanv8AgxD/fkEsNXQA1Zyz2+ia88lVahg9IOdA="; + hash = "sha256-Nzfsr1OFw7DnxrNol00BI9WIe1Tau3z/R4zdF0PaBOk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index 23fdd1e1a515..bcf3d0929c2e 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "47.2"; + version = "47.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz"; - hash = "sha256-k1HdjDns5wUMlny9zr4WYrwmuP2pJPioCpsqMS0H9HE="; + hash = "sha256-QE2wiHLmkDlD4nUam2Myf2NZcKnKodL2dTCcpEV8+cI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index 2bc4bda52d9f..fd0d3fe7f308 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "47.2"; + version = "47.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - hash = "sha256-3XdKApFYSRer3oi7xOzPkkQXjjwmnOBhjQSVF3wSZS0="; + hash = "sha256-GpFCpOhdeit9xbrTfjTfnuuzjoSW9JOL4teys1iD0Tk="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index ca1e5b62cf03..c6f38937db7e 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -24,7 +24,6 @@ librsvg, webp-pixbuf-loader, geoclue2, - perl, desktop-file-utils, libpulseaudio, libical, @@ -70,7 +69,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "47.2"; + version = "47.3"; outputs = [ "out" @@ -79,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-QYTQGhq4LLQh0couK8zgKSzrRsTHSeYbC95LdQBNLgA="; + hash = "sha256-eD3rmghlEeSlPbEFdL+7ppVXb2mAeCGMpsgMse/sKT4="; }; patches = [ @@ -117,7 +116,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config gettext gi-docgen - perl wrapGAppsHook4 sassc desktop-file-utils @@ -185,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - patchShebangs src/data-to-c.pl + patchShebangs src/data-to-c.py # We can generate it ourselves. rm -f man/gnome-shell.1 diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index 7936fc9a164e..468177440fbe 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "47.2"; + version = "47.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-ESM4+KmOflEl3j9XIphzU0IVt37u830/1CYvAhUcfOo="; + hash = "sha256-coHFS5t0jWai55LrjgMxyJec44+vrfct482ZnYDpe08="; }; patches = [ diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix index aa001a0ab4ff..4b573b1712f1 100644 --- a/pkgs/by-name/gn/gnu-shepherd/package.nix +++ b/pkgs/by-name/gn/gnu-shepherd/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnu-shepherd"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "mirror://gnu/shepherd/shepherd-${version}.tar.gz"; - hash = "sha256-6OavM7AnkMwKVIDXWaQhGobRQdBzrNPJNGtM8BDtnnw="; + hash = "sha256-iV0AUeHMRzsfefY5E3d7TRX4nxbQpyN3QXbaEC4nEMU="; }; configureFlags = [ "--localstatedir=/" ]; diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index e5284e697730..5ce066824f60 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -171,11 +171,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "132.0.6834.83"; + version = "132.0.6834.110"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-qufv7m7iQ8yX6WeNajTbPELCmRhr4GGBa8Wzy+iMFhg="; + hash = "sha256-4mtVCiKXKnjmHlyYgnDneX9hOmYgafwZ230iFfH48Tc="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -274,11 +274,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "132.0.6834.84"; + version = "132.0.6834.111"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/acpvuq6jnnfhesngduj6lnfmy3zq_132.0.6834.84/GoogleChrome-132.0.6834.84.dmg"; - hash = "sha256-SX8IUdTnIJHwfF9ZwIHZwGZUncJ/NLQpuEL/X8p1KJo="; + url = "http://dl.google.com/release2/chrome/acuc7atz5smv6q4nvkuutofbz6uq_132.0.6834.111/GoogleChrome-132.0.6834.111.dmg"; + hash = "sha256-kC4MA57eeapnzCgyBuLNq9NBTFdcECMtoNwMzWd0KEg="; }; dontPatch = true; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 0fabcd3d83c8..2df384d4b2a9 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.86.1"; + version = "0.87.0"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; tag = "v${version}"; - hash = "sha256-k4Faw7DqN5H2bGxKEqeUA4+sMZOdbW1139GcqbU56Hk="; + hash = "sha256-El7cegeHMb6fhO1Vr6FK0E3Mlk/dbU0Dv4lUYNu0Gcc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-qrMgc5/ukuri8Oabgq84SCqy26vVWgzlE2UkTd67ss8="; + vendorHash = "sha256-SbKvDAzWq58O0e/+1r5oI3rxfdsnPenMPwqNRTOe7AI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gu/guile-hoot/package.nix b/pkgs/by-name/gu/guile-hoot/package.nix index 42f8f06a7b18..76213c206727 100644 --- a/pkgs/by-name/gu/guile-hoot/package.nix +++ b/pkgs/by-name/gu/guile-hoot/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "guile-hoot"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitLab { owner = "spritely"; repo = "guile-hoot"; rev = "v${version}"; - hash = "sha256-n8u0xK2qDLGySxiYWH882/tkL8ggu3hivHn3qdDO9eI="; + hash = "sha256-xPU4uLyh3gd2ubyGednCqB3uzKrabhXQhs6vBc8z0ps="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gu/gupnp-av/package.nix b/pkgs/by-name/gu/gupnp-av/package.nix index 59145c2c421a..bcfef88811f8 100644 --- a/pkgs/by-name/gu/gupnp-av/package.nix +++ b/pkgs/by-name/gu/gupnp-av/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "gupnp-av"; - version = "0.14.1"; + version = "0.14.3"; outputs = [ "out" @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "t5zgzEsMZtnFS8Ihg6EOVwmgAR0q8nICWUjvyrM6Pk8="; + url = "mirror://gnome/sources/gupnp-av/${lib.versions.majorMinor version}/gupnp-av-${version}.tar.xz"; + sha256 = "q+IEYEPmapUpNl2JBZvhIhnCGk7eDEdDcDsP2arxe7Q="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_412 ]; - buildInputs = [ + propagatedBuildInputs = [ glib libxml2 ]; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gupnp-av"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/by-name/ha/hawkthorne-journey/package.nix b/pkgs/by-name/ha/hawkthorne-journey/package.nix new file mode 100644 index 000000000000..9d8ee57c9306 --- /dev/null +++ b/pkgs/by-name/ha/hawkthorne-journey/package.nix @@ -0,0 +1,96 @@ +{ + lib, + stdenv, + fetchFromGitHub, + love, + lua, + zip, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + tmx2lua, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hawkthorne-journey"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "hawkthorne"; + repo = "hawkthorne-journey"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RhxI2ChkFCBu2FaW2/eHT1KTTjKP++aHDktT+qQ5ooQ="; + }; + + nativeBuildInputs = [ + zip + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + love + lua + tmx2lua + ]; + + buildPhase = '' + runHook preBuild + + # Convert TMX maps to Lua + for tmxfile in src/maps/*.tmx; do + tmx2lua "$tmxfile" + done + + # Create the .love file + cd src + zip -X -r ../hawkthorne.love . \ + -x ".*" \ + -x "*.DS_Store" \ + -x "psds/*" \ + -x "test/*" \ + -x "*.tmx" \ + -x "maps/test-level.lua" \ + -x "*/full_soundtrack.ogg" \ + -x "*.bak" + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cd .. + mkdir -p $out/share/games/hawkthorne + cp hawkthorne.love $out/share/games/hawkthorne/ + + mkdir -p $out/bin + makeWrapper ${love}/bin/love $out/bin/hawkthorne \ + --add-flags "$out/share/games/hawkthorne/hawkthorne.love" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "hawkthorne"; + exec = "hawkthorne"; + icon = "hawkthorne"; + desktopName = "Journey to the Center of Hawkthorne"; + genericName = "Platform Game"; + categories = [ + "Game" + "ArcadeGame" + ]; + }) + ]; + + meta = { + description = "Journey to the Center of Hawkthorne - Community Fan Game"; + homepage = "https://projecthawkthorne.com"; + changelog = "https://github.com/hawkthorne/hawkthorne-journey/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ liberodark ]; + mainProgram = "hawkthorne"; + }; +}) diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix index 7a9c0dc2ac28..d1fe19e65dea 100644 --- a/pkgs/by-name/he/hermitcli/package.nix +++ b/pkgs/by-name/he/hermitcli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hermit"; - version = "0.41.0"; + version = "0.42.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "cashapp"; repo = "hermit"; - hash = "sha256-pHhGMVlBJAZ9pCv5IsayLw9g1LPIHLmvRczvDPgwj/A="; + hash = "sha256-OaYZMqe1bU5CKfs9IfFmTb3LUvJTFDAkU2uojZ9aRmw="; }; - vendorHash = "sha256-+phwbG2ODhzfzqOJ6IuT/XDzTevPrdOfJH6PKLKeJlM="; + vendorHash = "sha256-GPIJ3IvTM2da962M1FLHKn8OitHDPZ9zp8nSLaeRq10="; subPackages = [ "cmd/hermit" ]; diff --git a/pkgs/by-name/he/heroku/package.nix b/pkgs/by-name/he/heroku/package.nix index 8469e25788a1..78a370854af3 100644 --- a/pkgs/by-name/he/heroku/package.nix +++ b/pkgs/by-name/he/heroku/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation { pname = "heroku"; - version = "10.0.0"; + version = "10.0.2"; src = fetchzip { - url = "https://cli-assets.heroku.com/versions/10.0.0/b084308/heroku-v10.0.0-b084308-linux-x64.tar.xz"; - hash = "sha256-dwFwzOe0t+bXw53Fx96uS/MW25tubT0FDhMSmnzEqEY="; + url = "https://cli-assets.heroku.com/versions/10.0.2/7947ef4/heroku-v10.0.2-7947ef4-linux-x64.tar.xz"; + hash = "sha256-+z+oP4KUhlQuhmvXJ8cxkrDJzllww1gybJCst7RIph0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index 5a32a9059649..c1276b0cf7db 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.26.0"; + version = "1.26.1"; pyproject = true; src = fetchFromGitHub { owner = "icloud-photos-downloader"; repo = "icloud_photos_downloader"; rev = "v${version}"; - hash = "sha256-tythfDw053UjxbiZsT0AqUA9ckzHy5XgJD3Q8B5QRDM="; + hash = "sha256-VCDGOxW4kSfPoSOana94QRPxiGMKdbTY3ZTLcoScJbk="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/ka/kalamine/package.nix b/pkgs/by-name/ka/kalamine/package.nix index adfdc494077b..0d379dd1d126 100644 --- a/pkgs/by-name/ka/kalamine/package.nix +++ b/pkgs/by-name/ka/kalamine/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "kalamine"; - version = "0.22"; + version = "0.38"; pyproject = true; src = fetchFromGitHub { owner = "OneDeadKey"; repo = "kalamine"; rev = "v${version}"; - hash = "sha256-SPXVFeysVF/6RqjhXmlPc+3m5vnVndJb7LQshQZBeg8="; + hash = "sha256-eDOwoI7S0l48oOWWDaBbDlC0A8RtPEA+FDCHpPur0OQ="; }; nativeBuildInputs = [ @@ -22,7 +22,9 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ click + livereload lxml + progress pyyaml tomli ]; diff --git a/pkgs/by-name/ka/kanidm/1_4.nix b/pkgs/by-name/ka/kanidm/1_4.nix index 7c4ada64db24..1b1b941905bf 100644 --- a/pkgs/by-name/ka/kanidm/1_4.nix +++ b/pkgs/by-name/ka/kanidm/1_4.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "1.4.5"; - hash = "sha256-0nn/ZyjkLXWXBZasNhbeEynEN52cmZQAcgg3hLmRpdo="; - cargoHash = "sha256-9ZB9PwVnqoCRMFXOY7ejh76hmOg7cjVpnjgJfh8aXGI="; + version = "1.4.6"; + hash = "sha256-pjJyq52wO5p34LN2Jmt0npgWBDcWin8gIX4skZ7Ff8E="; + cargoHash = "sha256-XyyvXxZOvaxSzH8Jd23IxE4Wyd/6h5N3HRVEvdQ8RtY="; patchDir = ./patches/1_4; } diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix index bf03ee5786be..47222cc75b38 100644 --- a/pkgs/by-name/la/lazyjournal/package.nix +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "0.6.0"; + version = "0.7.1"; in buildGoModule { pname = "lazyjournal"; @@ -15,10 +15,10 @@ buildGoModule { owner = "Lifailon"; repo = "lazyjournal"; tag = version; - hash = "sha256-6ui9DZKFWX/p0qD2U79+HKNAY6Wy4OtzIm64W1PzPR4="; + hash = "sha256-FFPwifOLikuU7OEDglNFpBtME+3lWjzYMpE8uKz5umQ="; }; - vendorHash = "sha256-jh99+zlhr4ogig4Z2FFO6SZ2qTBkOUuiXo5iNk0VTi0="; + vendorHash = "sha256-1tQ0ZFww9VCnoRzmOQw9RaiRJmTRErAio13uAAKtgTw="; ldflags = [ "-s" diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix index b334fa5d78fe..75862435d2d3 100644 --- a/pkgs/by-name/le/level-zero/package.nix +++ b/pkgs/by-name/le/level-zero/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.19.2"; + version = "1.20.0"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; tag = "v${version}"; - hash = "sha256-MnTPu7jsjHR+PDHzj/zJiBKi9Ou/cjJvrf87yMdSnz0="; + hash = "sha256-dn/1EZlEBbmu4p7/5fn6LhQXOEUvI/gtAdHnCnosGEs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libepc/package.nix b/pkgs/by-name/li/libepc/package.nix index b9a94a544cab..a6c8912184a2 100644 --- a/pkgs/by-name/li/libepc/package.nix +++ b/pkgs/by-name/li/libepc/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Easy Publish and Consume Library"; homepage = "https://gitlab.gnome.org/Archive/libepc"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + maintainers = [ maintainers.bot-wxt1221 ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/li/libgdamm/package.nix b/pkgs/by-name/li/libgdamm/package.nix index 074a8167e9a0..2f81ac0fe49f 100644 --- a/pkgs/by-name/li/libgdamm/package.nix +++ b/pkgs/by-name/li/libgdamm/package.nix @@ -4,7 +4,7 @@ fetchurl, pkg-config, glibmm, - libgda, + libgda5, libxml2, gnome, mysqlSupport ? false, @@ -12,7 +12,7 @@ }: let - gda = libgda.override { + gda = libgda5.override { inherit mysqlSupport postgresSupport; }; in @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "C++ bindings for libgda"; homepage = "https://www.gnome-db.org/"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + maintainers = [ maintainers.bot-wxt1221 ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/li/libgee/package.nix b/pkgs/by-name/li/libgee/package.nix index ef7856de5efa..151abcac6771 100644 --- a/pkgs/by-name/li/libgee/package.nix +++ b/pkgs/by-name/li/libgee/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgee"; - version = "0.20.6"; + version = "0.20.8"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libgee/${lib.versions.majorMinor finalAttrs.version}/libgee-${finalAttrs.version}.tar.xz"; - sha256 = "G/g09eENYMxhJNdO08HdONpkZ4f794ciILi0Bo5HbU0="; + sha256 = "GJgVrBQ9iYZxk7DFK33DHzqhCKFfBNa13KK2rfrQsO4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix index ac45816ce2e9..09722df40864 100644 --- a/pkgs/by-name/li/liboqs/package.nix +++ b/pkgs/by-name/li/liboqs/package.nix @@ -6,17 +6,18 @@ openssl, fetchpatch, enableStatic ? stdenv.hostPlatform.isStatic, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "liboqs"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "open-quantum-safe"; repo = "liboqs"; rev = finalAttrs.version; - hash = "sha256-+Gx1JPrJoeMix9DIF0rJQTivxN1lgaCIYFvJ1pnYZzM="; + hash = "sha256-ngjN1JdmnvMn+UXJeCiBwF1Uf7kTOjHVBL99xzoZVFY="; }; patches = [ @@ -46,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "C library for prototyping and experimenting with quantum-resistant cryptography"; homepage = "https://openquantumsafe.org"; diff --git a/pkgs/by-name/li/libremidi/package.nix b/pkgs/by-name/li/libremidi/package.nix index 0395afa80c0e..0bba569e2343 100644 --- a/pkgs/by-name/li/libremidi/package.nix +++ b/pkgs/by-name/li/libremidi/package.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libremidi"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "jcelerier"; repo = "libremidi"; rev = "v${finalAttrs.version}"; - hash = "sha256-raVBJ75/UmM3P69s8VNUXRE/2jV4WqPIfI4eXaf6UEg="; + hash = "sha256-JwXOIBq+pmPIR4y/Zv5whEyCfpLHmbllzdH2WLZmWLw="; }; nativeBuildInputs = [ @@ -44,6 +44,10 @@ stdenv.mkDerivation (finalAttrs: { # Bug: set this as true breaks obs-studio-plugins.advanced-scene-switcher strictDeps = false; + # PipeWire support currently disabled. Enabling it requires packaging: + # https://github.com/cameron314/readerwriterqueue + cmakeFlags = [ "-DLIBREMIDI_NO_PIPEWIRE=ON" ]; + postInstall = '' cp -r $src/include $out ''; diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index 3bfc888390a5..04e359e360db 100644 --- a/pkgs/by-name/li/livekit/package.nix +++ b/pkgs/by-name/li/livekit/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "livekit"; - version = "1.8.0"; + version = "1.8.3"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${version}"; - hash = "sha256-KfUhpA5bhomPU5OC4aCQ5WQIC4ICkaLxQO0tunpkIPI="; + hash = "sha256-YzyrALWFdrnP6iAT0zTYKzhf16I3Xf39WsgLXz8rDCw="; }; - vendorHash = "sha256-z5h/r2xC/nEeHk2PLIN+oaGHa8l/xjws79OaDZh9jqE="; + vendorHash = "sha256-v+K4+BbwYKQD4q5egJaxLYozK8tbTra6c22ZzSlwvPE="; subPackages = [ "cmd/server" ]; diff --git a/pkgs/by-name/li/livi/package.nix b/pkgs/by-name/li/livi/package.nix index 8abe03548baa..35e2d62c374a 100644 --- a/pkgs/by-name/li/livi/package.nix +++ b/pkgs/by-name/li/livi/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "livi"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitLab { owner = "guidog"; repo = "livi"; domain = "gitlab.gnome.org"; rev = "v${version}"; - hash = "sha256-4CWH8TWxuDGYlOilxyCa/HL/vtO6A9u/x39s1OLDODo"; + hash = "sha256-13hvpYlMDfB6Y0yH2MaowuylKUk1AGv6R7j4E156YpI="; }; nativeBuildInputs = [ meson diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index cba0979e1fc3..550269e1639e 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -30,6 +30,7 @@ metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && !openclSupport, vulkanSupport ? false, rpcSupport ? false, + curl, shaderc, vulkan-headers, vulkan-loader, @@ -130,13 +131,15 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ optionals openclSupport [ clblast ] ++ optionals rocmSupport rocmBuildInputs ++ optionals blasSupport [ blas ] - ++ optionals vulkanSupport vulkanBuildInputs; + ++ optionals vulkanSupport vulkanBuildInputs + ++ [ curl ]; cmakeFlags = [ # -march=native is non-deterministic; override with platform-specific flags if needed (cmakeBool "GGML_NATIVE" false) (cmakeBool "LLAMA_BUILD_SERVER" true) + (cmakeBool "LLAMA_CURL" true) (cmakeBool "BUILD_SHARED_LIBS" true) (cmakeBool "GGML_BLAS" blasSupport) (cmakeBool "GGML_CLBLAST" openclSupport) diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index 2dca4a4638c4..131214d8e5c0 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "loupe"; - version = "47.2"; + version = "47.4"; src = fetchurl { url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz"; - hash = "sha256-bgRu/k965X7idI1S0dBzVsdEnSBKPTHQtCNnqAGXShU="; + hash = "sha256-jckmgpqcM4gAyPQytaNHJG5ty9mtLdGiTEmOr90+ias="; }; patches = [ diff --git a/pkgs/by-name/lu/lucenepp/package.nix b/pkgs/by-name/lu/lucenepp/package.nix index 5e9688571ce7..89e719e2295d 100644 --- a/pkgs/by-name/lu/lucenepp/package.nix +++ b/pkgs/by-name/lu/lucenepp/package.nix @@ -4,25 +4,25 @@ fetchFromGitHub, fetchpatch, cmake, - boost, + boost186, gtest, zlib, }: stdenv.mkDerivation rec { pname = "lucene++"; - version = "3.0.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "luceneplusplus"; repo = "LucenePlusPlus"; rev = "rel_${version}"; - sha256 = "12v7r62f7pqh5h210pb74sfx6h70lj4pgfpva8ya2d55fn0qxrr2"; + hash = "sha256-VxEV45OXHRldFdIt2OC6O7ey5u98VQzlzeOb9ZiKfd8="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ - boost + boost186 gtest zlib ]; @@ -30,32 +30,33 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; patches = [ - (fetchpatch { - name = "pkgconfig_use_correct_LIBDIR_for_destination_library"; - url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch"; - sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo"; - }) - (fetchpatch { - name = "fix-visibility-on-mac.patch"; - url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/bc436842227aea561b68c6ae89fbd1fdefcac7b3.patch"; - sha256 = "sha256-/S7tFZ4ht5p0cv036xF2NKZQwExbPaGINyWZiUg/lS4="; - }) (fetchpatch { name = "fix-build-with-boost-1_85_0.patch"; url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/76dc90f2b65d81be018c499714ff11e121ba5585.patch"; - sha256 = "sha256-SNAngHwy7yxvly8d6u1LcPsM6NYVx3FrFiSHLmkqY6Q="; + hash = "sha256-SNAngHwy7yxvly8d6u1LcPsM6NYVx3FrFiSHLmkqY6Q="; + }) + (fetchpatch { + name = "fix-install-path-for-liblucene_pc.patch"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/f40f59c6e169b4e16b7a6439ecb26a629c6540d1.patch"; + hash = "sha256-YtZMqh/cnkGikatcgRjOWXj570M5ZOnCqgW8/K0/nVo="; + }) + (fetchpatch { + name = "migrate-to-boost_asio_io_context.patch"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/e6a376836e5c891577eae6369263152106b9bc02.patch"; + hash = "sha256-0mdVvrS0nTxSJXRzVdx2Zb/vm9aVxGfARG/QliRx7tA="; }) ]; # Don't use the built in gtest - but the nixpkgs one requires C++14. postPatch = '' substituteInPlace src/test/CMakeLists.txt \ - --replace "add_subdirectory(gtest)" "" + --replace-fail "add_subdirectory(gtest)" "" substituteInPlace CMakeLists.txt \ - --replace "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)" + --replace-fail "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)" ''; - doCheck = true; + # FIXME: Stuck for several hours after passing 1472 tests + doCheck = false; checkPhase = '' runHook preCheck @@ -64,11 +65,6 @@ stdenv.mkDerivation rec { runHook postCheck ''; - postInstall = '' - mv $out/include/pkgconfig $out/lib/ - cp $src/src/contrib/include/*h $out/include/lucene++/ - ''; - meta = { description = "C++ port of the popular Java Lucene search engine"; homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; @@ -77,5 +73,6 @@ stdenv.mkDerivation rec { lgpl3Plus ]; platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ rewine ]; }; } diff --git a/pkgs/by-name/ma/matrix-hookshot/package.json b/pkgs/by-name/ma/matrix-hookshot/package.json index c45b6a97ad66..a28129ee7849 100644 --- a/pkgs/by-name/ma/matrix-hookshot/package.json +++ b/pkgs/by-name/ma/matrix-hookshot/package.json @@ -1,6 +1,6 @@ { "name": "matrix-hookshot", - "version": "6.0.1", + "version": "6.0.2", "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", "main": "lib/app.js", "repository": "https://github.com/matrix-org/matrix-hookshot", @@ -31,9 +31,9 @@ "start:webhooks": "node --require source-map-support/register lib/App/GithubWebhookApp.js", "start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js", "start:resetcrypto": "node --require source-map-support/register lib/App/ResetCryptoStore.js", - "test": "mocha -r ts-node/register tests/init.ts 'tests/*.ts' 'tests/**/*.ts'", - "test:e2e": "tsc --p tsconfig.spec.json && cp ./lib/libRs.js ./lib/matrix-hookshot-rs.node ./spec-lib/src && yarn node --experimental-vm-modules $(yarn bin jest)", - "test:cover": "nyc --reporter=lcov --reporter=text yarn test", + "test": "NODE_OPTIONS=--no-experimental-strip-types mocha -r ts-node/register tests/init.ts 'tests/*.ts' 'tests/**/*.ts'", + "test:e2e": "NODE_OPTIONS=--no-experimental-strip-types tsc --p tsconfig.spec.json && cp ./lib/libRs.js ./lib/matrix-hookshot-rs.node ./spec-lib/src && yarn node --experimental-vm-modules $(yarn bin jest)", + "test:cover": "NODE_OPTIONS=--no-experimental-strip-types nyc --reporter=lcov --reporter=text yarn test", "lint": "yarn run lint:js && yarn run lint:rs", "lint:js": "eslint", "lint:rs": "cargo fmt --all -- --check && cargo clippy -- -Dwarnings", diff --git a/pkgs/by-name/ma/matrix-hookshot/pin.json b/pkgs/by-name/ma/matrix-hookshot/pin.json index cc81e0b96a2a..e0aed65ff3d4 100644 --- a/pkgs/by-name/ma/matrix-hookshot/pin.json +++ b/pkgs/by-name/ma/matrix-hookshot/pin.json @@ -1,6 +1,6 @@ { - "version": "6.0.1", - "srcHash": "sha256-rs4jIRdGriZ2L02gSTqIYuwLE4Xu3avS5+nyHuSyJ/c=", + "version": "6.0.2", + "srcHash": "sha256-uqbKpmqiy0rU8ByMRUqyjGmEdZgAhYiMrh0VEwwcbK8=", "yarnHash": "0sjc333cl115pm3w69aknf20n85r8nisrdjx1231101zrz01nhhh", - "cargoHash": "sha256-lcY0Eq64oPH0CtL4WhVx6L/Ix/m8mHqum/oLQhu6cNc=" + "cargoHash": "sha256-UlPT/ko9d4bUvv3kutNPEISXEbKtegWo2OVKEmUlKrg=" } diff --git a/pkgs/by-name/mi/minio-client/package.nix b/pkgs/by-name/mi/minio-client/package.nix index 4da88715a140..2ab8857dc0e2 100644 --- a/pkgs/by-name/mi/minio-client/package.nix +++ b/pkgs/by-name/mi/minio-client/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2024-11-21T17-21-54Z"; + version = "2025-01-17T23-25-50Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-z6ixa5nrKcrvaBC1V6/iXCeHFO4xOkFf/yJ8HLQQcaY="; + sha256 = "sha256-ezc5SMJfebvaSrpUeA6dIPS5l9rfkvSMVyGLTDPiWxE="; }; - vendorHash = "sha256-teG+GrzmUgJ6QhcxDSbWXP32hRuCgoCvH2BoNL8ddUc="; + vendorHash = "sha256-Z0dpb6E+wTCmTLBIZzvjRM5RPUsIjAhTj+V+Q3CHwv0="; subPackages = [ "." ]; diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index f432f03702f5..9d643eb54e65 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, @@ -11,8 +12,6 @@ oniguruma, openssl, mkl, - stdenv, - darwin, # env fetchurl, @@ -68,32 +67,26 @@ let (acceleration == "metal") || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && (acceleration == null)); - darwinBuildInputs = - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreVideo - CoreGraphics - ] - ++ lib.optionals metalSupport [ - MetalKit - MetalPerformanceShaders - ]; in - rustPlatform.buildRustPackage rec { pname = "mistral-rs"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "EricLBuehler"; repo = "mistral.rs"; tag = "v${version}"; - hash = "sha256-aflzpJZ48AFBqNTssZl2KxkspQb662nGkEU6COIluxk="; + hash = "sha256-dsqW0XpZN2FGZlmNKgAEYGcdY5iGvRwNUko2OuU87Gw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-USp8siEXVjtkPoCHfQjDYPtgLfNHcy02LSUNdwDbxgs="; + cargoHash = "sha256-Fp/5xQ1ib2TTBSayxR5EDKkk7G+5c1QdnVW+kzcE5Jo="; + + # Otherwise, fails with + # failed to get `anyhow` as a dependency of package + postPatch = '' + rm "$cargoDepsCopy"/llguidance-*/build.rs + ''; nativeBuildInputs = [ pkg-config @@ -111,19 +104,12 @@ rustPlatform.buildRustPackage rec { cudaPackages.libcublas cudaPackages.libcurand ] - ++ lib.optionals mklSupport [ mkl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin darwinBuildInputs; + ++ lib.optionals mklSupport [ mkl ]; - cargoBuildFlags = - [ - # This disables the plotly crate which fails to build because of the kaleido feature requiring - # network access at build-time. - # See https://github.com/NixOS/nixpkgs/pull/323788#issuecomment-2206085825 - "--no-default-features" - ] - ++ lib.optionals cudaSupport [ "--features=cuda" ] - ++ lib.optionals mklSupport [ "--features=mkl" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && metalSupport) [ "--features=metal" ]; + buildFeatures = + lib.optionals cudaSupport [ "cuda" ] + ++ lib.optionals mklSupport [ "mkl" ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && metalSupport) [ "metal" ]; env = { @@ -163,16 +149,15 @@ rustPlatform.buildRustPackage rec { rm -rf target/${stdenv.hostPlatform.config}/release/build/ ''; + # Prevent checkFeatures from inheriting buildFeatures because + # - `cargo check ... --features=cuda` requires access to a real GPU + # - `cargo check ... --features=metal` (on darwin) requires the sandbox to be completely disabled + checkFeatures = [ ]; + # Try to access internet checkFlags = [ - "--skip=gguf::gguf_tokenizer::tests::test_decode_gpt2" - "--skip=gguf::gguf_tokenizer::tests::test_decode_llama" "--skip=gguf::gguf_tokenizer::tests::test_encode_decode_gpt2" "--skip=gguf::gguf_tokenizer::tests::test_encode_decode_llama" - "--skip=gguf::gguf_tokenizer::tests::test_encode_gpt2" - "--skip=gguf::gguf_tokenizer::tests::test_encode_llama" - "--skip=sampler::tests::test_argmax" - "--skip=sampler::tests::test_gumbel_speculative" "--skip=util::tests::test_parse_image_url" ]; @@ -187,7 +172,6 @@ rustPlatform.buildRustPackage rec { tests = { version = testers.testVersion { package = mistral-rs; }; - # TODO: uncomment when mkl support will be fixed withMkl = lib.optionalAttrs (stdenv.hostPlatform == "x86_64-linux") ( mistral-rs.override { acceleration = "mkl"; } ); diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/by-name/mm/mmex/package.nix similarity index 83% rename from pkgs/applications/office/mmex/default.nix rename to pkgs/by-name/mm/mmex/package.nix index c45500832f64..a5eb63ddc001 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/by-name/mm/mmex/package.nix @@ -15,7 +15,8 @@ sqlite, wxGTK32, gtk3, - darwin, + lua, + wxsqlite3, }: stdenv.mkDerivation rec { @@ -39,9 +40,9 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64) '' - substituteInPlace 3rd/CMakeLists.txt \ - --replace "-msse4.2 -maes" "" + postPatch = '' + substituteInPlace src/dbwrapper.cpp src/model/Model_Report.cpp \ + --replace-fail "sqlite3mc_amalgamation.h" "sqlite3.h" ''; nativeBuildInputs = @@ -59,19 +60,21 @@ stdenv.mkDerivation rec { lsb-release ]; - buildInputs = - [ - curl - sqlite - wxGTK32 - gtk3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc - ]; + buildInputs = [ + curl + sqlite + wxGTK32 + gtk3 + lua + wxsqlite3 + ]; strictDeps = true; + cmakeFlags = [ + "-DWXSQLITE3_HAVE_CODEC=1" + ]; + env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isClang [ "-Wno-deprecated-copy" diff --git a/pkgs/by-name/mp/mpris-timer/package.nix b/pkgs/by-name/mp/mpris-timer/package.nix index e957925af3a8..245452ea1b72 100644 --- a/pkgs/by-name/mp/mpris-timer/package.nix +++ b/pkgs/by-name/mp/mpris-timer/package.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "mpris-timer"; - version = "2.0.5"; + version = "2.1.1"; src = fetchFromGitHub { owner = "efogdev"; repo = "mpris-timer"; tag = version; - hash = "sha256-LNaf+nTQHpHOvUXdNzKexXGa0petWp+26UeLqfmjpZw="; + hash = "sha256-uFQJSKQ9k0fiOhzydJ7frs2kns9pSdZGILPGCW3QA1w="; }; vendorHash = "sha256-vCzQiQsljNyI7nBYvq+C/dv0T186Lsj7rOq5xHMs3c0="; diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 6ae910725240..e0fc11bb8223 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "47.3"; + version = "47.4"; outputs = [ "out" @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-dkIa9vkFCc/fGrhR1e5YJx4n6Uqo99tSHVqgba6mxWA="; + hash = "sha256-9TH8AObsbbtXCzv5QrZJD3qT35HEwmepGLTSr+khG9o="; }; mesonFlags = [ diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index a128c63adce0..b8f1af9891cb 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "myks"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-r8OT5cbHicJVAVIJ9cfDHPLcJrZGPVYdZ42Sbvu8Jvc="; + hash = "sha256-KTz6Tip6kz8AcRW73+MUHUvwr/QT9Z2CvHQNyFXD054="; }; - vendorHash = "sha256-LmWuztR6X3x0aOYCqRv3aLiFEZQkaSnh3LT7IOu2Xa0="; + vendorHash = "sha256-cTRyQu3lXrIrBHtEYYQIdv0F705KrgyXgDS8meHVRJw="; subPackages = "."; diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index 3a1f30dfb909..ea90bf63a177 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Ddocs=true" + "-Dtests=${if finalAttrs.finalPackage.doCheck then "all" else "none"}" ]; preFixup = '' diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix index 01ba41a8c397..a293140681e7 100644 --- a/pkgs/by-name/no/notcurses/package.nix +++ b/pkgs/by-name/no/notcurses/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "notcurses"; - version = "3.0.12"; + version = "3.0.13"; src = fetchFromGitHub { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-x7utMjXel5ax3mN7/QmSwFXCUVrkAx4exRHDTNIEETM="; + sha256 = "sha256-i3UNd1y88aOGBp2r9itBFd9w+UJQhleJQHZOiK0d26w="; }; outputs = [ diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index a6dbec42c0ea..e33bbe94a8be 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "10.1.1"; + version = "10.1.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; tag = "v${version}"; - hash = "sha256-WqGeNT3OLs5oY/b81fJh3R9b84vXYzn2u5hY9yI2kGM="; + hash = "sha256-Avg7IKL85skqV2DHgyYa6lt0eE4gZBZkPcVOyoaAJhg="; }; installPhase = '' diff --git a/pkgs/by-name/nu/numcpp/package.nix b/pkgs/by-name/nu/numcpp/package.nix index e1f49e44dbd5..d0a495e4d6e3 100644 --- a/pkgs/by-name/nu/numcpp/package.nix +++ b/pkgs/by-name/nu/numcpp/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "numcpp"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "dpilger26"; repo = "NumCpp"; rev = "Version_${finalAttrs.version}"; - hash = "sha256-1LGyDvT+PiGRXn7NorcYUjSPzNuRv/YXhQWIaOa7xdo="; + hash = "sha256-+2xd8GNMSKPz801lfMAcHIkmidKd+xM8YblkdFj3HZk="; }; nativeCheckInputs = [ diff --git a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix index 7473acb9ac14..2cc7265359e6 100644 --- a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix +++ b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-dock-hyprland"; tag = "v${version}"; - hash = "sha256-MujQMrqyxKl32cIzy7JHDeUIDEqDzFp6mr7pM3y9xng="; + hash = "sha256-l2JB+CmdQg/bDXneJ+rjv4z6xjB+BERh0rLZFETCMtE="; }; - vendorHash = "sha256-cAfKmcBf2hu3eP6a4ELEeNyPOYXi3chLkbHKFks14I0="; + vendorHash = "sha256-3ubDvtl/FvVyoRMRNBhwCoIJkJNFvlrWue+cNNGe5eI="; ldflags = [ "-s" diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix index 4a67f2ae08d7..8ab72d8222a1 100644 --- a/pkgs/by-name/nz/nzbhydra2/package.nix +++ b/pkgs/by-name/nz/nzbhydra2/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "7.11.3"; + version = "7.12.1"; src = fetchzip { url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip"; - hash = "sha256-OR0Yk0tVajfMtMHisWqBbLeCScgenjyYTmNWTcMG/KE="; + hash = "sha256-QCMsAFRU6THmKiIFvnfUHzmv91gcC1pAztNYg9RymzU="; stripRoot = false; }; diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index aa52ab3ab177..e9f4c2c5d0ce 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "okteto"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-0CMCP2ib0MEYJlbDPrbyKYw0yEzxnSx3WlO0iL+D3M0="; + hash = "sha256-9EGtcSOCRtt1Jw/e6EyZ5i4vTpof2fjV+XhF87IrUPU="; }; vendorHash = "sha256-4fw3Qc1VPrPFVtQNtCRW6RqPqV7aF+t9GQDL/sCqNvw="; diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index 29f009ac5624..85d9952b8c52 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -112,15 +112,21 @@ let provider: if provider ? override then # use opentofu plugin registry over terraform's - provider.override (oldArgs: { - provider-source-address = - lib.replaceStrings - [ "https://registry.terraform.io/providers" ] - [ - "registry.opentofu.org" - ] - oldArgs.homepage; - }) + provider.override ( + oldArgs: + if (builtins.hasAttr "homepage" oldArgs) then + { + provider-source-address = + lib.replaceStrings + [ "https://registry.terraform.io/providers" ] + [ + "registry.opentofu.org" + ] + oldArgs.homepage; + } + else + { } + ) else provider ) (plugins package.plugins); diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 9769b3c7fa35..86e54ac70aaf 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.14.0"; + version = "23.15.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; tag = "v${version}"; - hash = "sha256-1IesoAK5Aq/JlM83WT0dodwmUvWv6RDqTyUg6LURle4="; + hash = "sha256-LjZZYIA0Qkuheb8ZAPBuiy5GgjOgCfJ0D/YM03zTcW0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 73ed55bb1a79..faa025a797f0 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -6,7 +6,7 @@ cmake, pkg-config, wrapGAppsHook3, - boost, + boost186, cereal, cgal, curl, @@ -56,13 +56,13 @@ let in stdenv.mkDerivation rec { pname = "orca-slicer"; - version = "v2.2.0-unstable-2025-01-06"; + version = "v2.2.0-unstable-2025-01-23"; src = fetchFromGitHub { owner = "SoftFever"; repo = "OrcaSlicer"; - rev = "99a0facfb3a5c9b4e661e536825c08393053cb53"; - hash = "sha256-XWM04Vx65q+Vc+s3YLucS63IhGVw8ODhL2m+47nZKs8="; + rev = "1b1288c4353afca44edee323061bdd5c87fcafb9"; + hash = "sha256-IPdKusP2cB5jgr6JjQVu8ZjJ2kiG6mfmfZtDVSlAFNg="; }; nativeBuildInputs = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { buildInputs = [ binutils - (boost.override { + (boost186.override { enableShared = true; enableStatic = false; extraFeatures = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { "filesystem" ]; }) - boost.dev + boost186.dev cereal cgal curl @@ -127,7 +127,6 @@ stdenv.mkDerivation rec { # Fix for webkitgtk linking ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch ./patches/dont-link-opencv-world-orca.patch - ./patches/fix-boost.patch ]; doCheck = true; @@ -163,7 +162,7 @@ stdenv.mkDerivation rec { (lib.optionalString withSystemd "-ludev") "-L${mesa.osmesa}/lib" "-L${mesa.drivers}/lib" - "-L${boost}/lib" + "-L${boost186}/lib" "-lboost_log" "-lboost_log_setup" ]; diff --git a/pkgs/by-name/or/orca-slicer/patches/fix-boost.patch b/pkgs/by-name/or/orca-slicer/patches/fix-boost.patch deleted file mode 100644 index aaced2fe79e5..000000000000 --- a/pkgs/by-name/or/orca-slicer/patches/fix-boost.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp -index 25b282c7b..81ee858c2 100644 ---- a/src/libslic3r/PrintBase.cpp -+++ b/src/libslic3r/PrintBase.cpp -@@ -79,7 +79,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str - cfg.opt_string("input_filename_base") + default_ext : - this->placeholder_parser().process(format, 0, &cfg); - if (filename.extension().empty()) -- filename = boost::filesystem::change_extension(filename, default_ext); -+ filename.replace_extension(default_ext); - return filename.string(); - } catch (std::runtime_error &err) { - throw Slic3r::PlaceholderParserError(L("Failed processing of the filename_format template.") + "\n" + err.what()); -diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp -index 50368b854..cad5cf545 100644 ---- a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp -+++ b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp -@@ -337,7 +337,7 @@ wxDataViewItemArray AuxiliaryModel::ImportFile(AuxiliaryModelNode* sel, wxArrayS - dir_path += "\\" + src_bfs_path.filename().generic_wstring(); - - boost::system::error_code ec; -- if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_option::overwrite_if_exists, ec)) -+ if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_options::overwrite_existing, ec)) - continue; - - // Update model data -diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp -index f3782be14..e12f0c321 100644 ---- a/src/slic3r/GUI/Plater.cpp -+++ b/src/slic3r/GUI/Plater.cpp -@@ -10265,7 +10265,7 @@ bool Plater::preview_zip_archive(const boost::filesystem::path& archive_path) - std::replace(name.begin(), name.end(), '\\', '/'); - // rename if file exists - std::string filename = path.filename().string(); -- std::string extension = boost::filesystem::extension(path); -+ std::string extension = path.extension().string(); - std::string just_filename = filename.substr(0, filename.size() - extension.size()); - std::string final_filename = just_filename; - -diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp -index a26e13448..83ec4695c 100644 ---- a/src/slic3r/GUI/RemovableDriveManager.cpp -+++ b/src/slic3r/GUI/RemovableDriveManager.cpp -@@ -22,7 +22,6 @@ - #include - #include - #include --#include - #include - #endif - -@@ -202,7 +201,7 @@ namespace search_for_drives_internal - stat(path.c_str(), &buf); - uid_t uid = buf.st_uid; - if (getuid() == uid) -- out.emplace_back(DriveData{ boost::filesystem::basename(boost::filesystem::path(path)), path }); -+ out.emplace_back(DriveData{ boost::filesystem::path(path).stem().string(), path }); - } - } - } diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index 8408f9301b3c..4cfe1abf7965 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "ovn"; - version = "24.09.1"; + version = "24.09.2"; src = fetchFromGitHub { owner = "ovn-org"; repo = "ovn"; tag = "v${version}"; - hash = "sha256-Fz/YNEbMZ2mB4Fv1nKE3H3XrihehYP7j0N3clnTJ5x8="; + hash = "sha256-MKwta7XRIFpcNWu6duuNaLarlWm0B8+gph1R0qS29wI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pa/packcc/package.nix b/pkgs/by-name/pa/packcc/package.nix index 682bc519238e..182413401fb3 100644 --- a/pkgs/by-name/pa/packcc/package.nix +++ b/pkgs/by-name/pa/packcc/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "packcc"; - version = "2.0.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "arithy"; repo = "packcc"; rev = "v${finalAttrs.version}"; - hash = "sha256-k1C/thvr/5fYrgu/j8YN3kwXp4k26sC9AhYhYAKQuX0="; + hash = "sha256-fmZL34UL7epFFGo0gCsj8TcyhBt5uCfnLCLCQugXF6U="; }; postPatch = '' diff --git a/pkgs/by-name/pa/pandoc/package.nix b/pkgs/by-name/pa/pandoc/package.nix index 341edadd2617..50fb8bb20c5d 100644 --- a/pkgs/by-name/pa/pandoc/package.nix +++ b/pkgs/by-name/pa/pandoc/package.nix @@ -39,6 +39,12 @@ in remove-references-to \ -t ${pandoc-cli.scope.pandoc} \ $out/bin/pandoc + '' + # https://github.com/jgm/typst-hs/commit/9707b74ce60d71c2ba0f35249ffbd01dea197a6e + + lib.optionalString (lib.versionAtLeast pandoc-cli.scope.typst.version "0.6.1") '' + remove-references-to \ + -t ${pandoc-cli.scope.typst} \ + $out/bin/pandoc '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' mkdir -p $out/share/bash-completion/completions $out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc diff --git a/pkgs/by-name/pg/pgrok/package.nix b/pkgs/by-name/pg/pgrok/package.nix index 675d7a0bb50a..dd3c674b7416 100644 --- a/pkgs/by-name/pg/pgrok/package.nix +++ b/pkgs/by-name/pg/pgrok/package.nix @@ -9,12 +9,12 @@ let pname = "pgrok"; - version = "1.4.1"; + version = "1.4.4"; src = fetchFromGitHub { owner = "pgrok"; repo = "pgrok"; - rev = "v${version}"; - hash = "sha256-P36rpFi5J+dF6FrVaPhqupG00h4kwr0qumt4ehL/7vU="; + tag = "v${version}"; + hash = "sha256-1T3PUMgtEfjbCFmUKwKVofHPCCE0Hw1F18iC0mfh4KQ="; }; in @@ -31,12 +31,12 @@ buildGoModule { pnpm_9.configHook ]; - pnpmDeps = pnpm_9.fetchDeps { + env.pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-xObDEkNGMXcUqX9thAJoE45yzd7f15k2odDWv9X3RRE="; }; - vendorHash = "sha256-X5FjzliIJdfJnNaUXBjv1uq5tyjMVjBbnLCBH/P0LFM="; + vendorHash = "sha256-1s8PPP/Q5bSJleCPZ6P4BwLEan/lelohRKX/0RStdvY="; ldflags = [ "-s" diff --git a/pkgs/by-name/pl/planner/package.nix b/pkgs/by-name/pl/planner/package.nix index 24b026d257d1..4539fa878bda 100644 --- a/pkgs/by-name/pl/planner/package.nix +++ b/pkgs/by-name/pl/planner/package.nix @@ -6,7 +6,7 @@ gsettings-desktop-schemas, glib, gtk3, - libgda, + libgda5, libxml2, libxslt, makeWrapper, @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libgda + libgda5 libxml2 libxslt glib diff --git a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix index 57c6d2dc4f6d..c3be82584f18 100644 --- a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix +++ b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-spacer-extended"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-spacer-extended"; tag = "v${finalAttrs.version}"; - hash = "sha256-3ediynClboG6/dBQTih6jJPGjsTBZhZKOPQAjGLRNmk="; + hash = "sha256-Rr80bI+9xnrlj8JNTL+vGqOw9/98R0ub0pQfHQmEWNM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/polarity/Cargo.lock b/pkgs/by-name/po/polarity/Cargo.lock index bdcd45c62e87..faf3a2bc6f93 100644 --- a/pkgs/by-name/po/polarity/Cargo.lock +++ b/pkgs/by-name/po/polarity/Cargo.lock @@ -133,7 +133,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -171,7 +171,6 @@ dependencies = [ name = "ast" version = "0.1.0" dependencies = [ - "codespan", "derivative", "fxhash", "miette", @@ -329,7 +328,7 @@ checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -346,7 +345,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -556,7 +555,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -565,14 +564,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" -[[package]] -name = "codespan" -version = "0.11.1" -source = "git+https://github.com/polarity-lang/codespan.git?rev=91e4f64801cee923661097eb35e05a782996d8ea#91e4f64801cee923661097eb35e05a782996d8ea" -dependencies = [ - "url", -] - [[package]] name = "colorchoice" version = "1.0.3" @@ -748,7 +739,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -782,11 +773,12 @@ dependencies = [ "ast", "async-trait", "backend", - "codespan", "elaborator", "log", "lowering", + "lsp-types", "miette", + "miette_util", "parser", "printer", "ropey", @@ -807,7 +799,6 @@ name = "elaborator" version = "0.1.0" dependencies = [ "ast", - "codespan", "derivative", "log", "miette", @@ -1059,7 +1050,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -1436,7 +1427,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -1702,7 +1693,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax 0.8.5", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -1719,12 +1710,12 @@ name = "lowering" version = "0.1.0" dependencies = [ "ast", - "codespan", "log", "miette", "miette_util", "num-bigint", "parser", + "printer", "thiserror", "url", ] @@ -1762,7 +1753,6 @@ version = "0.1.0" dependencies = [ "ast", "async-lock 2.8.0", - "codespan", "driver", "miette", "miette_util", @@ -1843,14 +1833,13 @@ checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] name = "miette_util" version = "0.1.0" dependencies = [ - "codespan", "miette", ] @@ -2036,7 +2025,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -2105,13 +2094,13 @@ dependencies = [ name = "parser" version = "0.1.0" dependencies = [ - "codespan", "derivative", "lalrpop 0.19.12", "lalrpop 0.20.2", "lalrpop-util 0.20.2", "logos", "miette", + "miette_util", "num-bigint", "thiserror", "url", @@ -2646,7 +2635,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -2669,7 +2658,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -2798,9 +2787,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.94" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", @@ -2824,7 +2813,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -3047,7 +3036,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -3206,7 +3195,7 @@ source = "git+https://github.com/tower-lsp/tower-lsp?rev=19f5a87810ff4b643d2bc39 dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -3234,7 +3223,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -3251,9 +3240,9 @@ name = "transformations" version = "0.1.0" dependencies = [ "ast", - "codespan", "derivative", "miette", + "miette_util", "thiserror", "url", ] @@ -3430,7 +3419,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", "wasm-bindgen-shared", ] @@ -3466,7 +3455,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3681,7 +3670,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", "synstructure", ] @@ -3703,7 +3692,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -3723,7 +3712,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", "synstructure", ] @@ -3752,5 +3741,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index 412616857f4b..c62af332e068 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -7,19 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "polarity"; - version = "latest-unstable-2025-01-08"; + version = "latest-unstable-2025-01-23"; src = fetchFromGitHub { owner = "polarity-lang"; repo = "polarity"; - rev = "bbc91efbc25f77f505d244e96cc566f63f6dc858"; - hash = "sha256-3wKMFX4ubp8bLNhdLoMkZlsP2vfu0wcNpEZrs95xwAY="; + rev = "b5449d485a86fec9d88621cc38fcdfd9b4c3c2d1"; + hash = "sha256-MFem+/7LegSXJXlIQkaVLbTfxvuG46V10TI06NohQ9A="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "codespan-0.11.1" = "sha256-0cUndjWQ44X5zXVfg7YX/asBByWq/hFV1n9tHPBTcfY="; "tower-lsp-0.20.0" = "sha256-f3S2CyFFX6yylaxMoXhB1/bfizVsLfNldLM+dXl5Y8k="; }; }; diff --git a/pkgs/by-name/po/postprocessd/package.nix b/pkgs/by-name/po/postprocessd/package.nix index ef74fd7ad53b..5545534a02cc 100644 --- a/pkgs/by-name/po/postprocessd/package.nix +++ b/pkgs/by-name/po/postprocessd/package.nix @@ -3,6 +3,7 @@ fetchFromSourcehut, libexif, libraw, + libtiff, meson, ninja, opencv4, @@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libexif libraw + libtiff opencv4 ]; diff --git a/pkgs/by-name/pq/pq-cli/package.nix b/pkgs/by-name/pq/pq-cli/package.nix new file mode 100644 index 000000000000..d9e3ee1bc276 --- /dev/null +++ b/pkgs/by-name/pq/pq-cli/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + unstableGitUpdater, +}: + +python3Packages.buildPythonApplication rec { + pname = "pq-cli"; + version = "1.0.2-unstable-2024-07-15"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rr-"; + repo = "pq-cli"; + rev = "4122e936c87436552f35ff7972d6e543ba6c837b"; + hash = "sha256-PvHkTjPjOubhl9gfPTF7yNaFgg2GLk8y+PtF09fpaII="; + }; + + build-system = with python3Packages; [ + setuptools + poetry-core + ]; + + dependencies = with python3Packages; [ + xdg + xdg-base-dirs + urwid + urwid-readline + ]; + + pythonRelaxDeps = [ + "urwid-readline" + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Progress Quest: the CLI edition"; + homepage = "https://github.com/rr-/pq-cli"; + changelog = "https://github.com/rr-/pq-cli/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "pqcli"; + }; +} diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index b44d0f08e49f..3dec004d870d 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "5.1.0"; + version = "5.1.5"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; tag = version; - hash = "sha256-+wMoHzys4iceiQvRvwsl2aSvTYZxeZlKHy7D4xx33aU="; + hash = "sha256-yVoVfJGO+96ck8T63O0ubeTtdhpfziZFHYVXGFNENds="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/pr/proxychains-ng/package.nix b/pkgs/by-name/pr/proxychains-ng/package.nix index 96d5269f07f6..f6e666058e96 100644 --- a/pkgs/by-name/pr/proxychains-ng/package.nix +++ b/pkgs/by-name/pr/proxychains-ng/package.nix @@ -2,6 +2,9 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, + # "dlsym" for OSX version < 12 + darwinHookMethod ? "dyld", }: stdenv.mkDerivation rec { @@ -18,6 +21,16 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/NixOS/nixpkgs/issues/136093 ./swap-priority-4-and-5-in-get_config_path.patch + # The fix is not present in v4.17; remove the patch next version update. + # https://github.com/rofl0r/proxychains-ng/issues/557 + (fetchpatch { + url = "https://github.com/rofl0r/proxychains-ng/commit/fffd2532ad34bdf7bf430b128e4c68d1164833c6.patch"; + hash = "sha256-l3qSFUDMUfVDW1Iw+R2aW/wRz4CxvpR4eOwx9KzuAAo="; + }) + ]; + + configureFlags = lib.optionals stdenv.isDarwin [ + "--hookmethod=${darwinHookMethod}" ]; installFlags = [ @@ -29,7 +42,11 @@ stdenv.mkDerivation rec { description = "Preloader which hooks calls to sockets in dynamically linked programs and redirects it through one or more socks/http proxies"; homepage = "https://github.com/rofl0r/proxychains-ng"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ zenithal ]; - platforms = platforms.linux ++ [ "aarch64-darwin" ]; + maintainers = with maintainers; [ + zenithal + usertam + ]; + platforms = platforms.unix; + mainProgram = "proxychains4"; }; } diff --git a/pkgs/by-name/pu/puncia/package.nix b/pkgs/by-name/pu/puncia/package.nix index 4cfebc59bc5a..4be48fa50448 100644 --- a/pkgs/by-name/pu/puncia/package.nix +++ b/pkgs/by-name/pu/puncia/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "puncia"; - version = "0.26"; + version = "0.27"; pyproject = true; src = fetchFromGitHub { owner = "ARPSyndicate"; repo = "puncia"; tag = "v${version}"; - hash = "sha256-ZvB3X94gjIunerLhtd6a2Eou6AxHxONRJGS2jCiMjbk="; + hash = "sha256-P3F3e53H37Wr2qCRiEaQQ6SQBrSNILk+wT3Q9DIh0FU="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/py/pyrosimple/package.nix b/pkgs/by-name/py/pyrosimple/package.nix index eb58e774dc9c..488419993e11 100644 --- a/pkgs/by-name/py/pyrosimple/package.nix +++ b/pkgs/by-name/py/pyrosimple/package.nix @@ -11,14 +11,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.14.1"; + version = "2.14.2"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; tag = "v${version}"; - hash = "sha256-vYwdlFHfh59P62aYbaQSJJfkFC0WtX2UYmww3k30j08="; + hash = "sha256-qER73B6wuRczwV23A+NwfDL4oymvSwmauA0uf2AE+kY="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index e7af30a64cba..08e95d1f341f 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -15,14 +15,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.1.3"; + version = "25.1.5"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-A/cjkjwHP0bCWZOjzZdIVUzb1Gh8B0rJHsntVdj4hF4="; + hash = "sha256-Qr5pkKznosUGO7HvUkZhemWwtKpyYA79Vz1jU6YhODE="; }; nativeBuildInputs = diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index fff7e8a56536..52e24cd54b03 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.17.5"; + version = "3.17.7"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-EFSL1FDbpZ7uue+MHeeKp+2+Hp4Hi7lCOIBww4/k9yE="; + hash = "sha256-9crGXv5q7VKnOAgH3UPo5EayaZDDwRKpw275JaKnWoE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ro/rocksndiamonds/package.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix index e820bcdfbfa9..ac232630776c 100644 --- a/pkgs/by-name/ro/rocksndiamonds/package.nix +++ b/pkgs/by-name/ro/rocksndiamonds/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "rocksndiamonds"; - version = "4.4.0.0"; + version = "4.4.0.2"; src = fetchurl { url = "https://www.artsoft.org/RELEASES/linux/${pname}/${pname}-${version}-linux.tar.gz"; - hash = "sha256-aKHHD/v+zqxCsOYp06nqB2TShlwCwE1JaU0adO4T4Cw="; + hash = "sha256-qE78cJIEwWN6b54VhJwqFKLXvTgHdL1+Upy1DJnfWD8="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 1873cc36cf02..f87928256351 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = version; - hash = "sha256-DKDSjiN7Ve/1mHWXoYOIdJ67MRoJYDR59VuVmfwYJHs="; + hash = "sha256-V05GUo5nA6RhVWD7mn94GF3/93In3cnljd2G3hPeBZ0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-eIiR7pvSOZdB1lTPLtdriO9lkufFY/gX5d2ku53g2vE="; + cargoHash = "sha256-FpybUZZ5qjo87fYbUAnK+w4cUPx4UWGzexL92cEnIFU="; nativeBuildInputs = [ installShellFiles ]; @@ -80,7 +80,7 @@ rustPlatform.buildRustPackage rec { }; meta = { - description = "Extremely fast Python linter"; + description = "Extremely fast Python linter and code formatter"; homepage = "https://github.com/astral-sh/ruff"; changelog = "https://github.com/astral-sh/ruff/releases/tag/${version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index e6b0f063fc6e..5a6c0948c11e 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2025-01-08"; + version = "2025-01-20"; useFetchCargoVendor = true; - cargoHash = "sha256-7sLTQ+fwez8EmYgjXxDYDgslynHTQ65DdfMVdIVLhTU="; + cargoHash = "sha256-k1sjt/v1FYtAeAnTMcGxL32vA3xyQ7zfZBJ4KjQbfX8="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-dzslslI/5YEppCztz4FZ1VwXnb4SbuXWbSvDuWs0KKI="; + hash = "sha256-W8xioeq+h9dzGvtXPlQAn2nXtgNDN6C8uA1/9F2JP5I="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/sa/satysfi/package.nix b/pkgs/by-name/sa/satysfi/package.nix index 4b0c4ddab839..b2a393939a60 100644 --- a/pkgs/by-name/sa/satysfi/package.nix +++ b/pkgs/by-name/sa/satysfi/package.nix @@ -6,16 +6,18 @@ junicode, lmodern, lmmath, + which, }: let - camlpdf = ocamlPackages.camlpdf.overrideAttrs { + camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: { src = fetchFromGitHub { owner = "gfngfn"; repo = "camlpdf"; rev = "v2.3.1+satysfi"; sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k"; }; - }; + nativeBuildInputs = [ which ] ++ o.nativeBuildInputs; + }); yojson-with-position = ocamlPackages.buildDunePackage { pname = "yojson-with-position"; version = "1.4.2"; diff --git a/pkgs/by-name/sc/scap-security-guide/package.nix b/pkgs/by-name/sc/scap-security-guide/package.nix new file mode 100755 index 000000000000..8636e9edba3c --- /dev/null +++ b/pkgs/by-name/sc/scap-security-guide/package.nix @@ -0,0 +1,84 @@ +{ + ansible-lint, + bats, + cmake-lint, + cmake, + fetchFromGitHub, + lib, + libxml2, + libxslt, + linkchecker, + openscap, + python3Packages, + stdenv, + shellcheck, + yamllint, +}: + +stdenv.mkDerivation rec { + pname = "scap-security-guide"; + version = "0.1.75"; + + src = fetchFromGitHub { + owner = "ComplianceAsCode"; + repo = "content"; + tag = "v${version}"; + hash = "sha256-fS0zvWIKyGAhqgBzFuELA/1iJa4N0whsnc9h/uwA3Ao="; + }; + + postPatch = '' + substituteInPlace build-scripts/generate_guides.py \ + --replace-fail "XCCDF_GUIDE_XSL = None" "XCCDF_GUIDE_XSL = \"${openscap}/share/openscap/xsl/xccdf-guide.xsl\"" + ''; + + nativeBuildInputs = + with python3Packages; + [ + sphinx + sphinxcontrib-jinjadomain + sphinx-rtd-theme + sphinx-jinja + ] + ++ [ + cmake-lint + cmake + ]; + + buildInputs = + with python3Packages; + [ + ansible + jinja2 + json2html + myst-parser + mypy + openpyxl + pcre2-py + pygithub + pyyaml + pandas + pycompliance + prometheus-async + ruamel-yaml + voluptuous-stubs + yamllint + ] + ++ [ + ansible-lint + bats + libxslt + libxml2 + linkchecker + openscap + shellcheck + yamllint + ]; + + meta = { + description = "Security automation content in SCAP, Bash, Ansible, and other formats"; + homepage = "https://github.com/ComplianceAsCode/content"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ tochiaha ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/se/sequeler/package.nix b/pkgs/by-name/se/sequeler/package.nix index 798b8503ad6a..bff7c1c6bab3 100644 --- a/pkgs/by-name/se/sequeler/package.nix +++ b/pkgs/by-name/se/sequeler/package.nix @@ -15,7 +15,7 @@ gtk3, glib, libgee, - libgda, + libgda5, gtksourceview, libxml2, libsecret, @@ -23,7 +23,7 @@ }: let - sqlGda = libgda.override { + sqlGda = libgda5.override { mysqlSupport = true; postgresSupport = true; }; diff --git a/pkgs/by-name/se/serfdom/package.nix b/pkgs/by-name/se/serfdom/package.nix index 1abb60f71748..274e79664648 100644 --- a/pkgs/by-name/se/serfdom/package.nix +++ b/pkgs/by-name/se/serfdom/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "serf"; - version = "0.10.1"; + version = "0.10.2"; rev = "a2bba5676d6e37953715ea10e583843793a0c507"; src = fetchFromGitHub { owner = "hashicorp"; repo = "serf"; rev = "v${version}"; - sha256 = "sha256-8cWSWRfge5UjNzgA1Qp4AzbgIfGBum/ghHcB8H8MyCE="; + sha256 = "sha256-8kMQu3UYGihlYW7rdh1IkvRR/FgFK/N+iay0y6qOOWE="; }; - vendorHash = "sha256-6Kw0Co6vaBNkvVyK64wo9/39YF5UwuJg04EPoYwCP1c="; + vendorHash = "sha256-aNAbE8yFp8HUgdRtt/3eVz4VAaqSTPB4XKKLl1o7YRc="; subPackages = [ "cmd/serf" ]; diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix index 047da809c7af..d62c1a9b8270 100644 --- a/pkgs/by-name/se/sesh/package.nix +++ b/pkgs/by-name/se/sesh/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "sesh"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "joshmedeski"; repo = "sesh"; rev = "v${version}"; - hash = "sha256-wMYur/IRlJRIkCFAhjWcWMu4ApQD81SCRCsS/1GvxLQ="; + hash = "sha256-ndHi7GSdc+BJ7eYRt9ZE+eabZbFlYKJ9AqTY6Xs53QI="; }; - vendorHash = "sha256-a45P6yt93l0CnL5mrOotQmE/1r0unjoToXqSJ+spimg="; + vendorHash = "sha256-3wNp1meUoUFPa2CEgKjuWcu4I6sxta3FPFvCb9QMQhQ="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index 9c7502311777..a37c211cb91e 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shader-slang"; - version = "2025.2"; + version = "2025.3"; src = fetchFromGitHub { owner = "shader-slang"; repo = "slang"; tag = "v${finalAttrs.version}"; - hash = "sha256-H/ePYu6o926M22zussW1f15iYRJCq29TeNJzBD0eAao="; + hash = "sha256-kEW36pAo10xm3qY47hXTAjiXF74qa5rfDlQ6/gcGHqs="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix index 692a27cdb4d8..76ebeae80949 100644 --- a/pkgs/by-name/si/sirikali/package.nix +++ b/pkgs/by-name/si/sirikali/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "sirikali"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "sirikali"; rev = version; - hash = "sha256-zEiX0eAsmfWDXehxetkqXbdXhB53DE5LDyglMBijckI="; + hash = "sha256-YGMmDatTKjhORTisX9kTVrpIWo6j0YkxZsDLJXga6ho="; }; buildInputs = diff --git a/pkgs/by-name/sp/spirit/package.nix b/pkgs/by-name/sp/spirit/package.nix index cbdeae8968d2..e4e0334c0a53 100644 --- a/pkgs/by-name/sp/spirit/package.nix +++ b/pkgs/by-name/sp/spirit/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spirit"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "cashapp"; repo = "spirit"; rev = "v${version}-prerelease"; - hash = "sha256-mI4nO/yQdCrqxCDyOYQPQ905EVreYPEiupe+F4RjIqw="; + hash = "sha256-qC27kkUWELRFEVhZT7R6ickpAfDbL/AtYx2gRkDTvrI="; }; - vendorHash = "sha256-es1PGgLoE3DklnQziRjWmY7f6NNVd24L2JiuLkol6HI="; + vendorHash = "sha256-Dq7UeAH7FvY12rEYkpcKpEUzMMrGfubt0WadnZYt8dk="; subPackages = [ "cmd/spirit" ]; diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix index c03043400d75..d38921626061 100644 --- a/pkgs/by-name/sq/squid/package.nix +++ b/pkgs/by-name/sq/squid/package.nix @@ -14,6 +14,7 @@ pkg-config, systemd, cppunit, + esi ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -57,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-x-accelerator-vary" "--enable-htcp" ] + ++ lib.optional (!esi) "--disable-esi" ++ lib.optional ( stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl ) "--enable-linux-netfilter"; diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix index 75b4238c6333..6a014327943f 100644 --- a/pkgs/by-name/st/storj-uplink/package.nix +++ b/pkgs/by-name/st/storj-uplink/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.119.15"; + version = "1.120.4"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-XKTsgSkcVZ/2iYnEP0eeLjLEM4c2w9+XhvBqRFQAW+U="; + hash = "sha256-Ze3eQCySw3S6sKXwJCW6M+UV1FWp47syCWxIQdKttOs="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-eYFdoc5gtY7u9LFT7EAnooxrOC1y9fIA0ESTP+rPpCc="; + vendorHash = "sha256-kLXrKFJ/g2xenYTZ13loaZ7XAgRhmo2Iwen7P4esBIs="; ldflags = [ "-s" diff --git a/pkgs/by-name/st/stract/package.nix b/pkgs/by-name/st/stract/package.nix index ac809562dd9f..bcd2b0fedfe7 100644 --- a/pkgs/by-name/st/stract/package.nix +++ b/pkgs/by-name/st/stract/package.nix @@ -1,36 +1,79 @@ { lib, + stdenv, fetchFromGitHub, + unstableGitUpdater, + fetchurl, rustPlatform, pkg-config, + oniguruma, openssl, - curl, + zstd, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "stract"; - version = "0-unstable-2024-09-14"; + version = "0-unstable-2024-12-11"; src = fetchFromGitHub { owner = "StractOrg"; repo = "stract"; - rev = "21d28ea86d9ff19ccb4c25b1bdde67e5ec302d79"; - hash = "sha256-7Uvo5+saxwTMQjfDliyOYC6j6LbpMf/FiONfX38xepI="; + rev = "ecb495a66cf6c2f66d817803df38385a3001a38d"; + hash = "sha256-UeIziIihDCjGoz2IdfROnO9/N82S4yextnF4Sbtrn24="; + fetchSubmodules = true; }; - cargoHash = "sha256-7Skbeeev/xBAhlcyOsYpDJB9LnZpT66D0Fu1I/jIBso="; + cargoHash = "sha256-UArPGrcEfFZBOZ4Tv7NraqPzdMtyJXVFsfUM32eSGic="; + useFetchCargoVendor = true; - cargoDepsName = "stract"; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + oniguruma openssl - curl + zstd ]; + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + SWAGGER_UI_DOWNLOAD_URL = + let + # When updating: + # - Look for the version of `utoipa-swagger-ui` at: + # https://github.com/StractOrg/stract/blob//Cargo.toml#L183 + # - Look at the corresponding version of `swagger-ui` at: + # https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-/utoipa-swagger-ui/build.rs#L21-L22 + swaggerUiVersion = "5.17.12"; + swaggerUi = fetchurl { + url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v${swaggerUiVersion}.zip"; + hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I="; + }; + in + "file://${swaggerUi}"; + }; + + # swagger-ui will once more be copied in the target directory during the check phase + # Not deleting the existing unpacked archive leads to a `PermissionDenied` error + preCheck = '' + rm -rf target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/build/ + ''; + + passthru.updateScript = unstableGitUpdater { }; + meta = { - description = "Open source web search engine hosted at stract.com targeted towards tinkerers and developers."; + description = "Open source web search engine"; + longDescription = '' + Stract is an open source web search engine targeted towards tinkerers and + developers, with an official instance hosted at stract.com + ''; homepage = "https://github.com/StractOrg/stract"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ ailsa-sun ]; + maintainers = + with lib.maintainers; + [ + ailsa-sun + ] + ++ lib.teams.ngi.members; }; } diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix index bf28b02a515a..d1cfd6bbd85e 100644 --- a/pkgs/by-name/su/sunshine/package.nix +++ b/pkgs/by-name/su/sunshine/package.nix @@ -55,13 +55,13 @@ let in stdenv'.mkDerivation rec { pname = "sunshine"; - version = "2025.118.151840"; + version = "2025.122.141614"; src = fetchFromGitHub { owner = "LizardByte"; repo = "Sunshine"; tag = "v${version}"; - hash = "sha256-sTZUHc1385qOmy2w3fjItIidCxnWeEjAaOFxfLBB65c="; + hash = "sha256-rHf+lj5dycXA//fu3RPuimYz2hrJnoVt7GA2xuHGXJk="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sv/svelte-language-server/package-lock.json b/pkgs/by-name/sv/svelte-language-server/package-lock.json index 06f343ba006d..6ec0da8207b4 100644 --- a/pkgs/by-name/sv/svelte-language-server/package-lock.json +++ b/pkgs/by-name/sv/svelte-language-server/package-lock.json @@ -1,12 +1,12 @@ { "name": "svelte-language-server", - "version": "0.17.8", + "version": "0.17.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "svelte-language-server", - "version": "0.17.8", + "version": "0.17.10", "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.25", @@ -20,7 +20,7 @@ "prettier-plugin-svelte": "^3.3.0", "svelte": "^4.2.19", "svelte2tsx": "~0.7.25", - "typescript": "~5.6.3", + "typescript": "^5.7.2", "typescript-auto-import-cache": "^0.3.5", "vscode-css-languageservice": "~6.3.0", "vscode-html-languageservice": "~5.3.0", @@ -239,9 +239,9 @@ "license": "MIT" }, "node_modules/@types/lodash": { - "version": "4.17.13", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz", - "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==", + "version": "4.17.14", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.14.tgz", + "integrity": "sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==", "dev": true, "license": "MIT" }, @@ -253,9 +253,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "18.19.68", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.68.tgz", - "integrity": "sha512-QGtpFH1vB99ZmTa63K4/FU8twThj4fuVSBkGddTp7uIL/cuoLWIUSL2RcOaigBhfR+hg5pgGkBnkoOxrTVBMKw==", + "version": "18.19.70", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.70.tgz", + "integrity": "sha512-RE+K0+KZoEpDUbGGctnGdkrLFwi1eYKTlIHNl2Um98mUkGsm1u2Ff6Ltd0e8DktTtC98uy7rSj+hO8t/QuLoVQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1480,12 +1480,12 @@ } }, "node_modules/readdirp": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", - "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.1.tgz", + "integrity": "sha512-h80JrZu/MHUZCyHu5ciuoI0+WxsCxzxJTILn6Fs8rxSnFPh+UVHYfeIxK1nVGugMqkfC4vJcBOYbkfkwYK0+gw==", "license": "MIT", "engines": { - "node": ">= 14.16.0" + "node": ">= 14.18.0" }, "funding": { "type": "individual", @@ -1708,9 +1708,9 @@ } }, "node_modules/svelte2tsx": { - "version": "0.7.31", - "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.31.tgz", - "integrity": "sha512-exrN1o9mdCLAA7hTCudz731FIxomH/0SN9ZIX+WrY/XnlLuno/NNC1PF6JXPZVqp/4sMMDKteqyKoG44hliljQ==", + "version": "0.7.34", + "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.34.tgz", + "integrity": "sha512-WTMhpNhFf8/h3SMtR5dkdSy2qfveomkhYei/QW9gSPccb0/b82tjHvLop6vT303ZkGswU/da1s6XvrLgthQPCw==", "license": "MIT", "dependencies": { "dedent-js": "^1.0.1", @@ -1805,9 +1805,9 @@ } }, "node_modules/typescript": { - "version": "5.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", - "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", + "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index f7b00f53460e..187313f39462 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -4,7 +4,7 @@ fetchurl, }: let - version = "0.17.8"; + version = "0.17.10"; in buildNpmPackage { pname = "svelte-language-server"; @@ -12,10 +12,10 @@ buildNpmPackage { src = fetchurl { url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz"; - hash = "sha256-IbLjoXLN8sdnGy5SmoEeJUl1BzCulptMFtbJc+IRH70="; + hash = "sha256-KGsiYv57EnY5Atynuv1Qk0i/vq07FCbHuI9OOkyxOvE="; }; - npmDepsHash = "sha256-2rCgzEkwht03jxusPCdemA8EOabwRsHeDxiV4Uf4K8g="; + npmDepsHash = "sha256-Gph0papxZnN0BKbzhwyOeNQwtYI1QkWupG6RRaUiv8U="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix index e25f5de0714c..74193b6a7eaa 100644 --- a/pkgs/by-name/sw/swiftlint/package.nix +++ b/pkgs/by-name/sw/swiftlint/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "swiftlint"; - version = "0.58.0"; + version = "0.58.2"; src = fetchurl { url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip"; - hash = "sha256-Mp8S0f/xn3XHF4/doLF5s/kvhE+X6KiswY+3lZ/J4wc="; + hash = "sha256-rQcdWjbX9Ddt/pLX7Z9LrvizvedbdRMdwofPNPEDU6U="; }; dontPatch = true; diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index 18bc905d6f74..b67304a80724 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${version}"; - hash = "sha256-ot4qdCxF9Kg657IFzUIxGsmRCDag1a4Ipq1qj2RPW0E="; + hash = "sha256-mO4mRMLoYA5WjDsA4FbMd/RLbQOekXKikl1zlZNKYtk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-3GvOWu+h1d5qUxUd7yxE/YReeuXteVV/4ZrnMgGRZi0="; + vendorHash = "sha256-KmMES19mGgtSeGw31DqZQm9wp0y+nu3P2LTZh9ofCPM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index 470ebe3deb15..67bd9d6395d5 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "systemctl-tui"; - version = "0.3.10"; + version = "0.4.0"; src = fetchFromGitHub { owner = "rgwood"; repo = "systemctl-tui"; tag = "v${version}"; - hash = "sha256-7I4PM4ZQVtDESfchX0/HGu0Y94BxMCLNIrPw8bSokCQ="; + hash = "sha256-1KYaw4q1+dPHImjjCnUPXNu7ihdEfNuzQfHfPi1uDOw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bnnqGWX7xA4+55qDY7hzimVDPKaVD4sX//tk8Tgkqkc="; + cargoHash = "sha256-rOmoV8sHeoM2ypDlBbiLDIYHhFQZJ6T2D5VkSNW+uuc="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index c247db00ecb5..ee0744f777c9 100644 --- a/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -7,7 +7,7 @@ fetchgit, srcOnly, removeReferencesTo, - nodejs, + nodejs_20, pnpm_9, python3, gitMinimal, @@ -15,7 +15,7 @@ zip, }: let - nodeSources = srcOnly nodejs; + nodeSources = srcOnly nodejs_20; esbuild' = esbuild.override { buildGoModule = args: @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ customPython - nodejs + nodejs_20 pnpm_9.configHook gitMinimal jq @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-BVVmv0VVvQ2YhL0zOKiM1oVKJKvqwMGNR47DkcCj874="; }; - buildInputs = [ nodejs ]; + buildInputs = [ nodejs_20 ]; # Make a fake git repo with a commit. # Without this, the package does not build. diff --git a/pkgs/by-name/te/template-glib/package.nix b/pkgs/by-name/te/template-glib/package.nix index cef7a7a34305..08de4d6aceeb 100644 --- a/pkgs/by-name/te/template-glib/package.nix +++ b/pkgs/by-name/te/template-glib/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "template-glib"; - version = "3.36.2"; + version = "3.36.3"; outputs = [ "out" @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-ACDzpAGIjOdjs6F1CML1jpGXKkg6DFR6/bfMviVhmUg="; + url = "mirror://gnome/sources/template-glib/${lib.versions.majorMinor version}/template-glib-${version}.tar.xz"; + hash = "sha256-1SizWyz5Dgfa5Q4l4S+62w6wSPV/1RUc+fbpjM4d8g4="; }; nativeBuildInputs = [ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "template-glib"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/by-name/ti/tidb/package.nix b/pkgs/by-name/ti/tidb/package.nix index 6a1bf3cde948..caa55285b65a 100644 --- a/pkgs/by-name/ti/tidb/package.nix +++ b/pkgs/by-name/ti/tidb/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tidb"; - version = "8.5.0"; + version = "8.5.1"; src = fetchFromGitHub { owner = "pingcap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mrR4Rk+p1JaimvBVyEHc+syQwkvRDjQfGCuL5H0GqG8="; + sha256 = "sha256-lJrW61FARZO1ll7Ln9mgCTZxGhcMlBaL6AeAVGgExIA="; }; - vendorHash = "sha256-yV97PyVkHWQSj+nFuxCvKkAbdwfszM1gslOvi8iihaE="; + vendorHash = "sha256-N8wTUPUPOR2Bc5CcPgNktcZpaxGL2WncJc4w0RwqVDk="; ldflags = [ "-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${version}" diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix index 6c0c16dcf11e..7e066aa0c64a 100644 --- a/pkgs/by-name/ti/tideways-daemon/package.nix +++ b/pkgs/by-name/ti/tideways-daemon/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-daemon"; - version = "1.9.30"; + version = "1.9.32"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-pXWGoDnNQPlDQMriUbjD8+Tiv7jGeBf+5NGPMOAfuIo="; + hash = "sha256-d7qC6q6ukr2bPEEbgFa8u2N+u/cn0CvWXlrO4CAthl8="; }; "aarch64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; - hash = "sha256-x9QDaGz7nHEbe3o9awqyBu+0/ArM1QIr9jQ4kcSSnHA="; + hash = "sha256-3HXmX2mjM6buzMiVsmTSxReJ7ulphxzSL9hSR6Jwocg="; }; "aarch64-darwin" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-c5ntOhaJaRjipNd0B9ybzPD7EFkdQgEOSaS3JWGfBpA="; + hash = "sha256-3oWU1OjefWGOUmHsAgHIKlUqHiGWbty3WPex7wTfLIg="; }; }; updateScript = "${ diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix index d806bc48a542..0f9a6892160c 100644 --- a/pkgs/by-name/ti/tinty/package.nix +++ b/pkgs/by-name/ti/tinty/package.nix @@ -6,7 +6,7 @@ nix-update-script, }: let - version = "0.24.0"; + version = "0.26.0"; in rustPlatform.buildRustPackage { pname = "tinty"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "tinted-theming"; repo = "tinty"; tag = "v${version}"; - hash = "sha256-Yvwls9bh8YN8/jKC889soCSotLSBU9hJWz95szOdJ2k="; + hash = "sha256-tQW8z0Gtxh0cnMwm9oN3PyOQW7YFVXG2LDkljudMDp0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-2VnuZYUZRh2kJKoKl5/1o+RMFl4ZAr2GOU5RwJ0vc0c="; + cargoHash = "sha256-2S2M5AoppPoHIgEGGsCxrztTGXVAZIBax4VRQMH+5CE="; # Pretty much all tests require internet access doCheck = false; diff --git a/pkgs/by-name/tm/tmx2lua/package.nix b/pkgs/by-name/tm/tmx2lua/package.nix new file mode 100644 index 000000000000..cf73eeff6eae --- /dev/null +++ b/pkgs/by-name/tm/tmx2lua/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "tmx2lua"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "hawkthorne"; + repo = "tmx2lua"; + tag = "v${version}"; + hash = "sha256-vORmsr1hcdPzZYZZJ9GTOJ5B/fT2sp47Kc1dzbgDW9M="; + }; + + vendorHash = "sha256-Vfr5/lhpb+Qdhi4Z/yCbUUyd5DvI3z8UfUfxx+975iQ="; + + meta = { + description = "Convert TMX files to Lua for LÖVE"; + homepage = "https://github.com/hawkthorne/tmx2lua"; + changelog = "https://github.com/hawkthorne/tmx2lua/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ liberodark ]; + mainProgram = "tmx2lua"; + }; +} diff --git a/pkgs/by-name/tr/tre/package.nix b/pkgs/by-name/tr/tre/package.nix index e016e510e841..969b17817d71 100644 --- a/pkgs/by-name/tr/tre/package.nix +++ b/pkgs/by-name/tr/tre/package.nix @@ -1,30 +1,55 @@ { lib, stdenv, - fetchurl, - fetchpatch, + fetchFromGitHub, + autoconf, + automake, + darwin, + gettext, + libiconv, + libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tre"; - version = "0.8.0"; - src = fetchurl { - url = "https://laurikari.net/tre/${pname}-${version}.tar.gz"; - sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "laurikari"; + repo = "tre"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5O8yqzv+SR8x0X7GtC2Pjo94gp0799M2Va8wJ4EKyf8="; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/t/tre/0.8.0-6/debian/patches/03-cve-2016-8859"; - sha256 = "0navhizym6qxd4gngrsslbij8x9r3s67p1jzzhvsnq6ky49j7w3p"; - }) + outputs = [ + "out" + "dev" ]; + nativeBuildInputs = [ + autoconf + automake + libtool + ]; + + buildInputs = + [ + gettext + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + preConfigure = '' + ./utils/autogen.sh + ''; + meta = { description = "Lightweight and robust POSIX compliant regexp matching library"; homepage = "https://laurikari.net/tre/"; + changelog = "https://github.com/laurikari/tre/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd2; mainProgram = "agrep"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ug/ugs/package.nix b/pkgs/by-name/ug/ugs/package.nix index 96703d2d4b2e..576f5d414909 100644 --- a/pkgs/by-name/ug/ugs/package.nix +++ b/pkgs/by-name/ug/ugs/package.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "ugs"; - version = "2.1.9"; + version = "2.1.12"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; - hash = "sha256-cZlBIafz+SZHP5xY6PupoCrbCng9lx9mbixBWiV6ufQ="; + hash = "sha256-HJMJ9bPo7YGQOrI5eM0MRPDoPawyWcr0YY2CBBkijpA="; }; dontUnpack = true; diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 17af958c3a0e..5d44a274a3d5 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.5.22"; + version = "0.5.24"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-zAGPlzMkoJpvfT8CljCTz/qnWRROf5re4Js9zPgstt4="; + hash = "sha256-a4SemtzExhQing7CKjNvakoZSkI7wX01JPz4xWwEraQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-hMh0evlR8r01woSFVYWmheG3Di6m/QYHHWsoK95Ia3Q="; + cargoHash = "sha256-UdS3SiviF3j3XUd1hUD9eIurKaC9ZX7DrvvE158zS5w="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix index 0ad90479c75f..15b83f7ec486 100644 --- a/pkgs/by-name/va/vale/package.nix +++ b/pkgs/by-name/va/vale/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { pname = "vale"; - version = "3.9.3"; + version = "3.9.4"; subPackages = [ "cmd/vale" ]; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-2IvVF/x8n1zvVXHAJLAFuDrw0Oi/RuQDa851SBlyRIk="; + hash = "sha256-F677sYL49U7egbseDdcWtMRomMkZV7NBeOvEKmz2LwE="; }; - vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk="; + vendorHash = "sha256-zjJICe3T3fmyqf3HJbUOaOXOb2GdhAufSFiJTjxauZY="; ldflags = [ "-s" diff --git a/pkgs/by-name/vi/vikunja/nodejs-22.12-tailwindcss-update.patch b/pkgs/by-name/vi/vikunja/nodejs-22.12-tailwindcss-update.patch new file mode 100644 index 000000000000..8370b8ce56c9 --- /dev/null +++ b/pkgs/by-name/vi/vikunja/nodejs-22.12-tailwindcss-update.patch @@ -0,0 +1,3060 @@ +From 09e77d8c4e58d0e61a8d0b820ce2ad8db705f27f Mon Sep 17 00:00:00 2001 +From: Leona Maroni +Date: Tue, 21 Jan 2025 23:29:01 +0100 +Subject: [PATCH] update(frontend): tailwindcss 3.4.13 -> 3.4.17 + +In 3.4.17 a workaround for a change in NodeJS 22.12.0 was implemented. +This version enables `require(esm)` by default. + +generated with `pnpm up tailwindcss@3.4.17` +--- + package.json | 2 +- + pnpm-lock.yaml | 1511 +++++++++++++++++++++++++++++++++++++-- + 2 files changed, 1456 insertions(+), 57 deletions(-) + +diff --git a/package.json b/package.json +index 1caa9145a..9fab2e98e 100644 +--- a/package.json ++++ b/package.json +@@ -113,7 +113,7 @@ + "pinia": "2.2.2", + "register-service-worker": "1.7.2", + "sortablejs": "1.15.3", +- "tailwindcss": "3.4.13", ++ "tailwindcss": "3.4.17", + "tippy.js": "6.3.7", + "ufo": "1.5.4", + "vue": "3.5.10", +diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml +index e66f9117f..5bfbd4a98 100644 +--- a/pnpm-lock.yaml ++++ b/pnpm-lock.yaml +@@ -206,8 +206,8 @@ importers: + specifier: 1.15.3 + version: 1.15.3 + tailwindcss: +- specifier: 3.4.13 +- version: 3.4.13 ++ specifier: 3.4.17 ++ version: 3.4.17 + tippy.js: + specifier: 6.3.7 + version: 6.3.7 +@@ -419,22 +419,42 @@ packages: + resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==} + engines: {node: '>=6.9.0'} + ++ '@babel/code-frame@7.26.2': ++ resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/compat-data@7.25.4': + resolution: {integrity: sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==} + engines: {node: '>=6.9.0'} + ++ '@babel/compat-data@7.26.5': ++ resolution: {integrity: sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/core@7.25.2': + resolution: {integrity: sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==} + engines: {node: '>=6.9.0'} + ++ '@babel/core@7.26.0': ++ resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/generator@7.25.5': + resolution: {integrity: sha512-abd43wyLfbWoxC6ahM8xTkqLpGB2iWBVyuKC9/srhFunCd1SDNrV1s72bBpK4hLj8KLzHBBcOblvLQZBNw9r3w==} + engines: {node: '>=6.9.0'} + ++ '@babel/generator@7.26.5': ++ resolution: {integrity: sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/helper-annotate-as-pure@7.24.7': + resolution: {integrity: sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==} + engines: {node: '>=6.9.0'} + ++ '@babel/helper-annotate-as-pure@7.25.9': ++ resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/helper-builder-binary-assignment-operator-visitor@7.24.7': + resolution: {integrity: sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==} + engines: {node: '>=6.9.0'} +@@ -443,57 +463,112 @@ packages: + resolution: {integrity: sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==} + engines: {node: '>=6.9.0'} + ++ '@babel/helper-compilation-targets@7.26.5': ++ resolution: {integrity: sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/helper-create-class-features-plugin@7.25.4': + resolution: {integrity: sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + ++ '@babel/helper-create-class-features-plugin@7.25.9': ++ resolution: {integrity: sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/helper-create-regexp-features-plugin@7.25.2': + resolution: {integrity: sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + ++ '@babel/helper-create-regexp-features-plugin@7.26.3': ++ resolution: {integrity: sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/helper-define-polyfill-provider@0.6.2': + resolution: {integrity: sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==} + peerDependencies: + '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 + ++ '@babel/helper-define-polyfill-provider@0.6.3': ++ resolution: {integrity: sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==} ++ peerDependencies: ++ '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 ++ + '@babel/helper-member-expression-to-functions@7.24.8': + resolution: {integrity: sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==} + engines: {node: '>=6.9.0'} + ++ '@babel/helper-member-expression-to-functions@7.25.9': ++ resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/helper-module-imports@7.24.7': + resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==} + engines: {node: '>=6.9.0'} + ++ '@babel/helper-module-imports@7.25.9': ++ resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/helper-module-transforms@7.25.2': + resolution: {integrity: sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + ++ '@babel/helper-module-transforms@7.26.0': ++ resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/helper-optimise-call-expression@7.24.7': + resolution: {integrity: sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==} + engines: {node: '>=6.9.0'} + ++ '@babel/helper-optimise-call-expression@7.25.9': ++ resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/helper-plugin-utils@7.24.8': + resolution: {integrity: sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==} + engines: {node: '>=6.9.0'} + ++ '@babel/helper-plugin-utils@7.26.5': ++ resolution: {integrity: sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/helper-remap-async-to-generator@7.25.0': + resolution: {integrity: sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + ++ '@babel/helper-remap-async-to-generator@7.25.9': ++ resolution: {integrity: sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/helper-replace-supers@7.25.0': + resolution: {integrity: sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + ++ '@babel/helper-replace-supers@7.26.5': ++ resolution: {integrity: sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/helper-simple-access@7.24.7': + resolution: {integrity: sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==} + engines: {node: '>=6.9.0'} +@@ -502,26 +577,50 @@ packages: + resolution: {integrity: sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==} + engines: {node: '>=6.9.0'} + ++ '@babel/helper-skip-transparent-expression-wrappers@7.25.9': ++ resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/helper-string-parser@7.24.8': + resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==} + engines: {node: '>=6.9.0'} + ++ '@babel/helper-string-parser@7.25.9': ++ resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/helper-validator-identifier@7.24.7': + resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==} + engines: {node: '>=6.9.0'} + ++ '@babel/helper-validator-identifier@7.25.9': ++ resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/helper-validator-option@7.24.8': + resolution: {integrity: sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==} + engines: {node: '>=6.9.0'} + ++ '@babel/helper-validator-option@7.25.9': ++ resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/helper-wrap-function@7.25.0': + resolution: {integrity: sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==} + engines: {node: '>=6.9.0'} + ++ '@babel/helper-wrap-function@7.25.9': ++ resolution: {integrity: sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/helpers@7.25.0': + resolution: {integrity: sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==} + engines: {node: '>=6.9.0'} + ++ '@babel/helpers@7.26.0': ++ resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/highlight@7.24.7': + resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==} + engines: {node: '>=6.9.0'} +@@ -531,36 +630,71 @@ packages: + engines: {node: '>=6.0.0'} + hasBin: true + ++ '@babel/parser@7.26.5': ++ resolution: {integrity: sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==} ++ engines: {node: '>=6.0.0'} ++ hasBin: true ++ + '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.3': + resolution: {integrity: sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + ++ '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9': ++ resolution: {integrity: sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.0': + resolution: {integrity: sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + ++ '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9': ++ resolution: {integrity: sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.0': + resolution: {integrity: sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + ++ '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9': ++ resolution: {integrity: sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.7': + resolution: {integrity: sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.13.0 + ++ '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9': ++ resolution: {integrity: sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.13.0 ++ + '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.0': + resolution: {integrity: sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + ++ '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9': ++ resolution: {integrity: sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2': + resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==} + engines: {node: '>=6.9.0'} +@@ -599,12 +733,24 @@ packages: + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-syntax-import-assertions@7.26.0': ++ resolution: {integrity: sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-syntax-import-attributes@7.24.7': + resolution: {integrity: sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-syntax-import-attributes@7.26.0': ++ resolution: {integrity: sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-syntax-import-meta@7.10.4': + resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} + peerDependencies: +@@ -669,300 +815,606 @@ packages: + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-arrow-functions@7.25.9': ++ resolution: {integrity: sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-async-generator-functions@7.25.4': + resolution: {integrity: sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-async-generator-functions@7.25.9': ++ resolution: {integrity: sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-async-to-generator@7.24.7': + resolution: {integrity: sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-async-to-generator@7.25.9': ++ resolution: {integrity: sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-block-scoped-functions@7.24.7': + resolution: {integrity: sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-block-scoped-functions@7.26.5': ++ resolution: {integrity: sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-block-scoping@7.25.0': + resolution: {integrity: sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-block-scoping@7.25.9': ++ resolution: {integrity: sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-class-properties@7.25.4': + resolution: {integrity: sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-class-properties@7.25.9': ++ resolution: {integrity: sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-class-static-block@7.24.7': + resolution: {integrity: sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.12.0 + ++ '@babel/plugin-transform-class-static-block@7.26.0': ++ resolution: {integrity: sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.12.0 ++ + '@babel/plugin-transform-classes@7.25.4': + resolution: {integrity: sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-classes@7.25.9': ++ resolution: {integrity: sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-computed-properties@7.24.7': + resolution: {integrity: sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-computed-properties@7.25.9': ++ resolution: {integrity: sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-destructuring@7.24.8': + resolution: {integrity: sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-destructuring@7.25.9': ++ resolution: {integrity: sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-dotall-regex@7.24.7': + resolution: {integrity: sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-dotall-regex@7.25.9': ++ resolution: {integrity: sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-duplicate-keys@7.24.7': + resolution: {integrity: sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-duplicate-keys@7.25.9': ++ resolution: {integrity: sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.0': + resolution: {integrity: sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + ++ '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9': ++ resolution: {integrity: sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/plugin-transform-dynamic-import@7.24.7': + resolution: {integrity: sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-dynamic-import@7.25.9': ++ resolution: {integrity: sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-exponentiation-operator@7.24.7': + resolution: {integrity: sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-exponentiation-operator@7.26.3': ++ resolution: {integrity: sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-export-namespace-from@7.24.7': + resolution: {integrity: sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-export-namespace-from@7.25.9': ++ resolution: {integrity: sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-for-of@7.24.7': + resolution: {integrity: sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-for-of@7.25.9': ++ resolution: {integrity: sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-function-name@7.25.1': + resolution: {integrity: sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-function-name@7.25.9': ++ resolution: {integrity: sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-json-strings@7.24.7': + resolution: {integrity: sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-json-strings@7.25.9': ++ resolution: {integrity: sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-literals@7.25.2': + resolution: {integrity: sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-literals@7.25.9': ++ resolution: {integrity: sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-logical-assignment-operators@7.24.7': + resolution: {integrity: sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-logical-assignment-operators@7.25.9': ++ resolution: {integrity: sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-member-expression-literals@7.24.7': + resolution: {integrity: sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-member-expression-literals@7.25.9': ++ resolution: {integrity: sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-modules-amd@7.24.7': + resolution: {integrity: sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-modules-amd@7.25.9': ++ resolution: {integrity: sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-modules-commonjs@7.24.8': + resolution: {integrity: sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-modules-commonjs@7.26.3': ++ resolution: {integrity: sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-modules-systemjs@7.25.0': + resolution: {integrity: sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-modules-systemjs@7.25.9': ++ resolution: {integrity: sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-modules-umd@7.24.7': + resolution: {integrity: sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-modules-umd@7.25.9': ++ resolution: {integrity: sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-named-capturing-groups-regex@7.24.7': + resolution: {integrity: sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + ++ '@babel/plugin-transform-named-capturing-groups-regex@7.25.9': ++ resolution: {integrity: sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/plugin-transform-new-target@7.24.7': + resolution: {integrity: sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-new-target@7.25.9': ++ resolution: {integrity: sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-nullish-coalescing-operator@7.24.7': + resolution: {integrity: sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-nullish-coalescing-operator@7.26.6': ++ resolution: {integrity: sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-numeric-separator@7.24.7': + resolution: {integrity: sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-numeric-separator@7.25.9': ++ resolution: {integrity: sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-object-rest-spread@7.24.7': + resolution: {integrity: sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-object-rest-spread@7.25.9': ++ resolution: {integrity: sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-object-super@7.24.7': + resolution: {integrity: sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-object-super@7.25.9': ++ resolution: {integrity: sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-optional-catch-binding@7.24.7': + resolution: {integrity: sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-optional-catch-binding@7.25.9': ++ resolution: {integrity: sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-optional-chaining@7.24.8': + resolution: {integrity: sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-optional-chaining@7.25.9': ++ resolution: {integrity: sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-parameters@7.24.7': + resolution: {integrity: sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-parameters@7.25.9': ++ resolution: {integrity: sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-private-methods@7.25.4': + resolution: {integrity: sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-private-methods@7.25.9': ++ resolution: {integrity: sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-private-property-in-object@7.24.7': + resolution: {integrity: sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-private-property-in-object@7.25.9': ++ resolution: {integrity: sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-property-literals@7.24.7': + resolution: {integrity: sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-property-literals@7.25.9': ++ resolution: {integrity: sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-regenerator@7.24.7': + resolution: {integrity: sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-regenerator@7.25.9': ++ resolution: {integrity: sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ ++ '@babel/plugin-transform-regexp-modifiers@7.26.0': ++ resolution: {integrity: sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/plugin-transform-reserved-words@7.24.7': + resolution: {integrity: sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-reserved-words@7.25.9': ++ resolution: {integrity: sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-shorthand-properties@7.24.7': + resolution: {integrity: sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-shorthand-properties@7.25.9': ++ resolution: {integrity: sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-spread@7.24.7': + resolution: {integrity: sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-spread@7.25.9': ++ resolution: {integrity: sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-sticky-regex@7.24.7': + resolution: {integrity: sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-sticky-regex@7.25.9': ++ resolution: {integrity: sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-template-literals@7.24.7': + resolution: {integrity: sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-template-literals@7.25.9': ++ resolution: {integrity: sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-typeof-symbol@7.24.8': + resolution: {integrity: sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-typeof-symbol@7.25.9': ++ resolution: {integrity: sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-unicode-escapes@7.24.7': + resolution: {integrity: sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-unicode-escapes@7.25.9': ++ resolution: {integrity: sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-unicode-property-regex@7.24.7': + resolution: {integrity: sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-unicode-property-regex@7.25.9': ++ resolution: {integrity: sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-unicode-regex@7.24.7': + resolution: {integrity: sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/plugin-transform-unicode-regex@7.25.9': ++ resolution: {integrity: sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/plugin-transform-unicode-sets-regex@7.25.4': + resolution: {integrity: sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + ++ '@babel/plugin-transform-unicode-sets-regex@7.25.9': ++ resolution: {integrity: sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0 ++ + '@babel/preset-env@7.25.4': + resolution: {integrity: sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + ++ '@babel/preset-env@7.26.0': ++ resolution: {integrity: sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==} ++ engines: {node: '>=6.9.0'} ++ peerDependencies: ++ '@babel/core': ^7.0.0-0 ++ + '@babel/preset-modules@0.1.6-no-external-plugins': + resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==} + peerDependencies: +@@ -975,18 +1427,34 @@ packages: + resolution: {integrity: sha512-DSgLeL/FNcpXuzav5wfYvHCGvynXkJbn3Zvc3823AEe9nPwW9IK4UoCSS5yGymmQzN0pCPvivtgS6/8U2kkm1w==} + engines: {node: '>=6.9.0'} + ++ '@babel/runtime@7.26.0': ++ resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/template@7.25.0': + resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==} + engines: {node: '>=6.9.0'} + ++ '@babel/template@7.25.9': ++ resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/traverse@7.25.4': + resolution: {integrity: sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg==} + engines: {node: '>=6.9.0'} + ++ '@babel/traverse@7.26.5': ++ resolution: {integrity: sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==} ++ engines: {node: '>=6.9.0'} ++ + '@babel/types@7.25.4': + resolution: {integrity: sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==} + engines: {node: '>=6.9.0'} + ++ '@babel/types@7.26.5': ++ resolution: {integrity: sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==} ++ engines: {node: '>=6.9.0'} ++ + '@cliqz/adblocker-content@1.33.0': + resolution: {integrity: sha512-p8nYftY77VQNZ4JVvWbK/JWKWR0zeMWovt2FUgyb+ffqtlTtnUPwYF1PMEfG3invaq7dgDAeW5qAjEOxfm23Sg==} + +@@ -1691,22 +2159,22 @@ packages: + resolution: {integrity: sha512-ysJnTGDtuXPa6R2Ii4JIvfMVvDahUUny3aY8+P4r6/0TYHkblgzIMjV6cAn60em67AB0M7OWNAdcAVfWWeN8Qg==} + engines: {node: '>= 16'} + +- '@intlify/message-compiler@10.0.0': +- resolution: {integrity: sha512-OcaWc63NC/9p1cMdgoNKBj4d61BH8sUW1Hfs6YijTd9656ZR4rNqXAlRnBrfS5ABq0vjQjpa8VnyvH9hK49yBw==} +- engines: {node: '>= 16'} +- + '@intlify/message-compiler@10.0.3': + resolution: {integrity: sha512-KC2fG8nCzSYmXjHptEt6i/xM3k6S2szsPaHDCRgWKEYAbeHe6JFm6X4KRw3Csy112A8CxpavMi1dh3h7khwV5w==} + engines: {node: '>= 16'} + +- '@intlify/shared@10.0.0': +- resolution: {integrity: sha512-6ngLfI7DOTew2dcF9WMJx+NnMWghMBhIiHbGg+wRvngpzD5KZJZiJVuzMsUQE1a5YebEmtpTEfUrDp/NqVGdiw==} ++ '@intlify/message-compiler@11.0.0-rc.1': ++ resolution: {integrity: sha512-TGw2uBfuTFTegZf/BHtUQBEKxl7Q/dVGLoqRIdw8lFsp9g/53sYn5iD+0HxIzdYjbWL6BTJMXCPUHp9PxDTRPw==} + engines: {node: '>= 16'} + + '@intlify/shared@10.0.3': + resolution: {integrity: sha512-PWxrCb6fDlnoGLnXLlWu6d7o/HdWACB9TjRnpLro+9uyfqgWA9hvqg5vekcPRyraTieV5srCbTk/ldYw9V3LHw==} + engines: {node: '>= 16'} + ++ '@intlify/shared@11.0.0-rc.1': ++ resolution: {integrity: sha512-8tR1xe7ZEbkabTuE/tNhzpolygUn9OaYp9yuYAF4MgDNZg06C3Qny80bes2/e9/Wm3aVkPUlCw6WgU7mQd0yEg==} ++ engines: {node: '>= 16'} ++ + '@intlify/unplugin-vue-i18n@5.2.0': + resolution: {integrity: sha512-pmRiPY2Nj9mmSrixT69aO45XxGUr5fDBy/IIw4ajLlDTJm5TSmQKA5YNdsH0uxVDCPWy5tlQrF18hkDwI7UJvg==} + engines: {node: '>= 18'} +@@ -1750,6 +2218,10 @@ packages: + resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} + engines: {node: '>=6.0.0'} + ++ '@jridgewell/gen-mapping@0.3.8': ++ resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==} ++ engines: {node: '>=6.0.0'} ++ + '@jridgewell/resolve-uri@3.1.2': + resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} + engines: {node: '>=6.0.0'} +@@ -1850,6 +2322,15 @@ packages: + rollup: + optional: true + ++ '@rollup/plugin-node-resolve@15.3.1': ++ resolution: {integrity: sha512-tgg6b91pAybXHJQMAAwW9VuWBO6Thi+q7BCNARLwSqlmsHz0XYURtGvh/AuwSADXSI4h/2uHbs7s4FzlZDGSGA==} ++ engines: {node: '>=14.0.0'} ++ peerDependencies: ++ rollup: ^2.78.0||^3.0.0||^4.0.0 ++ peerDependenciesMeta: ++ rollup: ++ optional: true ++ + '@rollup/plugin-replace@2.4.2': + resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==} + peerDependencies: +@@ -1879,6 +2360,15 @@ packages: + rollup: + optional: true + ++ '@rollup/pluginutils@5.1.4': ++ resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==} ++ engines: {node: '>=14.0.0'} ++ peerDependencies: ++ rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 ++ peerDependenciesMeta: ++ rollup: ++ optional: true ++ + '@rollup/rollup-android-arm-eabi@4.22.5': + resolution: {integrity: sha512-SU5cvamg0Eyu/F+kLeMXS7GoahL+OoizlclVFX3l5Ql6yNlywJJ0OuqTzUx0v+aHhPHEB/56CT06GQrRrGNYww==} + cpu: [arm] +@@ -2750,6 +3240,11 @@ packages: + peerDependencies: + '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 + ++ babel-plugin-polyfill-corejs2@0.4.12: ++ resolution: {integrity: sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==} ++ peerDependencies: ++ '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 ++ + babel-plugin-polyfill-corejs3@0.10.6: + resolution: {integrity: sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==} + peerDependencies: +@@ -2760,6 +3255,11 @@ packages: + peerDependencies: + '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 + ++ babel-plugin-polyfill-regenerator@0.6.3: ++ resolution: {integrity: sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==} ++ peerDependencies: ++ '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 ++ + balanced-match@1.0.2: + resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} + +@@ -2817,6 +3317,11 @@ packages: + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + ++ browserslist@4.24.4: ++ resolution: {integrity: sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==} ++ engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} ++ hasBin: true ++ + buffer-crc32@0.2.13: + resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} + +@@ -2872,6 +3377,9 @@ packages: + caniuse-lite@1.0.30001664: + resolution: {integrity: sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==} + ++ caniuse-lite@1.0.30001695: ++ resolution: {integrity: sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==} ++ + capital-case@1.0.4: + resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} + +@@ -3049,6 +3557,9 @@ packages: + core-js-compat@3.38.1: + resolution: {integrity: sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==} + ++ core-js-compat@3.40.0: ++ resolution: {integrity: sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==} ++ + core-js@3.38.1: + resolution: {integrity: sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==} + +@@ -3214,6 +3725,15 @@ packages: + supports-color: + optional: true + ++ debug@4.4.0: ++ resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} ++ engines: {node: '>=6.0'} ++ peerDependencies: ++ supports-color: '*' ++ peerDependenciesMeta: ++ supports-color: ++ optional: true ++ + decamelize-keys@1.1.1: + resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==} + engines: {node: '>=0.10.0'} +@@ -3365,6 +3885,9 @@ packages: + electron-to-chromium@1.5.28: + resolution: {integrity: sha512-VufdJl+rzaKZoYVUijN13QcXVF5dWPZANeFTLNy+OSpHdDL5ynXTF35+60RSBbaQYB1ae723lQXHCrf4pyLsMw==} + ++ electron-to-chromium@1.5.84: ++ resolution: {integrity: sha512-I+DQ8xgafao9Ha6y0qjHHvpZ9OfyA1qKlkHkjywxzniORU2awxyz7f/iVJcULmrF2yrM3nHQf+iDjJtbbexd/g==} ++ + emoji-picker-element@1.22.7: + resolution: {integrity: sha512-lX0a8f8yeDw2YuMDRqC1YXjMFRhTxezSGcSYnvgkEvtbtUnzYuNadxFrl4VBOeiwZMtwSe81nMk1Of6muNhCtQ==} + +@@ -3436,6 +3959,10 @@ packages: + resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} + engines: {node: '>=6'} + ++ escalade@3.2.0: ++ resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} ++ engines: {node: '>=6'} ++ + escape-goat@2.1.1: + resolution: {integrity: sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==} + engines: {node: '>=8'} +@@ -3558,6 +4085,10 @@ packages: + resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} + engines: {node: '>=8.6.0'} + ++ fast-glob@3.3.3: ++ resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==} ++ engines: {node: '>=8.6.0'} ++ + fast-json-stable-stringify@2.1.0: + resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} + +@@ -4012,6 +4543,10 @@ packages: + resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==} + engines: {node: '>= 0.4'} + ++ is-core-module@2.16.1: ++ resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==} ++ engines: {node: '>= 0.4'} ++ + is-data-view@1.0.1: + resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==} + engines: {node: '>= 0.4'} +@@ -4164,6 +4699,10 @@ packages: + resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} + hasBin: true + ++ jiti@1.21.7: ++ resolution: {integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==} ++ hasBin: true ++ + joi@17.13.3: + resolution: {integrity: sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==} + +@@ -4211,6 +4750,16 @@ packages: + engines: {node: '>=4'} + hasBin: true + ++ jsesc@3.0.2: ++ resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==} ++ engines: {node: '>=6'} ++ hasBin: true ++ ++ jsesc@3.1.0: ++ resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==} ++ engines: {node: '>=6'} ++ hasBin: true ++ + json-buffer@3.0.0: + resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==} + +@@ -4288,12 +4837,8 @@ packages: + resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} + engines: {node: '>= 0.8.0'} + +- lilconfig@2.1.0: +- resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} +- engines: {node: '>=10'} +- +- lilconfig@3.1.2: +- resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==} ++ lilconfig@3.1.3: ++ resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==} + engines: {node: '>=14'} + + lines-and-columns@1.2.4: +@@ -4583,6 +5128,9 @@ packages: + node-releases@2.0.18: + resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==} + ++ node-releases@2.0.19: ++ resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==} ++ + nopt@7.2.1: + resolution: {integrity: sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} +@@ -4803,6 +5351,9 @@ packages: + picocolors@1.1.0: + resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==} + ++ picocolors@1.1.1: ++ resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} ++ + picomatch@2.3.1: + resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} + engines: {node: '>=8.6'} +@@ -5231,6 +5782,10 @@ packages: + resolution: {integrity: sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==} + engines: {node: '>=4'} + ++ regenerate-unicode-properties@10.2.0: ++ resolution: {integrity: sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==} ++ engines: {node: '>=4'} ++ + regenerate@1.4.2: + resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==} + +@@ -5248,6 +5803,10 @@ packages: + resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==} + engines: {node: '>=4'} + ++ regexpu-core@6.2.0: ++ resolution: {integrity: sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==} ++ engines: {node: '>=4'} ++ + register-service-worker@1.7.2: + resolution: {integrity: sha512-CiD3ZSanZqcMPRhtfct5K9f7i3OLCcBBWsJjLh1gW9RO/nS94sVzY59iS+fgYBOBqaBpf4EzfqUF3j9IG+xo8A==} + +@@ -5259,6 +5818,13 @@ packages: + resolution: {integrity: sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==} + engines: {node: '>=8'} + ++ regjsgen@0.8.0: ++ resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==} ++ ++ regjsparser@0.12.0: ++ resolution: {integrity: sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==} ++ hasBin: true ++ + regjsparser@0.9.1: + resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==} + hasBin: true +@@ -5281,6 +5847,11 @@ packages: + resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} + engines: {node: '>=4'} + ++ resolve@1.22.10: ++ resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==} ++ engines: {node: '>= 0.4'} ++ hasBin: true ++ + resolve@1.22.8: + resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} + hasBin: true +@@ -5319,6 +5890,11 @@ packages: + engines: {node: '>=10.0.0'} + hasBin: true + ++ rollup@2.79.2: ++ resolution: {integrity: sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==} ++ engines: {node: '>=10.0.0'} ++ hasBin: true ++ + rollup@4.22.5: + resolution: {integrity: sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} +@@ -5632,8 +6208,8 @@ packages: + systemjs@6.15.1: + resolution: {integrity: sha512-Nk8c4lXvMB98MtbmjX7JwJRgJOL8fluecYCfCeYBznwmpOs8Bf15hLM6z4z71EDAhQVrQrI+wt1aLWSXZq+hXA==} + +- tailwindcss@3.4.13: +- resolution: {integrity: sha512-KqjHOJKogOUt5Bs752ykCeiwvi0fKVkr5oqsFNt/8px/tA8scFPIlkygsf6jXrfCqGHz7VflA6+yytWuM+XhFw==} ++ tailwindcss@3.4.17: ++ resolution: {integrity: sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==} + engines: {node: '>=14.0.0'} + hasBin: true + +@@ -5850,6 +6426,10 @@ packages: + resolution: {integrity: sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==} + engines: {node: '>=4'} + ++ unicode-match-property-value-ecmascript@2.2.0: ++ resolution: {integrity: sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==} ++ engines: {node: '>=4'} ++ + unicode-property-aliases-ecmascript@2.1.0: + resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==} + engines: {node: '>=4'} +@@ -5897,6 +6477,12 @@ packages: + peerDependencies: + browserslist: '>= 4.21.0' + ++ update-browserslist-db@1.1.2: ++ resolution: {integrity: sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==} ++ hasBin: true ++ peerDependencies: ++ browserslist: '>= 4.21.0' ++ + update-notifier@4.1.3: + resolution: {integrity: sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==} + engines: {node: '>=8'} +@@ -6304,8 +6890,8 @@ packages: + resolution: {integrity: sha512-4wZWvE398hCP7O8n3nXKu/vdq1HcH01ixYlCREaJL5NUMwQ0g3MaGFUBNSlmBtKmhbtVG/Cm6lyYmSVTEVil8A==} + engines: {node: ^14.17.0 || >=16.0.0} + +- yaml@2.5.0: +- resolution: {integrity: sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==} ++ yaml@2.7.0: ++ resolution: {integrity: sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==} + engines: {node: '>= 14'} + hasBin: true + +@@ -6364,8 +6950,16 @@ snapshots: + '@babel/highlight': 7.24.7 + picocolors: 1.1.0 + ++ '@babel/code-frame@7.26.2': ++ dependencies: ++ '@babel/helper-validator-identifier': 7.25.9 ++ js-tokens: 4.0.0 ++ picocolors: 1.1.1 ++ + '@babel/compat-data@7.25.4': {} + ++ '@babel/compat-data@7.26.5': {} ++ + '@babel/core@7.25.2': + dependencies: + '@ampproject/remapping': 2.3.0 +@@ -6386,6 +6980,26 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/core@7.26.0': ++ dependencies: ++ '@ampproject/remapping': 2.3.0 ++ '@babel/code-frame': 7.26.2 ++ '@babel/generator': 7.26.5 ++ '@babel/helper-compilation-targets': 7.26.5 ++ '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) ++ '@babel/helpers': 7.26.0 ++ '@babel/parser': 7.26.5 ++ '@babel/template': 7.25.9 ++ '@babel/traverse': 7.26.5 ++ '@babel/types': 7.26.5 ++ convert-source-map: 2.0.0 ++ debug: 4.4.0 ++ gensync: 1.0.0-beta.2 ++ json5: 2.2.3 ++ semver: 6.3.1 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/generator@7.25.5': + dependencies: + '@babel/types': 7.25.4 +@@ -6393,10 +7007,22 @@ snapshots: + '@jridgewell/trace-mapping': 0.3.25 + jsesc: 2.5.2 + ++ '@babel/generator@7.26.5': ++ dependencies: ++ '@babel/parser': 7.26.5 ++ '@babel/types': 7.26.5 ++ '@jridgewell/gen-mapping': 0.3.8 ++ '@jridgewell/trace-mapping': 0.3.25 ++ jsesc: 3.1.0 ++ + '@babel/helper-annotate-as-pure@7.24.7': + dependencies: + '@babel/types': 7.25.4 + ++ '@babel/helper-annotate-as-pure@7.25.9': ++ dependencies: ++ '@babel/types': 7.26.5 ++ + '@babel/helper-builder-binary-assignment-operator-visitor@7.24.7': + dependencies: + '@babel/traverse': 7.25.4 +@@ -6412,6 +7038,14 @@ snapshots: + lru-cache: 5.1.1 + semver: 6.3.1 + ++ '@babel/helper-compilation-targets@7.26.5': ++ dependencies: ++ '@babel/compat-data': 7.26.5 ++ '@babel/helper-validator-option': 7.25.9 ++ browserslist: 4.24.0 ++ lru-cache: 5.1.1 ++ semver: 6.3.1 ++ + '@babel/helper-create-class-features-plugin@7.25.4(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6425,6 +7059,19 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/helper-create-class-features-plugin@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-annotate-as-pure': 7.25.9 ++ '@babel/helper-member-expression-to-functions': 7.25.9 ++ '@babel/helper-optimise-call-expression': 7.25.9 ++ '@babel/helper-replace-supers': 7.26.5(@babel/core@7.26.0) ++ '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 ++ '@babel/traverse': 7.26.5 ++ semver: 6.3.1 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/helper-create-regexp-features-plugin@7.25.2(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6432,6 +7079,20 @@ snapshots: + regexpu-core: 5.3.2 + semver: 6.3.1 + ++ '@babel/helper-create-regexp-features-plugin@7.25.2(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-annotate-as-pure': 7.24.7 ++ regexpu-core: 5.3.2 ++ semver: 6.3.1 ++ ++ '@babel/helper-create-regexp-features-plugin@7.26.3(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-annotate-as-pure': 7.25.9 ++ regexpu-core: 6.2.0 ++ semver: 6.3.1 ++ + '@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6443,6 +7104,28 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-compilation-targets': 7.25.2 ++ '@babel/helper-plugin-utils': 7.24.8 ++ debug: 4.3.7(supports-color@8.1.1) ++ lodash.debounce: 4.0.8 ++ resolve: 1.22.8 ++ transitivePeerDependencies: ++ - supports-color ++ ++ '@babel/helper-define-polyfill-provider@0.6.3(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-compilation-targets': 7.26.5 ++ '@babel/helper-plugin-utils': 7.26.5 ++ debug: 4.4.0 ++ lodash.debounce: 4.0.8 ++ resolve: 1.22.10 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/helper-member-expression-to-functions@7.24.8': + dependencies: + '@babel/traverse': 7.25.4 +@@ -6450,6 +7133,13 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/helper-member-expression-to-functions@7.25.9': ++ dependencies: ++ '@babel/traverse': 7.26.5 ++ '@babel/types': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/helper-module-imports@7.24.7': + dependencies: + '@babel/traverse': 7.25.4 +@@ -6457,6 +7147,13 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/helper-module-imports@7.25.9': ++ dependencies: ++ '@babel/traverse': 7.26.5 ++ '@babel/types': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/helper-module-transforms@7.25.2(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6467,12 +7164,27 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/helper-module-transforms@7.26.0(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-module-imports': 7.25.9 ++ '@babel/helper-validator-identifier': 7.25.9 ++ '@babel/traverse': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/helper-optimise-call-expression@7.24.7': + dependencies: + '@babel/types': 7.25.4 + ++ '@babel/helper-optimise-call-expression@7.25.9': ++ dependencies: ++ '@babel/types': 7.26.5 ++ + '@babel/helper-plugin-utils@7.24.8': {} + ++ '@babel/helper-plugin-utils@7.26.5': {} ++ + '@babel/helper-remap-async-to-generator@7.25.0(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6482,6 +7194,15 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/helper-remap-async-to-generator@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-annotate-as-pure': 7.25.9 ++ '@babel/helper-wrap-function': 7.25.9 ++ '@babel/traverse': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/helper-replace-supers@7.25.0(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6491,6 +7212,15 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/helper-replace-supers@7.26.5(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-member-expression-to-functions': 7.25.9 ++ '@babel/helper-optimise-call-expression': 7.25.9 ++ '@babel/traverse': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/helper-simple-access@7.24.7': + dependencies: + '@babel/traverse': 7.25.4 +@@ -6505,12 +7235,25 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/helper-skip-transparent-expression-wrappers@7.25.9': ++ dependencies: ++ '@babel/traverse': 7.26.5 ++ '@babel/types': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/helper-string-parser@7.24.8': {} + ++ '@babel/helper-string-parser@7.25.9': {} ++ + '@babel/helper-validator-identifier@7.24.7': {} + ++ '@babel/helper-validator-identifier@7.25.9': {} ++ + '@babel/helper-validator-option@7.24.8': {} + ++ '@babel/helper-validator-option@7.25.9': {} ++ + '@babel/helper-wrap-function@7.25.0': + dependencies: + '@babel/template': 7.25.0 +@@ -6519,11 +7262,24 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/helper-wrap-function@7.25.9': ++ dependencies: ++ '@babel/template': 7.25.9 ++ '@babel/traverse': 7.26.5 ++ '@babel/types': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/helpers@7.25.0': + dependencies: + '@babel/template': 7.25.0 + '@babel/types': 7.25.4 + ++ '@babel/helpers@7.26.0': ++ dependencies: ++ '@babel/template': 7.25.9 ++ '@babel/types': 7.26.5 ++ + '@babel/highlight@7.24.7': + dependencies: + '@babel/helper-validator-identifier': 7.24.7 +@@ -6535,6 +7291,10 @@ snapshots: + dependencies: + '@babel/types': 7.25.4 + ++ '@babel/parser@7.26.5': ++ dependencies: ++ '@babel/types': 7.26.5 ++ + '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.3(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6543,16 +7303,34 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/traverse': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.0(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.0(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6562,6 +7340,15 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 ++ '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.0) ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.0(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6570,10 +7357,22 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/traverse': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + ++ '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ + '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6604,11 +7403,21 @@ snapshots: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-syntax-import-assertions@7.26.0(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-syntax-import-attributes@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-syntax-import-attributes@7.26.0(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6665,11 +7474,22 @@ snapshots: + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.24.8 ++ + '@babel/plugin-transform-arrow-functions@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-arrow-functions@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-async-generator-functions@7.25.4(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6680,6 +7500,15 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-async-generator-functions@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.0) ++ '@babel/traverse': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-async-to-generator@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6689,21 +7518,48 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-async-to-generator@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-module-imports': 7.25.9 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.0) ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-block-scoped-functions@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-block-scoped-functions@7.26.5(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-block-scoping@7.25.0(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-block-scoping@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-class-properties@7.25.4(@babel/core@7.25.2)': + dependencies: +- '@babel/core': 7.25.2 +- '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) +- '@babel/helper-plugin-utils': 7.24.8 ++ '@babel/core': 7.25.2 ++ '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) ++ '@babel/helper-plugin-utils': 7.24.8 ++ transitivePeerDependencies: ++ - supports-color ++ ++ '@babel/plugin-transform-class-properties@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 + transitivePeerDependencies: + - supports-color + +@@ -6716,6 +7572,14 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-class-static-block@7.26.0(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-classes@7.25.4(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6728,40 +7592,85 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-classes@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-annotate-as-pure': 7.25.9 ++ '@babel/helper-compilation-targets': 7.26.5 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/helper-replace-supers': 7.26.5(@babel/core@7.26.0) ++ '@babel/traverse': 7.26.5 ++ globals: 11.12.0 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-computed-properties@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/template': 7.25.0 + ++ '@babel/plugin-transform-computed-properties@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/template': 7.25.9 ++ + '@babel/plugin-transform-destructuring@7.24.8(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-destructuring@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-dotall-regex@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-dotall-regex@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-duplicate-keys@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-duplicate-keys@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.0(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-dynamic-import@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.25.2) + ++ '@babel/plugin-transform-dynamic-import@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-exponentiation-operator@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6770,12 +7679,22 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-exponentiation-operator@7.26.3(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-export-namespace-from@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.25.2) + ++ '@babel/plugin-transform-export-namespace-from@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-for-of@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6784,6 +7703,14 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-for-of@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-function-name@7.25.1(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6793,28 +7720,57 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-function-name@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-compilation-targets': 7.26.5 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/traverse': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-json-strings@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.25.2) + ++ '@babel/plugin-transform-json-strings@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-literals@7.25.2(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-literals@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-logical-assignment-operators@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.25.2) + ++ '@babel/plugin-transform-logical-assignment-operators@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-member-expression-literals@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-member-expression-literals@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-modules-amd@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6823,6 +7779,14 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-modules-amd@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-modules-commonjs@7.24.8(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6832,6 +7796,14 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-modules-commonjs@7.26.3(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-modules-systemjs@7.25.0(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6842,6 +7814,16 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-modules-systemjs@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/helper-validator-identifier': 7.25.9 ++ '@babel/traverse': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-modules-umd@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6850,29 +7832,58 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-modules-umd@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-named-capturing-groups-regex@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-named-capturing-groups-regex@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-new-target@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-new-target@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-nullish-coalescing-operator@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.25.2) + ++ '@babel/plugin-transform-nullish-coalescing-operator@7.26.6(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-numeric-separator@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.25.2) + ++ '@babel/plugin-transform-numeric-separator@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-object-rest-spread@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6881,6 +7892,13 @@ snapshots: + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.25.2) + '@babel/plugin-transform-parameters': 7.24.7(@babel/core@7.25.2) + ++ '@babel/plugin-transform-object-rest-spread@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-compilation-targets': 7.26.5 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0) ++ + '@babel/plugin-transform-object-super@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6889,12 +7907,25 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-object-super@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/helper-replace-supers': 7.26.5(@babel/core@7.26.0) ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-optional-catch-binding@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.25.2) + ++ '@babel/plugin-transform-optional-catch-binding@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-optional-chaining@7.24.8(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6904,11 +7935,24 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-optional-chaining@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-parameters@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-parameters@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-private-methods@7.25.4(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6917,6 +7961,14 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-private-methods@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-private-property-in-object@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6927,27 +7979,63 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-private-property-in-object@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-annotate-as-pure': 7.25.9 ++ '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-property-literals@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-property-literals@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-regenerator@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + regenerator-transform: 0.15.2 + ++ '@babel/plugin-transform-regenerator@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ regenerator-transform: 0.15.2 ++ ++ '@babel/plugin-transform-regexp-modifiers@7.26.0(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-reserved-words@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-reserved-words@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-shorthand-properties@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-shorthand-properties@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-spread@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -6956,44 +8044,90 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/plugin-transform-spread@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/plugin-transform-sticky-regex@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-sticky-regex@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-template-literals@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-template-literals@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-typeof-symbol@7.24.8(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-typeof-symbol@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-unicode-escapes@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-unicode-escapes@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-unicode-property-regex@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-unicode-property-regex@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-unicode-regex@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-unicode-regex@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/plugin-transform-unicode-sets-regex@7.25.4(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) + '@babel/helper-plugin-utils': 7.24.8 + ++ '@babel/plugin-transform-unicode-sets-regex@7.25.9(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0) ++ '@babel/helper-plugin-utils': 7.26.5 ++ + '@babel/preset-env@7.25.4(@babel/core@7.25.2)': + dependencies: + '@babel/compat-data': 7.25.4 +@@ -7083,6 +8217,81 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/preset-env@7.26.0(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/compat-data': 7.26.5 ++ '@babel/core': 7.26.0 ++ '@babel/helper-compilation-targets': 7.26.5 ++ '@babel/helper-plugin-utils': 7.26.5 ++ '@babel/helper-validator-option': 7.25.9 ++ '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.0) ++ '@babel/plugin-syntax-import-assertions': 7.26.0(@babel/core@7.26.0) ++ '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.26.0) ++ '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.26.0) ++ '@babel/plugin-transform-arrow-functions': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-async-generator-functions': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-async-to-generator': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-block-scoped-functions': 7.26.5(@babel/core@7.26.0) ++ '@babel/plugin-transform-block-scoping': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-class-properties': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-class-static-block': 7.26.0(@babel/core@7.26.0) ++ '@babel/plugin-transform-classes': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-computed-properties': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-destructuring': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-dotall-regex': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-duplicate-keys': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-dynamic-import': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-exponentiation-operator': 7.26.3(@babel/core@7.26.0) ++ '@babel/plugin-transform-export-namespace-from': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-for-of': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-function-name': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-json-strings': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-literals': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-logical-assignment-operators': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-member-expression-literals': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-modules-amd': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-modules-commonjs': 7.26.3(@babel/core@7.26.0) ++ '@babel/plugin-transform-modules-systemjs': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-modules-umd': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-new-target': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-nullish-coalescing-operator': 7.26.6(@babel/core@7.26.0) ++ '@babel/plugin-transform-numeric-separator': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-object-rest-spread': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-object-super': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-optional-catch-binding': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-private-methods': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-private-property-in-object': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-property-literals': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-regenerator': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-regexp-modifiers': 7.26.0(@babel/core@7.26.0) ++ '@babel/plugin-transform-reserved-words': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-shorthand-properties': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-spread': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-sticky-regex': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-template-literals': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-typeof-symbol': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-unicode-escapes': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-unicode-property-regex': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-unicode-regex': 7.25.9(@babel/core@7.26.0) ++ '@babel/plugin-transform-unicode-sets-regex': 7.25.9(@babel/core@7.26.0) ++ '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.26.0) ++ babel-plugin-polyfill-corejs2: 0.4.12(@babel/core@7.26.0) ++ babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.26.0) ++ babel-plugin-polyfill-regenerator: 0.6.3(@babel/core@7.26.0) ++ core-js-compat: 3.40.0 ++ semver: 6.3.1 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 +@@ -7090,18 +8299,35 @@ snapshots: + '@babel/types': 7.25.4 + esutils: 2.0.3 + ++ '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.26.0)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-plugin-utils': 7.24.8 ++ '@babel/types': 7.25.4 ++ esutils: 2.0.3 ++ + '@babel/regjsgen@0.8.0': {} + + '@babel/runtime@7.25.4': + dependencies: + regenerator-runtime: 0.14.1 + ++ '@babel/runtime@7.26.0': ++ dependencies: ++ regenerator-runtime: 0.14.1 ++ + '@babel/template@7.25.0': + dependencies: + '@babel/code-frame': 7.24.7 + '@babel/parser': 7.25.4 + '@babel/types': 7.25.4 + ++ '@babel/template@7.25.9': ++ dependencies: ++ '@babel/code-frame': 7.26.2 ++ '@babel/parser': 7.26.5 ++ '@babel/types': 7.26.5 ++ + '@babel/traverse@7.25.4': + dependencies: + '@babel/code-frame': 7.24.7 +@@ -7114,12 +8340,29 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@babel/traverse@7.26.5': ++ dependencies: ++ '@babel/code-frame': 7.26.2 ++ '@babel/generator': 7.26.5 ++ '@babel/parser': 7.26.5 ++ '@babel/template': 7.25.9 ++ '@babel/types': 7.26.5 ++ debug: 4.4.0 ++ globals: 11.12.0 ++ transitivePeerDependencies: ++ - supports-color ++ + '@babel/types@7.25.4': + dependencies: + '@babel/helper-string-parser': 7.24.8 + '@babel/helper-validator-identifier': 7.24.7 + to-fast-properties: 2.0.0 + ++ '@babel/types@7.26.5': ++ dependencies: ++ '@babel/helper-string-parser': 7.25.9 ++ '@babel/helper-validator-identifier': 7.25.9 ++ + '@cliqz/adblocker-content@1.33.0': + dependencies: + '@cliqz/adblocker-extended-selectors': 1.33.0 +@@ -7758,8 +9001,8 @@ snapshots: + + '@intlify/bundle-utils@9.0.0-beta.0(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)))': + dependencies: +- '@intlify/message-compiler': 10.0.0 +- '@intlify/shared': 10.0.0 ++ '@intlify/message-compiler': 11.0.0-rc.1 ++ '@intlify/shared': 11.0.0-rc.1 + acorn: 8.12.1 + escodegen: 2.1.0 + estree-walker: 2.0.2 +@@ -7775,26 +9018,26 @@ snapshots: + '@intlify/message-compiler': 10.0.3 + '@intlify/shared': 10.0.3 + +- '@intlify/message-compiler@10.0.0': +- dependencies: +- '@intlify/shared': 10.0.0 +- source-map-js: 1.2.1 +- + '@intlify/message-compiler@10.0.3': + dependencies: + '@intlify/shared': 10.0.3 + source-map-js: 1.2.1 + +- '@intlify/shared@10.0.0': {} ++ '@intlify/message-compiler@11.0.0-rc.1': ++ dependencies: ++ '@intlify/shared': 11.0.0-rc.1 ++ source-map-js: 1.2.1 + + '@intlify/shared@10.0.3': {} + ++ '@intlify/shared@11.0.0-rc.1': {} ++ + '@intlify/unplugin-vue-i18n@5.2.0(@vue/compiler-dom@3.5.10)(eslint@8.57.1)(rollup@4.22.5)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))': + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) + '@intlify/bundle-utils': 9.0.0-beta.0(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2))) +- '@intlify/shared': 10.0.0 +- '@intlify/vue-i18n-extensions': 7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.10)(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2)) ++ '@intlify/shared': 11.0.0-rc.1 ++ '@intlify/vue-i18n-extensions': 7.0.0(@intlify/shared@11.0.0-rc.1)(@vue/compiler-dom@3.5.10)(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2)) + '@rollup/pluginutils': 5.1.0(rollup@4.22.5) + '@typescript-eslint/scope-manager': 7.18.0 + '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) +@@ -7816,11 +9059,11 @@ snapshots: + - supports-color + - typescript + +- '@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.10)(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))': ++ '@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@11.0.0-rc.1)(@vue/compiler-dom@3.5.10)(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))': + dependencies: + '@babel/parser': 7.25.4 + optionalDependencies: +- '@intlify/shared': 10.0.0 ++ '@intlify/shared': 11.0.0-rc.1 + '@vue/compiler-dom': 3.5.10 + vue: 3.5.10(typescript@5.6.2) + vue-i18n: 10.0.3(vue@3.5.10(typescript@5.6.2)) +@@ -7844,6 +9087,12 @@ snapshots: + '@jridgewell/sourcemap-codec': 1.5.0 + '@jridgewell/trace-mapping': 0.3.25 + ++ '@jridgewell/gen-mapping@0.3.8': ++ dependencies: ++ '@jridgewell/set-array': 1.2.1 ++ '@jridgewell/sourcemap-codec': 1.5.0 ++ '@jridgewell/trace-mapping': 0.3.25 ++ + '@jridgewell/resolve-uri@3.1.2': {} + + '@jridgewell/set-array@1.2.1': {} +@@ -7929,6 +9178,15 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ '@rollup/plugin-babel@5.3.1(@babel/core@7.26.0)(rollup@2.79.2)': ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-module-imports': 7.24.7 ++ '@rollup/pluginutils': 3.1.0(rollup@2.79.2) ++ rollup: 2.79.2 ++ transitivePeerDependencies: ++ - supports-color ++ + '@rollup/plugin-node-resolve@15.2.3(rollup@2.79.1)': + dependencies: + '@rollup/pluginutils': 5.1.0(rollup@2.79.1) +@@ -7940,12 +9198,28 @@ snapshots: + optionalDependencies: + rollup: 2.79.1 + ++ '@rollup/plugin-node-resolve@15.3.1(rollup@2.79.2)': ++ dependencies: ++ '@rollup/pluginutils': 5.1.4(rollup@2.79.2) ++ '@types/resolve': 1.20.2 ++ deepmerge: 4.3.1 ++ is-module: 1.0.0 ++ resolve: 1.22.10 ++ optionalDependencies: ++ rollup: 2.79.2 ++ + '@rollup/plugin-replace@2.4.2(rollup@2.79.1)': + dependencies: + '@rollup/pluginutils': 3.1.0(rollup@2.79.1) + magic-string: 0.25.9 + rollup: 2.79.1 + ++ '@rollup/plugin-replace@2.4.2(rollup@2.79.2)': ++ dependencies: ++ '@rollup/pluginutils': 3.1.0(rollup@2.79.2) ++ magic-string: 0.25.9 ++ rollup: 2.79.2 ++ + '@rollup/plugin-terser@0.4.4(rollup@2.79.1)': + dependencies: + serialize-javascript: 6.0.2 +@@ -7954,6 +9228,14 @@ snapshots: + optionalDependencies: + rollup: 2.79.1 + ++ '@rollup/plugin-terser@0.4.4(rollup@2.79.2)': ++ dependencies: ++ serialize-javascript: 6.0.2 ++ smob: 1.5.0 ++ terser: 5.31.6 ++ optionalDependencies: ++ rollup: 2.79.2 ++ + '@rollup/pluginutils@3.1.0(rollup@2.79.1)': + dependencies: + '@types/estree': 0.0.39 +@@ -7961,6 +9243,13 @@ snapshots: + picomatch: 2.3.1 + rollup: 2.79.1 + ++ '@rollup/pluginutils@3.1.0(rollup@2.79.2)': ++ dependencies: ++ '@types/estree': 0.0.39 ++ estree-walker: 1.0.1 ++ picomatch: 2.3.1 ++ rollup: 2.79.2 ++ + '@rollup/pluginutils@5.1.0(rollup@2.79.1)': + dependencies: + '@types/estree': 1.0.5 +@@ -7977,6 +9266,14 @@ snapshots: + optionalDependencies: + rollup: 4.22.5 + ++ '@rollup/pluginutils@5.1.4(rollup@2.79.2)': ++ dependencies: ++ '@types/estree': 1.0.6 ++ estree-walker: 2.0.2 ++ picomatch: 4.0.2 ++ optionalDependencies: ++ rollup: 2.79.2 ++ + '@rollup/rollup-android-arm-eabi@4.22.5': + optional: true + +@@ -8912,6 +10209,15 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ babel-plugin-polyfill-corejs2@0.4.12(@babel/core@7.26.0): ++ dependencies: ++ '@babel/compat-data': 7.26.5 ++ '@babel/core': 7.26.0 ++ '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.0) ++ semver: 6.3.1 ++ transitivePeerDependencies: ++ - supports-color ++ + babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.25.2): + dependencies: + '@babel/core': 7.25.2 +@@ -8920,6 +10226,14 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.26.0): ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.26.0) ++ core-js-compat: 3.38.1 ++ transitivePeerDependencies: ++ - supports-color ++ + babel-plugin-polyfill-regenerator@0.6.2(@babel/core@7.25.2): + dependencies: + '@babel/core': 7.25.2 +@@ -8927,6 +10241,13 @@ snapshots: + transitivePeerDependencies: + - supports-color + ++ babel-plugin-polyfill-regenerator@0.6.3(@babel/core@7.26.0): ++ dependencies: ++ '@babel/core': 7.26.0 ++ '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.0) ++ transitivePeerDependencies: ++ - supports-color ++ + balanced-match@1.0.2: {} + + base64-js@1.5.1: {} +@@ -8989,6 +10310,13 @@ snapshots: + node-releases: 2.0.18 + update-browserslist-db: 1.1.0(browserslist@4.24.0) + ++ browserslist@4.24.4: ++ dependencies: ++ caniuse-lite: 1.0.30001695 ++ electron-to-chromium: 1.5.84 ++ node-releases: 2.0.19 ++ update-browserslist-db: 1.1.2(browserslist@4.24.4) ++ + buffer-crc32@0.2.13: {} + + buffer-from@1.1.2: {} +@@ -9043,6 +10371,8 @@ snapshots: + + caniuse-lite@1.0.30001664: {} + ++ caniuse-lite@1.0.30001695: {} ++ + capital-case@1.0.4: + dependencies: + no-case: 3.0.4 +@@ -9247,6 +10577,10 @@ snapshots: + dependencies: + browserslist: 4.24.0 + ++ core-js-compat@3.40.0: ++ dependencies: ++ browserslist: 4.24.4 ++ + core-js@3.38.1: {} + + core-util-is@1.0.2: {} +@@ -9436,6 +10770,10 @@ snapshots: + optionalDependencies: + supports-color: 8.1.1 + ++ debug@4.4.0: ++ dependencies: ++ ms: 2.1.3 ++ + decamelize-keys@1.1.1: + dependencies: + decamelize: 1.2.0 +@@ -9580,6 +10918,8 @@ snapshots: + + electron-to-chromium@1.5.28: {} + ++ electron-to-chromium@1.5.84: {} ++ + emoji-picker-element@1.22.7: {} + + emoji-regex@8.0.0: {} +@@ -9733,6 +11073,8 @@ snapshots: + + escalade@3.1.2: {} + ++ escalade@3.2.0: {} ++ + escape-goat@2.1.1: {} + + escape-html@1.0.3: {} +@@ -9927,6 +11269,14 @@ snapshots: + merge2: 1.4.1 + micromatch: 4.0.8 + ++ fast-glob@3.3.3: ++ dependencies: ++ '@nodelib/fs.stat': 2.0.5 ++ '@nodelib/fs.walk': 1.2.8 ++ glob-parent: 5.1.2 ++ merge2: 1.4.1 ++ micromatch: 4.0.8 ++ + fast-json-stable-stringify@2.1.0: {} + + fast-levenshtein@2.0.6: {} +@@ -10440,6 +11790,10 @@ snapshots: + dependencies: + hasown: 2.0.2 + ++ is-core-module@2.16.1: ++ dependencies: ++ hasown: 2.0.2 ++ + is-data-view@1.0.1: + dependencies: + is-typed-array: 1.1.13 +@@ -10558,6 +11912,8 @@ snapshots: + + jiti@1.21.6: {} + ++ jiti@1.21.7: {} ++ + joi@17.13.3: + dependencies: + '@hapi/hoek': 9.3.0 +@@ -10628,6 +11984,10 @@ snapshots: + + jsesc@2.5.2: {} + ++ jsesc@3.0.2: {} ++ ++ jsesc@3.1.0: {} ++ + json-buffer@3.0.0: {} + + json-buffer@3.0.1: {} +@@ -10698,9 +12058,7 @@ snapshots: + prelude-ls: 1.2.1 + type-check: 0.4.0 + +- lilconfig@2.1.0: {} +- +- lilconfig@3.1.2: {} ++ lilconfig@3.1.3: {} + + lines-and-columns@1.2.4: {} + +@@ -10972,6 +12330,8 @@ snapshots: + + node-releases@2.0.18: {} + ++ node-releases@2.0.19: {} ++ + nopt@7.2.1: + dependencies: + abbrev: 2.0.0 +@@ -11183,6 +12543,8 @@ snapshots: + + picocolors@1.1.0: {} + ++ picocolors@1.1.1: {} ++ + picomatch@2.3.1: {} + + picomatch@4.0.2: {} +@@ -11320,7 +12682,7 @@ snapshots: + postcss: 8.4.47 + postcss-value-parser: 4.2.0 + read-cache: 1.0.0 +- resolve: 1.22.8 ++ resolve: 1.22.10 + + postcss-js@4.0.1(postcss@8.4.47): + dependencies: +@@ -11338,8 +12700,8 @@ snapshots: + + postcss-load-config@4.0.2(postcss@8.4.47): + dependencies: +- lilconfig: 3.1.2 +- yaml: 2.5.0 ++ lilconfig: 3.1.3 ++ yaml: 2.7.0 + optionalDependencies: + postcss: 8.4.47 + +@@ -11703,6 +13065,10 @@ snapshots: + dependencies: + regenerate: 1.4.2 + ++ regenerate-unicode-properties@10.2.0: ++ dependencies: ++ regenerate: 1.4.2 ++ + regenerate@1.4.2: {} + + regenerator-runtime@0.14.1: {} +@@ -11727,6 +13093,15 @@ snapshots: + unicode-match-property-ecmascript: 2.0.0 + unicode-match-property-value-ecmascript: 2.1.0 + ++ regexpu-core@6.2.0: ++ dependencies: ++ regenerate: 1.4.2 ++ regenerate-unicode-properties: 10.2.0 ++ regjsgen: 0.8.0 ++ regjsparser: 0.12.0 ++ unicode-match-property-ecmascript: 2.0.0 ++ unicode-match-property-value-ecmascript: 2.2.0 ++ + register-service-worker@1.7.2: {} + + registry-auth-token@4.2.2: +@@ -11737,6 +13112,12 @@ snapshots: + dependencies: + rc: 1.2.8 + ++ regjsgen@0.8.0: {} ++ ++ regjsparser@0.12.0: ++ dependencies: ++ jsesc: 3.0.2 ++ + regjsparser@0.9.1: + dependencies: + jsesc: 0.5.0 +@@ -11753,6 +13134,12 @@ snapshots: + + resolve-from@4.0.0: {} + ++ resolve@1.22.10: ++ dependencies: ++ is-core-module: 2.16.1 ++ path-parse: 1.0.7 ++ supports-preserve-symlinks-flag: 1.0.0 ++ + resolve@1.22.8: + dependencies: + is-core-module: 2.15.1 +@@ -11789,6 +13176,10 @@ snapshots: + optionalDependencies: + fsevents: 2.3.3 + ++ rollup@2.79.2: ++ optionalDependencies: ++ fsevents: 2.3.3 ++ + rollup@4.22.5: + dependencies: + '@types/estree': 1.0.6 +@@ -12115,7 +13506,7 @@ snapshots: + + sucrase@3.35.0: + dependencies: +- '@jridgewell/gen-mapping': 0.3.5 ++ '@jridgewell/gen-mapping': 0.3.8 + commander: 4.1.1 + glob: 10.4.5 + lines-and-columns: 1.2.4 +@@ -12151,29 +13542,29 @@ snapshots: + + systemjs@6.15.1: {} + +- tailwindcss@3.4.13: ++ tailwindcss@3.4.17: + dependencies: + '@alloc/quick-lru': 5.2.0 + arg: 5.0.2 + chokidar: 3.6.0 + didyoumean: 1.2.2 + dlv: 1.1.3 +- fast-glob: 3.3.2 ++ fast-glob: 3.3.3 + glob-parent: 6.0.2 + is-glob: 4.0.3 +- jiti: 1.21.6 +- lilconfig: 2.1.0 ++ jiti: 1.21.7 ++ lilconfig: 3.1.3 + micromatch: 4.0.8 + normalize-path: 3.0.0 + object-hash: 3.0.0 +- picocolors: 1.1.0 ++ picocolors: 1.1.1 + postcss: 8.4.47 + postcss-import: 15.1.0(postcss@8.4.47) + postcss-js: 4.0.1(postcss@8.4.47) + postcss-load-config: 4.0.2(postcss@8.4.47) + postcss-nested: 6.2.0(postcss@8.4.47) + postcss-selector-parser: 6.1.2 +- resolve: 1.22.8 ++ resolve: 1.22.10 + sucrase: 3.35.0 + transitivePeerDependencies: + - ts-node +@@ -12382,6 +13773,8 @@ snapshots: + + unicode-match-property-value-ecmascript@2.1.0: {} + ++ unicode-match-property-value-ecmascript@2.2.0: {} ++ + unicode-property-aliases-ecmascript@2.1.0: {} + + unique-string@2.0.0: +@@ -12417,6 +13810,12 @@ snapshots: + escalade: 3.1.2 + picocolors: 1.1.0 + ++ update-browserslist-db@1.1.2(browserslist@4.24.4): ++ dependencies: ++ browserslist: 4.24.4 ++ escalade: 3.2.0 ++ picocolors: 1.1.1 ++ + update-notifier@4.1.3: + dependencies: + boxen: 4.2.0 +@@ -12801,13 +14200,13 @@ snapshots: + workbox-build@7.1.1: + dependencies: + '@apideck/better-ajv-errors': 0.3.6(ajv@8.17.1) +- '@babel/core': 7.25.2 +- '@babel/preset-env': 7.25.4(@babel/core@7.25.2) +- '@babel/runtime': 7.25.4 +- '@rollup/plugin-babel': 5.3.1(@babel/core@7.25.2)(rollup@2.79.1) +- '@rollup/plugin-node-resolve': 15.2.3(rollup@2.79.1) +- '@rollup/plugin-replace': 2.4.2(rollup@2.79.1) +- '@rollup/plugin-terser': 0.4.4(rollup@2.79.1) ++ '@babel/core': 7.26.0 ++ '@babel/preset-env': 7.26.0(@babel/core@7.26.0) ++ '@babel/runtime': 7.26.0 ++ '@rollup/plugin-babel': 5.3.1(@babel/core@7.26.0)(rollup@2.79.2) ++ '@rollup/plugin-node-resolve': 15.3.1(rollup@2.79.2) ++ '@rollup/plugin-replace': 2.4.2(rollup@2.79.2) ++ '@rollup/plugin-terser': 0.4.4(rollup@2.79.2) + '@surma/rollup-plugin-off-main-thread': 2.2.3 + ajv: 8.17.1 + common-tags: 1.8.2 +@@ -12816,7 +14215,7 @@ snapshots: + glob: 7.2.3 + lodash: 4.17.21 + pretty-bytes: 5.6.0 +- rollup: 2.79.1 ++ rollup: 2.79.2 + source-map: 0.8.0-beta.0 + stringify-object: 3.3.0 + strip-comments: 2.0.1 +@@ -12966,9 +14365,9 @@ snapshots: + dependencies: + eslint-visitor-keys: 3.4.3 + lodash: 4.17.21 +- yaml: 2.5.0 ++ yaml: 2.7.0 + +- yaml@2.5.0: {} ++ yaml@2.7.0: {} + + yargs-parser@18.1.3: + dependencies: +-- +2.47.0 + diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index 7948d5aa5e35..1096639899de 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -23,16 +23,20 @@ let pname = "vikunja-frontend"; inherit version src; + patches = [ + ./nodejs-22.12-tailwindcss-update.patch + ]; sourceRoot = "${finalAttrs.src.name}/frontend"; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version + patches src sourceRoot ; - hash = "sha256-D2dOyYsdsNV1ZSQdjpy6rfoix7yBACEHj/2XyHb7HWE="; + hash = "sha256-94ZlywOZYmW/NsvE0dtEA81MeBWGUrJsBXTUauuOmZM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vt/vttest/package.nix b/pkgs/by-name/vt/vttest/package.nix index b2a78c7887a4..14991f1c39cc 100644 --- a/pkgs/by-name/vt/vttest/package.nix +++ b/pkgs/by-name/vt/vttest/package.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20241204"; + version = "20241208"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/vttest/vttest-${version}.tgz" "ftp://ftp.invisible-island.net/vttest/vttest-${version}.tgz" ]; - sha256 = "sha256-cBDDK2Qllo7NfuxD2J8sbGdElPc7Isjnxm2t8hwjG/8="; + sha256 = "sha256-j+47rH6H1KpKIXvSs4q5kQw7jPmmBbRQx2zMCtKmUZ0="; }; meta = with lib; { diff --git a/pkgs/by-name/vu/vue-typescript-plugin/package-lock.json b/pkgs/by-name/vu/vue-typescript-plugin/package-lock.json new file mode 100644 index 000000000000..c7c33b1b191b --- /dev/null +++ b/pkgs/by-name/vu/vue-typescript-plugin/package-lock.json @@ -0,0 +1,269 @@ +{ + "name": "@vue/typescript-plugin", + "version": "2.2.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "@vue/typescript-plugin", + "version": "2.2.0", + "license": "MIT", + "dependencies": { + "@volar/typescript": "~2.4.11", + "@vue/language-core": "2.2.0", + "@vue/shared": "^3.5.0" + }, + "devDependencies": { + "@types/node": "latest" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz", + "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.26.5" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/types": { + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz", + "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==", + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@types/node": { + "version": "22.10.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.6.tgz", + "integrity": "sha512-qNiuwC4ZDAUNcY47xgaSuS92cjf8JbSUoaKS77bmLG1rU7MlATVSiw/IlrjtIyyskXBZ8KkNfjK/P5na7rgXbQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "node_modules/@volar/language-core": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.11.tgz", + "integrity": "sha512-lN2C1+ByfW9/JRPpqScuZt/4OrUUse57GLI6TbLgTIqBVemdl1wNcZ1qYGEo2+Gw8coYLgCy7SuKqn6IrQcQgg==", + "license": "MIT", + "dependencies": { + "@volar/source-map": "2.4.11" + } + }, + "node_modules/@volar/source-map": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.11.tgz", + "integrity": "sha512-ZQpmafIGvaZMn/8iuvCFGrW3smeqkq/IIh9F1SdSx9aUl0J4Iurzd6/FhmjNO5g2ejF3rT45dKskgXWiofqlZQ==", + "license": "MIT" + }, + "node_modules/@volar/typescript": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.11.tgz", + "integrity": "sha512-2DT+Tdh88Spp5PyPbqhyoYavYCPDsqbHLFwcUI9K1NlY1YgUJvujGdrqUp0zWxnW7KWNTr3xSpMuv2WnaTKDAw==", + "license": "MIT", + "dependencies": { + "@volar/language-core": "2.4.11", + "path-browserify": "^1.0.1", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/@vue/compiler-core": { + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz", + "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==", + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.25.3", + "@vue/shared": "3.5.13", + "entities": "^4.5.0", + "estree-walker": "^2.0.2", + "source-map-js": "^1.2.0" + } + }, + "node_modules/@vue/compiler-dom": { + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz", + "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==", + "license": "MIT", + "dependencies": { + "@vue/compiler-core": "3.5.13", + "@vue/shared": "3.5.13" + } + }, + "node_modules/@vue/compiler-vue2": { + "version": "2.7.16", + "resolved": "https://registry.npmjs.org/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz", + "integrity": "sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==", + "license": "MIT", + "dependencies": { + "de-indent": "^1.0.2", + "he": "^1.2.0" + } + }, + "node_modules/@vue/language-core": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.0.tgz", + "integrity": "sha512-O1ZZFaaBGkKbsRfnVH1ifOK1/1BUkyK+3SQsfnh6PmMmD4qJcTU8godCeA96jjDRTL6zgnK7YzCHfaUlH2r0Mw==", + "license": "MIT", + "dependencies": { + "@volar/language-core": "~2.4.11", + "@vue/compiler-dom": "^3.5.0", + "@vue/compiler-vue2": "^2.7.16", + "@vue/shared": "^3.5.0", + "alien-signals": "^0.4.9", + "minimatch": "^9.0.3", + "muggle-string": "^0.4.1", + "path-browserify": "^1.0.1" + }, + "peerDependencies": { + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@vue/shared": { + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz", + "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==", + "license": "MIT" + }, + "node_modules/alien-signals": { + "version": "0.4.14", + "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.4.14.tgz", + "integrity": "sha512-itUAVzhczTmP2U5yX67xVpsbbOiquusbWVyA9N+sy6+r6YVbFkahXvNCeEPWEOMhwDYwbVbGHFkVL03N9I5g+Q==", + "license": "MIT" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/de-indent": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", + "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==", + "license": "MIT" + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "license": "MIT" + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "license": "MIT", + "bin": { + "he": "bin/he" + } + }, + "node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/muggle-string": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz", + "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==", + "license": "MIT" + }, + "node_modules/path-browserify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", + "license": "MIT" + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, + "node_modules/vscode-uri": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz", + "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==", + "license": "MIT" + } + } +} diff --git a/pkgs/by-name/vu/vue-typescript-plugin/package.nix b/pkgs/by-name/vu/vue-typescript-plugin/package.nix new file mode 100644 index 000000000000..845be9488afc --- /dev/null +++ b/pkgs/by-name/vu/vue-typescript-plugin/package.nix @@ -0,0 +1,27 @@ +{ + lib, + buildNpmPackage, + fetchurl, +}: +buildNpmPackage rec { + pname = "vue-typescript-plugin"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-${version}.tgz"; + hash = "sha256-WzbJ3ERFZ4T22RNSYXAVTWb+6Q3WEPYimFzkugNao+4="; + }; + npmDepsHash = "sha256-yzoeV5ZRvRu1ADdGJ9DdolWOQvGF+FIdn5J5G/KItk4="; + postPatch = '' + ln -s ${./package-lock.json} package-lock.json + ''; + dontNpmBuild = true; + passthru.updateScript = ./update.sh; + meta = { + description = "Official Vue.js typescript plugin"; + homepage = "https://github.com/vuejs/language-tools#readme"; + changelog = "https://github.com/vuejs/language-tools/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wbondanza_devoteam ]; + mainProgram = "vue-typescript-plugin"; + }; +} diff --git a/pkgs/by-name/vu/vue-typescript-plugin/update.sh b/pkgs/by-name/vu/vue-typescript-plugin/update.sh new file mode 100755 index 000000000000..58544a7e1d07 --- /dev/null +++ b/pkgs/by-name/vu/vue-typescript-plugin/update.sh @@ -0,0 +1,30 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget + +set -euo pipefail +pushd "$(dirname "${BASH_SOURCE[0]}")" + +version=$(npm view @vue/language-server version) +tarball="typescript-plugin-$version.tgz" +url="https://registry.npmjs.org/@vue/typescript-plugin/-/$tarball" + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix + +sha256=$(nix-prefetch-url "$url") +src_hash=$(nix-hash --to-sri --type sha256 "$sha256") +sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix + +rm -f package-lock.json package.json *.tgz +wget "$url" +tar xf "$tarball" --strip-components=1 package/package.json +npm i --package-lock-only --ignore-scripts +npm_hash=$(prefetch-npm-deps package-lock.json) +sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix +rm -f package.json *.tgz + +popd diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix index 75903295a9d9..3366a2fcd7aa 100644 --- a/pkgs/by-name/wa/walker/package.nix +++ b/pkgs/by-name/wa/walker/package.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "walker"; - version = "0.11.19"; + version = "0.12.10"; src = fetchFromGitHub { owner = "abenz1267"; repo = "walker"; rev = "v${version}"; - hash = "sha256-dt6dGl/1KGmnG8g9iv+EL7xYXVVy48tizg9aGunh1QU="; + hash = "sha256-nrt/uHHAtnQbOwzXCfNrdk/ywRUWWLLpy9PO2VkGwkQ="; }; vendorHash = "sha256-urAtl2aSuNw7UVnuacSACUE8PCwAsrRQbuMb7xItjao="; diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix new file mode 100644 index 000000000000..561c5dbf55ab --- /dev/null +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -0,0 +1,59 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + wrapGAppsHook4, + glib, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "waytrogen"; + version = "0.5.8"; + + src = fetchFromGitHub { + owner = "nikolaizombie1"; + repo = "waytrogen"; + tag = version; + hash = "sha256-tq5cC0Z0kmrYopOGbdoAERBHQXrAw799zWdQP06rTYw="; + }; + + cargoHash = "sha256-05YfQBezDbQ8KfNvl/4Av5vf/rxJU3Ej6RDgSnSfjtM="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + ]; + + postBuild = '' + install -Dm644 org.Waytrogen.Waytrogen.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas + glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas + ''; + + postInstall = '' + install -Dm644 waytrogen.desktop $out/share/applications/waytrogen.desktop + install -Dm644 README-Assets/WaytrogenLogo.svg $out/share/icons/hicolor/scalable/apps/waytrogen.svg + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Lightning fast wallpaper setter for Wayland"; + longDescription = '' + A GUI wallpaper setter for Wayland that is a spiritual successor + for the minimalistic wallpaper changer for X11 nitrogen. Written purely + in the Rust 🦀 programming language. Supports hyprpaper, swaybg, mpvpaper and swww wallpaper changers. + ''; + homepage = "https://github.com/nikolaizombie1/waytrogen"; + changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${version}"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "waytrogen"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 1864b34a499b..3d26e8728778 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "2.19.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-bNh2Rg77yWWBgXTnAo1IVU0RzieFOYtM5k0G1ltn3+Y="; + hash = "sha256-43ZN2bMzVBpliXjDDJrVZqdiWBS3rT5mYEd0440wp4s="; }; - vendorHash = "sha256-ICZneCPV858wRThUaSBmS9oApemKlUiA4SEWsH2sOak="; + vendorHash = "sha256-Qy5Tjg/QETeN8leTaWZXSUauK2LkPUUZbpztC79v6Jo="; proxyVendor = true; diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix index ec93ba9600b1..0f89a5bb4881 100644 --- a/pkgs/by-name/wi/wire-desktop/package.nix +++ b/pkgs/by-name/wi/wire-desktop/package.nix @@ -28,23 +28,23 @@ let version = let - x86_64-darwin = "3.37.5164"; + x86_64-darwin = "3.39.5211"; in { inherit x86_64-darwin; aarch64-darwin = x86_64-darwin; - x86_64-linux = "3.37.3607"; + x86_64-linux = "3.39.3653"; } .${system} or throwSystem; hash = let - x86_64-darwin = "sha256-xQ6EaZFE6qdpgFj1Lom37wT8URd5FsRwG89YeM/+U7k="; + x86_64-darwin = "sha256-k6CIqHt67AFL70zdK0/91aQcpbb00OIggk5TF7y1IOY="; in { inherit x86_64-darwin; aarch64-darwin = x86_64-darwin; - x86_64-linux = "sha256-mckFxxrWnxeVGgJ//efPTdtHt5nVII1lXu/BT61TKxE="; + x86_64-linux = "sha256-BbY+7fGAWW5CR/z4GeoBl5aOewCRuWzQjpQX4x1rzls="; } .${system} or throwSystem; diff --git a/pkgs/by-name/wy/wyoming-satellite/package.nix b/pkgs/by-name/wy/wyoming-satellite/package.nix index 3a56ff6cf6d3..4e74aee9c0c3 100644 --- a/pkgs/by-name/wy/wyoming-satellite/package.nix +++ b/pkgs/by-name/wy/wyoming-satellite/package.nix @@ -21,14 +21,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "wyoming-satellite"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-satellite"; tag = "v${version}"; - hash = "sha256-KIWhWE9Qaxs72fJ1LRTkvk6QtpBJOFlmZv2od69O15g="; + hash = "sha256-9UgfD0Hs/IgOszd/QBbe6DYY6kBWh7q/e57gghQ1/Bk="; }; build-system = with python.pkgs; [ diff --git a/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix b/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix index f0ac6e12eb08..0e0b7669919a 100644 --- a/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix +++ b/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix @@ -2,9 +2,8 @@ stdenv, lib, fetchurl, - fetchpatch, - autoreconfHook, - intltool, + meson, + ninja, pkg-config, xdg-user-dirs, wrapGAppsHook3, @@ -14,36 +13,30 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-user-dirs-gtk"; - version = "0.11"; + version = "0.14"; src = fetchurl { url = "mirror://gnome/sources/xdg-user-dirs-gtk/${lib.versions.majorMinor finalAttrs.version}/xdg-user-dirs-gtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-U0vVY9PA4/jcvzV4y4qw5J07pByWbUd8ivlDg2QSHn0="; + hash = "sha256-U3++FCskc27XiU5KAfaf11jLbHpnejgoeVKdIX9KKHM="; }; - patches = [ - # Fix cross: ./configure: line 7633: no: command not found - (fetchpatch { - url = "https://salsa.debian.org/gnome-team/xdg-user-dirs-gtk/-/raw/b047b613d5f18aebe8e9bca4e0a82b75b2d1f8c4/debian/patches/fix-pkg-config-cross-compilation.patch"; - hash = "sha256-QHq8hlX0SS+T6jtagMs9qApJCWFG1PHxftzoID2Nag4="; - }) - ]; - nativeBuildInputs = [ - autoreconfHook - intltool + meson + ninja pkg-config - xdg-user-dirs # for AC_PATH_PROG + xdg-user-dirs wrapGAppsHook3 ]; buildInputs = [ gtk3 ]; postPatch = '' - # Fetch translations from correct localedir. + # Fetch “xdg-user-dirs” translations from correct localedir. substituteInPlace update.c --replace-fail \ 'bindtextdomain ("xdg-user-dirs", GLIBLOCALEDIR);' \ 'bindtextdomain ("xdg-user-dirs", "${xdg-user-dirs}/share/locale");' + + patchShebangs meson_custom_install_desktop_file.sh ''; preFixup = '' @@ -57,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk"; description = "Companion to xdg-user-dirs that integrates it into the GNOME desktop and GTK applications"; - license = lib.licenses.gpl2Only; + license = lib.licenses.gpl2Plus; maintainers = lib.teams.gnome.members; platforms = lib.platforms.unix; mainProgram = "xdg-user-dirs-gtk-update"; diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index 590055955881..1484fd64239c 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -6,8 +6,8 @@ , python , withGodef ? true , godef -, withGotools ? true -, gotools +, withGopls ? true +, gopls , withRustAnalyzer ? true , rust-analyzer , withTypescript ? true @@ -80,10 +80,10 @@ stdenv.mkDerivation { TARGET=$out/lib/ycmd/third_party/godef mkdir -p $TARGET ln -sf ${godef}/bin/godef $TARGET - '' + lib.optionalString withGotools '' - TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls + '' + lib.optionalString withGopls '' + TARGET=$out/lib/ycmd/third_party/go/bin mkdir -p $TARGET - ln -sf ${gotools}/bin/gopls $TARGET + ln -sf ${gopls}/bin/gopls $TARGET '' + lib.optionalString withRustAnalyzer '' TARGET=$out/lib/ycmd/third_party/rust-analyzer mkdir -p $TARGET @@ -105,7 +105,7 @@ stdenv.mkDerivation { mainProgram = "ycmd"; homepage = "https://github.com/ycm-core/ycmd"; license = licenses.gpl3; - maintainers = with maintainers; [ rasendubi lnl7 siriobalmelli ]; + maintainers = with maintainers; [ rasendubi lnl7 mel ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 654726028fb4..d768673af00d 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -95,7 +95,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.170.1"; + version = "0.170.2"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -103,7 +103,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-prRBByJGzwwLowFX9P/k1QvjMvYk8yrvkSToK1RYJPQ="; + hash = "sha256-E9p/JHHIQ2nQ6LeFob1tDf6UopeEWL/Z7INstehvfEI="; }; patches = [ @@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-40Pif9JYN9uKqXTmaTMriYEvZ7DkcbNCif5h7YdiceY="; + cargoHash = "sha256-A9sTR5MCLXskhvJHVGRQ/rSLwOKqhfgJi5zaGsgglL0="; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index 530470a4824d..8275885597e0 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -8,7 +8,7 @@ , gobject-introspection , gsound , hddtemp -, libgda +, libgda6 , libgtop , libhandy , liquidctl @@ -119,7 +119,7 @@ super: lib.trivial.pipe super [ }; preInstall = '' substituteInPlace extension.js \ - --replace-fail "import Gda from 'gi://Gda?version>=5.0'" "imports.gi.GIRepository.Repository.prepend_search_path('${libgda}/lib/girepository-1.0'); const Gda = (await import('gi://Gda')).default" \ + --replace-fail "import Gda from 'gi://Gda?version>=5.0'" "imports.gi.GIRepository.Repository.prepend_search_path('${libgda6}/lib/girepository-1.0'); const Gda = (await import('gi://Gda')).default" \ --replace-fail "import GSound from 'gi://GSound'" "imports.gi.GIRepository.Repository.prepend_search_path('${gsound}/lib/girepository-1.0'); const GSound = (await import('gi://GSound')).default" ''; })) diff --git a/pkgs/desktops/gnome/find-latest-version.py b/pkgs/desktops/gnome/find-latest-version.py index d921fd7366cb..06874d047614 100644 --- a/pkgs/desktops/gnome/find-latest-version.py +++ b/pkgs/desktops/gnome/find-latest-version.py @@ -37,55 +37,179 @@ class Stability(Enum): STABLE = "stable" UNSTABLE = "unstable" + def allows(self, target: "Stability") -> bool: + """ + Whether selected stability `self` allows version + with a specified `target` stability. + """ + match self: + case Stability.STABLE: + return target == Stability.STABLE + case Stability.UNSTABLE: + return True + + def __repr__(self) -> str: + """ + Useful for tests. + """ + match self: + case Stability.STABLE: + return "Stability.STABLE" + case Stability.UNSTABLE: + return "Stability.UNSTABLE" + VersionPolicy = Callable[[Version], bool] -VersionPredicate = Callable[[Version, Stability], bool] +VersionClassifier = Callable[[Version], Stability] -class VersionPredicateHolder(NamedTuple): - function: VersionPredicate +class VersionClassifierHolder(NamedTuple): + function: VersionClassifier def version_to_list(version: str) -> List[int]: return list(map(int, version.split("."))) -def odd_unstable(version: Version, selected: Stability) -> bool: +def odd_unstable(version: Version) -> Stability: + """ + Traditional GNOME version policy + + >>> odd_unstable(Version("32")) + Stability.STABLE + >>> odd_unstable(Version("3.2.1")) + Stability.STABLE + >>> odd_unstable(Version("3.2.1.alpha")) + Stability.UNSTABLE + >>> odd_unstable(Version("3.2.1beta")) + Stability.UNSTABLE + >>> odd_unstable(Version("4.2.89")) + Stability.STABLE + >>> odd_unstable(Version("4.2.90")) + Stability.STABLE + >>> odd_unstable(Version("4.88.2")) + Stability.STABLE + >>> odd_unstable(Version("4.90.2")) + Stability.UNSTABLE + >>> odd_unstable(Version("4.3.0")) + Stability.UNSTABLE + >>> odd_unstable(Version("4.3.89")) + Stability.UNSTABLE + >>> odd_unstable(Version("4.2.899")) + Stability.STABLE + >>> odd_unstable(Version("4.2.900")) + Stability.STABLE + >>> odd_unstable(Version("4.898.2")) + Stability.STABLE + >>> odd_unstable(Version("4.900.2")) + Stability.UNSTABLE + """ try: version_parts = version_to_list(version.value) except: # Failing to parse as a list of numbers likely means the version contains a string tag like “beta”, therefore it is not a stable release. - return selected != Stability.STABLE + return Stability.UNSTABLE if len(version_parts) < 2: - return True + return Stability.STABLE even = version_parts[1] % 2 == 0 prerelease = (version_parts[1] >= 90 and version_parts[1] < 100) or (version_parts[1] >= 900 and version_parts[1] < 1000) stable = even and not prerelease - if selected == Stability.STABLE: - return stable + if stable: + return Stability.STABLE else: - return True + return Stability.UNSTABLE -def tagged(version: Version, selected: Stability) -> bool: - if selected == Stability.STABLE: - return not ("alpha" in version.value or "beta" in version.value or "rc" in version.value) +def ninety_micro_unstable(version: Version) -> Stability: + """ + : + > To denote unstable versions, the micro version number will correspond to 90 or + > higher, e.g. 4.$MINOR.90. + + >>> ninety_micro_unstable(Version("3.2.1")) + Stability.STABLE + >>> ninety_micro_unstable(Version("3.2.1.alpha")) + Stability.UNSTABLE + >>> ninety_micro_unstable(Version("3.2.1beta")) + Stability.UNSTABLE + >>> ninety_micro_unstable(Version("4.2.89")) + Stability.STABLE + >>> ninety_micro_unstable(Version("4.3.89")) + Stability.STABLE + >>> ninety_micro_unstable(Version("4.2.90")) + Stability.UNSTABLE + >>> ninety_micro_unstable(Version("4.2.89.3")) + Stability.STABLE + >>> ninety_micro_unstable(Version("4.2.90.3")) + Stability.UNSTABLE + >>> ninety_micro_unstable(Version("4.90.1")) + Stability.STABLE + """ + try: + version_parts = version_to_list(version.value) + except: + # Failing to parse as a list of numbers likely means the version contains a string tag like “beta”, therefore it is not a stable release. + return Stability.UNSTABLE + + if len(version_parts) < 3: + return Stability.STABLE + + prerelease = version_parts[2] >= 90 + if prerelease: + return Stability.UNSTABLE else: - return True + return Stability.STABLE -def no_policy(version: Version, selected: Stability) -> bool: - return True +def tagged(version: Version) -> Stability: + """ + Considers only versions with explicit `alpha`, `beta` or `rc` tags unstable. + + >>> tagged(Version("32")) + Stability.STABLE + >>> tagged(Version("3.2.1")) + Stability.STABLE + >>> tagged(Version("4.3.0")) + Stability.STABLE + >>> tagged(Version("3.2.1.alpha")) + Stability.UNSTABLE + >>> tagged(Version("3.2.1beta")) + Stability.UNSTABLE + >>> tagged(Version("3.2.1rc.3")) + Stability.UNSTABLE + """ + prerelease = "alpha" in version.value or "beta" in version.value or "rc" in version.value + if prerelease: + return Stability.UNSTABLE + else: + return Stability.STABLE + + +def no_policy(version: Version) -> Stability: + """ + Considers any version stable. + + >>> no_policy(Version("32")) + Stability.STABLE + >>> no_policy(Version("3.2.1")) + Stability.STABLE + >>> no_policy(Version("3.2.1.alpha")) + Stability.STABLE + >>> no_policy(Version("3.2.1beta")) + Stability.STABLE + """ + return Stability.STABLE class VersionPolicyKind(Enum): # HACK: Using function as values directly would make Enum # think they are methods and skip them. - ODD_UNSTABLE = VersionPredicateHolder(odd_unstable) - TAGGED = VersionPredicateHolder(tagged) - NONE = VersionPredicateHolder(no_policy) + ODD_UNSTABLE = VersionClassifierHolder(odd_unstable) + NINETY_MICRO_UNSTABLE = VersionClassifierHolder(ninety_micro_unstable) + TAGGED = VersionClassifierHolder(tagged) + NONE = VersionClassifierHolder(no_policy) def make_version_policy( @@ -93,11 +217,11 @@ def make_version_policy( selected: Stability, upper_bound: Optional[Version], ) -> VersionPolicy: - version_predicate = version_policy_kind.value.function + version_classifier = version_policy_kind.value.function if not upper_bound: - return lambda version: version_predicate(version, selected) + return lambda version: selected.allows(version_classifier(version)) else: - return lambda version: version_predicate(version, selected) and version < upper_bound + return lambda version: selected.allows(version_classifier(version)) and version < upper_bound def find_versions(package_name: str, version_policy: VersionPolicy) -> List[Version]: diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix index bf7881659864..9f25a3aebc04 100644 --- a/pkgs/desktops/lomiri/applications/lomiri/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix @@ -35,12 +35,13 @@ lomiri-app-launch, lomiri-download-manager, lomiri-indicator-network, - lomiri-ui-toolkit, + lomiri-notifications, lomiri-settings-components, lomiri-system-settings-unwrapped, lomiri-schemas, - lomiri-notifications, + lomiri-telephony-service, lomiri-thumbnailer, + lomiri-ui-toolkit, maliit-keyboard, mir_2_15, nixos-icons, @@ -55,7 +56,6 @@ qtmir, qtmultimedia, qtsvg, - telephony-service, wrapGAppsHook3, wrapQtAppsHook, xwayland, @@ -210,9 +210,9 @@ stdenv.mkDerivation (finalAttrs: { hfd-service lomiri-notifications lomiri-settings-components + lomiri-telephony-service lomiri-thumbnailer qtmultimedia - telephony-service ]; nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ python-dbusmock ])) ]; diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 0f60cdb9cac9..bd26af310969 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -63,10 +63,10 @@ let lomiri-history-service = callPackage ./services/lomiri-history-service { }; lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { }; lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { }; + lomiri-telephony-service = callPackage ./services/lomiri-telephony-service { }; lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { }; lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { }; mediascanner2 = callPackage ./services/mediascanner2 { }; - telephony-service = callPackage ./services/telephony-service { }; }; in lib.makeScope libsForQt5.newScope packages @@ -74,4 +74,5 @@ lib.makeScope libsForQt5.newScope packages content-hub = lib.warnOnInstantiate "`content-hub` was renamed to `lomiri-content-hub`." pkgs.lomiri.lomiri-content-hub; # Added on 2024-09-11 history-service = lib.warnOnInstantiate "`history-service` was renamed to `lomiri-history-service`." pkgs.lomiri.lomiri-history-service; # Added on 2024-11-11 lomiri-system-settings-security-privacy = lib.warnOnInstantiate "`lomiri-system-settings-security-privacy` upstream was merged into `lomiri-system-settings`. Please use `pkgs.lomiri.lomiri-system-settings-unwrapped` if you need to directly access the plugins that belonged to this project." pkgs.lomiri.lomiri-system-settings-unwrapped; # Added on 2024-08-08 + telephony-service = lib.warnOnInstantiate "`telephony-service` was renamed to `lomiri-telephony-service`." pkgs.lomiri.lomiri-telephony-service; # Adder on 2025-01-15 } diff --git a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix index 71a233beb181..b4080874ee96 100644 --- a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, testers, cmake, @@ -32,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-app-launch"; - version = "0.1.9"; + version = "0.1.11"; outputs = [ @@ -46,25 +45,11 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-app-launch"; - rev = finalAttrs.version; - hash = "sha256-vuu6tZ5eDJN2rraOpmrDddSl1cIFFBSrILKMJqcUDVc="; + tag = finalAttrs.version; + hash = "sha256-5/8RCtDvCBtxyb65WhT63jL4TryMvJfHTSieb/vTs9I="; }; patches = [ - # Remove when version > 0.1.9 - (fetchpatch { - name = "0001-lomiri-app-launch-Fix-typelib-gir-dependency.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-app-launch/-/commit/8466e77914e73801499df224fcd4a53c4a0eab25.patch"; - hash = "sha256-11pEhFi39Cvqb9Hg47kT8+5hq+bz6WmySqaIdwt1MVk="; - }) - - # Remove when version > 0.1.9 - (fetchpatch { - name = "0002-lomiri-app-launch-Fix-parallel-access-to-_iconFinders.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-app-launch/-/commit/74da7db2d59e91d95129dcaa5f6d8960fbc32eca.patch"; - hash = "sha256-3r12eS9uLJIoBqSiKE2xnkfrJ7uPhyvYxXsxXs0cykg="; - }) - # Use /run/current-system/sw/bin fallback for desktop file Exec= lookups, propagate to launched applications ./2001-Inject-current-system-PATH.patch ]; diff --git a/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix index 353eb1a30b86..61bf4d6db240 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, cmake, dbus, @@ -15,35 +14,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-notifications"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-notifications"; - rev = finalAttrs.version; - hash = "sha256-EGslfTgfADrmVGhNLG7HWqcDKhu52H/r41j7fxoliko="; + tag = finalAttrs.version; + hash = "sha256-d3fJiYGAYF5e6XPuZ26Lrjj8tUiquunMLDLs9PdAYcA="; }; - patches = [ - # Drop use of deprecated qt5_use_modules - # Remove when https://gitlab.com/ubports/development/core/lomiri-notifications/-/merge_requests/11 merged & in release - (fetchpatch { - url = "https://gitlab.com/OPNA2608/lomiri-notifications/-/commit/5d164d6d8d68efe1d14154eca4d0d736ce2a1265.patch"; - hash = "sha256-nUg0zUft1n4AlotOaZgDqWbiVDvWvMizdlClavwygoI="; - }) - ]; - postPatch = '' substituteInPlace CMakeLists.txt \ - --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" # Need to replace prefix to not try to install into lomiri-api prefix substituteInPlace src/CMakeLists.txt \ - --replace '--variable=plugindir' '--define-variable=prefix=''${CMAKE_INSTALL_PREFIX} --variable=plugindir' + --replace-fail '--variable=plugindir' '--define-variable=prefix=''${CMAKE_INSTALL_PREFIX} --variable=plugindir' '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' - sed -i CMakeLists.txt -e '/add_subdirectory(test)/d' + substituteInPlace CMakeLists.txt \ + --replace-fail 'add_subdirectory(test)' "" ''; strictDeps = true; @@ -71,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # In case anything still depends on deprecated hints - "-DENABLE_UBUNTU_COMPAT=ON" + (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -85,11 +76,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Free Desktop Notification server QML implementation for Lomiri"; homepage = "https://gitlab.com/ubports/development/core/lomiri-notifications"; - license = licenses.gpl3Only; - maintainers = teams.lomiri.members; - platforms = platforms.linux; + changelog = "https://gitlab.com/ubports/development/core/lomiri-notifications/-/blob/${finalAttrs.version}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index 58ca6d208779..4cd9ea9e7db3 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-indicator-network"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-indicator-network"; - rev = finalAttrs.version; - hash = "sha256-9AQCWCZFbt4XcmKsjoTXJlWOm02/kBhpPxbHRtftNFM="; + tag = finalAttrs.version; + hash = "sha256-pN5M5VKRyo6csmI/vrmp/bonnap3oEdPuHAUJ1PjdOs="; }; outputs = [ @@ -49,21 +49,16 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # Move to new lomiri-indicators target - # Remove when version > 1.0.2 - (fetchpatch { - name = "0001-lomiri-indicator-network-lomiri-indicators-target.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/commit/b1e1f7da4b298964eba3caea37b1dace7a6182e9.patch"; - hash = "sha256-pZKpEn2OJtB1pG/U+6IjtPGiOchRDhdbBHEZbTW7Lx0="; - }) - ]; - postPatch = '' # Override original prefixes substituteInPlace data/CMakeLists.txt \ --replace-fail 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir)' 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir DEFINE_VARIABLES datadir=''${CMAKE_INSTALL_FULL_SYSCONFDIR})' \ --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' + + # Fix typo + # Remove when https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/merge_requests/131 merged & in release + substituteInPlace src/indicator/nmofono/wwan/modem.cpp \ + --replace-fail 'if (m_isManaged = managed)' 'if (m_isManaged == managed)' ''; strictDeps = true; @@ -115,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \ - --replace '/bin/false' '${lib.getExe' coreutils "false"}' + --replace-fail '/bin/false' '${lib.getExe' coreutils "false"}' ''; passthru = { diff --git a/pkgs/desktops/lomiri/services/telephony-service/default.nix b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix similarity index 67% rename from pkgs/desktops/lomiri/services/telephony-service/default.nix rename to pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix index 1c43a37dd4d0..d89e51c193bc 100644 --- a/pkgs/desktops/lomiri/services/telephony-service/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, runCommand, @@ -43,56 +42,16 @@ let "--replace-fail \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\""; in stdenv.mkDerivation (finalAttrs: { - pname = "telephony-service"; - version = "0.5.3"; + pname = "lomiri-telephony-service"; + version = "0.6.0"; src = fetchFromGitLab { owner = "ubports"; - repo = "development/core/telephony-service"; - rev = finalAttrs.version; - hash = "sha256-eLGwAJmBDDvSODQUNr/zcPA/0DdXtVBiS7vg+iIYPDo="; + repo = "development/core/lomiri-telephony-service"; + tag = finalAttrs.version; + hash = "sha256-vEMTnflHszgANSZHcVGx1goMWVe7/6eZLYCIxq8aMt4="; }; - patches = [ - # Remove when https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/90 merged & in release - (fetchpatch { - name = "0001-lomiri-telephony-service-CMakeLists-Make-tests-optional.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch"; - hash = "sha256-Za4ZGKnw9iz2RP1LzLhKrEJ1vLUufWk8J07LmWDW40E="; - }) - - # Remove when version > 0.5.3 - (fetchpatch { - name = "0002-lomiri-telephony-service-Fix-gettext-funcs-in-wrong-namespace.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/18e0ba8e025b097eef1217d97d98ef4a4940fe84.patch"; - hash = "sha256-vOIy+B/OQeccsVn4pXsnr8LYyEapqbebW1I6dBg5u2c="; - }) - - # Remove when version > 0.5.3 - (fetchpatch { - name = "0003-lomiri-telephony-service-Handle-renamed-history-service.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/3a387670ed13041db069068292b1f41229e79583.patch"; - hash = "sha256-b7gxzr6Mmtogclq3hR7a/zl+816H2wmJqv3oHjUJggw="; - }) - - # Remove when version > 0.5.3 - # Patched to be compatible with pre-rename code - (runCommand "0004-lomiri-telephony-service-Fix-NotificationInterface-regeneration-backported.patch" - { - src = fetchpatch { - name = "0004-lomiri-telephony-service-Fix-NotificationInterface-regeneration.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9533ce1a9495e5c11e9b78fc0166e903e19519b4.patch"; - hash = "sha256-3rsZ08bz2CxKpcwYWCCd6f7gJ22v9jl7Lg7JPnWz50A="; - }; - } - '' - cp $src $out - substituteInPlace $out \ - --replace-fail 'lomiritelephony' 'telephony' - '' - ) - ]; - postPatch = '' # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory @@ -226,8 +185,8 @@ stdenv.mkDerivation (finalAttrs: { } # These SystemD services are referenced by the installed D-Bus services, but not part of the installation. Why? - for service in telephony-service-{approver,indicator}; do - install -Dm644 ../debian/telephony-service."$service".user.service $out/lib/systemd/user/"$service".service + for service in lomiri-telephony-service-approver lomiri-indicator-telephony-service; do + install -Dm644 ../debian/lomiri-telephony-service."$service".user.service $out/lib/systemd/user/"$service".service # ofono-setup.service would be provided by ubuntu-touch-session, we don't plan to package it # Doesn't make sense to provide on non-Lomiri @@ -235,17 +194,17 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '/usr' "$out" \ --replace-warn 'Requires=ofono-setup.service' "" \ --replace-warn 'After=ofono-setup.service' "" \ - --replace-warn 'WantedBy=ayatana-indicators.target' 'WantedBy=lomiri-indicators.target' + --replace-warn 'ayatana-indicators.target' 'lomiri-indicators.target' done # Parses the call & SMS indicator desktop files & tries to find its own executable in PATH - wrapProgram $out/bin/telephony-service-indicator \ + wrapProgram $out/bin/lomiri-indicator-telephony-service \ --prefix PATH : "$out/bin" ''; passthru = { ayatana-indicators = { - telephony-service-indicator = [ "lomiri" ]; + lomiri-indicator-telephony-service = [ "lomiri" ]; }; tests.vm = nixosTests.ayatana-indicators; updateScript = gitUpdater { }; @@ -253,8 +212,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Backend dispatcher service for various mobile phone related operations"; - homepage = "https://gitlab.com/ubports/development/core/telephony-service"; - changelog = "https://gitlab.com/ubports/development/core/telephony-service/-/blob/${finalAttrs.version}/ChangeLog"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-telephony-service"; + changelog = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/blob/${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl3Only; maintainers = lib.teams.lomiri.members; platforms = lib.platforms.linux; diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch new file mode 100644 index 000000000000..e055fff09940 --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch @@ -0,0 +1,25 @@ +From e8893fcae7e732c9e15ccd6d54a62b5b3862e445 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Thu, 16 Jan 2025 17:12:36 +0100 +Subject: [PATCH 1/5] doc/liblomiri-thumbnailer-qt: Honour CMAKE_INSTALL_DOCDIR + +--- + doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt +index 91e12a0..3e96f80 100644 +--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt ++++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt +@@ -28,7 +28,7 @@ add_doxygen( + ) + + install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/liblomiri-thumbnailer-qt/html +- DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/doc/liblomiri-thumbnailer-qt) ++ DESTINATION ${CMAKE_INSTALL_DOCDIR}) + + add_subdirectory(examples) + +-- +2.47.0 + diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1002-Re-enable-documentation.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1002-Re-enable-documentation.patch new file mode 100644 index 000000000000..2dd982961dce --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1002-Re-enable-documentation.patch @@ -0,0 +1,97 @@ +From 37687a195052186432923276bc2c2358b3622ab1 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Thu, 16 Jan 2025 17:12:44 +0100 +Subject: [PATCH 2/5] Re-enable documentation + +--- + CMakeLists.txt | 6 +++++- + debian/liblomiri-thumbnailer-qt-doc.install | 1 + + ...lomiri-thumbnailer-qt-doc.install.disabled | 1 - + doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 21 ++++++++----------- + 4 files changed, 15 insertions(+), 14 deletions(-) + create mode 100644 debian/liblomiri-thumbnailer-qt-doc.install + delete mode 100644 debian/liblomiri-thumbnailer-qt-doc.install.disabled + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 464ac70..cade10f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,7 +184,11 @@ if (${BUILD_TESTING}) + endif() + add_subdirectory(include) + add_subdirectory(man) +-#add_subdirectory(doc) ++ ++option(ENABLE_DOC "Build documentation" ON) ++if(ENABLE_DOC) ++ add_subdirectory(doc) ++endif() + + #enable_coverage_report( + # TARGETS +diff --git a/debian/liblomiri-thumbnailer-qt-doc.install b/debian/liblomiri-thumbnailer-qt-doc.install +new file mode 100644 +index 0000000..ff56aee +--- /dev/null ++++ b/debian/liblomiri-thumbnailer-qt-doc.install +@@ -0,0 +1 @@ ++usr/share/doc/lomiri-thumbnailer/* +diff --git a/debian/liblomiri-thumbnailer-qt-doc.install.disabled b/debian/liblomiri-thumbnailer-qt-doc.install.disabled +deleted file mode 100644 +index db055cf..0000000 +--- a/debian/liblomiri-thumbnailer-qt-doc.install.disabled ++++ /dev/null +@@ -1 +0,0 @@ +-usr/share/doc/liblomiri-thumbnailer-qt/* +diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt +index 3e96f80..fe98e4c 100644 +--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt ++++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt +@@ -1,35 +1,32 @@ +-include(UseDoxygen OPTIONAL) ++find_package(DoxygenBuilder REQUIRED) + + file(GLOB libthumbnailer_headers "${PROJECT_SOURCE_DIR}/include/lomiri/thumbnailer/qt/*.h") + + add_doxygen( + liblomiri-thumbnailer-qt-doc ++ PROJECT_NAME ++ "Thumbnailer Qt API" + INPUT + ${CMAKE_CURRENT_SOURCE_DIR}/tutorial.dox + ${libthumbnailer_headers} +- OUTPUT_DIRECTORY +- ${CMAKE_BINARY_DIR}/doc/liblomiri-thumbnailer-qt ++ EXAMPLE_PATH ++ ${CMAKE_CURRENT_SOURCE_DIR} + STRIP_FROM_PATH + "${CMAKE_SOURCE_DIR}/src" + STRIP_FROM_INC_PATH + "${CMAKE_SOURCE_DIR}/include" ++ DOXYFILE_IN ++ ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in + EXCLUDE_PATTERNS + */internal/* + EXCLUDE_SYMBOLS + *::internal* + *::Priv +- EXAMPLE_PATH +- ${CMAKE_CURRENT_SOURCE_DIR} +- DOXYFILE_IN +- ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in +- PROJECT_NAME +- "Thumbnailer Qt API" ++ INSTALL ++ ${CMAKE_INSTALL_DOCDIR} + ALL + ) + +-install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/liblomiri-thumbnailer-qt/html +- DESTINATION ${CMAKE_INSTALL_DOCDIR}) +- + add_subdirectory(examples) + + list(APPEND UNIT_TEST_TARGETS qt_example_test) +-- +2.47.0 + diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch new file mode 100644 index 000000000000..1ea1d9799e6e --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch @@ -0,0 +1,25 @@ +From 010d19f85f4f8d73f96f054e5d293951fae1f9de Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Thu, 16 Jan 2025 17:12:45 +0100 +Subject: [PATCH 3/5] doc/liblomiri-thumbnailer-qt/examples: Drop + qt5_use_modules usage + +Leftover from a0d81863f3f48717507cfa181030a8ffb0c4e881 +--- + doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt +index db8139f..825a821 100644 +--- a/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt ++++ b/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt +@@ -1,6 +1,5 @@ + include_directories(${CMAKE_BINARY_DIR}/tests ${CMAKE_SOURCE_DIR}/tests) + add_executable(qt_example_test qt_example_test.cpp) +-qt5_use_modules(qt_example_test Core Gui Network Test) + target_link_libraries(qt_example_test + gtest + Qt5::Core +-- +2.47.0 + diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1004-Re-enable-coverge-reporting.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1004-Re-enable-coverge-reporting.patch new file mode 100644 index 000000000000..d507346eb23c --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1004-Re-enable-coverge-reporting.patch @@ -0,0 +1,131 @@ +From ffec02835aa44e93c96c48b7a33be3f51a3571a1 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Thu, 16 Jan 2025 17:12:46 +0100 +Subject: [PATCH 4/5] Re-enable coverge reporting + +--- + CMakeLists.txt | 51 +++++++++++++-------- + doc/CMakeLists.txt | 6 ++- + doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 8 ++-- + tests/CMakeLists.txt | 2 - + 4 files changed, 40 insertions(+), 27 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cade10f..cbfd9c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -134,7 +134,14 @@ endif() + + include(CTest) + +-#include(EnableCoverageReport) ++if (cmake_build_type_lower MATCHES coverage) ++ find_package(CoverageReport REQUIRED) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" ) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" ) ++ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -coverage" ) ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -coverage" ) ++endif() ++ + + include(cmake/UseGSettings.cmake) + +@@ -169,6 +176,8 @@ include_directories(${TAGLIB_DEPS_INCLUDE_DIRS}) + include_directories(include) + include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) + ++set(UNIT_TEST_TARGETS "") ++ + add_subdirectory(src) + add_subdirectory(data) + add_subdirectory(plugins/Lomiri/Thumbnailer.0.1) +@@ -190,22 +199,24 @@ if(ENABLE_DOC) + add_subdirectory(doc) + endif() + +-#enable_coverage_report( +-# TARGETS +-# recovery_test # Need to turn on coverage for this, to get the helper template instrumented. +-# testutils +-# test-seq +-# thumbnailer-admin +-# thumbnailer-qml +-# thumbnailer-qml-static +-# lomiri-thumbnailer-qt +-# thumbnailer-service +-# thumbnailer-static +-# vs-thumb +-# vs-thumb-static +-# FILTER +-# ${CMAKE_SOURCE_DIR}/tests/* +-# ${CMAKE_BINARY_DIR}/* +-# TESTS +-# ${UNIT_TEST_TARGETS} +-#) ++if (cmake_build_type_lower MATCHES coverage) ++ enable_coverage_report( ++ TARGETS ++ recovery_test # Need to turn on coverage for this, to get the helper template instrumented. ++ testutils ++ test-seq ++ lomiri-thumbnailer-admin ++ LomiriThumbnailer-qml ++ thumbnailer-qml-static ++ lomiri-thumbnailer-qt ++ thumbnailer-service ++ thumbnailer-static ++ vs-thumb ++ vs-thumb-static ++ FILTER ++ ${CMAKE_SOURCE_DIR}/tests/* ++ ${CMAKE_BINARY_DIR}/* ++ TESTS ++ ${UNIT_TEST_TARGETS} ++ ) ++endif() +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index 11f4449..249f5e0 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -1,4 +1,6 @@ + add_subdirectory(liblomiri-thumbnailer-qt) + +-list(APPEND UNIT_TEST_TARGETS qt_example_test) +-set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE) ++if(BUILD_TESTING) ++ list(APPEND UNIT_TEST_TARGETS qt_example_test) ++ set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE) ++endif() +diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt +index fe98e4c..078be07 100644 +--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt ++++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt +@@ -27,7 +27,9 @@ add_doxygen( + ALL + ) + +-add_subdirectory(examples) ++if(BUILD_TESTING) ++ add_subdirectory(examples) + +-list(APPEND UNIT_TEST_TARGETS qt_example_test) +-set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE) ++ list(APPEND UNIT_TEST_TARGETS qt_example_test) ++ set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE) ++endif() +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 03a4900..97cb3a1 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -42,8 +42,6 @@ set(slow_test_dirs + stress + ) + +-set(UNIT_TEST_TARGETS "") +- + foreach(dir ${unit_test_dirs}) + add_subdirectory(${dir}) + list(APPEND UNIT_TEST_TARGETS "${dir}_test") +-- +2.47.0 + diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1005-Make-GTest-available-to-example-test.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1005-Make-GTest-available-to-example-test.patch new file mode 100644 index 000000000000..0fd3ba976fee --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1005-Make-GTest-available-to-example-test.patch @@ -0,0 +1,38 @@ +From d9152f5e1f77a6c3bbc759eec58811410de7b85a Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Thu, 16 Jan 2025 17:12:49 +0100 +Subject: [PATCH 5/5] Make GTest available to example test + +--- + CMakeLists.txt | 2 ++ + tests/CMakeLists.txt | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cbfd9c0..0663b44 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -189,6 +189,8 @@ if (${BUILD_TESTING}) + find_package(Qt5QuickTest REQUIRED) + find_package(Qt5Network REQUIRED) + ++ find_package(GMock REQUIRED) ++ + add_subdirectory(tests) + endif() + add_subdirectory(include) +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 97cb3a1..92eae14 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -3,7 +3,6 @@ + + set(old_cxx_flags ${CMAKE_CXX_FLAGS}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wno-old-style-cast -Wno-missing-field-initializers") +-find_package(GMock) + set(CMAKE_CXX_FLAGS ${old_cxx_flags}) + + set(TESTDATADIR ${CMAKE_CURRENT_SOURCE_DIR}/media) +-- +2.47.0 + diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix index f7a18d5a0726..c6ba7ef33a0b 100644 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, testers, boost, @@ -32,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-thumbnailer"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-thumbnailer"; - rev = finalAttrs.version; - hash = "sha256-BE/U4CT4z4WzEJXrVhX8ME/x9q7w8wNnJKTbfVku2VQ="; + tag = finalAttrs.version; + hash = "sha256-pf/bzpooCcoIGb5JtSnowePcobcfVSzHyBaEkb51IOg="; }; outputs = [ @@ -48,74 +47,35 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - # Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/19 merged & in release - (fetchpatch { - name = "0001-lomiri-thumbnailer-Add-more-better-GNUInstallDirs-variables-usage.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/0b9795a6313fd025d5646f2628a2cbb3104b0ebc.patch"; - hash = "sha256-br99n2nDLjUfnjbjhOsWlvP62VmVjYeZ6yPs1dhPN/s="; - }) - - # Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/22 merged & in release - (fetchpatch { - name = "0002-lomiri-thumbnailer-Make-tests-optional.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/df7a3d1689f875d207a90067b957e888160491b9.patch"; - hash = "sha256-gVxigpSL/3fXNdJBjh8Ex3/TYmQUiwRji/NmLW/uhE4="; - }) - # Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/23 merged & in release - (fetchpatch { - name = "0003-lomiri-thumbnailer-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DOCDIR.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/930a3b57e899f6eb65a96d096edaea6a6f6b242a.patch"; - hash = "sha256-klYycUoQqA+Dfk/4fRQgdS4/G4o0sC1k98mbtl0iHkE="; - }) - (fetchpatch { - name = "0004-lomiri-thumbnailer-Re-enable-documentation.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/2f9186f71fdd25e8a0852073f1da59ba6169cf3f.patch"; - hash = "sha256-youaJfCeYVpLmruHMupuUdl0c/bSDPWqKPLgu5plBrw="; - }) - (fetchpatch { - name = "0005-lomiri-thumbnailer-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_modules-usage.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/9e5cf09de626e73e6b8f180cbc1160ebd2f169e7.patch"; - hash = "sha256-vfNCN7tqq6ngzNmb3qqHDHaDx/kI8/UXyyv7LqUWya0="; - }) - (fetchpatch { - name = "0006-lomiri-thumbnailer-Re-enable-coverge-reporting.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/6a48831f042cd3ad34200f32800393d4eec2f84b.patch"; - hash = "sha256-HZd4K0R1W6adOjKy7tODfQAD+9IKPcK0DnH1uKNd/Ak="; - }) - (fetchpatch { - name = "0007-lomiri-thumbnailer-Make-GTest-available-to-example-test.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/657be3bd1aeb227edc04e26b597b2fe97b2dc51a.patch"; - hash = "sha256-XEvdWV3JJujG16+87iewYor0jFK7NTeE5459iT96SkU="; - }) - (fetchpatch { - name = "0008-fix-googletest-1-13.patch"; - url = "https://salsa.debian.org/ubports-team/lomiri-thumbnailer/-/raw/debian/3.0.3-1/debian/patches/0001_fix_googletest_1_13.patch"; - hash = "sha256-oBcdspQMhCxh4L/XotG9NRp/Ij2YzIjpC8xg/jdiptw="; - }) + ./1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch + ./1002-Re-enable-documentation.patch + ./1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch + ./1004-Re-enable-coverge-reporting.patch + ./1005-Make-GTest-available-to-example-test.patch ]; postPatch = '' patchShebangs tools/{parse-settings.py,run-xvfb.sh} tests/{headers,whitespace,server}/*.py substituteInPlace tests/thumbnailer-admin/thumbnailer-admin_test.cpp \ - --replace '/usr/bin/test' 'test' + --replace-fail '/usr/bin/test' 'test' substituteInPlace plugins/*/Thumbnailer*/CMakeLists.txt \ - --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" # I think this variable fails to be populated because of our toolchain, while upstream uses Debian / Ubuntu where this works fine # https://cmake.org/cmake/help/v3.26/variable/CMAKE_LIBRARY_ARCHITECTURE.html # > If the compiler passes to the linker an architecture-specific system library search directory such as # > /lib/ this variable contains the name if/as detected by CMake. substituteInPlace tests/qml/CMakeLists.txt \ - --replace 'CMAKE_LIBRARY_ARCHITECTURE' 'CMAKE_SYSTEM_PROCESSOR' \ - --replace 'powerpc-linux-gnu' 'ppc' \ - --replace 's390x-linux-gnu' 's390x' + --replace-fail 'CMAKE_LIBRARY_ARCHITECTURE' 'CMAKE_SYSTEM_PROCESSOR' \ + --replace-fail 'powerpc-linux-gnu' 'ppc' \ + --replace-fail 's390x-linux-gnu' 's390x' # Tests run in parallel to other builds, don't suck up cores substituteInPlace tests/headers/compile_headers.py \ - --replace 'max_workers=multiprocessing.cpu_count()' "max_workers=1" + --replace-fail 'max_workers=multiprocessing.cpu_count()' "max_workers=1" ''; strictDeps = true; @@ -213,17 +173,17 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "D-Bus service for out of process thumbnailing"; mainProgram = "lomiri-thumbnailer-admin"; homepage = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer"; changelog = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/blob/${finalAttrs.version}/ChangeLog"; - license = with licenses; [ + license = with lib.licenses; [ gpl3Only lgpl3Only ]; - maintainers = teams.lomiri.members; - platforms = platforms.linux; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; pkgConfigModules = [ "liblomiri-thumbnailer-qt" ]; diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index 1601669673eb..d739f7666935 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -14,9 +14,17 @@ stdenv.mkDerivation { pname = "polyml"; inherit version; - prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace configure.ac --replace stdc++ c++ - ''; + postPatch = + '' + substituteInPlace configure.ac \ + --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA + AH_TEMPLATE([_Static_assert]) + AC_DEFINE([_Static_assert], [static_assert]) + " + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace configure.ac --replace-fail stdc++ c++ + ''; patches = [ # glibc 2.34 compat @@ -26,7 +34,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; + nativeBuildInputs = [ autoreconfHook ]; src = fetchurl { url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index 197a787594ea..c35a325ba01a 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -12,9 +12,17 @@ stdenv.mkDerivation rec { pname = "polyml"; version = "5.7.1"; - prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace configure.ac --replace stdc++ c++ - ''; + postPatch = + '' + substituteInPlace configure.ac \ + --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA + AH_TEMPLATE([_Static_assert]) + AC_DEFINE([_Static_assert], [static_assert]) + " + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace configure.ac --replace-fail stdc++ c++ + ''; patches = [ ./5.7-new-libffi-FFI_SYSV.patch @@ -31,7 +39,7 @@ stdenv.mkDerivation rec { gmp ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-shared" diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 067bdd018f27..99b6889eb4d6 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, gmp -, libffi +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + gmp, + libffi, }: stdenv.mkDerivation rec { @@ -17,13 +18,24 @@ stdenv.mkDerivation rec { sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; }; - prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace configure.ac --replace stdc++ c++ - ''; + postPatch = + '' + substituteInPlace configure.ac \ + --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA + AH_TEMPLATE([_Static_assert]) + AC_DEFINE([_Static_assert], [static_assert]) + " + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace configure.ac --replace-fail stdc++ c++ + ''; - buildInputs = [ libffi gmp ]; + buildInputs = [ + libffi + gmp + ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-shared" @@ -47,6 +59,9 @@ stdenv.mkDerivation rec { homepage = "https://www.polyml.org/"; license = licenses.lgpl21; platforms = with platforms; (linux ++ darwin); - maintainers = with maintainers; [ maggesi kovirobi ]; + maintainers = with maintainers; [ + maggesi + kovirobi + ]; }; } diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 2cafe8ca8ac7..48d36b2dbb8c 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -67,7 +67,7 @@ let mathcomp_ = package: let mathcomp-deps = lib.optionals (package != "single") (map mathcomp_ (lib.head (lib.splitList (lib.pred.equal package) packages))); - pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}"; + pkgpath = if package == "single" then "." else package; pname = if package == "single" then "mathcomp" else "mathcomp-${package}"; pkgallMake = '' echo "all.v" > Make @@ -92,6 +92,8 @@ let then patchShebangs etc/buildlibgraph fi '' + '' + # handle mathcomp < 2.4.0 which had an extra base mathcomp directory + test -d mathcomp && cd mathcomp cd ${pkgpath} '' + lib.optionalString (package == "all") pkgallMake; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1f4fb42885cd..36a5285a6482 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -513,22 +513,22 @@ self: super: { # Manually maintained cachix-api = overrideCabal (drv: { - version = "1.7.5"; + version = "1.7.6"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.5"; - sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs="; + rev = "v1.7.6"; + hash = "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; }) super.cachix-api; cachix = (overrideCabal (drv: { - version = "1.7.5"; + version = "1.7.6"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.5"; - sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs="; + rev = "v1.7.6"; + hash = "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; }) (lib.pipe @@ -2004,17 +2004,22 @@ self: super: { # https://github.com/NixOS/nixpkgs/pull/349683 pandoc-cli_3_6 = super.pandoc-cli_3_6.overrideScope ( self: super: { + commonmark-extensions = self.commonmark-extensions_0_2_5_6; + commonmark-pandoc = self.commonmark-pandoc_0_2_2_3; doclayout = self.doclayout_0_5; hslua-module-doclayout = self.hslua-module-doclayout_1_2_0; lpeg = self.lpeg_1_1_0; pandoc = self.pandoc_3_6; pandoc-lua-engine = self.pandoc-lua-engine_0_4; + pandoc-lua-marshal = self.pandoc-lua-marshal_0_3_0; pandoc-server = self.pandoc-server_0_1_0_10; + skylighting = self.skylighting_0_14_5; + skylighting-core = self.skylighting-core_0_14_5; texmath = self.texmath_0_12_8_12; tls = self.tls_2_0_6; toml-parser = self.toml-parser_2_0_1_0; typst = self.typst_0_6_1; - typst-symbols = self.typst-symbols_0_1_6; + typst-symbols = self.typst-symbols_0_1_7; } ); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 42e07f4fa4a8..447df2a7ce02 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -116,7 +116,6 @@ extra-packages: - tls < 2.1.0 # 2024-07-19: requested by darcs == 2.18.3 - extensions == 0.1.0.2 # 2024-10-20: for GHC 9.10/Cabal 3.12 - network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.* - - typst-symbols >=0.1.6 && <0.1.7 # 2024-11-20: for pandoc 3.5 and quarto - ghc-source-gen < 0.4.6.0 # 2024-12-31: support GHC < 9.0 package-maintainers: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 36cf7f46bd80..2be1a3cd0e20 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -260442,6 +260442,7 @@ self: { description = "Anonymous extensible records"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rawstring-qm" = callPackage @@ -323218,18 +323219,6 @@ self: { license = lib.licenses.mit; }) {}; - "typst-symbols_0_1_6" = callPackage - ({ mkDerivation, base, text }: - mkDerivation { - pname = "typst-symbols"; - version = "0.1.6"; - sha256 = "17a2grflk67vs68b2pxygvk7p50rj9fb3ri7fcwa19j9jnhg4zwl"; - libraryHaskellDepends = [ base text ]; - description = "Symbol and emoji lookup for typst language"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "typst-symbols_0_1_7" = callPackage ({ mkDerivation, base, text }: mkDerivation { diff --git a/pkgs/development/interpreters/elixir/1.18.nix b/pkgs/development/interpreters/elixir/1.18.nix index 640181a6a2af..059d7fe05d85 100644 --- a/pkgs/development/interpreters/elixir/1.18.nix +++ b/pkgs/development/interpreters/elixir/1.18.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation { - version = "1.18.1"; - sha256 = "sha256-zJNAoyqSj/KdJ1Cqau90QCJihjwHA+HO7nnD1Ugd768="; + version = "1.18.2"; + sha256 = "sha256-8FhUKAaEjBBcF0etVPdkxMfrnR5niU40U8cxDRJdEok="; # https://hexdocs.pm/elixir/1.18.0/compatibility-and-deprecations.html#between-elixir-and-erlang-otp minimumOTPVersion = "25"; escriptPath = "lib/elixir/scripts/generate_app.escript"; diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index f51c712eecfe..84dadc68968e 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.2"; - hash = "sha256-70/pkhuIXOOwR3kqtgJg6vZX4igSvlEdGdDkXt+YR4M="; + version = "8.4.3"; + hash = "sha256-1rEjedHx3yFtGTKECjGxT+0eD8fo2x6dF5X3Wh516tk="; } ); in diff --git a/pkgs/development/libraries/gcr/4.nix b/pkgs/development/libraries/gcr/4.nix index d534840887ee..7b3cd9a0f96b 100644 --- a/pkgs/development/libraries/gcr/4.nix +++ b/pkgs/development/libraries/gcr/4.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gcr/${lib.versions.majorMinor version}/gcr-${version}.tar.xz"; hash = "sha256-w+6HKOQ2SwOX9DX6IPkvkBqxOdKyZPTgWdZ7PA9DzTY="; }; @@ -103,7 +103,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { attrPath = "gcr_4"; - packageName = pname; + packageName = "gcr"; + versionPolicy = "ninety-micro-unstable"; }; }; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 8c06d3818aa1..a50e227124eb 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -11,7 +11,6 @@ glib, gtk3, gtksourceview4, - libgda, libpeas, pango, pkg-config, @@ -46,7 +45,6 @@ stdenv.mkDerivation rec { gst-plugins-base gtk3 gtksourceview4 - libgda libpeas librsvg pango diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index c71dc03bc733..f34c14e79d27 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.6.2"; + version = "1.6.3"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; rev = finalAttrs.version; - hash = "sha256-HNj6gCQFs1ECjJETtQ7oWEVT02IqRssiEtbhg1dQmY8="; + hash = "sha256-4rYiNI6Oj++iqbPIwe8KvwviGnh93sAZ9wp1cIPZcBA="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/5.x.nix similarity index 92% rename from pkgs/development/libraries/libgda/default.nix rename to pkgs/development/libraries/libgda/5.x.nix index 60e4e3c132ce..3972c44c0f39 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/5.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { version = "5.2.10"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libgda/${lib.versions.majorMinor version}/libgda-${version}.tar.xz"; hash = "sha256-b2zfe4BT9VO5B+DIimBk60jPJ1GFLrJDI9zwJ3kjNMg="; }; @@ -97,7 +97,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libgda"; + attrPath = "libgda5"; versionPolicy = "odd-unstable"; freeze = true; }; @@ -112,7 +113,7 @@ stdenv.mkDerivation rec { # CLI tools gpl2Plus ]; - maintainers = lib.teams.gnome.members; + maintainers = [ lib.maintainers.bot-wxt1221 ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 853b3f45ddf0..5383aa71f863 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -15,6 +15,7 @@ pango, cairo, libXres, + libXi, libstartup_notification, gettext, gobject-introspection, @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "43.1"; + version = "43.2"; outputs = [ "out" @@ -33,8 +34,8 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Y0tFh7c2ekk9OBjEtXdA2sBhU8+PJc1k9a8WtlfdaEU="; + url = "mirror://gnome/sources/libwnck/${lib.versions.major version}/libwnck-${version}.tar.xz"; + sha256 = "VadETsH7uVwIbUCWc4jyMbXAu8jP+qCGv5KQrkSeUdU="; }; nativeBuildInputs = @@ -58,6 +59,7 @@ stdenv.mkDerivation rec { pango cairo libXres + libXi ]; propagatedBuildInputs = [ @@ -71,7 +73,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libwnck"; }; }; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index d187b9ee4378..a08d86f73f76 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -50,6 +50,7 @@ mapAliases { "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 "@tailwindcss/language-server" = pkgs.tailwindcss-language-server; # added 2024-01-22 "@volar/vue-language-server" = pkgs.vue-language-server; # added 2024-06-15 + "@volar/vue-typescript-plugin" = pkgs.vue-typescript-plugin; # added 2025-01-16 "@vue/language-server" = pkgs.vue-language-server; # added 2024-06-15 "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25 "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09 diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 7f4cbe4cf5cc..003e2c0263bc 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, which, ocaml, findlib }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib }: if lib.versionOlder ocaml.version "4.10" then throw "camlpdf is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.7.1"; + version = "2.8"; pname = "ocaml${ocaml.version}-camlpdf"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; rev = "v${version}"; - hash = "sha256-/ZKL80HqLZ9ObOvgfg+ZHFZ8m2CRe0zWT8zHIf9CXes="; + hash = "sha256-+SFuFqlrP0nwm199y0QFWYvlwD+Cbh0PHA5bmXIWdNk="; }; - nativeBuildInputs = [ which ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 7e917482379d..66823ce21fa1 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -5,7 +5,6 @@ ocaml, findlib, camlpdf, - ncurses, }: if lib.versionOlder ocaml.version "4.10" then @@ -14,20 +13,19 @@ else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-cpdf"; - version = "2.7.1"; + version = "2.8"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "cpdf-source"; rev = "v${version}"; - hash = "sha256-lFI7f1t70Pw0LJjDrhaB7yQKR1N5906xNYB+fnrz55M="; + hash = "sha256-DvTY5EQcvnL76RlQTcVqBiycqbCdGQCXzarSMH2P/pg="; }; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ ncurses ]; propagatedBuildInputs = [ camlpdf ]; strictDeps = true; diff --git a/pkgs/development/python-modules/airportsdata/default.nix b/pkgs/development/python-modules/airportsdata/default.nix new file mode 100644 index 000000000000..1e9901887bb7 --- /dev/null +++ b/pkgs/development/python-modules/airportsdata/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "airportsdata"; + version = "20241001"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-+gvRQ7T0vjVXy4kvoGEu8hD9kakr1yC02CId5Xak+gA="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "airportsdata" ]; + + meta = { + description = "Extensive database of location and timezone data for nearly every operational airport"; + homepage = "https://github.com/mborsetti/airportsdata/"; + changelog = "https://github.com/mborsetti/airportsdata/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index 48db179f7240..6eb47812b1df 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry-core>=1.0.0,<2" "poetry-core" + ''; + build-system = [ poetry-core ]; dependencies = [ @@ -78,7 +83,7 @@ buildPythonPackage rec { "test_binary_compatibility" ]; - meta = with lib; { + meta = { description = "Code generator & library for Protobuf 3 and async gRPC"; mainProgram = "protoc-gen-python_betterproto"; longDescription = '' @@ -88,7 +93,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/danielgtaylor/python-betterproto"; changelog = "https://github.com/danielgtaylor/python-betterproto/blob/v.${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ nikstur ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nikstur ]; }; } diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 15f562185e1b..51656522a36b 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -1,63 +1,69 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, curtsies, cwcwidth, greenlet, jedi, pygments, pytestCheckHook, - pythonOlder, pyperclip, pyxdg, requests, - typing-extensions, + setuptools, urwid, watchdog, }: buildPythonPackage rec { pname = "bpython"; - version = "0.24"; - format = "setuptools"; + version = "0.25"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-mHNv/XqMSP0r+1PYmKR19CQb3gtnISVwavBNnQj9Pb0="; + src = fetchFromGitHub { + owner = "bpython"; + repo = "bpython"; + tag = version; + hash = "sha256-p5+IQiHNRRazqr+WRdx3Yw+ImG25tdZGLXvMf7woD9w="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'version = "unknown"' 'version = "${version}"' + ''; + + build-system = [ setuptools ]; + + dependencies = [ curtsies cwcwidth greenlet - jedi pygments - pyperclip pyxdg requests - typing-extensions - urwid - watchdog ]; + optional-dependencies = { + clipboard = [ pyperclip ]; + jedi = [ jedi ]; + urwid = [ urwid ]; + watch = [ watchdog ]; + }; + postInstall = '' substituteInPlace "$out/share/applications/org.bpython-interpreter.bpython.desktop" \ - --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython" + --replace "Exec=/usr/bin/bpython" "Exec=bpython" ''; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "bpython" ]; - disabledTests = [ - # Check for syntax error ends with an AssertionError - "test_syntaxerror" - ]; - meta = with lib; { + changelog = "https://github.com/bpython/bpython/blob/${src.tag}/CHANGELOG.rst"; description = "Fancy curses interface to the Python interactive interpreter"; homepage = "https://bpython-interpreter.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/eheimdigital/default.nix b/pkgs/development/python-modules/eheimdigital/default.nix index a7c806ff9a9f..b2f701b20b5c 100644 --- a/pkgs/development/python-modules/eheimdigital/default.nix +++ b/pkgs/development/python-modules/eheimdigital/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "eheimdigital"; - version = "1.0.3"; + version = "1.0.5"; pyproject = true; src = fetchFromGitHub { owner = "autinerd"; repo = "eheimdigital"; tag = version; - hash = "sha256-oWMlQIj8q2UVpW0xyPnoblT+ryHwCn9PCk2vugXyh2c="; + hash = "sha256-fzvQrguwZoaQCoJlXzFCF7WUZpBe0EMQNcyKnmhQ4l8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index ec9b429b8931..e82e53219bc3 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -102,19 +102,15 @@ buildPythonPackage rec { "flax/nnx/examples/*" # See https://github.com/google/flax/issues/3232. "tests/jax_utils_test.py" - # Too old version of tensorflow: - # ModuleNotFoundError: No module named 'keras.api._v2' - "tests/tensorboard_test.py" ]; disabledTests = [ - # ValueError: Checkpoint path should be absolute - "test_overwrite_checkpoints0" - # Fixed in more recent versions of jax: https://github.com/google/flax/issues/4211 - # TODO: Re-enable when jax>0.4.28 will be available in nixpkgs - "test_vmap_and_cond_passthrough" # ValueError: vmap has mapped output but out_axes is None - "test_vmap_and_cond_passthrough_error" # AssertionError: "at vmap.*'broadcast'.*got axis spec ... + # Failing with AssertionError since the jax update to 0.5.0 + "test_basic_demo_single" + "test_batch_norm_multi_init" + "test_multimetric" + "test_split_merge" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated! diff --git a/pkgs/development/python-modules/gcp-storage-emulator/default.nix b/pkgs/development/python-modules/gcp-storage-emulator/default.nix index ab67535edb8f..91d4d81042a9 100644 --- a/pkgs/development/python-modules/gcp-storage-emulator/default.nix +++ b/pkgs/development/python-modules/gcp-storage-emulator/default.nix @@ -3,14 +3,11 @@ buildPythonPackage, fetchFromGitHub, setuptools, - wheel, - flake8, fs, google-cloud-storage, google-crc32c, - pytest, pytestCheckHook, - pytest-cov, + pytest-cov-stub, requests, }: @@ -22,23 +19,23 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oittaa"; repo = "gcp-storage-emulator"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-Lp9Wvod0wSE2+cnvLXguhagT30ax9TivyR8gC/kB7w0="; }; build-system = [ setuptools - wheel + ]; + + dependencies = [ + fs + google-crc32c ]; nativeCheckInputs = [ - flake8 - fs google-cloud-storage - google-crc32c - pytest + pytest-cov-stub pytestCheckHook - pytest-cov requests ]; @@ -51,5 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/oittaa/gcp-storage-emulator"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "gcp-storage-emulator"; }; } diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index a1a6ea29c00b..c7123783cf2e 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2025.1.10"; + version = "2025.1.11"; pyproject = true; disabled = pythonOlder "3.12"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "SukramJ"; repo = "hahomematic"; tag = version; - hash = "sha256-4aHrQ8EgaQNNT4M8FBEHXxgU+ES3ylegYwFyz3Hf+jQ="; + hash = "sha256-XHXQ1A6s5ew5hsivlC83oufYiImpKCRJ7v7NsAn6PJs="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index 40320035f53e..fd3a9318b8ca 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -10,6 +10,7 @@ pydicom, pylibjpeg, pylibjpeg-libjpeg, + setuptools, }: let @@ -22,19 +23,23 @@ let in buildPythonPackage rec { pname = "highdicom"; - version = "0.22.0"; + version = "0.23.1"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "MGHComputationalPathology"; repo = "highdicom"; tag = "v${version}"; - hash = "sha256-KHSJWEnm8u0xHkeeLF/U7MY4FfiWb6Q0GQQy2w1mnKw="; + hash = "sha256-LrsG85/bpqIEP++LgvyaVyw4tMsuUTtHNwWl7apuToM="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ numpy pillow pillow-jpls @@ -49,6 +54,10 @@ buildPythonPackage rec { ]; }; + pythonRemoveDeps = [ + "pyjpegls" # not directly used + ]; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.libjpeg; preCheck = '' export HOME=$TMP/test-home @@ -56,6 +65,20 @@ buildPythonPackage rec { ln -s ${test_data}/data_store/data $HOME/.pydicom/data ''; + disabledTests = [ + # require pyjpegls + "test_jpegls_monochrome" + "test_jpegls_rgb" + "test_jpeglsnearlossless_monochrome" + "test_jpeglsnearlossless_rgb" + "test_multi_frame_sm_image_ushort_encapsulated_jpegls" + "test_monochrome_jpegls" + "test_monochrome_jpegls_near_lossless" + "test_rgb_jpegls" + "test_construction_autotile" + "test_pixel_types_fractional" + ]; + pythonImportsCheck = [ "highdicom" "highdicom.legacy" diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix index 67f5774a2f49..b22e6fc6350f 100644 --- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix @@ -33,7 +33,7 @@ let srcs = { "x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_x86_64.whl"; - hash = "sha256-g75MWfvPMAd6YAhdmOfVncc4sckeDWKOSsF3n94VrCs="; + hash = "sha256-0jgzwbiF2WwnZAAOlQUvK1gnx31JLqaPZ+kDoTJlbbs="; }; "aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_aarch64.whl"; diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix index 0b63fac213a1..572ec530f6d3 100644 --- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix @@ -39,7 +39,7 @@ let "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-nULpmc1k3VZ8FJ7Wj3k5K6iGRDZCGLtjbNzvoBl8kv4="; + hash = "sha256-D0Q6azcpjt+weW/NvR+GzoWksIS2vT8fUKT7/Wfe2Gs="; }; "3.10-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; @@ -49,7 +49,7 @@ let "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-cEZUOG8OYAoCgdquqViCqmekfttoOTthsbFzx+jKdKg="; + hash = "sha256-qYE1oCIwZLj1xoU+It3BpOOGIVLTf7aF8Nve/+DIASI="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; @@ -59,7 +59,7 @@ let "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-Ufas/3Ew63LrsCU039NYGg9eoGlx3lLX68Ia1Nh/5x4="; + hash = "sha256-QwWN/FZdjJ2mn0fNTkuVxJXxaG8onvRYTCtygD5vFgc="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; @@ -69,7 +69,7 @@ let "3.13-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp313"; - hash = "sha256-CSKKTCtEO3aozZqOwikGAInEzINuBiSWh1ptb9xm0x8="; + hash = "sha256-3zbEsXbi01qCqfOM13zDadJx5gBR43GgqO9FFD+PWLY="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 99154a8ea86a..7c83e9be3a12 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.38"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { @@ -48,7 +48,7 @@ buildPythonPackage rec { repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! tag = "jax-v${version}"; - hash = "sha256-H8I9Mkz6Ia1RxJmnuJOSevLGHN2J8ey59ZTlFx8YfnA="; + hash = "sha256-D6n9Z34nrCbBd9IS8YW6uio5Yi9GLCo9PViO3YYbkQ8="; }; build-system = [ setuptools ]; @@ -154,6 +154,7 @@ buildPythonPackage rec { "testInAxesPyTreePrefixMismatchErrorKwargs" "testOutAxesPyTreePrefixMismatchError" "test_tree_map" + "test_tree_prefix_error" "test_vjp_rule_inconsistent_pytree_structures_error" "test_vmap_in_axes_tree_prefix_error" "test_vmap_mismatched_axis_sizes_error_message_issue_705" diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index dd82358f03b7..7cc8578a01d3 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -18,7 +18,7 @@ }: let - version = "0.4.38"; + version = "0.5.0"; inherit (python) pythonVersion; # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the @@ -49,85 +49,65 @@ let "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-Ya7MuaJ8Z/24RQ9jVyQAGc1FEcudYqROR2R1bThIU60="; + hash = "sha256-dEQLYyEHM2QA1Pl6Fkgddn8T6pFMU7oU5UTG/aVIGbM="; }; "3.10-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp310"; - hash = "sha256-7hnBY6j98IOdTBi4il+/tOcxunxDdBbT5Ug+Vwu3ZOQ="; + hash = "sha256-Wy7+Pf6/GKhMRR04A6yITuJCAhwRE7J5wT9LvDeMPcA="; }; "3.10-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp310"; - hash = "sha256-MLL1LLUNdHNK8vR3wlM6elg+O7eyyKzes2Hud9lAV3o="; - }; - "3.10-x86_64-darwin" = getSrcFromPypi { - platform = "macosx_10_14_x86_64"; - dist = "cp310"; - hash = "sha256-VcGbnT8zpvxZ9kSqWiH7oCY5zN13bLSptVJmJfV4Of8="; + hash = "sha256-G4psQ0XxN/OHZQ3i28SIwgJRt0ErVd1kjhpPE7z1B/s="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-J1H/cDfWqZfQvg53zEvjgcWp+buLMU7bdVwTpv2Wn0U="; + hash = "sha256-CRE+8Vgro018vEQP7bMY9IVbWbd2cRqKuiRzyXJ9MCU="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp311"; - hash = "sha256-Q9tYxMQnYnKWNmpWwQMY4fAPUDaQ4X+Uu0NEKT4ZleA="; + hash = "sha256-YwiNv6qFu1bNUhqSWjRy/XMosY7JPC2P+oWvMxCVyZU="; }; "3.11-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp311"; - hash = "sha256-P7DqrnNpFXr+y+rVCq8p5z/936d6IzXXIb2XlPPFEOQ="; - }; - "3.11-x86_64-darwin" = getSrcFromPypi { - platform = "macosx_10_14_x86_64"; - dist = "cp311"; - hash = "sha256-tn/eq9bf7Qi3do873/tSEWAIX4MFZpvRl77vYdCN4Is="; + hash = "sha256-bNdi7RYjEySZ+nAcQgNEYQLgqcgsojGUuHKI90bRKik="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-2tbAqWVnwG0IPARp/sQPIBIQsJk2W9aYvjGm0uyI/Vk="; + hash = "sha256-+YDHM+mMmYqNqHyajMYbZybQvmZ6WL1mTB1xe0tOrnU="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp312"; - hash = "sha256-SW9FsOABojQTCc0MdK8LZwU33O15wWjLIwz8x3PwqoY"; + hash = "sha256-S0sBr7Dd7JbAg1a/8rtoXdvpf9/+Ttbi2DSzCrqXLyI="; }; "3.12-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp312"; - hash = "sha256-8zvK/jLJelYuz2iU18QWdMgMCs3t+lQj1Jr1EUcUmHQ="; - }; - "3.12-x86_64-darwin" = getSrcFromPypi { - platform = "macosx_10_14_x86_64"; - dist = "cp312"; - hash = "sha256-P+/qmF8EFYFvO7r9PwOkNwUCde+brJpywTFOFkSsV8E="; + hash = "sha256-c+M1cVdgxW5jUQnWFCZDWl1/RvM2OhFdrqCUJ9XNDv0="; }; "3.13-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp313"; - hash = "sha256-LOd7qM2pJZpLypevwcci5CkabEY6Y/jTcsbtyFEX1iU="; + hash = "sha256-Ee7wHTfA8cUwYmW3byB/EALRNIDe0uMf1j7HaRLJPKI="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp313"; - hash = "sha256-JIzKN3Hr8ksHD0lwE2TOraM+YTlEWwbHgsylrFrZK/Q="; + hash = "sha256-fZsXp+oZNV1F7Nsv8NtdcHqG8MWoYtlLibRWjWxFMRo="; }; "3.13-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp313"; - hash = "sha256-b+MmuK82Y4fdR8zzElg7Kxf+0ScSybdKZIsYoTy9ur8="; - }; - "3.13-x86_64-darwin" = getSrcFromPypi { - platform = "macosx_10_14_x86_64"; - dist = "cp313"; - hash = "sha256-QeVa5YGKiC5XiehI9vFmh6wTK8+7Wl+hFKXRi3jQXy0="; + hash = "sha256-7RjqcWHQOqj9TRtVSUiC8hQg79/qaOXymMSuvPKsPzQ="; }; }; in diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index de7fea0a26e8..137d9b39e510 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -15,7 +15,7 @@ cython, fetchFromGitHub, git, - IOKit, + darwin, jsoncpp, nsync, openssl, @@ -242,25 +242,22 @@ let which ] ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ cctools ]; - buildInputs = - [ - curl - double-conversion - giflib - jsoncpp - libjpeg_turbo - numpy - openssl - pkgs.flatbuffers - pkgs.protobuf - pybind11 - scipy - six - snappy - zlib - ] - ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ IOKit ] - ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ]; + buildInputs = [ + curl + double-conversion + giflib + jsoncpp + libjpeg_turbo + numpy + openssl + pkgs.flatbuffers + pkgs.protobuf + pybind11 + scipy + six + snappy + zlib + ] ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ]; # We don't want to be quite so picky regarding bazel version postPatch = '' @@ -393,12 +390,12 @@ let } ).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}"); - # Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546 - preInstall = '' - cat << \EOF > "$bazelOut/external/go_sdk/versions.json" - [] - EOF - ''; + # Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546 + preInstall = '' + cat << \EOF > "$bazelOut/external/go_sdk/versions.json" + [] + EOF + ''; }; buildAttrs = { @@ -415,7 +412,7 @@ let # are not available yet. Framework search paths aren't added by bintools # hook. See https://github.com/NixOS/nixpkgs/pull/41914. preBuild = lib.optionalString effectiveStdenv.hostPlatform.isDarwin '' - export NIX_LDFLAGS+=" -F${IOKit}/Library/Frameworks" + export NIX_LDFLAGS+=" -F${darwin.apple_sdk.frameworks.IOKit}/Library/Frameworks" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \ --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \ diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix index 9b4c088b2b16..5579ea4610a1 100644 --- a/pkgs/development/python-modules/led-ble/default.nix +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "led-ble"; - version = "1.1.1"; + version = "1.1.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "led-ble"; tag = "v${version}"; - hash = "sha256-FPF/jPsXVk16UDpfglmVy01sOpv/XAwx+dCYCbJnFZQ="; + hash = "sha256-+4qzAeFzU1Bdt9kvegBtaENh/dlRA0jbAUFr3WuSFsg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 03c1316f4d6f..44a0723b13f8 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.5.8"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; tag = version; - hash = "sha256-68c4KrXudjs6YGi282pa31XwbvjsXgKVQ2e+zPBYHf4="; + hash = "sha256-9eq/VoIgHGYLERLqFHGLPmIyv28rD78eZnd6zVfWod8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix index f438525e5182..0a30e71eb1c4 100644 --- a/pkgs/development/python-modules/nh3/default.nix +++ b/pkgs/development/python-modules/nh3/default.nix @@ -10,23 +10,23 @@ }: let pname = "nh3"; - version = "0.2.17"; + version = "0.2.20"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-j9OoXAuuCWsBHanN+SzSip94ZA+kY8HUVvfY/omUSSM="; + hash = "sha256-N+xMS1sb3Qq80eNaI5GUACjCHaCba2d8zZeizayy4kY="; }; in buildPythonPackage { inherit pname version src; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-WomlVzKOUfcgAWGJInSvZn9hm+bFpgc4nJbRiyPCU64="; + hash = "sha256-NmSOmM3OHiBx1xwlV2QyliQxDMNFApOlEehxfwyEU0I="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/nitrokey/default.nix b/pkgs/development/python-modules/nitrokey/default.nix index b6426fe8b1ec..6e1f0ac7d7d6 100644 --- a/pkgs/development/python-modules/nitrokey/default.nix +++ b/pkgs/development/python-modules/nitrokey/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "nitrokey"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8Ig2LI7waU/IbUwApyFI2TwtarT5bYolgeq14SgmbEo="; + hash = "sha256-XDlcOfOTGgYsg5DLsy1wJd3AzuvWSvqyFSEYrDOp0Ic="; }; disabled = pythonOlder "3.9"; diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 650780b58555..15862aa0f3a1 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.5.6"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; tag = version; - hash = "sha256-dwymJIsMDeVsG7eF45CgUPlZf3sEdwnxZ8OxT+gEQCs="; + hash = "sha256-3n+CoB8SLSjpmif2qBd9+gyF55JpwtJQuxcJEyXaWtk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index 89d0c2e0d18b..8decec762030 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -90,6 +90,30 @@ buildPythonPackage rec { "test_kl_dirichlet_dirichlet" "test_kl_univariate" "test_mean_var" + # since jax update to 0.5.0 + "test_analytic_kl_2" + "test_analytic_kl_3" + "test_apply_kernel" + "test_beta_bernoulli" + "test_biject_to" + "test_bijective_transforms" + "test_change_point_x64" + "test_cholesky_update" + "test_dais_vae" + "test_discrete_gibbs_multiple_sites_chain" + "test_entropy_categorical" + "test_gaussian_model" + "test_get_proposal_loc_and_scale" + "test_guide_plate_contraction" + "test_kernel_forward" + "test_laplace_approximation_warning" + "test_log_prob_gradient" + "test_logistic_regression" + "test_logistic_regression_x64" + "test_scale" + "test_scan_svi" + "test_stein_particle_loss" + "test_weight_convergence" # Tests want to download data "data_load" diff --git a/pkgs/development/python-modules/outlines-core/Cargo.lock b/pkgs/development/python-modules/outlines-core/Cargo.lock new file mode 100644 index 000000000000..abad149b1273 --- /dev/null +++ b/pkgs/development/python-modules/outlines-core/Cargo.lock @@ -0,0 +1,1793 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bincode" +version = "2.0.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95" +dependencies = [ + "bincode_derive", + "serde", +] + +[[package]] +name = "bincode_derive" +version = "2.0.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e30759b3b99a1b802a7a3aa21c85c3ded5c28e1c83170d82d70f08bbf7f3e4c" +dependencies = [ + "virtue", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cc" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width 0.1.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] + +[[package]] +name = "fastrand" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" + +[[package]] +name = "flate2" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hashbrown" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hf-hub" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" +dependencies = [ + "dirs", + "indicatif", + "log", + "native-tls", + "rand", + "serde", + "serde_json", + "thiserror 1.0.69", + "ureq", +] + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indicatif" +version = "0.17.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" +dependencies = [ + "console", + "number_prefix", + "portable-atomic", + "unicode-width 0.2.0", + "web-time", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" + +[[package]] +name = "js-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "monostate" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "openssl" +version = "0.10.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "outlines-core" +version = "0.0.0" +dependencies = [ + "bincode", + "hf-hub", + "once_cell", + "pyo3", + "regex", + "rustc-hash", + "serde", + "serde-pyobject", + "serde_json", + "thiserror 2.0.3", + "tokenizers", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror 1.0.69", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustc-hash" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" + +[[package]] +name = "rustix" +version = "0.38.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-pyobject" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca4b0aad8b225845739a0030a0d5cc2ae949c56a86a7daf9226c7df7c2016d16" +dependencies = [ + "pyo3", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.133" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +dependencies = [ + "indexmap", + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempfile" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tokenizers" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b67c92f6d705e2a1d106fb0b28c696f9074901a9c656ee5d9f5de204c39bf7" +dependencies = [ + "aho-corasick", + "derive_builder", + "esaxx-rs", + "getrandom", + "hf-hub", + "indicatif", + "itertools 0.12.1", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax", + "serde", + "serde_json", + "spm_precompiled", + "thiserror 1.0.69", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] +name = "unicode-ident" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "unicode-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "virtue" +version = "0.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/development/python-modules/outlines-core/default.nix b/pkgs/development/python-modules/outlines-core/default.nix new file mode 100644 index 000000000000..2e39baea6579 --- /dev/null +++ b/pkgs/development/python-modules/outlines-core/default.nix @@ -0,0 +1,95 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + cargo, + pkg-config, + rustPlatform, + rustc, + openssl, + setuptools-rust, + setuptools-scm, + interegular, + jsonschema, + datasets, + numpy, + pytestCheckHook, + pydantic, + scipy, + torch, + transformers, +}: + +buildPythonPackage rec { + pname = "outlines-core"; + version = "0.1.26"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version; + pname = "outlines_core"; + hash = "sha256-SBxDATQed8yPGDLWFnhK201GG0/sZYeOfA0sunFjoYk="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + cp --no-preserve=mode ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + cargo + pkg-config + rustPlatform.cargoSetupHook + rustc + ]; + + buildInputs = [ + openssl.dev + ]; + + build-system = [ + setuptools-rust + setuptools-scm + ]; + + dependencies = [ + interegular + jsonschema + ]; + + optional-dependencies = { + tests = [ + datasets + numpy + pydantic + scipy + torch + transformers + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); + + disabledTests = [ + # Tests that need to download from Hugging Face Hub. + "test_complex_serialization" + "test_create_fsm_index_tokenizer" + "test_reduced_vocabulary_with_rare_tokens" + ]; + + pythonImportsCheck = [ "outlines_core" ]; + + meta = { + description = "Structured text generation (core)"; + homepage = "https://github.com/outlines-dev/outlines-core"; + changelog = "https://github.com/dottxt-ai/outlines-core/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix index 82128f2383cb..f29fdac01667 100644 --- a/pkgs/development/python-modules/outlines/default.nix +++ b/pkgs/development/python-modules/outlines/default.nix @@ -4,56 +4,60 @@ fetchFromGitHub, setuptools, setuptools-scm, + airportsdata, interegular, cloudpickle, datasets, diskcache, - joblib, + jinja2, jsonschema, - pyairports, + numpy, + outlines-core, pycountry, pydantic, lark, nest-asyncio, - numba, - scipy, + referencing, + requests, torch, transformers, }: buildPythonPackage rec { pname = "outlines"; - version = "0.0.46"; + version = "0.1.13"; pyproject = true; src = fetchFromGitHub { owner = "outlines-dev"; - repo = pname; + repo = "outlines"; tag = version; - hash = "sha256-6VH9BcMRVRf2xvLcK3GNA1pGgAOs95UOlFQ6KxHXwKo="; + hash = "sha256-HuJqLbBHyoyY5ChQQi+9ftvPjLuh63Guk2w6KSZxq6s="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ + airportsdata interegular cloudpickle datasets diskcache - joblib + jinja2 jsonschema + outlines-core pydantic lark nest-asyncio - numba - scipy + numpy + referencing + requests torch transformers pycountry - pyairports ]; checkPhase = '' diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index c844d2ea4887..c505c93c6b3a 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -22,7 +22,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.47.0"; + version = "1.48.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; tag = "v${version}"; - hash = "sha256-C/spH54hhLI0Egs2jjTjQ5BH1pIw1syrfSyUvVQRoKM="; + hash = "sha256-ZWVySGehR5r6s0y6qCZuFI8SobYbjWP+A6Rgfug2JEE="; }; patches = [ diff --git a/pkgs/development/python-modules/playwright/update.sh b/pkgs/development/python-modules/playwright/update.sh index 2b283d3b607a..a8dfacdafac2 100755 --- a/pkgs/development/python-modules/playwright/update.sh +++ b/pkgs/development/python-modules/playwright/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps unzip +#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps unzip nix-prefetch set -euo pipefail root="$(dirname "$(readlink -f "$0")")" @@ -30,18 +30,38 @@ replace_sha() { } prefetch_browser() { - nix store prefetch-file --json --hash-type sha256 --unpack "$1" | jq -r .hash + # nix-prefetch is used to obtain sha with `stripRoot = false` + # doesn't work on macOS https://github.com/msteen/nix-prefetch/issues/53 + nix-prefetch -q "{ stdenv, fetchzip }: stdenv.mkDerivation rec { name=\"browser\"; src = fetchzip { url = \"$1\"; stripRoot = $2; }; }" } update_browser() { name="$1" - suffix="$2" - arm64_suffix="${3:-$2-arm64}" + platform="$2" + stripRoot="false" + if [ "$platform" = "darwin" ]; then + if [ "$name" = "webkit" ]; then + suffix="mac-14" + else + suffix="mac" + fi + else + if [ "$name" = "ffmpeg" ]; then + suffix="linux" + elif [ "$name" = "firefox" ]; then + stripRoot="true" + suffix="ubuntu-22.04" + else + suffix="ubuntu-22.04" + fi + fi + aarch64_suffix="$suffix-arm64" + revision="$(jq -r ".browsers.$name.revision" "$playwright_dir/browsers.json")" - replace_sha "$playwright_dir/$name.nix" "x86_64-linux" \ - "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$suffix.zip")" - replace_sha "$playwright_dir/$name.nix" "aarch64-linux" \ - "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$arm64_suffix.zip")" + replace_sha "$playwright_dir/$name.nix" "x86_64-$platform" \ + "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$suffix.zip" $stripRoot)" + replace_sha "$playwright_dir/$name.nix" "aarch64-$platform" \ + "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$aarch64_suffix.zip" $stripRoot)" } curl -fsSl \ @@ -58,10 +78,14 @@ curl -fsSl \ # We currently use Chromium from nixpkgs, so we don't need to download it here # Likewise, darwin can be ignored here atm as we are using an impure install anyway. -update_browser "firefox" "ubuntu-22.04" -update_browser "webkit" "ubuntu-22.04" +update_browser "firefox" "linux" +update_browser "webkit" "linux" update_browser "ffmpeg" "linux" +update_browser "chromium" "darwin" +update_browser "firefox" "darwin" +update_browser "webkit" "darwin" +update_browser "ffmpeg" "darwin" # Update package-lock.json files for all npm deps that are built in playwright diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index 04eebea98bb6..bf9410926170 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "square"; repo = "pylink"; tag = "v${version}"; - hash = "sha256-4tdtyb0AjsAmFOPdkxbbro8PH3akC5uihN59lgijhkc="; + hash = "sha256-Fjulh2wmcVO+/608uTO10orRz8Pq0I+ZhJ8zMa3YFC0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 7af71b0ccbf2..e9092858650a 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -21,7 +21,7 @@ watchfiles, # optional-dependencies - # adag + # cgraph cupy, # client grpcio, @@ -41,6 +41,7 @@ smart-open, virtualenv, # observability + memray, opentelemetry-api, opentelemetry-sdk, opentelemetry-exporter-otlp, @@ -48,7 +49,7 @@ dm-tree, gymnasium, lz4, - scikit-image, + # ormsgpack, scipy, typer, rich, @@ -64,7 +65,7 @@ let pname = "ray"; - version = "2.40.0"; + version = "2.41.0"; in buildPythonPackage rec { inherit pname version; @@ -76,9 +77,9 @@ buildPythonPackage rec { let pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}"; binary-hashes = { - cp310 = "sha256-9uqxHchJD4jnjgaqZFkFslnN4foDsV6EJhVcR4K6C74="; - cp311 = "sha256-cXEcvywVYhP9SbD5zJMYCnukJBEAcKNL3qPcCVJ/Md8="; - cp312 = "sha256-Z0dVgU9WkjBsVUytvCQBWvgj3AUW40ve8kzKydemVuM="; + cp310 = "sha256-OTLW2zqJgsUZbbCM9W4u0L9QuFaFCM/khr6N5jui2V0="; + cp311 = "sha256-//XpzFpTgV07WGomHjS9D+8cMkss3tTJuOeQ4ePcOZc="; + cp312 = "sha256-PXassHD6i9Tr2wEazfoiu4m9vps1+3iuxZgdt26sK2A="; }; in fetchPypi { @@ -109,11 +110,12 @@ buildPythonPackage rec { ]; optional-dependencies = rec { - adag = [ - cupy - ]; + adag = cgraph; air = lib.unique (data ++ serve ++ tune ++ train); all = lib.flatten (builtins.attrValues optional-dependencies); + cgraph = [ + cupy + ]; client = [ grpcio ]; data = [ fsspec @@ -135,6 +137,7 @@ buildPythonPackage rec { virtualenv ]; observability = [ + memray opentelemetry-api opentelemetry-sdk opentelemetry-exporter-otlp @@ -143,8 +146,8 @@ buildPythonPackage rec { dm-tree gymnasium lz4 + # ormsgpack pyyaml - scikit-image scipy typer rich diff --git a/pkgs/development/python-modules/rfc3161-client/default.nix b/pkgs/development/python-modules/rfc3161-client/default.nix new file mode 100644 index 000000000000..6d56846dbee0 --- /dev/null +++ b/pkgs/development/python-modules/rfc3161-client/default.nix @@ -0,0 +1,52 @@ +{ + buildPythonPackage, + lib, + fetchFromGitHub, + perl, + cryptography, + rustPlatform, + pretend, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "rfc3161-client"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "rfc3161-client"; + tag = "v${version}"; + hash = "sha256-fdNpM5fQnvwBgeL/adIb74pywtK6+8dLxc6kIVgCOCw="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src pname; + hash = "sha256-jpysrco+dybMwiKOa21uLKqsOeYFFERL7XKND7gPwX8="; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + perl + ]; + + dependencies = [ + cryptography + pretend + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + homepage = "https://github.com/trailofbits/rfc3161-client"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + changelog = "https://github.com/trailofbits/rfc3161-client/releases/tag/v${version}"; + description = "Opinionated Python RFC3161 Client"; + }; +} diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 6cd96914765b..82e72af1446c 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; tag = version; - hash = "sha256-rIIXTrP340lWMjQcT+/JKULwvaWC2gjrWSzu+3tqnK0="; + hash = "sha256-AR7JMvx5qWPFtMhotO2MlqKH5d/CcGOrvpaB031vTX8="; }; patches = [ diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix index ba523fe259a1..d1a46c8b5d24 100644 --- a/pkgs/development/python-modules/sigstore-rekor-types/default.nix +++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix @@ -28,11 +28,14 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - meta = with lib; { + meta = { description = "Python models for Rekor's API types"; homepage = "https://github.com/trailofbits/sigstore-rekor-types"; changelog = "https://github.com/trailofbits/sigstore-rekor-types/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + fab + bot-wxt1221 + ]; }; } diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix index f4983e93590c..2bcc833a541a 100644 --- a/pkgs/development/python-modules/sigstore/default.nix +++ b/pkgs/development/python-modules/sigstore/default.nix @@ -19,6 +19,7 @@ securesystemslib, sigstore-protobuf-specs, sigstore-rekor-types, + rfc3161-client, tuf, rfc8785, pyasn1, @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "sigstore-python"; - version = "3.5.3"; + version = "3.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,10 +37,13 @@ buildPythonPackage rec { owner = "sigstore"; repo = "sigstore-python"; tag = "v${version}"; - hash = "sha256-pAzS/LU5me3qoJo6EmuSFPDO/lqRDKIl5hjFiysWTdM="; + hash = "sha256-BdVX2LWCsMx9r0bDTJjMdrvy4Hqn6hrw9wAcub0nRMk="; }; - pythonRelaxDeps = [ "sigstore-rekor-types" ]; + pythonRelaxDeps = [ + "sigstore-rekor-types" + "rfc3161-client" + ]; build-system = [ flit-core ]; @@ -53,6 +57,7 @@ buildPythonPackage rec { pyopenssl pyasn1 rfc8785 + rfc3161-client platformdirs requests rich @@ -88,6 +93,7 @@ buildPythonPackage rec { "test_trust_root_bundled_get" "test_fix_bundle_upgrades_bundle" "test_trust_root_tuf_caches_and_requests" + "test_regression_verify_legacy_bundle" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index a71e757bea79..af83517ed02d 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.257.0"; + version = "0.258.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; tag = version; - hash = "sha256-HU3d3ss9axGMqWGxlCQjbRsia9XiMQvHaVs9YMX01v8="; + hash = "sha256-gv/P7pz2wcIKXP5SChTlsM2j2GPuRK+iuLZil8/VvJk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix index 02d3cb375582..3c0d3422883b 100644 --- a/pkgs/development/python-modules/typst/default.nix +++ b/pkgs/development/python-modules/typst/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "typst"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,13 +22,13 @@ buildPythonPackage rec { owner = "messense"; repo = "typst-py"; tag = "v${version}"; - hash = "sha256-vK55LoEc5BaS2tQwuLhXDnv8xiSOgk/ngU/gtbhZR2k="; + hash = "sha256-VgQbMeyvXjzE8jSaGLygIy8EhR23MpqjlU68FsBZq6E="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-01kSin3da58rPTHRmjyj62nf6HshmD6ARbhUd3eBfV0="; + hash = "sha256-H7lKoSDSx0cGH+VsIX90KaiWJw1h/BokNdKzxmvm6XQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 560e7211228e..aab259612d16 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "8.10.0"; + version = "8.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; tag = "v${version}"; - hash = "sha256-0fC12QsCOgFc6GJk5T7kCjVHe9W4Fhwmtv3dwJVh9mM="; + hash = "sha256-ajKe0pIUV2xwFi49MR4NK19G1DZ84e6oSJQIGlXq+Vo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix b/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix index fc7e14205f9f..993f6c0b3588 100644 --- a/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix +++ b/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix @@ -2,11 +2,11 @@ mkTclDerivation { pname = "wapp"; - version = "0-unstable-2024-05-23"; + version = "0-unstable-2024-11-22"; src = fetchurl { - url = "https://wapp.tcl-lang.org/home/raw/98f23b2160bafc41f34be8e5d8ec414c53d33412eb2f724a07f2476eaf04ac6f?at=wapp.tcl"; - hash = "sha256-A+Ml5h5C+OMoDQtAoB9lHgYEK1A7qHExT3p46PHRTYg="; + url = "https://wapp.tcl-lang.org/home/raw/3b1ce7c0234b4b2750deadc80f524ed28e835aa5e741bf3fe63b416a16a55699?at=wapp.tcl"; + hash = "sha256-0e9yTVFYj1tYGU7EiXRPw35qfDzckzz4i3RV/8TttGw="; }; dontUnpack = true; diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index ab8569bb1df7..ee92dc7a1457 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -21,7 +21,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.33.1"; + version = "0.34.1"; # the platform-specific, statically linked binary src = diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index 6567306ab682..2c3e4b8bda65 100644 --- a/pkgs/development/tools/infisical/hashes.json +++ b/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" -, "x86_64-linux": "sha256-Pa4Tm8rHlYz6u5/xLgHlVFoLABMusmKgM2ssJv5jTh4=" -, "x86_64-darwin": "sha256-lM76sOH9dIhp4txSbGVCqjTAD2eLI4u0X2gRN/40QzY=" -, "aarch64-linux": "sha256-s/XwcjPzQjrLD4D2m0PkzcVRpxcTRY4MDB9oloKpP68=" -, "aarch64-darwin": "sha256-q6ctHlgG5MfLxEg+5cPej7aLphCgHzl1OKhu0qCGL3k=" +, "x86_64-linux": "sha256-+Juy/znuRkRNLTNYTh56BEPjPghmjwN2X4PXlulLMlg=" +, "x86_64-darwin": "sha256-GUlSnkq07rrxmAQUJzkXpPpTs9bUMLzNm6VCEZ3eDFI=" +, "aarch64-linux": "sha256-kkgt63caEiCAj5o7rueCHcWlst0i8D/uiLTUdw/JFK0=" +, "aarch64-darwin": "sha256-FbN3tvCclDokK6dWg6U6zQ9NWTZ4x6U/bn8kNznCL1k=" } diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index aed03b72322a..69a6961b55c0 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "15.0.0"; + version = "15.0.1"; src = fetchurl { url = "mirror://qt/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-I7HGtHjKdgmX7N3Uxyjw2igLBpYAipvd2aEGjxbUj3I="; + hash = "sha256-dDutW7417X9QCffOFh8dovJsF7tRMUc+BhzmWzp64JM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/web/playwright/browsers.json b/pkgs/development/web/playwright/browsers.json index e7fb77faf27e..28c44ae7bfa1 100644 --- a/pkgs/development/web/playwright/browsers.json +++ b/pkgs/development/web/playwright/browsers.json @@ -2,15 +2,15 @@ "comment": "This file is kept up to date via update.sh", "browsers": { "chromium": { - "revision": "1134", - "browserVersion": "129.0.6668.29" + "revision": "1140", + "browserVersion": "130.0.6723.31" }, "firefox": { - "revision": "1463", - "browserVersion": "130.0" + "revision": "1465", + "browserVersion": "131.0" }, "webkit": { - "revision": "2070", + "revision": "2083", "revisionOverrides": { "mac10.14": "1446", "mac10.15": "1616", @@ -22,7 +22,11 @@ "browserVersion": "18.0" }, "ffmpeg": { - "revision": "1010" + "revision": "1010", + "revisionOverrides": { + "mac12": "1010", + "mac12-arm64": "1010" + } } } } diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix index 709cef5c5ca4..da0235272cca 100644 --- a/pkgs/development/web/playwright/chromium.nix +++ b/pkgs/development/web/playwright/chromium.nix @@ -3,22 +3,47 @@ makeWrapper, fontconfig_file, chromium, + fetchzip, + revision, + suffix, + system, + throwSystem, ... }: -runCommand "playwright-chromium" - { - nativeBuildInputs = [ - makeWrapper - ]; - } - '' - mkdir -p $out/chrome-linux +let + chromium-linux = + runCommand "playwright-chromium" + { + nativeBuildInputs = [ + makeWrapper + ]; + } + '' + mkdir -p $out/chrome-linux - # See here for the Chrome options: - # https://github.com/NixOS/nixpkgs/issues/136207#issuecomment-908637738 - # We add --disable-gpu to be able to run in gpu-less environments such - # as headless nixos test vms. - makeWrapper ${chromium}/bin/chromium $out/chrome-linux/chrome \ - --set-default SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \ - --set-default FONTCONFIG_FILE ${fontconfig_file} - '' + # See here for the Chrome options: + # https://github.com/NixOS/nixpkgs/issues/136207#issuecomment-908637738 + # We add --disable-gpu to be able to run in gpu-less environments such + # as headless nixos test vms. + makeWrapper ${chromium}/bin/chromium $out/chrome-linux/chrome \ + --set-default SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \ + --set-default FONTCONFIG_FILE ${fontconfig_file} + ''; + chromium-darwin = fetchzip { + url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-${suffix}.zip"; + stripRoot = false; + hash = + { + x86_64-darwin = "sha256-N/uh3Q2ivqeraAqRt80deVz1XEPyLTYI8L3DBfNQGWg="; + aarch64-darwin = "sha256-tR9PwGanPcsDQwi1BijeYJd9LhNIWgEoXs5u3gZpghU="; + } + .${system} or throwSystem; + }; +in +{ + x86_64-linux = chromium-linux; + aarch64-linux = chromium-linux; + x86_64-darwin = chromium-darwin; + aarch64-darwin = chromium-darwin; +} +.${system} or throwSystem diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 1058a61d48fb..e63f9fcf349b 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -27,20 +27,20 @@ let } .${system} or throwSystem; - version = "1.47.0"; + version = "1.48.1"; src = fetchFromGitHub { owner = "Microsoft"; repo = "playwright"; rev = "v${version}"; - hash = "sha256-cKjVDy1wFo8NlF8v+8YBuQUF2OUYjCmv27uhEoVUrno="; + hash = "sha256-VMp/Tjd5w2v+IHD+CMaR/XdMJHkS/u7wFe0hNxa1TbE="; }; babel-bundle = buildNpmPackage { pname = "babel-bundle"; inherit version src; sourceRoot = "${src.name}/packages/playwright/bundles/babel"; - npmDepsHash = "sha256-HrDTkP2lHl2XKD8aGpmnf6YtSe/w9UePH5W9QfbaoMg="; + npmDepsHash = "sha256-kHuNFgxmyIoxTmvT+cyzDRfKNy18zzeUH3T+gJopWeA="; dontNpmBuild = true; installPhase = '' cp -r . "$out" @@ -50,7 +50,7 @@ let pname = "expect-bundle"; inherit version src; sourceRoot = "${src.name}/packages/playwright/bundles/expect"; - npmDepsHash = "sha256-qnFx/AQZtmxNFrrabfOpsWy6I64DFJf3sWrJzL1wfU4="; + npmDepsHash = "sha256-KwxNqPefvPPHG4vbco2O4G8WlA7l33toJdfNWHMTDOQ="; dontNpmBuild = true; installPhase = '' cp -r . "$out" @@ -92,7 +92,7 @@ let inherit version src; sourceRoot = "${src.name}"; # update.sh depends on sourceRoot presence - npmDepsHash = "sha256-FaDTJmIiaaOCvq6tARfiWX5IBTTNOJ/iVkRsO4D8aqc="; + npmDepsHash = "sha256-cmUmYuUL7zfB7WEBKft43r69f7vaZDEjku8uwR3RZ1A="; nativeBuildInputs = [ cacert ]; @@ -159,15 +159,11 @@ let passthru = { browsersJSON = (lib.importJSON ./browsers.json).browsers; - browsers = - { - x86_64-linux = browsers-linux { }; - aarch64-linux = browsers-linux { }; - x86_64-darwin = browsers-mac; - aarch64-darwin = browsers-mac; - } - .${system} or throwSystem; - browsers-chromium = browsers-linux { }; + browsers = browsers { }; + browsers-chromium = browsers { + withFirefox = false; + withWebkit = false; + }; }; }); @@ -196,28 +192,7 @@ let }; }); - browsers-mac = stdenv.mkDerivation { - pname = "playwright-browsers"; - inherit (playwright) version; - - dontUnpack = true; - - nativeBuildInputs = [ cacert ]; - - installPhase = '' - runHook preInstall - - export PLAYWRIGHT_BROWSERS_PATH=$out - ${playwright-core}/cli.js install - rm -r $out/.links - - runHook postInstall - ''; - - meta.platforms = lib.platforms.darwin; - }; - - browsers-linux = lib.makeOverridable ( + browsers = lib.makeOverridable ( { withChromium ? true, withFirefox ? true, diff --git a/pkgs/development/web/playwright/ffmpeg.nix b/pkgs/development/web/playwright/ffmpeg.nix index f541031019ed..108b19a29214 100644 --- a/pkgs/development/web/playwright/ffmpeg.nix +++ b/pkgs/development/web/playwright/ffmpeg.nix @@ -12,6 +12,8 @@ fetchzip { { x86_64-linux = "sha256-FEm62UvMv0h6Sav93WmbPLw3CW1L1xg4nD26ca5ol38="; aarch64-linux = "sha256-jtQ+NS++VHRiKoIV++PIxEnyVnYtVwUyNlSILKSH4A4="; + x86_64-darwin = "sha256-ED6noxSDeEUt2DkIQ4gNe/kL+zHVeb2AD5klBk93F88="; + aarch64-darwin = "sha256-3Adnvb7zvMXKFOhb8uuj5kx0wEIFicmckYx9WLlNNf0="; } .${system} or throwSystem; } diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix index 0f404bee2899..cb23a5a48262 100644 --- a/pkgs/development/web/playwright/firefox.nix +++ b/pkgs/development/web/playwright/firefox.nix @@ -9,31 +9,48 @@ throwSystem, }: let - suffix' = - if lib.hasPrefix "linux" suffix then "ubuntu-22.04" + (lib.removePrefix "linux" suffix) else suffix; -in -stdenv.mkDerivation { - name = "playwright-firefox"; - src = fetchzip { - url = "https://playwright.azureedge.net/builds/firefox/${revision}/firefox-${suffix'}.zip"; + firefox-linux = stdenv.mkDerivation { + name = "playwright-firefox"; + src = fetchzip { + url = "https://playwright.azureedge.net/builds/firefox/${revision}/firefox-${ + "ubuntu-22.04" + (lib.removePrefix "linux" suffix) + }.zip"; + hash = + { + x86_64-linux = "sha256-L/CJVtj9bVXKuKSLWw0wAdNICiRTg5ek+fw4togBoSI="; + aarch64-linux = "sha256-DgCuX+6KSnoHNFoFUli6S20GGHOExARasiJY9fy3CCE="; + } + .${system} or throwSystem; + }; + + inherit (firefox-bin.unwrapped) + nativeBuildInputs + buildInputs + runtimeDependencies + appendRunpaths + patchelfFlags + ; + + buildPhase = '' + mkdir -p $out/firefox + cp -R . $out/firefox + ''; + }; + firefox-darwin = fetchzip { + url = "https://playwright.azureedge.net/builds/firefox/${revision}/firefox-${suffix}.zip"; + stripRoot = false; hash = { - x86_64-linux = "sha256-Hd9LlSRLW51gDoFyszqvg46Q/sMizLRsVKAN9atbwsw="; - aarch64-linux = "sha256-SEXH3gLOfNjOcnNWQjQ5gaaow47veVs0BoTYSgXw+24="; + x86_64-darwin = "sha256-HJ0jBmTW/Zz2fkmSo1gEv5P58PGyhXKnJVxJ12Q4IiM="; + aarch64-darwin = "sha256-YnnG8BX06vQlJmzZGaCKq1wKGp3yRaUQ4RF+tEWoK6U="; } .${system} or throwSystem; }; - - inherit (firefox-bin.unwrapped) - nativeBuildInputs - buildInputs - runtimeDependencies - appendRunpaths - patchelfFlags - ; - - buildPhase = '' - mkdir -p $out/firefox - cp -R . $out/firefox - ''; +in +{ + x86_64-linux = firefox-linux; + aarch64-linux = firefox-linux; + x86_64-darwin = firefox-darwin; + aarch64-darwin = firefox-darwin; } +.${system} or throwSystem diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index 8c89a34918f0..5433a4baf821 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -50,7 +50,12 @@ }: let suffix' = - if lib.hasPrefix "linux" suffix then "ubuntu-22.04" + (lib.removePrefix "linux" suffix) else suffix; + if lib.hasPrefix "linux" suffix then + "ubuntu-22.04" + (lib.removePrefix "linux" suffix) + else if lib.hasPrefix "mac" suffix then + "mac-14" + (lib.removePrefix "mac" suffix) + else + suffix; libvpx' = libvpx.overrideAttrs ( finalAttrs: previousAttrs: { version = "1.12.0"; @@ -62,74 +67,90 @@ let }; } ); + webkit-linux = stdenv.mkDerivation { + name = "playwright-webkit"; + src = fetchzip { + url = "https://playwright.azureedge.net/builds/webkit/${revision}/webkit-${suffix'}.zip"; + stripRoot = false; + hash = + { + x86_64-linux = "sha256-vz/c2Bzr1NWRZZL5hIRwnor2Wte61gS++8rRfmy9T+0="; + aarch64-linux = "sha256-dS4Hsy/lGZWgznviwkslSk5oBYdUIBxeQPfaEyLNXyc="; + } + .${system} or throwSystem; + }; -in -stdenv.mkDerivation { - name = "playwright-webkit"; - src = fetchzip { + nativeBuildInputs = [ + autoPatchelfHook + patchelfUnstable + makeWrapper + ]; + buildInputs = [ + at-spi2-atk + cairo + flite + fontconfig.lib + freetype + glib + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + harfbuzz + harfbuzzFull + icu70 + lcms + libdrm + libepoxy + libevent + libgcc.lib + libgcrypt + libgpg-error + libjpeg8 + libopus + libpng + libsoup_3 + libtasn1 + libwebp + libwpe + libwpe-fdo + libvpx' + libxml2 + libxslt + libgbm + sqlite + systemdLibs + wayland-scanner + woff2.lib + libxkbcommon + zlib + ]; + + patchelfFlags = [ "--no-clobber-old-sections" ]; + buildPhase = '' + cp -R . $out + + # remove unused gtk browser + rm -rf $out/minibrowser-gtk + + wrapProgram $out/minibrowser-wpe/bin/MiniBrowser \ + --prefix GIO_EXTRA_MODULES ":" "${glib-networking}/lib/gio/modules/" + ''; + }; + webkit-darwin = fetchzip { url = "https://playwright.azureedge.net/builds/webkit/${revision}/webkit-${suffix'}.zip"; stripRoot = false; hash = { - x86_64-linux = "sha256-pHYGQYwu47jdOAD+/mLrP6Dd+2aDMHENddVwAu0uEfI="; - aarch64-linux = "sha256-0UeYWjeFnQ8yVa3juWg7Z7VF1GDbP4pJ9OUJRbv1OJw="; + x86_64-darwin = "sha256-lOAHJaDXtt80RhqFNaO1JhaJH5WAu6+rpoR+IsfzGeM="; + aarch64-darwin = "sha256-GrjTnMGTPBdRI3xE5t9HbXLrvgOjCdqbJGElTKhUoA4="; } .${system} or throwSystem; }; - - nativeBuildInputs = [ - autoPatchelfHook - patchelfUnstable - makeWrapper - ]; - buildInputs = [ - at-spi2-atk - cairo - flite - fontconfig.lib - freetype - glib - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - harfbuzz - harfbuzzFull - icu70 - lcms - libdrm - libepoxy - libevent - libgcc.lib - libgcrypt - libgpg-error - libjpeg8 - libopus - libpng - libsoup_3 - libtasn1 - libwebp - libwpe - libwpe-fdo - libvpx' - libxml2 - libxslt - libgbm - sqlite - systemdLibs - wayland-scanner - woff2.lib - libxkbcommon - zlib - ]; - - patchelfFlags = [ "--no-clobber-old-sections" ]; - buildPhase = '' - cp -R . $out - - # remove unused gtk browser - rm -rf $out/minibrowser-gtk - - wrapProgram $out/minibrowser-wpe/bin/MiniBrowser \ - --prefix GIO_EXTRA_MODULES ":" "${glib-networking}/lib/gio/modules/" - ''; +in +{ + x86_64-linux = webkit-linux; + aarch64-linux = webkit-linux; + x86_64-darwin = webkit-darwin; + aarch64-darwin = webkit-darwin; } +.${system} or throwSystem diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 5d761fbf7f71..340e1bbf68b0 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -18,16 +18,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "openxray"; - version = "2188-november-2023-rc1"; + version = "2921-january-2025-rc1"; src = fetchFromGitHub { owner = "OpenXRay"; repo = "xray-16"; - rev = finalAttrs.version; + tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-rRxw/uThACmT2qI8NUwJU+WbJ3BWUss6CH13R5aaHco="; + hash = "sha256-PYRC1t4gjT2d41ZZOZJF4u3vc0Pq7DpivEnnfbcSQYk="; }; + # Don't force-override these please + postPatch = '' + substituteInPlace Externals/LuaJIT-proj/CMakeLists.txt \ + --replace-fail 'set(CMAKE_OSX_SYSROOT' '#set(CMAKE_OSX_SYSROOT' \ + --replace-fail 'set(ENV{SDKROOT}' '#set(ENV{SDKROOT}' + ''; + strictDeps = true; nativeBuildInputs = [ @@ -47,6 +54,16 @@ stdenv.mkDerivation (finalAttrs: { pcre ]; + cmakeFlags = + [ + # Breaks on Darwin + (lib.cmakeBool "USE_LTO" (!stdenv.hostPlatform.isDarwin)) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # This seemingly only gets set properly by CMake when using the XCode generator + (lib.cmakeFeature "CMAKE_OSX_DEPLOYMENT_TARGET" "${stdenv.hostPlatform.darwinMinVersion}") + ]; + # Crashes can happen, we'd like them to be reasonably debuggable cmakeBuildType = "RelWithDebInfo"; dontStrip = true; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix index 0e0778d394a6..e5a5d71ee517 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix @@ -27,6 +27,25 @@ lib.makeOverridable ( stdenvLibcMinimal else stdenv; + + machineMap = { + aarch64 = "arm64"; + armv7l = "armv7"; + i486 = "i386"; + i586 = "i386"; + i686 = "i386"; + x86_64 = "amd64"; + }; + + archMap = { + aarch64 = "aarch64"; + armv7l = "arm"; + i486 = "i386"; + i586 = "i386"; + i686 = "i386"; + x86_64 = "amd64"; + }; + in stdenv'.mkDerivation ( rec { @@ -57,22 +76,12 @@ lib.makeOverridable ( HOST_SH = stdenv'.shell; - MACHINE_ARCH = - { - # amd64 not x86_64 for this on unlike NetBSD - x86_64 = "amd64"; - aarch64 = "arm64"; - i486 = "i386"; - i586 = "i386"; - i686 = "i386"; - } - .${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; - - MACHINE = MACHINE_ARCH; - + MACHINE = machineMap.${stdenv'.hostPlatform.parsed.cpu.name}; + MACHINE_ARCH = archMap.${stdenv'.hostPlatform.parsed.cpu.name}; MACHINE_CPU = MACHINE_ARCH; - MACHINE_CPUARCH = MACHINE_ARCH; + TARGET_MACHINE_ARCH = archMap.${stdenv'.targetPlatform.parsed.cpu.name}; + TARGET_MACHINE_CPU = TARGET_MACHINE_ARCH; COMPONENT_PATH = attrs.path or null; diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 0b4101246930..2bce3881edca 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index f7c4a9edbc1a..cd2022097d51 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/amneziawg/default.nix b/pkgs/os-specific/linux/amneziawg/default.nix index f0e76f7f58b0..9e21f4176b55 100644 --- a/pkgs/os-specific/linux/amneziawg/default.nix +++ b/pkgs/os-specific/linux/amneziawg/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; makeFlags = - kernel.makeFlags + kernel.moduleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ] ++ lib.optional (lib.versionAtLeast kernel.version "5.6") "KERNEL_SOURCE_DIR=${srcOnly kernel}"; diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index d8bf15f0a845..1e46fbb9121a 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index d9a7890ae98a..14ee2a8db539 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 67c4bcbbcb0f..bdf71c470725 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { --replace "/lib/modules" "${kernel.dev}/lib/modules" ''; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; installPhase = '' mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 1a6f78d82824..9e348e78e315 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq"; }; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index ff1a4f88f0cc..eee504a0633d 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" "prefix=$(out)" diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index d674daabbeca..cfe8b16da956 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --replace depmod \# ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KVER=${kernel.modDirVersion}" "KERNEL_MODLIB=$(out)/lib/modules/${kernel.modDirVersion}" diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 31d68acc5316..3262b1d0c1c1 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { rm -r $out/lib/udev ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KVERSION=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "DESTDIR=${placeholder "out"}" diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix index 6b19320dd9e3..6db752a885b6 100644 --- a/pkgs/os-specific/linux/dpdk-kmods/default.nix +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/drbd/driver.nix b/pkgs/os-specific/linux/drbd/driver.nix index ce944bce3e0a..a76758fbdb8e 100644 --- a/pkgs/os-specific/linux/drbd/driver.nix +++ b/pkgs/os-specific/linux/drbd/driver.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KVER=${kernel.version}" "INSTALL_MOD_PATH=${placeholder "out"}" diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 963b683a8593..40e22d2008fc 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; env.KERNEL_BUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 25634b4f78d0..8703fb9010ac 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { python3WithLibs ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/fanout/default.nix b/pkgs/os-specific/linux/fanout/default.nix index 2798f9da6233..99ee011fcf8e 100644 --- a/pkgs/os-specific/linux/fanout/default.nix +++ b/pkgs/os-specific/linux/fanout/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix index 1b5b70af88e0..4bb8f4f0e79e 100644 --- a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix +++ b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix index dd005e6dc4e6..7caafe491ab2 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index 76e0bfd770c7..43bcd899742c 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cd src ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(PWD)" diff --git a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix index c56914fcee7a..adac60eb2489 100644 --- a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix +++ b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNEL_SOURCE_DIR=${kernel.dev}/${kerneldir}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/hid-ite8291r3/default.nix b/pkgs/os-specific/linux/hid-ite8291r3/default.nix index e7d7ccb27a9f..5f24fda01d9e 100644 --- a/pkgs/os-specific/linux/hid-ite8291r3/default.nix +++ b/pkgs/os-specific/linux/hid-ite8291r3/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "VERSION=${version}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/hid-t150/default.nix b/pkgs/os-specific/linux/hid-t150/default.nix index 7cb40d01aaff..74a254b6e22f 100644 --- a/pkgs/os-specific/linux/hid-t150/default.nix +++ b/pkgs/os-specific/linux/hid-t150/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/hid-t150"; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/hid-tmff2/default.nix b/pkgs/os-specific/linux/hid-tmff2/default.nix index 7957bf90400a..3784746ca9d3 100644 --- a/pkgs/os-specific/linux/hid-tmff2/default.nix +++ b/pkgs/os-specific/linux/hid-tmff2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix index d3e37f5a5bd4..0be218282d2c 100644 --- a/pkgs/os-specific/linux/ipu6-drivers/default.nix +++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/ithc/default.nix b/pkgs/os-specific/linux/ithc/default.nix index ff888ec16599..0ede651706bc 100644 --- a/pkgs/os-specific/linux/ithc/default.nix +++ b/pkgs/os-specific/linux/ithc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "VERSION=${version}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/ivsc-driver/default.nix b/pkgs/os-specific/linux/ivsc-driver/default.nix index e4c6c9d5adcd..93ce524672a2 100644 --- a/pkgs/os-specific/linux/ivsc-driver/default.nix +++ b/pkgs/os-specific/linux/ivsc-driver/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index edbc3359386f..e1d892d33fd0 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "-C src/mod" "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 2344057f8241..c14ac3ab6357 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,42 +2,42 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.10.232-hardened1.patch", - "sha256": "1bfhnj6k65q6kjlxbxqfzq2l81dvbfdc4khn7n0zp6vm37a34c74", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.232-hardened1/linux-hardened-v5.10.232-hardened1.patch" + "name": "linux-hardened-v5.10.233-hardened1.patch", + "sha256": "1dchzjp4dvdla2mpac8bk6cj4ymx2vkwllck9wvlsbi15897a50y", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.233-hardened1/linux-hardened-v5.10.233-hardened1.patch" }, - "sha256": "1w5ycdh24j4gsjc2zk7nhbmya59vhi49lbh8333ziprqlj4lb97x", - "version": "5.10.232" + "sha256": "0lkz2g8r032f027j3gih3f7crx991mrpng9qgqc5k4cc1wl5g7i3", + "version": "5.10.233" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.15.175-hardened1.patch", - "sha256": "1j7z487n26jd8npylddflpdksrwk7b7xck2gblsd1rp1zgpd0q4g", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.175-hardened1/linux-hardened-v5.15.175-hardened1.patch" + "name": "linux-hardened-v5.15.176-hardened1.patch", + "sha256": "10r86rxixrvclzfpzp449ry7j79gr0n75zvh4x9bzr1860f0mha6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.176-hardened1/linux-hardened-v5.15.176-hardened1.patch" }, - "sha256": "1l59x1f1b29mayhzxxkh9vlba41h51mmfh1vram31bks1v4bpn4g", - "version": "5.15.175" + "sha256": "1cfk55469swywnf4r6pl7b3njxws8w3np81r99f0wnlaihrbajm8", + "version": "5.15.176" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.4.288-hardened1.patch", - "sha256": "0zqc0xblfy2rj1n8mr2q07apcq1rmqshsi15881df4ml5lkq4y62", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.288-hardened1/linux-hardened-v5.4.288-hardened1.patch" + "name": "linux-hardened-v5.4.289-hardened1.patch", + "sha256": "1gg4awiiggks5biyhkqdlxm7xxkpd754lxibflk3nwfj1rs44iwn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.289-hardened1/linux-hardened-v5.4.289-hardened1.patch" }, - "sha256": "1zhsb6gwhb6cvijzh7s8rnm4b06klyhb2mxb06gcyfvj0givlvw7", - "version": "5.4.288" + "sha256": "043dl195h06hs3zdjd6j1m1zgvmky3s0plrpma75zqf8ab05yghy", + "version": "5.4.289" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.1.123-hardened1.patch", - "sha256": "0ara8rw6l77wfsc0ccz74q22693dhbj7pxw7k12i2an3vy10y16j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.123-hardened1/linux-hardened-v6.1.123-hardened1.patch" + "name": "linux-hardened-v6.1.126-hardened1.patch", + "sha256": "096bchjy9n7q48r7xzzky9pmicdzz9pvmg5sk6943s4q5icrhi6s", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.126-hardened1/linux-hardened-v6.1.126-hardened1.patch" }, - "sha256": "1g5k9q113nyid3a347abb36v2xfv5vf74ic88af7kf04kzbsr9rk", - "version": "6.1.123" + "sha256": "140pprw2fkyz9qi5wnhi0yzpj65lzwi3zbmnvsk2yhgc9arj06f9", + "version": "6.1.126" }, "6.11": { "patch": { @@ -52,21 +52,21 @@ "6.12": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.12.8-hardened1.patch", - "sha256": "1hb2rvf6p1hwqyb5rhgwd9nwkxw1axjg0x47ym453rs6zddxyqlb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.8-hardened1/linux-hardened-v6.12.8-hardened1.patch" + "name": "linux-hardened-v6.12.10-hardened1.patch", + "sha256": "1m48sf0ihzpcj4ca9420rmhrihhchd2qrv86vw8llq3jmv7xqij5", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.10-hardened1/linux-hardened-v6.12.10-hardened1.patch" }, - "sha256": "0y992b484rkkaqdkz5mw2is1l0izxhm3cl7fi5f72jx0bh3dm492", - "version": "6.12.8" + "sha256": "15xjjn8ff7g9q0ljr2g8k098ppxnpvxlgv22rdrplls8sxg6wlaa", + "version": "6.12.10" }, "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.6.69-hardened1.patch", - "sha256": "06rr4r927sdzlyixs4blwxdgygb5akm76a81px5xj8a754iaws8x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.69-hardened1/linux-hardened-v6.6.69-hardened1.patch" + "name": "linux-hardened-v6.6.73-hardened1.patch", + "sha256": "18jy2acz7gh4f8gqc6ifq1rkgxqlc53wmrhs0m8ndi5p70wswr6v", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.73-hardened1/linux-hardened-v6.6.73-hardened1.patch" }, - "sha256": "0d2gilgh8myavzfdjnx7az4dbwvkk7irvsz6rla9bnbmgdb0aqww", - "version": "6.6.69" + "sha256": "141428a3bxks9w5jj17w8jmp7zp90p3v33dyk046a0f2j2qqs0nj", + "version": "6.6.73" } } diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 3c7665c5b5ab..edbebb68b880 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,12 +4,12 @@ "hash": "sha256:12c9bd0ikppkdpqmvg7g2062s60ks9p0qxx1jis29wl9swr74120" }, "6.1": { - "version": "6.1.126", - "hash": "sha256:140pprw2fkyz9qi5wnhi0yzpj65lzwi3zbmnvsk2yhgc9arj06f9" + "version": "6.1.127", + "hash": "sha256:0xkqpwhvz6qhaxzg1j993lv1iyvb2zydgq6d8mhdbfkz38fx9c0q" }, "5.15": { - "version": "5.15.176", - "hash": "sha256:1cfk55469swywnf4r6pl7b3njxws8w3np81r99f0wnlaihrbajm8" + "version": "5.15.177", + "hash": "sha256:1q56w3lqwi3ynny6z7siqzv3h8nryksyw70r3fhghca2il4bi7pa" }, "5.10": { "version": "5.10.233", @@ -20,16 +20,16 @@ "hash": "sha256:043dl195h06hs3zdjd6j1m1zgvmky3s0plrpma75zqf8ab05yghy" }, "6.6": { - "version": "6.6.72", - "hash": "sha256:0fggpba886340xi8gkxc6hmzplcm69nliddql3d6hn8djcafbfgy" + "version": "6.6.74", + "hash": "sha256:0ka9snxl0y57fajy8vszwa4ggn48pid8m1879d4vl3mbicd2nppi" }, "6.11": { "version": "6.11.11", "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532" }, "6.12": { - "version": "6.12.10", - "hash": "sha256:15xjjn8ff7g9q0ljr2g8k098ppxnpvxlgv22rdrplls8sxg6wlaa" + "version": "6.12.11", + "hash": "sha256:0jgczvy1kr55s4bs8n2vmxnxnfvp5rkm4yd54gqm78c7ppyp4la7" }, "6.13": { "version": "6.13", diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 247da436949c..fb229afe8314 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -54,6 +54,7 @@ lib.overrideDerivation platforms = with lib.platforms; arm ++ aarch64; hydraPlatforms = [ "aarch64-linux" ]; }; + ignoreConfigErrors = true; } // (args.argsOverride or { }) )) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d5722bbbd6f4..0b5e64dd6d4d 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -421,18 +421,9 @@ let timeout = 14400; # 4 hours } // extraMeta; }; -in - -stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) // { - inherit pname version; - - enableParallelBuilding = true; - - hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; # Absolute paths for compilers avoid any PATH-clobbering issues. - makeFlags = [ - "O=$(buildRoot)" + commonMakeFlags = [ "ARCH=${stdenv.hostPlatform.linuxArch}" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] ++ lib.optionals (stdenv.isx86_64 && stdenv.cc.bintools.isLLVM) [ @@ -444,5 +435,27 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ] ++ (stdenv.hostPlatform.linux-kernel.makeFlags or []) ++ extraMakeFlags; - karch = stdenv.hostPlatform.linuxArch; -} // (optionalAttrs (pos != null) { inherit pos; }))) + finalKernel = stdenv.mkDerivation ( + builtins.foldl' lib.recursiveUpdate {} [ + (drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) + { + inherit pname version; + + enableParallelBuilding = true; + + hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; + + makeFlags = [ + "O=$(buildRoot)" + ] ++ commonMakeFlags; + + passthru.moduleMakeFlags = [ + "KBUILD_OUTPUT=${finalKernel.dev}/lib/modules/${finalKernel.modDirVersion}/build" + ] ++ commonMakeFlags; + + karch = stdenv.hostPlatform.linuxArch; + } + (optionalAttrs (pos != null) { inherit pos; }) + ] + ); +in finalKernel) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index c74aa7f4285a..c5228f4aca2b 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation { "WERROR=0" "ASCIIDOC8=1" ] - ++ kernel.makeFlags + ++ kernel.moduleMakeFlags ++ lib.optional (!withGtk) "NO_GTK2=1" ++ lib.optional (!withZstd) "NO_LIBZSTD=1" ++ lib.optional (!withLibcap) "NO_LIBCAP=1"; diff --git a/pkgs/os-specific/linux/lenovo-legion/default.nix b/pkgs/os-specific/linux/lenovo-legion/default.nix index 75d8a10b8d06..ef1acb055077 100644 --- a/pkgs/os-specific/linux/lenovo-legion/default.nix +++ b/pkgs/os-specific/linux/lenovo-legion/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { sed -i -e '/depmod/d' ./Makefile ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "SHELL=bash" "KERNELVERSION=${kernel.modDirVersion}" "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/lkrg/default.nix b/pkgs/os-specific/linux/lkrg/default.nix index 9b5676037776..760e08d4cbbf 100644 --- a/pkgs/os-specific/linux/lkrg/default.nix +++ b/pkgs/os-specific/linux/lkrg/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNEL=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index f37c15979f57..75421fed139e 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 2f5358e6ea15..2b4acd172bbb 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix index 6907ffeec752..388777c1f6f7 100644 --- a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix +++ b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; buildPhase = '' make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ diff --git a/pkgs/os-specific/linux/msi-ec/default.nix b/pkgs/os-specific/linux/msi-ec/default.nix index 2720eb652eb9..d73eae69a05b 100644 --- a/pkgs/os-specific/linux/msi-ec/default.nix +++ b/pkgs/os-specific/linux/msi-ec/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix index ee84b2508e66..0ce131315b71 100644 --- a/pkgs/os-specific/linux/mstflint_access/default.nix +++ b/pkgs/os-specific/linux/mstflint_access/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KVER=${kernel.modDirVersion}" "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix index 19d52276ecef..218f7f0eb8d0 100644 --- a/pkgs/os-specific/linux/nct6687d/default.nix +++ b/pkgs/os-specific/linux/nct6687d/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 4b8cf9019efa..e116f0925712 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { kmod=${kmod} substituteAllInPlace netatop.service ''; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; preInstall = '' mkdir -p $out/lib/systemd/system $out/bin $out/sbin $out/share/man/man{4,8} diff --git a/pkgs/os-specific/linux/nullfs/default.nix b/pkgs/os-specific/linux/nullfs/default.nix index 62a71829b2e1..5b6a5517d6de 100644 --- a/pkgs/os-specific/linux/nullfs/default.nix +++ b/pkgs/os-specific/linux/nullfs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 3e45be1123fc..1c11334d002c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -215,7 +215,7 @@ let kernelVersion = if libsOnly then null else kernel.modDirVersion; makeFlags = lib.optionals (!libsOnly) ( - kernel.makeFlags + kernel.moduleMakeFlags ++ [ "IGNORE_PREEMPT_RT_PRESENCE=1" "NV_BUILD_SUPPORTS_HMM=1" diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix index 7f60918f3872..e0e1c0b33ab8 100644 --- a/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation ( nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "MODLIB=$(out)/lib/modules/${kernel.modDirVersion}" diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix index 38b4312cc31f..1d80b27c84fd 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation ( nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/qc71_laptop/default.nix b/pkgs/os-specific/linux/qc71_laptop/default.nix index 952337ef282b..72a0c7db798e 100644 --- a/pkgs/os-specific/linux/qc71_laptop/default.nix +++ b/pkgs/os-specific/linux/qc71_laptop/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "VERSION=${version}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index 9806ddebb8d3..7403f6d2ef86 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { # avoid using the Makefile directly -- it doesn't understand # any kernel but the current. # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168 - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(PWD)/src" "modules" diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index a0588c5ce20c..33fbd30fd2bb 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ( "CONFIG_PLATFORM_I386_PC=" diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 0737d1fae87c..4a98cd915276 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -25,7 +25,9 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies ++ [ bc ]; - makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.moduleMakeFlags ++ [ + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index c808fa95dd24..a29075695896 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 67046b28c9ab..8715a71652a5 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 270d6832f412..70f2b9f572c2 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 91ed7cf9b490..119795f2c3aa 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index 095f4135c82d..0c830c34cd29 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.moduleMakeFlags ++ [ + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rtw89/default.nix b/pkgs/os-specific/linux/rtw89/default.nix index a704f75ec174..8e90bcf9f08d 100644 --- a/pkgs/os-specific/linux/rtw89/default.nix +++ b/pkgs/os-specific/linux/rtw89/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.moduleMakeFlags ++ [ + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix index c2a4a52c20e5..61c807be3911 100644 --- a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix +++ b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix @@ -17,7 +17,9 @@ kernel.stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.moduleMakeFlags ++ [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; installTargets = [ "modules_install" ]; diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix index 372c237e651b..aed568556714 100644 --- a/pkgs/os-specific/linux/shufflecake/default.nix +++ b/pkgs/os-specific/linux/shufflecake/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt lvm2 ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix index 764891a4bbc1..fe721e2912fd 100644 --- a/pkgs/os-specific/linux/tmon/default.nix +++ b/pkgs/os-specific/linux/tmon/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { cd tools/thermal/tmon ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "INSTALL_ROOT=\"$(out)\"" "BINDIR=bin" ]; diff --git a/pkgs/os-specific/linux/trelay/default.nix b/pkgs/os-specific/linux/trelay/default.nix index 291d8a2111bb..4b9684bcbbc5 100644 --- a/pkgs/os-specific/linux/trelay/default.nix +++ b/pkgs/os-specific/linux/trelay/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { cp '${./Makefile}' Makefile ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" diff --git a/pkgs/os-specific/linux/tsme-test/default.nix b/pkgs/os-specific/linux/tsme-test/default.nix index fc35b49106cc..8f47dbe9f652 100644 --- a/pkgs/os-specific/linux/tsme-test/default.nix +++ b/pkgs/os-specific/linux/tsme-test/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix index 93d84c1f8978..1fd18d36f56f 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -22,14 +22,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ pahole ]; nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; - # kernel makeFlags contain O=$$(buildRoot), that upstream passes through to make and causes build failure, so we filter it out here - makeFlags = - (lib.filter (flag: lib.head (lib.strings.splitString "=" flag) != "O") kernel.makeFlags) - ++ [ - "KERNELRELEASE=${kernel.modDirVersion}" - "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - "INSTALL_MOD_PATH=${placeholder "out"}" - ]; + makeFlags = kernel.moduleMakeFlags ++ [ + "KERNELRELEASE=${kernel.modDirVersion}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; meta = { broken = stdenv.hostPlatform.isAarch64 || (lib.versionOlder kernel.version "5.5"); diff --git a/pkgs/os-specific/linux/universal-pidff/default.nix b/pkgs/os-specific/linux/universal-pidff/default.nix index 01ac035282b5..153383a56627 100644 --- a/pkgs/os-specific/linux/universal-pidff/default.nix +++ b/pkgs/os-specific/linux/universal-pidff/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "universal-pidff"; - version = "0.0.10"; + version = "0.0.12"; src = fetchFromGitHub { owner = "JacKeTUs"; repo = "universal-pidff"; - tag = version; - hash = "sha256-BViobWl+9ypTcQJWtZ9pbeU4cmHcFNZWlsmQUOO64Vc="; + rev = "23ec6488eddaa9f5b370b53b0198ba7b656ffa3d"; + hash = "sha256-aA1iRXoVgJ1wVQMxFZm7/GqB7G/IjcLXifAk6B8odCs="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 86457e253770..104c0c687f1b 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { outputs = [ "out" "bin" ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix index 7fc01712951f..55b1cf931d70 100644 --- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix +++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ kernel ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix index 7b0853f4dca0..5c5fda8b8d13 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CONFIG_RTC_HCTOSYS yes ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "DEPMOD=echo" "INSTALL_MOD_PATH=$(out)" "KERNELRELEASE=${kernel.modDirVersion}" diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix index e4dbbf89b105..5d5bac541f47 100644 --- a/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/pkgs/os-specific/linux/vmm_clock/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { CONFIG_RTC_HCTOSYS yes ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "DEPMOD=echo" "INSTALL_MOD_PATH=$(out)" "KERNELRELEASE=${kernel.modDirVersion}" diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index 39ce3e1c71a3..eefe8b139b0a 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ bluez ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" diff --git a/pkgs/os-specific/linux/zenergy/default.nix b/pkgs/os-specific/linux/zenergy/default.nix index cfdb63d2a135..2a737fb34f57 100644 --- a/pkgs/os-specific/linux/zenergy/default.nix +++ b/pkgs/os-specific/linux/zenergy/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { "pic" ]; - makeFlags = kernel.makeFlags ++ [ "KDIR=${kernelDirectory}" ]; + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernelDirectory}" ]; installTargets = [ "modules_install" ]; diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index e00db1d6229e..690baaa5c510 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -191,10 +191,10 @@ let "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ] - ++ kernel.makeFlags + ++ kernel.moduleMakeFlags ); - makeFlags = optionals buildKernel kernel.makeFlags; + makeFlags = optionals buildKernel kernel.moduleMakeFlags; enableParallelBuilding = true; diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index da56ac16eea4..6b9e34c13e0d 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "SukramJ"; domain = "homematicip_local"; - version = "1.79.0"; + version = "1.79.1"; src = fetchFromGitHub { owner = "SukramJ"; repo = "custom_homematic"; tag = version; - hash = "sha256-kVYyc1froOwqu1s/RWstJr82Ffp+wj5hx7brq8u4zdg="; + hash = "sha256-kkUN7orPs9Xdq23VPwVp+AxqkWXMLiDcYRFNWeVlVpM="; }; postPatch = '' diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 8e2eb98f4bd8..65ae74386203 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz"; - hash = "sha256-M2WbqXHAL77fu9khTgb7BOe0mLgmU0Rcf9KN4KmvYAU="; + hash = "sha256-TMvQb2cU+uz4CeyWksWYfueyQ7NpUsG4saoJVXVkd7Y="; }; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 93a503d716cc..380d63c2a439 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -8,11 +8,11 @@ }: yarn2nix-moretea.mkYarnPackage { - version = "1.1.35"; + version = "1.1.38"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.35.tgz"; - sha256 = "0y0c6r8bijkz2pwc9mgkkg3fi7sbaawcarvcjf47xa5zkl65a2qf"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.38.tgz"; + sha256 = "1g87r4z6xh4hz1xsq64q2ryjr9pa7z2ym3gi9rdx4ch0qn0brsj0"; }; patches = [ @@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage { offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; - hash = "sha256-wK3w5y0Ic9g6iBOUG7KseA1lPW2wzPMbJqb0YWiZJTM="; + hash = "sha256-wlIVi1ucxXTzVhTqwKRAkfIhuVy/aXAJgFQFChGtmeU="; }; # Tarball has CRLF line endings. This makes patching difficult, so let's convert them. diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index 7c3583f5b35f..4e07cba27345 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "1.1.35", + "version": "1.1.38", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -41,9 +41,9 @@ "archiver": "7.0.1", "body-parser": "1.20.3", "cbor": "5.2.0", - "compression": "1.7.4", + "compression": "1.7.5", "cookie-session": "2.1.0", - "express": "4.21.1", + "express": "4.21.2", "express-handlebars": "7.1.3", "express-ws": "5.0.2", "ipcheck": "0.1.0", @@ -72,12 +72,13 @@ "jwt-simple": "*", "openid-client": "5.7.1", "passport-saml": "*", + "@duosecurity/duo_universal": "*", "archiver": "7.0.1", "body-parser": "1.20.3", "cbor": "5.2.0", - "compression": "1.7.4", + "compression": "1.7.5", "cookie-session": "2.1.0", - "express": "4.21.1", + "express": "4.21.2", "express-handlebars": "7.1.3", "express-ws": "5.0.2", "ipcheck": "0.1.0", @@ -109,16 +110,17 @@ "semver": "7.5.4", "https-proxy-agent": "7.0.2", "mongojs": "3.1.0", - "nodemailer": "6.9.15", + "nodemailer": "6.9.16", "@sendgrid/mail": "*", "jsdom": "22.1.0", "esprima": "4.0.1", "html-minifier": "4.0.0", "@crowdsec/express-bouncer": "0.1.0", + "prom-client": "*", "archiver-zip-encrypted": "2.0.0", "googleapis": "128.0.0", "webdav": "4.11.4", - "minio": "8.0.1", + "minio": "8.0.2", "wildleek": "2.0.0", "yubikeyotp": "0.2.0", "otplib": "10.2.3", @@ -132,7 +134,7 @@ "node-pushover": "1.0.0", "zulip": "0.1.0", "web-push": "3.6.6", - "node-xcs": "0.1.8", + "firebase-admin": "12.7.0", "modern-syslog": "1.2.0", "syslog": "0.1.1-1", "heapdump": "0.3.15" diff --git a/pkgs/tools/admin/meshcentral/update.sh b/pkgs/tools/admin/meshcentral/update.sh index 950fa617ce81..c8a5898e29c7 100755 --- a/pkgs/tools/admin/meshcentral/update.sh +++ b/pkgs/tools/admin/meshcentral/update.sh @@ -22,7 +22,7 @@ cd package awk =13.7.0", "@types/node@^22.0.1", "@types/node@^22.5.4": + version "22.10.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.7.tgz#14a1ca33fd0ebdd9d63593ed8d3fbc882a6d28d7" + integrity sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg== dependencies: undici-types "~6.20.0" @@ -1410,6 +1639,48 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b" integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ== +"@types/qs@*": + version "6.9.18" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.18.tgz#877292caa91f7c1b213032b34626505b746624c2" + integrity sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA== + +"@types/range-parser@*": + version "1.2.7" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" + integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== + +"@types/request@^2.48.8": + version "2.48.12" + resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.12.tgz#0f590f615a10f87da18e9790ac94c29ec4c5ef30" + integrity sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw== + dependencies: + "@types/caseless" "*" + "@types/node" "*" + "@types/tough-cookie" "*" + form-data "^2.5.0" + +"@types/send@*": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a" + integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + +"@types/serve-static@*": + version "1.15.7" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714" + integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw== + dependencies: + "@types/http-errors" "*" + "@types/node" "*" + "@types/send" "*" + +"@types/tough-cookie@*": + version "4.0.5" + resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.5.tgz#cb6e2a691b70cb177c6e3ae9c1d2e8b2ea8cd304" + integrity sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA== + "@types/triple-beam@^1.3.2": version "1.3.5" resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c" @@ -1440,23 +1711,23 @@ resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.13.tgz#ff34942667a4e19a9f4a0996a76814daac364cf3" integrity sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g== -"@xmpp/base64@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/base64/-/base64-0.13.1.tgz#92cb55554cea301e5e157d0f4e957d3c3d6e9c3e" - integrity sha512-ifzj81zZc8uhL9Nl8us2NUDfLt3qsbHr8lwdKmrDMk/9unY8aIGjzHdNBJoFFyJe8GSo1NFq3mS7X+X0TwkQYw== +"@xmpp/base64@^0.13.2": + version "0.13.2" + resolved "https://registry.yarnpkg.com/@xmpp/base64/-/base64-0.13.2.tgz#ca3e936de6c50e8db067a35162fc8c72cb17d19f" + integrity sha512-RDEq66sW/jqj2HZKoRvnIvlRJMRLEGa0EGyJ0yPCF1+KijmTqrWr1PxZAol850QizXlqpvo8MS8OCFWMryX7RQ== dependencies: base-64 "^1.0.0" "@xmpp/client-core@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/client-core/-/client-core-0.13.1.tgz#508986bf87560a5f34940977fc6e832c8f420667" - integrity sha512-ANVcqzgDCmmUj/R9pf5rJGH41mL16Bo+DRJ+2trKoRHe9p5s0p6IssjhJtTOSVx6oh2ilPXMB8qoMPjTGzY6cw== + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/client-core/-/client-core-0.13.3.tgz#88f4eaac9cf10a218d7891212c9b031c4946101f" + integrity sha512-pOtCozET4BxJZU7aWykT+PFBGaxT/Sl8mC0E3X6QgL7/2Vo39lz2KIhkcvtSwMC8myuaB+klOBrifuKLo3IajA== dependencies: - "@xmpp/connection" "^0.13.1" - "@xmpp/jid" "^0.13.1" - "@xmpp/xml" "^0.13.1" + "@xmpp/connection" "^0.13.3" + "@xmpp/jid" "^0.13.2" + "@xmpp/xml" "^0.13.3" -"@xmpp/client@0.13.1", "@xmpp/client@^0.13.1": +"@xmpp/client@0.13.1": version "0.13.1" resolved "https://registry.yarnpkg.com/@xmpp/client/-/client-0.13.1.tgz#6c8db3cd308479ef17b8f78e2eda9a68b4ebd2d6" integrity sha512-DA+pOkWliTKN5C0Bod4rqlZ4hj/CiqQDHRhQgpx7Y/69qsUwK8M/9C02qylpyZSL2TFGzOM6ZMhr/jlMCsL9jQ== @@ -1484,186 +1755,178 @@ "@xmpp/websocket" "^0.13.1" babel-plugin-jsx-pragmatic "^1.0.2" -"@xmpp/connection-tcp@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/connection-tcp/-/connection-tcp-0.13.1.tgz#07a48223ac0dc2cc97fa8adf85d98a73418568f9" - integrity sha512-yTVrj5o5rPVbZT5ql5ljzzIZHnLkCuyTNEQpiU9IYvfjWjy4+E2DreUnpRf3IAbpARkMoPq5uQJchH0RE3WBjg== +"@xmpp/connection-tcp@^0.13.3": + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/connection-tcp/-/connection-tcp-0.13.3.tgz#f61c15286b8aa30b848ab0cfb3f71e3fa7117fe0" + integrity sha512-6MMUSM265eBtHeLOYIe5UP1ld3oZaQMso6Cq7KJ0Xe7qC6zDy3YYaRHAe3Z+bdoJxpgmfiN8jvDM+QfypcTpKg== dependencies: - "@xmpp/connection" "^0.13.1" - "@xmpp/xml" "^0.13.1" + "@xmpp/connection" "^0.13.3" + "@xmpp/xml" "^0.13.3" -"@xmpp/connection@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/connection/-/connection-0.13.1.tgz#1c71e2dcfa8a2e72dda4dbf73fe0b520f8971851" - integrity sha512-A8ojaVRrvGtvRTXcWiOJMnBPAytLFvsz18g/jO9PbnhzuqqeJ6LxmCtyaKqchMdX0lhuZpo0JUgCSPnZ68tXrQ== +"@xmpp/connection@^0.13.3": + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/connection/-/connection-0.13.3.tgz#2cb563df0e67cc061dc5421ecb784bf5ab4ecbdc" + integrity sha512-EM6/wLUJ6MFJl7Kb+qwQut1gLDp7G107KTOB1W/GljGMd7ydD2Bn0BJt2AAx8EGPve9G2jjhV3+jJmu7KwK4rQ== dependencies: - "@xmpp/error" "^0.13.1" - "@xmpp/events" "^0.13.1" - "@xmpp/jid" "^0.13.1" - "@xmpp/xml" "^0.13.1" + "@xmpp/error" "^0.13.2" + "@xmpp/events" "^0.13.2" + "@xmpp/jid" "^0.13.2" + "@xmpp/xml" "^0.13.3" -"@xmpp/debug@^0.13.0": - version "0.13.0" - resolved "https://registry.yarnpkg.com/@xmpp/debug/-/debug-0.13.0.tgz#5bda39b3aa628719dbab0741c305f8579e73e88f" - integrity sha512-4RCN0UsGLmfzzOdDAfzpm8luKprcdo9oRf0cnKqU/TKmbw5PN5F+TqX4we7uc4xHKzpu0rNyEhusKkVOfe3xzw== - dependencies: - "@xmpp/xml" "^0.13.0" - ltx "^3.0.0" +"@xmpp/error@^0.13.2": + version "0.13.2" + resolved "https://registry.yarnpkg.com/@xmpp/error/-/error-0.13.2.tgz#1a4081558c68a3bcae9ddf0767d8cbd905ecbd4b" + integrity sha512-bjbxwF8s6jfQNI+ZHV9Jwcb7K2kBeTlD60QHjMJlxIUrjTH1ZsJoDQh9tMdq1mBu/h/bm2SX7yZUqUb1wY6gMw== -"@xmpp/error@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/error/-/error-0.13.1.tgz#fba9ddd33e34f77616635b87b67e974637b23995" - integrity sha512-tKecj36xIGLhLctdYhUOxWs+ZdiJpl0Tfp/GhfrUCKLHj/wq14d62SP9kxa0sDNKOY1uqRq2N9gWZBQHuP+r2Q== - -"@xmpp/events@^0.13.0", "@xmpp/events@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/events/-/events-0.13.1.tgz#8bfa57117bb8c21da87e62a1985d65b7b1c342c2" - integrity sha512-c538zWUoD7KfMzMWGHyJkXvRYE5exzVjK6NAsMtfNtbVqw9SXJJaGLvDvYSXOQmKQaZz5guUuIUGiHJbr7yjsA== +"@xmpp/events@^0.13.2": + version "0.13.2" + resolved "https://registry.yarnpkg.com/@xmpp/events/-/events-0.13.2.tgz#90627810800ae95fcf435d0f0c65926d8f77829b" + integrity sha512-fXaAMChvLnP9vEQIatFKWoAm/F9U122hShfRfVw4xS6pympThygWVPIuRuAznMt5tOyTVFWBuPge6hgGousT0g== dependencies: events "^3.3.0" -"@xmpp/id@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/id/-/id-0.13.1.tgz#771f5cc64e402cab0994e6e4e05bfc635a300948" - integrity sha512-ivc7kxfk5sU6PspdQvglsibcWRCr40nbaPEvGYbXO8ymFN6qps91DPlEt0Cc0XJExq7PXo0Yt7DACfe8f7K03g== +"@xmpp/id@^0.13.2": + version "0.13.2" + resolved "https://registry.yarnpkg.com/@xmpp/id/-/id-0.13.2.tgz#f10e014374300b465c0263346d909d8301b54519" + integrity sha512-LhSzcaPvjddvL+u/xNAuu6tNtxWR7HZPTyMUck8tyYnbwsXaJQ6sDoS8AEQE8o7iW5E31xJUTOktYd/s6HMo3w== "@xmpp/iq@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/iq/-/iq-0.13.1.tgz#29e5e62f6bad7cd73020948dc682c3bb2dd6e2ec" - integrity sha512-YyJj6up2aFTobTUmjdX86vs0+/WIB8i88QQjDDlzSKdMDDXgrB8B8JAMlEBfAsruAv/ZIwUnE4/yqCeMAehTuA== + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/iq/-/iq-0.13.3.tgz#c9761fb754cc119b2f7b08e996d9fea266db6336" + integrity sha512-sGeyGF4OnYGTZw3PhQaYLYlE8+LRZfYijT/ESGqhY2ed9gm0U4TCR8C8s5oT7Puu6S6smdHehcvYCrcFEeQyBw== dependencies: - "@xmpp/events" "^0.13.1" - "@xmpp/id" "^0.13.1" - "@xmpp/middleware" "^0.13.1" - "@xmpp/xml" "^0.13.1" + "@xmpp/events" "^0.13.2" + "@xmpp/id" "^0.13.2" + "@xmpp/middleware" "^0.13.3" + "@xmpp/xml" "^0.13.3" -"@xmpp/jid@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/jid/-/jid-0.13.1.tgz#043cd7c491feeb6a7c9f7b1b3581f94939670717" - integrity sha512-E5ulk4gfPQwPY71TWXapiWzoxxAJz3LP0bDIUXIfgvlf1/2QKP3EcYQ7o+qmI0cLEZwWmwluRGouylqhyuwcAw== +"@xmpp/jid@^0.13.2": + version "0.13.2" + resolved "https://registry.yarnpkg.com/@xmpp/jid/-/jid-0.13.2.tgz#117d69b455f607735ad569e23ff40529a6681f16" + integrity sha512-OuYrxiNdlmXgMFPJqnbZSKe/bdn1wxtc1ASEadrizI9h6T1y7tAEl5YpXFWYb+fdAL9vRD+bGCxrDUrm1er/LQ== -"@xmpp/middleware@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/middleware/-/middleware-0.13.1.tgz#fe64e7f5d12fb74254684d96e17777fb4e7a44ed" - integrity sha512-t7kws9KMgaQURCDMcPjJOm/sEcC2Gs2YtpE35NaTR87NSwr8yZ37ZJL5Kki3Z4qhL6nhMXJPAprc6uqBn5q3Og== +"@xmpp/middleware@^0.13.1", "@xmpp/middleware@^0.13.3": + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/middleware/-/middleware-0.13.3.tgz#aec98c9afd80b74a3c8f1d91defc3a9f5da4a6d1" + integrity sha512-zZTsqLaHnfTqMBDyZh01HLYUgcHLmbalVfC32CsEcjPG5/bIete9sOUVPaiGH1cicMgi3O7WZK512RvQFcBbwA== dependencies: - "@xmpp/error" "^0.13.1" - "@xmpp/jid" "^0.13.1" - "@xmpp/xml" "^0.13.1" + "@xmpp/error" "^0.13.2" + "@xmpp/jid" "^0.13.2" + "@xmpp/xml" "^0.13.3" koa-compose "^4.1.0" "@xmpp/reconnect@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/reconnect/-/reconnect-0.13.1.tgz#c815ec749a5c142fb9255af951d64e1dbadc419b" - integrity sha512-m/j/mTU7b3cOXP78uGzBbihmJMuXCYcTcwsTHlexj6tj6CE/vpuLNgxvf6pPkO7B9lH0HfezqU7ExHpS+4Nfaw== + version "0.13.2" + resolved "https://registry.yarnpkg.com/@xmpp/reconnect/-/reconnect-0.13.2.tgz#0ba0230807d5ea4f147e0eaf7b4562225a7306aa" + integrity sha512-FWCC+dzi23N7H99PYPqWZa7oRPNp9G7yYzMZwOpeiVporbNy+op3yUbCszo3YA3XVEsuLRQ1aQJ8evLo+GD5ow== dependencies: - "@xmpp/events" "^0.13.1" + "@xmpp/events" "^0.13.2" "@xmpp/resolve@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/resolve/-/resolve-0.13.1.tgz#19f7a23983b78b72af5ce6606382428c4e7e7421" - integrity sha512-Lgsl6C/uJCxmYr0jWWOCJMqYvKi5WzN6loZwP7f6ov2nLMOMEZ7TSb66z393/7Pd0hy6DqZeggESMAFOkQH+vw== + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/resolve/-/resolve-0.13.3.tgz#0e965032e00631ed9c78e9861fdac51e536ab19a" + integrity sha512-HL86p0a2CI0ILFYUR8vPR77ZXwxQ0xXLLRnyb88TjQ/eNbYsc1gmdXjELE0xRCfQblXZsETvUwWv5RofTYAgrQ== dependencies: - "@xmpp/events" "^0.13.0" - "@xmpp/xml" "^0.13.0" - node-fetch "^2.6.6" + "@xmpp/events" "^0.13.2" + "@xmpp/xml" "^0.13.3" + node-fetch "^3.3.2" "@xmpp/resource-binding@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/resource-binding/-/resource-binding-0.13.1.tgz#76a8248ced24bc24cd4dff0a031ed376eafeb54b" - integrity sha512-S6PGlfufDTTDlh21ynyJrGR0sMeEYIRq+BKUl4QhsR19BvP0RUW0t8Ypx1QwDY3++ihqRjvCllCmtmFMY1iJsQ== + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/resource-binding/-/resource-binding-0.13.3.tgz#15e67c76acf39c902364408691d057c8f1ef4064" + integrity sha512-cph/8vJ5sRHVg7Njx8rR27xAVmKWACSx95jlOw7LmUSTRSxZDw2wHsqie76HxUD5fPszOsTh/Ph7Fw1532aRUQ== dependencies: - "@xmpp/xml" "^0.13.1" + "@xmpp/xml" "^0.13.3" "@xmpp/sasl-anonymous@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/sasl-anonymous/-/sasl-anonymous-0.13.1.tgz#21139dafe4dbc8fb626e974daf64af9c46e469c5" - integrity sha512-l0Bqmva7xw10p8MelD2bHO10LwCPz6CEd/t5xO+Kw98hjI9lX6k5cxW7frvdnxRwPxJbGTciTQKHokYWR4luaA== + version "0.13.2" + resolved "https://registry.yarnpkg.com/@xmpp/sasl-anonymous/-/sasl-anonymous-0.13.2.tgz#d6ea4eb6febe8a8c1a7c0578d5798f930b4778ef" + integrity sha512-0fI9+A+Vptcyv8+o8J2veRnodtnKahJDy5fappIZbmXLrv4JcrVBChQDWULyta0Hez9M3XWoIyuhp4pyz0IU/Q== dependencies: sasl-anonymous "^0.1.0" "@xmpp/sasl-plain@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/sasl-plain/-/sasl-plain-0.13.1.tgz#ccdf9c73f61fb203ec7822ae55e2c707d3aed305" - integrity sha512-Xx4ay67Mg6aQFeelTZuY5QatP3cCJsArAuD0AozHKzjUWzyLqqydsDS+yFN23pxkOZPGgyYVebc4gKti4jZ+GA== + version "0.13.2" + resolved "https://registry.yarnpkg.com/@xmpp/sasl-plain/-/sasl-plain-0.13.2.tgz#e4ce2dba38d1960a4dbe70ffea8cada2e69eadef" + integrity sha512-zwS/q+Vd4YsLdnZjmCuS1JCacWWg2Vd3ecqpBmIV3S394s1Mgiwdnd2bVRen5S0kl/de+VzHg/DRLuYvC94SUg== dependencies: sasl-plain "^0.1.0" "@xmpp/sasl-scram-sha-1@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.13.1.tgz#139a74f176301513da987ddc3eb98f1e58c8d9ad" - integrity sha512-qWyR5+v10pykTxQnKfNVUnCnZisA/UmC4Po5EQSgA5dNRuzraqwk/bH5PVi9+M0OcbtdNs9wCO2Hv06YA9AjwA== + version "0.13.2" + resolved "https://registry.yarnpkg.com/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.13.2.tgz#47f240ce25a200004696f76dde5e376db86f04b7" + integrity sha512-qHwooR3m8/BsuG17tK50ZKO97HITG+k6Chjk/pSjRfKG5Fm3mWh2U8K98QWNpJYbgVm9amkIQ0tbTaw+/kMjvQ== dependencies: - sasl-scram-sha-1 "^1.2.1" + sasl-scram-sha-1 "^1.3.0" "@xmpp/sasl@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/sasl/-/sasl-0.13.1.tgz#ee8484dda611ccff9b39243109b78c47abd01584" - integrity sha512-ynhKsL43EtezqJ9s476leHzliMudCAFS4xNG5x4ZFHoc7Iz5J6p6jFI89LGgnk9DeIdk9A/CFrPWTdyjhvyiTQ== + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/sasl/-/sasl-0.13.3.tgz#bd5d98259a1a375b0aa700192ed4cf105f810b0d" + integrity sha512-qsSs25niGu32ulWEyKP6yq400rLyFYNzxwMO2K5V4iAGdzAkTXRcqliu39fd5A+7MqK9q9KE8/mMm0qcLMsLhg== dependencies: - "@xmpp/base64" "^0.13.1" - "@xmpp/error" "^0.13.1" - "@xmpp/xml" "^0.13.1" + "@xmpp/base64" "^0.13.2" + "@xmpp/error" "^0.13.2" + "@xmpp/xml" "^0.13.3" saslmechanisms "^0.1.1" "@xmpp/session-establishment@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/session-establishment/-/session-establishment-0.13.1.tgz#5fc6e6e2d96d78c4646c227620cdab69046c42ae" - integrity sha512-uba6BZeeSJtbHtU+pCumSiX/zuc9hUdN5dVRNjvRjr/ZcXLMuC5MroRyrld+fm/rQYQLJjF4BcIaxvysXTCAGA== + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/session-establishment/-/session-establishment-0.13.3.tgz#2ab32981292b4c747ce54753d22925d1678c6415" + integrity sha512-dQhH7aIzsqyMRsjMIuER4UBCxQgvDUHjkmNoeIbUZX5bYJuGeET90tZ4eNAq6yXnpSGJiKoXVfVBxNoiXovfgA== dependencies: - "@xmpp/xml" "^0.13.1" + "@xmpp/xml" "^0.13.3" "@xmpp/starttls@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/starttls/-/starttls-0.13.1.tgz#20d9c399ea822985e5f9ba5636a9fa1cc0600cb9" - integrity sha512-rQumwpbD5+yclcXgPNDF7Jg1mzDFejHKZehD6JRti+Emsxayst/qFDq3uMO3x6P+nKexL4mMoKUtWHlJM7BUGw== + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/starttls/-/starttls-0.13.3.tgz#2e5202e2877e7b277597c79f186987a0c3b7689e" + integrity sha512-FjKrpahL/yBiRlMUL4d88I5N5PxQN2Mirx39Q0kyo479Nj1OY4dTA78Iy5+tsbsBYO3j5aE2tRoLhUQaMPGvBQ== dependencies: - "@xmpp/events" "^0.13.1" - "@xmpp/tls" "^0.13.1" - "@xmpp/xml" "^0.13.1" + "@xmpp/events" "^0.13.2" + "@xmpp/tls" "^0.13.3" + "@xmpp/xml" "^0.13.3" "@xmpp/stream-features@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/stream-features/-/stream-features-0.13.1.tgz#1a91aadaf027bfb1e4b5073bb0130ebad7f0e091" - integrity sha512-yZg+CXBRVXsIQzu4SI5UYlDZHmg3wY6YXy4MbeLiI4O8OQ/oCz6OHJlHKUnFl+cGmjDXvhN4Ga6pRhbEIIqM/g== + version "0.13.2" + resolved "https://registry.yarnpkg.com/@xmpp/stream-features/-/stream-features-0.13.2.tgz#3554050b38b708289c85254b4fe4fcb52086e26b" + integrity sha512-eyxFEEDSfNvG4ybvAYTYkjaUcaytu8sAqT8DfWwrWzCkPgfRzpexsxb9yhe8hAVrvPLavOyr+zh4raUQf4Ogkg== "@xmpp/stream-management@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/stream-management/-/stream-management-0.13.1.tgz#643b94ed243b81f8a6f74937a6906a21dd8ce889" - integrity sha512-06dhJAlGn+MU5ESrvIUg5xOS7azVE0swq86cx4SCv7t5dWL1WBj4xg2qigLn1hMnFkDw0bO/SOikXTxqGii/hA== + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/stream-management/-/stream-management-0.13.3.tgz#e6119c3711e2c6f5ffb348471cddc640b6ff266f" + integrity sha512-hdQAyp6FldEkBktou/mbb7MPOe/EzBxP3sIjWvNQXwRMV8AJxAXyi+DhnW5sigRQoeTJJB0FGTxOlFDeXWGhPg== dependencies: - "@xmpp/xml" "^0.13.1" + "@xmpp/xml" "^0.13.3" "@xmpp/tcp@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/tcp/-/tcp-0.13.1.tgz#7a7a08791282a9c8a319cc9f6feee1b94c1bdde6" - integrity sha512-N/AQBT+6Updb/E8A1SYdMbIJGaRFG8+7+bkm9MLw44UsihA6Yg0fmvC02O+BjNg3tXGkcMYLhu/8NYpjK4NlQg== + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/tcp/-/tcp-0.13.3.tgz#7dad798e71e875fffb5794816b11eba1f6379196" + integrity sha512-WUjAsPVQAr/DTNJGxXOqXEviFvI5Gzp/18TuCJEssAjyHv1Pr7Qn6PjAersIPidEKqVfapNyHOmgyLePh1kAqQ== dependencies: - "@xmpp/connection-tcp" "^0.13.1" + "@xmpp/connection-tcp" "^0.13.3" -"@xmpp/tls@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/tls/-/tls-0.13.1.tgz#bf3891a0fd381478cc90f88358b7e8b706209bd4" - integrity sha512-ecOmnrZmRbMMPDdvDNirw7sYQHt//YV7UJgfS4c9M+R5ljP2eUJiAiotEEykjKJ6CJPMMxdTnrLLP3ullsgfog== +"@xmpp/tls@^0.13.1", "@xmpp/tls@^0.13.3": + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/tls/-/tls-0.13.3.tgz#e978a3de0bbb717655cda0563ebab5bef8ca5148" + integrity sha512-oeXbkzu2i2LkpvPQ4B3RourYnktoUpkWeUS7jRB4wHvdy6ecEli593R+DYVCWr3Hvj+3l40MkyRQSmZp4S7tVg== dependencies: - "@xmpp/connection" "^0.13.1" - "@xmpp/connection-tcp" "^0.13.1" + "@xmpp/connection" "^0.13.3" + "@xmpp/connection-tcp" "^0.13.3" "@xmpp/websocket@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/websocket/-/websocket-0.13.1.tgz#a94196555244a0490fa58046cce4322f84fbf58e" - integrity sha512-UyMYyy/0Cm2UtVoAlhfV31u6LzGrBUU0h7I0qGCq1yYPQpscehNl8lXE4vmB8OfpeDvSZmvGk2vJAvGxzunoDQ== + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/websocket/-/websocket-0.13.3.tgz#0418d1ab276b73a198876a8fcbdf773f3bad5b26" + integrity sha512-RXZJFecaAlotqhAdNohO0SoP8Rx3eJrl18c78gxybAhNaCexFbuMJIvSj91L/b8bOErJtFMTwreWeMfzP6Ijiw== dependencies: - "@xmpp/connection" "^0.13.1" - "@xmpp/xml" "^0.13.1" - ws "^8.4.0" + "@xmpp/connection" "^0.13.3" + "@xmpp/xml" "^0.13.3" + ws "^8.18.0" -"@xmpp/xml@^0.13.0", "@xmpp/xml@^0.13.1": - version "0.13.1" - resolved "https://registry.yarnpkg.com/@xmpp/xml/-/xml-0.13.1.tgz#856b992dec1978fba89e06bd4718d91a31188916" - integrity sha512-GMfYB3PKY9QzsMnl3dPohgPBGd1JQTBanKOaZexJCSYJN2cdYLU2HGhjMtDlGSno6h9U+t0oO7r0igsJwyigwg== +"@xmpp/xml@^0.13.3": + version "0.13.3" + resolved "https://registry.yarnpkg.com/@xmpp/xml/-/xml-0.13.3.tgz#0f8ed17f85a3b9131d38ab6c3bf61a6fcd7652c5" + integrity sha512-lYXBg/VlpUeavGgQE8LADfZUzMFUnWFVYgvKUcx97AqjiEJUuo40ijdRcGmkAVtTg0RBkml5WB+Mo+JqynMk7Q== dependencies: - ltx "^3.0.0" + ltx "^3.1.1" "@zxing/text-encoding@0.9.0": version "0.9.0" @@ -1692,7 +1955,7 @@ abstract-logging@^2.0.0: resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz#6b0c371df212db7129b57d2e7fcf282b8bf1c839" integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA== -accepts@~1.3.5, accepts@~1.3.8: +accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -1780,9 +2043,9 @@ agent-base@^7.0.2, agent-base@^7.1.2: integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw== agentkeepalive@^4.1.3: - version "4.5.0" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923" - integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew== + version "4.6.0" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.6.0.tgz#35f73e94b3f40bf65f105219c623ad19c136ea6a" + integrity sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ== dependencies: humanize-ms "^1.2.1" @@ -1932,13 +2195,13 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -array-buffer-byte-length@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" - integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== +array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz#384d12a37295aec3769ab022ad323a18a51ccf8b" + integrity sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw== dependencies: - call-bind "^1.0.5" - is-array-buffer "^3.0.4" + call-bound "^1.0.3" + is-array-buffer "^3.0.5" array-flatten@1.1.1: version "1.1.1" @@ -1958,19 +2221,23 @@ array.prototype.reduce@^1.0.6: es-object-atoms "^1.0.0" is-string "^1.0.7" -arraybuffer.prototype.slice@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" - integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== +arraybuffer.prototype.slice@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz#9d760d84dbdd06d0cbf92c8849615a1a7ab3183c" + integrity sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ== dependencies: array-buffer-byte-length "^1.0.1" - call-bind "^1.0.5" + call-bind "^1.0.8" define-properties "^1.2.1" - es-abstract "^1.22.3" - es-errors "^1.2.1" - get-intrinsic "^1.2.3" + es-abstract "^1.23.5" + es-errors "^1.3.0" + get-intrinsic "^1.2.6" is-array-buffer "^3.0.4" - is-shared-array-buffer "^1.0.2" + +arrify@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" + integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== asn1.js@^5.3.0: version "5.4.1" @@ -2011,6 +2278,13 @@ async-mutex@^0.3.0: dependencies: tslib "^2.3.1" +async-retry@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280" + integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw== + dependencies: + retry "0.13.1" + async@^3.2.3, async@^3.2.4: version "3.2.6" resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" @@ -2075,7 +2349,7 @@ axios@^0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" -axios@^1.7.4: +axios@^1.2.2, axios@^1.7.4: version "1.7.9" resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a" integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw== @@ -2127,9 +2401,9 @@ balanced-match@^1.0.0: integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== bare-events@^2.2.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.5.0.tgz#305b511e262ffd8b9d5616b056464f8e1b3329cc" - integrity sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A== + version "2.5.4" + resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.5.4.tgz#16143d435e1ed9eafd1ab85f12b89b3357a41745" + integrity sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA== base-64@^0.1.0: version "0.1.0" @@ -2190,6 +2464,11 @@ bindings@^1.1.1, bindings@^1.5.0: dependencies: file-uri-to-path "1.0.0" +bintrees@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.2.tgz#49f896d6e858a4a499df85c38fb399b9aff840f8" + integrity sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw== + bl@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5" @@ -2294,13 +2573,13 @@ browser-or-node@^2.1.1: integrity sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg== browserslist@^4.24.0: - version "4.24.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580" - integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg== + version "4.24.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b" + integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A== dependencies: - caniuse-lite "^1.0.30001669" - electron-to-chromium "^1.5.41" - node-releases "^2.0.18" + caniuse-lite "^1.0.30001688" + electron-to-chromium "^1.5.73" + node-releases "^2.0.19" update-browserslist-db "^1.1.1" bson@^1.1.4: @@ -2352,9 +2631,9 @@ buffer@^6.0.3: ieee754 "^1.2.1" bufferutil@^4.0.1, bufferutil@^4.0.3: - version "4.0.8" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.8.tgz#1de6a71092d65d7766c4d8a522b261a6e787e8ea" - integrity sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw== + version "4.0.9" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.9.tgz#6e81739ad48a95cad45a279588e13e95e24a800a" + integrity sha512-WDtdLmJvAuNNPzByAYpRo2rF1Mmradw6gvWsQKf63476DDXmomT9zUiGypLcG4ibIM67vhAj8jJRdbmEws2Aqw== dependencies: node-gyp-build "^4.3.0" @@ -2381,11 +2660,6 @@ byte-length@^1.0.2: resolved "https://registry.yarnpkg.com/byte-length/-/byte-length-1.0.2.tgz#ba5a5909240b0121c079b7f7b15248d6f08223cc" integrity sha512-ovBpjmsgd/teRmgcPh23d4gJvxDoXtAzEL9xTfMU8Yc2kqCDb7L9jAG0XHl1nzuGl+h3ebCIF1i62UFyA9V/2Q== -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== - bytes@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" @@ -2425,15 +2699,15 @@ caching-transform@^3.0.2: package-hash "^3.0.0" write-file-atomic "^2.4.2" -call-bind-apply-helpers@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.0.tgz#33127b42608972f76812a501d69db5d8ce404979" - integrity sha512-CCKAP2tkPau7D3GE8+V8R6sQubA9R5foIzGp+85EXCVSCivuxBNAWqcpn72PKYiIcqoViv/kcUDpaEIMBVi1lQ== +call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz#32e5892e6361b29b0b545ba6f7763378daca2840" + integrity sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g== dependencies: es-errors "^1.3.0" function-bind "^1.1.2" -call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7, call-bind@^1.0.8: +call-bind@^1.0.7, call-bind@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c" integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww== @@ -2443,6 +2717,14 @@ call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7, call-bin get-intrinsic "^1.2.4" set-function-length "^1.2.2" +call-bound@^1.0.2, call-bound@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.3.tgz#41cfd032b593e39176a71533ab4f384aa04fd681" + integrity sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA== + dependencies: + call-bind-apply-helpers "^1.0.1" + get-intrinsic "^1.2.6" + camel-case@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" @@ -2456,10 +2738,10 @@ camelcase@^5.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-lite@^1.0.30001669: - version "1.0.30001687" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz#d0ac634d043648498eedf7a3932836beba90ebae" - integrity sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ== +caniuse-lite@^1.0.30001688: + version "1.0.30001695" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz#39dfedd8f94851132795fdf9b79d29659ad9c4d4" + integrity sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw== caseless@~0.12.0: version "0.12.0" @@ -2556,6 +2838,15 @@ cliui@^5.0.0: strip-ansi "^5.2.0" wrap-ansi "^5.1.0" +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -2663,24 +2954,24 @@ compress-commons@^6.0.0, compress-commons@^6.0.2: normalize-path "^3.0.0" readable-stream "^4.0.0" -compressible@~2.0.16: +compressible@~2.0.18: version "2.0.18" resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== dependencies: mime-db ">= 1.43.0 < 2" -compression@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== +compression@1.7.5: + version "1.7.5" + resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.5.tgz#fdd256c0a642e39e314c478f6c2cd654edd74c93" + integrity sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q== dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" + bytes "3.1.2" + compressible "~2.0.18" debug "2.6.9" + negotiator "~0.6.4" on-headers "~1.0.2" - safe-buffer "5.1.2" + safe-buffer "5.2.1" vary "~1.1.2" concat-map@0.0.1: @@ -2759,9 +3050,9 @@ core-js@^2.4.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.30.2: - version "3.39.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.39.0.tgz#57f7647f4d2d030c32a72ea23a0555b2eaa30f83" - integrity sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g== + version "3.40.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.40.0.tgz#2773f6b06877d8eda102fc42f828176437062476" + integrity sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ== core-util-is@1.0.2: version "1.0.2" @@ -2884,6 +3175,11 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" +data-uri-to-buffer@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e" + integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A== + data-urls@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4" @@ -2893,30 +3189,30 @@ data-urls@^4.0.0: whatwg-mimetype "^3.0.0" whatwg-url "^12.0.0" -data-view-buffer@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2" - integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA== +data-view-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz#211a03ba95ecaf7798a8c7198d79536211f88570" + integrity sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ== dependencies: - call-bind "^1.0.6" + call-bound "^1.0.3" es-errors "^1.3.0" - is-data-view "^1.0.1" + is-data-view "^1.0.2" -data-view-byte-length@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2" - integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ== +data-view-byte-length@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz#9e80f7ca52453ce3e93d25a35318767ea7704735" + integrity sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ== dependencies: - call-bind "^1.0.7" + call-bound "^1.0.3" es-errors "^1.3.0" - is-data-view "^1.0.1" + is-data-view "^1.0.2" -data-view-byte-offset@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a" - integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA== +data-view-byte-offset@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz#068307f9b71ab76dbbe10291389e020856606191" + integrity sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ== dependencies: - call-bind "^1.0.6" + call-bound "^1.0.2" es-errors "^1.3.0" is-data-view "^1.0.1" @@ -2994,7 +3290,7 @@ define-data-property@^1.0.1, define-data-property@^1.1.4: es-errors "^1.3.0" gopd "^1.0.1" -define-properties@^1.2.0, define-properties@^1.2.1: +define-properties@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== @@ -3048,15 +3344,10 @@ detect-libc@^2.0.0: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700" integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw== -discord-api-types@0.37.97: - version "0.37.97" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.97.tgz#d658573f726ad179261d538dbad4e7e8eca48d11" - integrity sha512-No1BXPcVkyVD4ZVmbNgDKaBoqgeQ+FJpzZ8wqHkfmBnTZig1FcH3iPPersiK1TUIAzgClh2IvOuVUYfcWLQAOA== - -discord-api-types@^0.37.12, discord-api-types@^0.37.41: - version "0.37.110" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.110.tgz#cccd596a1be2456bb90a251d4d750d60542ab23e" - integrity sha512-wVaAJkrSgNRo8nd523qKYPqkClTNHhjKOk/g6265rzHuc7TNS6Ivz06DPW4iZvnhFobbH95hKlgsRf6jcAbtlA== +discord-api-types@^0.37.114, discord-api-types@^0.37.12, discord-api-types@^0.37.41: + version "0.37.116" + resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.116.tgz#2f28ffd3b5749768bd94dfc055d0f0001293ef59" + integrity sha512-g+BH/m0hyS/JzL+e0aM+z2o9UtwfyUZ0hqeyc+6sNwdMx+NtQkqULRV/oj9ynAefpRb+cpOjmWaYec4B1I0Hqg== discord.js@14.6.0: version "14.6.0" @@ -3113,15 +3404,25 @@ domutils@^2.5.2: domelementtype "^2.2.0" domhandler "^4.2.0" -dunder-proto@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.0.tgz#c2fce098b3c8f8899554905f4377b6d85dabaa80" - integrity sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A== +dunder-proto@^1.0.0, dunder-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a" + integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A== dependencies: - call-bind-apply-helpers "^1.0.0" + call-bind-apply-helpers "^1.0.1" es-errors "^1.3.0" gopd "^1.2.0" +duplexify@^4.0.0, duplexify@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.3.tgz#a07e1c0d0a2c001158563d32592ba58bddb0236f" + integrity sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA== + dependencies: + end-of-stream "^1.4.1" + inherits "^2.0.3" + readable-stream "^3.1.1" + stream-shift "^1.0.2" + each-series@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/each-series/-/each-series-1.0.0.tgz#f886e6c66dfdb25ef1fe73564146ee5cb478afcb" @@ -3152,10 +3453,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.5.41: - version "1.5.71" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.71.tgz#d8b5dba1e55b320f2f4e9b1ca80738f53fcfec2b" - integrity sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA== +electron-to-chromium@^1.5.73: + version "1.5.83" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.83.tgz#3f74078f0c83e24bf7e692eaa855a998d1bec34f" + integrity sha512-LcUDPqSt+V0QmI47XLzZrz5OqILSMGsPFkDYus22rIbgorSvBYEFqq854ltTmUdHkY92FSdAAvsh4jWEULMdfQ== emoji-regex@^7.0.1: version "7.0.3" @@ -3228,57 +3529,62 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2, es-abstract@^1.23.5: - version "1.23.5" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.5.tgz#f4599a4946d57ed467515ed10e4f157289cd52fb" - integrity sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ== +es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9: + version "1.23.9" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.9.tgz#5b45994b7de78dada5c1bebf1379646b32b9d606" + integrity sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA== dependencies: - array-buffer-byte-length "^1.0.1" - arraybuffer.prototype.slice "^1.0.3" + array-buffer-byte-length "^1.0.2" + arraybuffer.prototype.slice "^1.0.4" available-typed-arrays "^1.0.7" - call-bind "^1.0.7" - data-view-buffer "^1.0.1" - data-view-byte-length "^1.0.1" - data-view-byte-offset "^1.0.0" - es-define-property "^1.0.0" + call-bind "^1.0.8" + call-bound "^1.0.3" + data-view-buffer "^1.0.2" + data-view-byte-length "^1.0.2" + data-view-byte-offset "^1.0.1" + es-define-property "^1.0.1" es-errors "^1.3.0" es-object-atoms "^1.0.0" - es-set-tostringtag "^2.0.3" - es-to-primitive "^1.2.1" - function.prototype.name "^1.1.6" - get-intrinsic "^1.2.4" - get-symbol-description "^1.0.2" + es-set-tostringtag "^2.1.0" + es-to-primitive "^1.3.0" + function.prototype.name "^1.1.8" + get-intrinsic "^1.2.7" + get-proto "^1.0.0" + get-symbol-description "^1.1.0" globalthis "^1.0.4" - gopd "^1.0.1" + gopd "^1.2.0" has-property-descriptors "^1.0.2" - has-proto "^1.0.3" - has-symbols "^1.0.3" + has-proto "^1.2.0" + has-symbols "^1.1.0" hasown "^2.0.2" - internal-slot "^1.0.7" - is-array-buffer "^3.0.4" + internal-slot "^1.1.0" + is-array-buffer "^3.0.5" is-callable "^1.2.7" - is-data-view "^1.0.1" - is-negative-zero "^2.0.3" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.3" - is-string "^1.0.7" - is-typed-array "^1.1.13" - is-weakref "^1.0.2" + is-data-view "^1.0.2" + is-regex "^1.2.1" + is-shared-array-buffer "^1.0.4" + is-string "^1.1.1" + is-typed-array "^1.1.15" + is-weakref "^1.1.0" + math-intrinsics "^1.1.0" object-inspect "^1.13.3" object-keys "^1.1.1" - object.assign "^4.1.5" + object.assign "^4.1.7" + own-keys "^1.0.1" regexp.prototype.flags "^1.5.3" - safe-array-concat "^1.1.2" - safe-regex-test "^1.0.3" - string.prototype.trim "^1.2.9" - string.prototype.trimend "^1.0.8" + safe-array-concat "^1.1.3" + safe-push-apply "^1.0.0" + safe-regex-test "^1.1.0" + set-proto "^1.0.0" + string.prototype.trim "^1.2.10" + string.prototype.trimend "^1.0.9" string.prototype.trimstart "^1.0.8" - typed-array-buffer "^1.0.2" - typed-array-byte-length "^1.0.1" - typed-array-byte-offset "^1.0.2" - typed-array-length "^1.0.6" - unbox-primitive "^1.0.2" - which-typed-array "^1.1.15" + typed-array-buffer "^1.0.3" + typed-array-byte-length "^1.0.3" + typed-array-byte-offset "^1.0.4" + typed-array-length "^1.0.7" + unbox-primitive "^1.1.0" + which-typed-array "^1.1.18" es-array-method-boxes-properly@^1.0.0: version "1.0.0" @@ -3290,28 +3596,29 @@ es-define-property@^1.0.0, es-define-property@^1.0.1: resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa" integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g== -es-errors@^1.2.1, es-errors@^1.3.0: +es-errors@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== es-object-atoms@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941" - integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw== + version "1.1.1" + resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1" + integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA== dependencies: es-errors "^1.3.0" -es-set-tostringtag@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" - integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== +es-set-tostringtag@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d" + integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA== dependencies: - get-intrinsic "^1.2.4" + es-errors "^1.3.0" + get-intrinsic "^1.2.6" has-tostringtag "^1.0.2" - hasown "^2.0.1" + hasown "^2.0.2" -es-to-primitive@^1.2.1: +es-to-primitive@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18" integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g== @@ -3352,7 +3659,7 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3: d "^1.0.2" ext "^1.7.0" -escalade@^3.2.0: +escalade@^3.1.1, escalade@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== @@ -3436,10 +3743,10 @@ express-ws@5.0.2: dependencies: ws "^7.4.6" -express@4.21.1: - version "4.21.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.21.1.tgz#9dae5dda832f16b4eec941a4e44aa89ec481b281" - integrity sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ== +express@4.21.2: + version "4.21.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32" + integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA== dependencies: accepts "~1.3.8" array-flatten "1.1.1" @@ -3460,7 +3767,7 @@ express@4.21.1: methods "~1.1.2" on-finished "2.4.1" parseurl "~1.3.3" - path-to-regexp "0.1.10" + path-to-regexp "0.1.12" proxy-addr "~2.0.7" qs "6.13.0" range-parser "~1.2.1" @@ -3495,6 +3802,11 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== +farmhash-modern@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/farmhash-modern/-/farmhash-modern-1.1.0.tgz#c36b34ad196290d57b0b482dc89e637d0b59835f" + integrity sha512-6ypT4XfgqJk/F3Yuv4SX26I3doUjt0GTG4a+JgWxXQpxXzTBq8fPUeGHfcYMMDPHJHm3yPOSjaeBwBGAHWXCdA== + fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -3517,10 +3829,10 @@ fast-xml-parser@4.4.1: dependencies: strnum "^1.0.5" -fast-xml-parser@^4.2.2, fast-xml-parser@^4.2.4: - version "4.5.0" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz#2882b7d01a6825dfdf909638f2de0256351def37" - integrity sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg== +fast-xml-parser@^4.2.4, fast-xml-parser@^4.4.1: + version "4.5.1" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.5.1.tgz#a7e665ff79b7919100a5202f23984b6150f9b31e" + integrity sha512-y655CeyUQ+jj7KBbYMc4FG01V8ZQqjN+gDYGJ50RtfsUB8iG9AmwmwoAgeKLJdmueKKMrH1RJ7yXHTSoczdv5w== dependencies: strnum "^1.0.5" @@ -3547,6 +3859,13 @@ fastseries@^1.7.2: reusify "^1.0.0" xtend "^4.0.0" +faye-websocket@0.11.4: + version "0.11.4" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" + integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== + dependencies: + websocket-driver ">=0.5.1" + fd-slicer@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" @@ -3559,6 +3878,14 @@ fecha@^4.2.0: resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== +fetch-blob@^3.1.2, fetch-blob@^3.1.4: + version "3.2.0" + resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.2.0.tgz#f09b8d4bbd45adc6f0c20b7e787e793e309dcce9" + integrity sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ== + dependencies: + node-domexception "^1.0.0" + web-streams-polyfill "^3.0.3" + figures@^1.3.5: version "1.7.0" resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" @@ -3622,6 +3949,24 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" +firebase-admin@12.7.0: + version "12.7.0" + resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-12.7.0.tgz#586c9ed852c4bb2d4d72f0d52c1c48a2b6dee793" + integrity sha512-raFIrOyTqREbyXsNkSHyciQLfv8AUZazehPaQS1lZBSCDYW74FYXU0nQZa3qHI4K+hawohlDbywZ4+qce9YNxA== + dependencies: + "@fastify/busboy" "^3.0.0" + "@firebase/database-compat" "1.0.8" + "@firebase/database-types" "1.0.5" + "@types/node" "^22.0.1" + farmhash-modern "^1.1.0" + jsonwebtoken "^9.0.0" + jwks-rsa "^3.1.0" + node-forge "^1.3.1" + uuid "^10.0.0" + optionalDependencies: + "@google-cloud/firestore" "^7.7.0" + "@google-cloud/storage" "^7.7.0" + fn.name@1.x.x: version "1.1.0" resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" @@ -3665,6 +4010,16 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== +form-data@^2.5.0: + version "2.5.2" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.2.tgz#dc653743d1de2fcc340ceea38079daf6e9069fd2" + integrity sha512-GgwY0PS7DbXqajuGf4OYlsrIu3zgxD6Vvql43IBhm6MahqA5SK/7mwhtNj2AdH2z35YR34ujJ7BN+3fFC3jP5Q== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + safe-buffer "^5.2.1" + form-data@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48" @@ -3692,6 +4047,13 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" +formdata-polyfill@^4.0.10: + version "4.0.10" + resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423" + integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g== + dependencies: + fetch-blob "^3.1.2" + forwarded@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" @@ -3742,15 +4104,22 @@ function-bind@^1.1.2: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== -function.prototype.name@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" - integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== +function.prototype.name@^1.1.6, function.prototype.name@^1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78" + integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + call-bind "^1.0.8" + call-bound "^1.0.3" + define-properties "^1.2.1" functions-have-names "^1.2.3" + hasown "^2.0.2" + is-callable "^1.2.7" + +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== functions-have-names@^1.2.3: version "1.2.3" @@ -3771,7 +4140,7 @@ gauge@^4.0.3: strip-ansi "^6.0.1" wide-align "^1.1.5" -gaxios@^6.0.0, gaxios@^6.0.3, gaxios@^6.1.1: +gaxios@^6.0.0, gaxios@^6.0.2, gaxios@^6.0.3, gaxios@^6.1.1: version "6.7.1" resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.7.1.tgz#ebd9f7093ede3ba502685e73390248bb5b7f71fb" integrity sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ== @@ -3802,33 +4171,43 @@ gensync@^1.0.0-beta.2: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -get-caller-file@^2.0.1: +get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: - version "1.2.5" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.5.tgz#dfe7dd1b30761b464fe51bf4bb00ac7c37b681e7" - integrity sha512-Y4+pKa7XeRUPWFNvOOYHkRYrfzW07oraURSvjDmRVOJ748OrVmeXtpE4+GCEHncjCjkTxPNRt8kEbxDhsn6VTg== +get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.7.tgz#dcfcb33d3272e15f445d15124bc0a216189b9044" + integrity sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA== dependencies: - call-bind-apply-helpers "^1.0.0" - dunder-proto "^1.0.0" + call-bind-apply-helpers "^1.0.1" es-define-property "^1.0.1" es-errors "^1.3.0" + es-object-atoms "^1.0.0" function-bind "^1.1.2" + get-proto "^1.0.0" gopd "^1.2.0" has-symbols "^1.1.0" hasown "^2.0.2" + math-intrinsics "^1.1.0" -get-symbol-description@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" - integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== +get-proto@^1.0.0, get-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1" + integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g== dependencies: - call-bind "^1.0.5" + dunder-proto "^1.0.1" + es-object-atoms "^1.0.0" + +get-symbol-description@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee" + integrity sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg== + dependencies: + call-bound "^1.0.3" es-errors "^1.3.0" - get-intrinsic "^1.2.4" + get-intrinsic "^1.2.6" getpass@^0.1.1: version "0.1.7" @@ -3886,7 +4265,7 @@ globalthis@^1.0.4: define-properties "^1.2.1" gopd "^1.0.1" -google-auth-library@^9.0.0, google-auth-library@^9.7.0: +google-auth-library@^9.0.0, google-auth-library@^9.3.0, google-auth-library@^9.6.3, google-auth-library@^9.7.0: version "9.15.0" resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.15.0.tgz#1b009c08557929c881d72f953f17e839e91b009b" integrity sha512-7ccSEJFDFO7exFbO6NRyC+xH8/mZ1GZGG2xxx9iHxZWcjUjJpjWxIMw3cofAKcueZ6DATiukmmprD7yavQHOyQ== @@ -3898,6 +4277,24 @@ google-auth-library@^9.0.0, google-auth-library@^9.7.0: gtoken "^7.0.0" jws "^4.0.0" +google-gax@^4.3.3: + version "4.4.1" + resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.4.1.tgz#95a9cf7ee7777ac22d1926a45b5f886dd8beecae" + integrity sha512-Phyp9fMfA00J3sZbJxbbB4jC55b7DBjE3F6poyL3wKMEBVKA79q6BGuHcTiM28yOzVql0NDbRL8MLLh8Iwk9Dg== + dependencies: + "@grpc/grpc-js" "^1.10.9" + "@grpc/proto-loader" "^0.7.13" + "@types/long" "^4.0.0" + abort-controller "^3.0.0" + duplexify "^4.0.0" + google-auth-library "^9.3.0" + node-fetch "^2.7.0" + object-hash "^3.0.0" + proto3-json-serializer "^2.0.2" + protobufjs "^7.3.2" + retry-request "^7.0.0" + uuid "^9.0.1" + google-protobuf@3.19.4: version "3.19.4" resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.19.4.tgz#8d32c3e34be9250956f28c0fb90955d13f311888" @@ -3923,7 +4320,7 @@ googleapis@128.0.0: google-auth-library "^9.0.0" googleapis-common "^7.0.0" -gopd@^1.0.1, gopd@^1.1.0, gopd@^1.2.0: +gopd@^1.0.1, gopd@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1" integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg== @@ -3974,9 +4371,9 @@ has-ansi@^2.0.0: ansi-regex "^2.0.0" has-bigints@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" - integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.1.0.tgz#28607e965ac967e03cd2a2c70a2636a1edad49fe" + integrity sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg== has-flag@^3.0.0: version "3.0.0" @@ -3990,7 +4387,7 @@ has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2: dependencies: es-define-property "^1.0.0" -has-proto@^1.0.3: +has-proto@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.2.0.tgz#5de5a6eabd95fdffd9818b43055e8065e39fe9d5" integrity sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ== @@ -4002,7 +4399,7 @@ has-symbols@^1.0.3, has-symbols@^1.1.0: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338" integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ== -has-tostringtag@^1.0.0, has-tostringtag@^1.0.2: +has-tostringtag@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== @@ -4030,7 +4427,7 @@ hasha@^3.0.0: dependencies: is-stream "^1.0.1" -hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2: +hasown@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== @@ -4088,6 +4485,11 @@ html-encoding-sniffer@^3.0.0: dependencies: whatwg-encoding "^2.0.0" +html-entities@^2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f" + integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA== + html-escaper@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" @@ -4143,6 +4545,11 @@ http-errors@~1.8.1: statuses ">= 1.5.0 < 2" toidentifier "1.0.1" +http-parser-js@>=0.5.1: + version "0.5.9" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.9.tgz#b817b3ca0edea6236225000d795378707c169cec" + integrity sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw== + http-proxy-agent@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" @@ -4324,14 +4731,14 @@ inquirer@^0.12.0: strip-ansi "^3.0.0" through "^2.3.6" -internal-slot@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" - integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== +internal-slot@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961" + integrity sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw== dependencies: es-errors "^1.3.0" - hasown "^2.0.0" - side-channel "^1.0.4" + hasown "^2.0.2" + side-channel "^1.1.0" ip-address@^7.1.0: version "7.1.0" @@ -4365,20 +4772,21 @@ ipcheck@0.1.0: integrity sha512-NwhrmROU0iXKa+U1quGuQ+ag+K/1Bb5V/yh5Q4SylSu/LGymPZcWB7p4u7JgJH0qOR6cTLDO5VZlRbhoeekNzQ== is-arguments@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.2.0.tgz#ad58c6aecf563b78ef2bf04df540da8f5d7d8e1b" + integrity sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA== dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" + call-bound "^1.0.2" + has-tostringtag "^1.0.2" -is-array-buffer@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" - integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== +is-array-buffer@^3.0.4, is-array-buffer@^3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz#65742e1e687bd2cc666253068fd8707fe4d44280" + integrity sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.1" + call-bind "^1.0.8" + call-bound "^1.0.3" + get-intrinsic "^1.2.6" is-arrayish@^0.2.1: version "0.2.1" @@ -4391,11 +4799,14 @@ is-arrayish@^0.3.1: integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== is-async-function@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646" - integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA== + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.1.0.tgz#1d1080612c493608e93168fc4458c245074c06a6" + integrity sha512-GExz9MtyhlZyXYLxzlJRj5WUCE661zhDa1Yna52CN57AJsymh+DvXXjyveSioqSRdxvUrdKdvqB1b5cVKsNpWQ== dependencies: - has-tostringtag "^1.0.0" + call-bound "^1.0.3" + get-proto "^1.0.1" + has-tostringtag "^1.0.2" + safe-regex-test "^1.1.0" is-bigint@^1.1.0: version "1.1.0" @@ -4411,12 +4822,12 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-boolean-object@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.0.tgz#9743641e80a62c094b5941c5bb791d66a88e497a" - integrity sha512-kR5g0+dXf/+kXnqI+lu0URKYPKgICtHGGNCDSB10AaUFj3o/HkB3u7WfpRBJGFopxxY0oH3ux7ZsDjLtK7xqvw== +is-boolean-object@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.1.tgz#c20d0c654be05da4fbc23c562635c019e93daf89" + integrity sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng== dependencies: - call-bind "^1.0.7" + call-bound "^1.0.2" has-tostringtag "^1.0.2" is-buffer@~1.1.6: @@ -4429,26 +4840,29 @@ is-callable@^1.1.3, is-callable@^1.2.7: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== -is-core-module@^2.13.0: - version "2.15.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" - integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== +is-core-module@^2.16.0: + version "2.16.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4" + integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w== dependencies: hasown "^2.0.2" -is-data-view@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f" - integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w== +is-data-view@^1.0.1, is-data-view@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e" + integrity sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw== dependencies: + call-bound "^1.0.2" + get-intrinsic "^1.2.6" is-typed-array "^1.1.13" -is-date-object@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== +is-date-object@^1.0.5, is-date-object@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7" + integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg== dependencies: - has-tostringtag "^1.0.0" + call-bound "^1.0.2" + has-tostringtag "^1.0.2" is-extglob@^2.1.1: version "2.1.1" @@ -4456,11 +4870,11 @@ is-extglob@^2.1.1: integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-finalizationregistry@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.1.0.tgz#d74a7d0c5f3578e34a20729e69202e578d495dc2" - integrity sha512-qfMdqbAQEwBw78ZyReKnlA8ezmPdb9BemzIIip/JkjaZUhitfXDkkr+3QTboW0JrSXT1QWyYShpvnNHGZ4c4yA== + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz#eefdcdc6c94ddd0674d9c85887bf93f944a97c90" + integrity sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg== dependencies: - call-bind "^1.0.7" + call-bound "^1.0.3" is-fullwidth-code-point@^1.0.0: version "1.0.0" @@ -4480,11 +4894,14 @@ is-fullwidth-code-point@^3.0.0: integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== is-generator-function@^1.0.10, is-generator-function@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" - integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca" + integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ== dependencies: - has-tostringtag "^1.0.0" + call-bound "^1.0.3" + get-proto "^1.0.0" + has-tostringtag "^1.0.2" + safe-regex-test "^1.1.0" is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.3" @@ -4503,17 +4920,12 @@ is-map@^2.0.3: resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e" integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw== -is-negative-zero@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" - integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== - -is-number-object@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.0.tgz#5a867e9ecc3d294dda740d9f127835857af7eb05" - integrity sha512-KVSZV0Dunv9DTPkhXwcZ3Q+tUc9TsaE1ZwX5J2WMvsSGS6Md8TFPun5uwh0yRdrNerI6vf/tbJxqSx4c1ZI1Lw== +is-number-object@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541" + integrity sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw== dependencies: - call-bind "^1.0.7" + call-bound "^1.0.3" has-tostringtag "^1.0.2" is-number@^7.0.0: @@ -4538,13 +4950,13 @@ is-property@^1.0.2: resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" integrity sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g== -is-regex@^1.1.4: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.0.tgz#41b9d266e7eb7451312c64efc37e8a7d453077cf" - integrity sha512-B6ohK4ZmoftlUe+uvenXSbPJFo6U37BH7oO1B3nQH8f/7h27N56s85MhUtbFJAziz5dcmuR3i8ovUl35zp8pFA== +is-regex@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22" + integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g== dependencies: - call-bind "^1.0.7" - gopd "^1.1.0" + call-bound "^1.0.2" + gopd "^1.2.0" has-tostringtag "^1.0.2" hasown "^2.0.2" @@ -4553,12 +4965,12 @@ is-set@^2.0.3: resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d" integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg== -is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" - integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg== +is-shared-array-buffer@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz#9b67844bd9b7f246ba0708c3a93e34269c774f6f" + integrity sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A== dependencies: - call-bind "^1.0.7" + call-bound "^1.0.3" is-stream@^1.0.1: version "1.1.0" @@ -4570,29 +4982,29 @@ is-stream@^2.0.0, is-stream@^2.0.1: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-string@^1.0.7, is-string@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.0.tgz#8cb83c5d57311bf8058bc6c8db294711641da45d" - integrity sha512-PlfzajuF9vSo5wErv3MJAKD/nqf9ngAs1NFQYm16nUYFO2IzxJ2hcm+IOCg+EEopdykNNUhVq5cz35cAUxU8+g== +is-string@^1.0.7, is-string@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9" + integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA== dependencies: - call-bind "^1.0.7" + call-bound "^1.0.3" has-tostringtag "^1.0.2" -is-symbol@^1.0.4, is-symbol@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.0.tgz#ae993830a56d4781886d39f9f0a46b3e89b7b60b" - integrity sha512-qS8KkNNXUZ/I+nX6QT8ZS1/Yx0A444yhzdTKxCzKkNjQ9sHErBxJnJAgh+f5YhusYECEcjo4XcyH87hn6+ks0A== +is-symbol@^1.0.4, is-symbol@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634" + integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w== dependencies: - call-bind "^1.0.7" - has-symbols "^1.0.3" - safe-regex-test "^1.0.3" + call-bound "^1.0.2" + has-symbols "^1.1.0" + safe-regex-test "^1.1.0" -is-typed-array@^1.1.13, is-typed-array@^1.1.3: - version "1.1.13" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" - integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== +is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15, is-typed-array@^1.1.3: + version "1.1.15" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b" + integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ== dependencies: - which-typed-array "^1.1.14" + which-typed-array "^1.1.16" is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" @@ -4604,20 +5016,20 @@ is-weakmap@^2.0.2: resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd" integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w== -is-weakref@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" - integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== +is-weakref@^1.0.2, is-weakref@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.0.tgz#47e3472ae95a63fa9cf25660bcf0c181c39770ef" + integrity sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q== dependencies: - call-bind "^1.0.2" + call-bound "^1.0.2" is-weakset@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007" - integrity sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ== + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.4.tgz#c9f5deb0bc1906c6d6f1027f284ddf459249daca" + integrity sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ== dependencies: - call-bind "^1.0.7" - get-intrinsic "^1.2.4" + call-bound "^1.0.3" + get-intrinsic "^1.2.6" isarray@^2.0.5: version "2.0.5" @@ -4724,7 +5136,7 @@ joi@^17.9.2: "@sideway/formula" "^3.0.1" "@sideway/pinpoint" "^2.0.0" -jose@^4.15.9: +jose@^4.14.6, jose@^4.15.9: version "4.15.9" resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.9.tgz#9b68eda29e9a0614c042fa29387196c7dd800100" integrity sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA== @@ -4782,9 +5194,9 @@ jsdom@22.1.0: xml-name-validator "^4.0.0" jsesc@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" - integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g== + version "3.1.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d" + integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA== json-bigint@^1.0.0: version "1.0.0" @@ -4872,6 +5284,18 @@ jwa@^2.0.0: ecdsa-sig-formatter "1.0.11" safe-buffer "^5.0.1" +jwks-rsa@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-3.1.0.tgz#50406f23e38c9b2682cd437f824d7d61aa983171" + integrity sha512-v7nqlfezb9YfHHzYII3ef2a2j1XnGeSE/bK3WfumaYCqONAIstJbrEGapz4kadScZzEt7zYCN7bucj8C0Mv/Rg== + dependencies: + "@types/express" "^4.17.17" + "@types/jsonwebtoken" "^9.0.2" + debug "^4.3.4" + jose "^4.14.6" + limiter "^1.1.5" + lru-memoizer "^2.2.0" + jws@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304" @@ -4965,6 +5389,11 @@ lie@3.1.1: dependencies: immediate "~3.0.5" +limiter@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2" + integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA== + load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" @@ -4997,6 +5426,16 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA== + +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== + lodash.flattendeep@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" @@ -5059,10 +5498,10 @@ logform@^2.7.0: safe-stable-stringify "^2.3.1" triple-beam "^1.3.0" -long@^5.2.1: - version "5.2.3" - resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1" - integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q== +long@^5.0.0, long@^5.2.1: + version "5.2.4" + resolved "https://registry.yarnpkg.com/long/-/long-5.2.4.tgz#ee651d5c7c25901cfca5e67220ae9911695e99b2" + integrity sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg== lossless-json@2.0.1: version "2.0.1" @@ -5074,6 +5513,13 @@ lower-case@^1.1.1: resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" integrity sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA== +lru-cache@6.0.0, lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + lru-cache@^10.2.0, lru-cache@^10.3.0: version "10.4.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119" @@ -5094,27 +5540,28 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - lru-cache@^7.10.1, lru-cache@^7.14.1: version "7.18.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== +lru-memoizer@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lru-memoizer/-/lru-memoizer-2.3.0.tgz#ef0fbc021bceb666794b145eefac6be49dc47f31" + integrity sha512-GXn7gyHAMhO13WSKrIiNfztwxodVsP8IoZ3XfrJV4yH2x0/OeTO/FIaAHTY5YekdGgW94njfuKmyyt1E0mR6Ug== + dependencies: + lodash.clonedeep "^4.5.0" + lru-cache "6.0.0" + lru.min@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/lru.min/-/lru.min-1.1.1.tgz#146e01e3a183fa7ba51049175de04667d5701f0e" integrity sha512-FbAj6lXil6t8z4z3j0E5mfRlPzxkySotzUHwRXjlpRh10vc6AI6WN62ehZj82VG7M20rqogJ0GLwar2Xa05a8Q== -ltx@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ltx/-/ltx-3.0.0.tgz#f2a2260814165c5e28d455f9f7db2178ed295187" - integrity sha512-bu3/4/ApUmMqVNuIkHaRhqVtEi6didYcBDIF56xhPRCzVpdztCipZ62CUuaxMlMBUzaVL93+4LZRqe02fuAG6A== +ltx@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/ltx/-/ltx-3.1.2.tgz#cdbb693aab421f2524ddf0e7abf42a8b21b2ca47" + integrity sha512-tFSKojN92FqNK6eRTmKK/ROUTUYVWKAxgohz523TPhF1G3nR3DXQS/I7/705rEPrDSloKDgMdRlh0qgMFQoVYw== make-dir@^2.0.0, make-dir@^2.1.0: version "2.1.0" @@ -5157,6 +5604,11 @@ mariadb@3.4.0: iconv-lite "^0.6.3" lru-cache "^10.3.0" +math-intrinsics@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9" + integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g== + md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" @@ -5275,17 +5727,17 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw== -minio@8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/minio/-/minio-8.0.1.tgz#9cc553cd7e3ab2498eee32401f02915bc09edcab" - integrity sha512-FzDO6yGnqLtm8sp3mXafWtiRUOslJSSg/aI0v9YbN5vjw5KLoODKAROCyi766NIvTSxcfHBrbhCSGk1A+MOzDg== +minio@8.0.2: + version "8.0.2" + resolved "https://registry.yarnpkg.com/minio/-/minio-8.0.2.tgz#ea1703ff52dcf610ba6d4e2ece8c5627f664d581" + integrity sha512-7ipWbtgzzboctf+McK+2cXwCrNOhuboTA/O1g9iWa0gH8R4GkeyFWwk12aVDEHdzjPiG8wxnjwfHS7pgraKuHw== dependencies: async "^3.2.4" block-stream2 "^2.1.0" browser-or-node "^2.1.1" buffer-crc32 "^1.0.0" eventemitter3 "^5.0.1" - fast-xml-parser "^4.2.2" + fast-xml-parser "^4.4.1" ipaddr.js "^2.0.1" lodash "^4.17.21" mime-types "^2.1.35" @@ -5293,7 +5745,7 @@ minio@8.0.1: stream-json "^1.8.0" through2 "^4.0.2" web-encoding "^1.1.5" - xml2js "^0.5.0" + xml2js "^0.5.0 || ^0.6.2" minipass-collect@^1.0.2: version "1.0.2" @@ -5518,7 +5970,7 @@ negotiator@0.6.3: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -negotiator@^0.6.2: +negotiator@^0.6.2, negotiator@~0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7" integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w== @@ -5551,9 +6003,9 @@ no-case@^2.2.0: lower-case "^1.1.1" node-abi@^3.3.0: - version "3.71.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.71.0.tgz#52d84bbcd8575efb71468fbaa1f9a49b2c242038" - integrity sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw== + version "3.73.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.73.0.tgz#4459ea77e71969edba8588387eecb05e2c2cff3b" + integrity sha512-z8iYzQGBu35ZkTQ9mtR8RqugJZ9RCLn8fv3d7LsgDBzOijGQP3RdKTX4LA7LXw03ZhU5z0l4xfhIMgSES31+cg== dependencies: semver "^7.3.5" @@ -5567,6 +6019,11 @@ node-addon-api@^7.0.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558" integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ== +node-domexception@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" + integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== + node-environment-flags@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088" @@ -5575,14 +6032,23 @@ node-environment-flags@^1.0.5: object.getownpropertydescriptors "^2.0.3" semver "^5.7.0" -node-fetch@^2.6.1, node-fetch@^2.6.6, node-fetch@^2.6.9: +node-fetch@^2.6.1, node-fetch@^2.6.9, node-fetch@^2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== dependencies: whatwg-url "^5.0.0" -node-forge@1.3.1, node-forge@^1.3.0: +node-fetch@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.2.tgz#d1e889bacdf733b4ff3b2b243eb7a12866a0b78b" + integrity sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA== + dependencies: + data-uri-to-buffer "^4.0.0" + fetch-blob "^3.1.4" + formdata-polyfill "^4.0.10" + +node-forge@1.3.1, node-forge@^1.3.0, node-forge@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== @@ -5622,10 +6088,10 @@ node-pushover@1.0.0: dependencies: httpreq "*" -node-releases@^2.0.18: - version "2.0.18" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" - integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== +node-releases@^2.0.19: + version "2.0.19" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314" + integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw== node-sspi@0.2.10: version "0.2.10" @@ -5658,18 +6124,10 @@ node-windows@0.1.14: optimist "~0.6.0" xml "0.0.12" -node-xcs@0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/node-xcs/-/node-xcs-0.1.8.tgz#753363acb2e933db14161bfe8f961f0c54f326d4" - integrity sha512-ZIkJ80Q02Fe3ANQWJdRHtyd17HlAPd3vg1FnZB1+yjz06aVTjJ1dgWBTGpUAB1vZEsrjWY08Ik6nZmjNubaYTw== - dependencies: - "@xmpp/client" "^0.13.1" - "@xmpp/debug" "^0.13.0" - -nodemailer@6.9.15: - version "6.9.15" - resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.15.tgz#57b79dc522be27e0e47ac16cc860aa0673e62e04" - integrity sha512-AHf04ySLC6CIfuRtRiEYtGEXgRfa6INgWGluDhnxTZhHSKvrBu7lc1VVchQ0d8nPc4cFaZoPq8vkyNoZr0TpGQ== +nodemailer@6.9.16: + version "6.9.16" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.16.tgz#3ebdf6c6f477c571c0facb0727b33892635e0b8b" + integrity sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ== nofilter@^1.0.4: version "1.0.4" @@ -5779,7 +6237,12 @@ object-hash@^2.2.0: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== -object-inspect@^1.13.1, object-inspect@^1.13.3: +object-hash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9" + integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw== + +object-inspect@^1.13.3: version "1.13.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a" integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA== @@ -5789,14 +6252,16 @@ object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object.assign@^4.1.5: - version "4.1.5" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" - integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== +object.assign@^4.1.7: + version "4.1.7" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d" + integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw== dependencies: - call-bind "^1.0.5" + call-bind "^1.0.8" + call-bound "^1.0.3" define-properties "^1.2.1" - has-symbols "^1.0.3" + es-object-atoms "^1.0.0" + has-symbols "^1.1.0" object-keys "^1.1.1" object.getownpropertydescriptors@^2.0.3: @@ -5892,6 +6357,15 @@ otplib@10.2.3: dependencies: thirty-two "1.0.2" +own-keys@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/own-keys/-/own-keys-1.0.1.tgz#e4006910a2bf913585289676eebd6f390cf51358" + integrity sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg== + dependencies: + get-intrinsic "^1.2.6" + object-keys "^1.1.1" + safe-push-apply "^1.0.0" + p-limit@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -5899,6 +6373,13 @@ p-limit@^2.0.0: dependencies: p-try "^2.0.0" +p-limit@^3.0.1: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -6102,10 +6583,10 @@ path-scurry@^1.11.1: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" -path-to-regexp@0.1.10: - version "0.1.10" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" - integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== +path-to-regexp@0.1.12: + version "0.1.12" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7" + integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ== path-type@^3.0.0: version "3.0.0" @@ -6190,7 +6671,7 @@ pgpass@1.x: dependencies: split2 "^4.1.0" -picocolors@^1.0.0, picocolors@^1.1.0: +picocolors@^1.0.0, picocolors@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== @@ -6330,6 +6811,14 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== +prom-client@*: + version "15.1.3" + resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-15.1.3.tgz#69fa8de93a88bc9783173db5f758dc1c69fa8fc2" + integrity sha512-6ZiOBfCywsD4k1BN9IX0uZhF+tJkV8q8llP64G5Hajs4JOeVLPCwpPVcpXy3BwYiUGgyJzsJJQeOIv7+hDSq8g== + dependencies: + "@opentelemetry/api" "^1.4.0" + tdigest "^0.1.1" + promise-inflight@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" @@ -6343,6 +6832,31 @@ promise-retry@^2.0.1: err-code "^2.0.2" retry "^0.12.0" +proto3-json-serializer@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-2.0.2.tgz#5b705203b4d58f3880596c95fad64902617529dd" + integrity sha512-SAzp/O4Yh02jGdRc+uIrGoe87dkN/XtwxfZ4ZyafJHymd79ozp5VG5nyZ7ygqPM5+cpLDjjGnYFUkngonyDPOQ== + dependencies: + protobufjs "^7.2.5" + +protobufjs@^7.2.5, protobufjs@^7.2.6, protobufjs@^7.3.2: + version "7.4.0" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.4.0.tgz#7efe324ce9b3b61c82aae5de810d287bc08a248a" + integrity sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/node" ">=13.7.0" + long "^5.0.0" + proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" @@ -6394,11 +6908,11 @@ qs@6.13.0: side-channel "^1.0.6" qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: - version "6.13.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.1.tgz#3ce5fc72bd3a8171b85c99b93c65dd20b7d1b16e" - integrity sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg== + version "6.14.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930" + integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w== dependencies: - side-channel "^1.0.6" + side-channel "^1.1.0" qs@~0.6.0: version "0.6.6" @@ -6519,9 +7033,9 @@ readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.3.5: util-deprecate "~1.0.1" readable-stream@^4.0.0: - version "4.5.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.5.2.tgz#9e7fc4c45099baeed934bff6eb97ba6cf2729e09" - integrity sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g== + version "4.7.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.7.0.tgz#cedbd8a1146c13dfff8dab14068028d58c15ac91" + integrity sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg== dependencies: abort-controller "^3.0.0" buffer "^6.0.3" @@ -6564,19 +7078,19 @@ real-cancellable-promise@^1.1.1: resolved "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.2.0.tgz#f365e78b29c6a2303584f2c308959b415401056a" integrity sha512-FYhmx1FVSgoPRjneoTjh+EKZcNb8ijl/dyatTzase5eujYhVrLNDOiIY6AgQq7GU1kOoLgEd9jLVbhFg8k8dOQ== -reflect.getprototypeof@^1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.8.tgz#c58afb17a4007b4d1118c07b92c23fca422c5d82" - integrity sha512-B5dj6usc5dkk8uFliwjwDHM8To5/QwdKz9JcBZ8Ic4G1f0YmeeJTtE/ZTdgRFPAfxZFiUaPhZ1Jcs4qeagItGQ== +reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9: + version "1.0.10" + resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz#c629219e78a3316d8b604c765ef68996964e7bf9" + integrity sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw== dependencies: call-bind "^1.0.8" define-properties "^1.2.1" - dunder-proto "^1.0.0" - es-abstract "^1.23.5" + es-abstract "^1.23.9" es-errors "^1.3.0" - get-intrinsic "^1.2.4" - gopd "^1.2.0" - which-builtin-type "^1.2.0" + es-object-atoms "^1.0.0" + get-intrinsic "^1.2.7" + get-proto "^1.0.1" + which-builtin-type "^1.2.1" regenerator-runtime@^0.11.0: version "0.11.1" @@ -6589,13 +7103,15 @@ regenerator-runtime@^0.14.0: integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== regexp.prototype.flags@^1.5.3: - version "1.5.3" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz#b3ae40b1d2499b8350ab2c3fe6ef3845d3a96f42" - integrity sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ== + version "1.5.4" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19" + integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA== dependencies: - call-bind "^1.0.7" + call-bind "^1.0.8" define-properties "^1.2.1" es-errors "^1.3.0" + get-proto "^1.0.1" + gopd "^1.2.0" set-function-name "^2.0.2" relateurl@^0.2.7: @@ -6680,11 +7196,11 @@ resolve-from@^4.0.0: integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== resolve@^1.10.0: - version "1.22.8" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" - integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + version "1.22.10" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39" + integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w== dependencies: - is-core-module "^2.13.0" + is-core-module "^2.16.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -6701,6 +7217,20 @@ retimer@^2.0.0: resolved "https://registry.yarnpkg.com/retimer/-/retimer-2.0.0.tgz#e8bd68c5e5a8ec2f49ccb5c636db84c04063bbca" integrity sha512-KLXY85WkEq2V2bKex/LOO1ViXVn2KGYe4PYysAdYdjmraYIUsVkXu8O4am+8+5UbaaGl1qho4aqAAPHNQ4GSbg== +retry-request@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-7.0.2.tgz#60bf48cfb424ec01b03fca6665dee91d06dd95f3" + integrity sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w== + dependencies: + "@types/request" "^2.48.8" + extend "^3.0.2" + teeny-request "^9.0.0" + +retry@0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" + integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== + retry@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" @@ -6757,34 +7287,43 @@ rx-lite@^3.1.2: dependencies: tslib "^2.1.0" -safe-array-concat@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb" - integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q== +safe-array-concat@^1.1.2, safe-array-concat@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3" + integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q== dependencies: - call-bind "^1.0.7" - get-intrinsic "^1.2.4" - has-symbols "^1.0.3" + call-bind "^1.0.8" + call-bound "^1.0.2" + get-intrinsic "^1.2.6" + has-symbols "^1.1.0" isarray "^2.0.5" -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-regex-test@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" - integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-push-apply@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz#01850e981c1602d398c85081f360e4e6d03d27f5" + integrity sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA== dependencies: - call-bind "^1.0.6" es-errors "^1.3.0" - is-regex "^1.1.4" + isarray "^2.0.5" + +safe-regex-test@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1" + integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw== + dependencies: + call-bound "^1.0.2" + es-errors "^1.3.0" + is-regex "^1.2.1" safe-stable-stringify@^2.3.1: version "2.5.0" @@ -6806,7 +7345,7 @@ sasl-plain@^0.1.0: resolved "https://registry.yarnpkg.com/sasl-plain/-/sasl-plain-0.1.0.tgz#cf145e7c02222b64d60c0806d9cd2ae5380426cc" integrity sha512-X8mCSfR8y0NryTu0tuVyr4IS2jBunBgyG+3a0gEEkd0nlHGiyqJhlc4EIkzmSwaa7F8S4yo+LS6Cu5qxRkJrmg== -sasl-scram-sha-1@^1.2.1: +sasl-scram-sha-1@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/sasl-scram-sha-1/-/sasl-scram-sha-1-1.3.0.tgz#7d249d6d9da0030f0070746126ad6d96529858ab" integrity sha512-hJE3eUCEx0aK+9jwHu6VVrQwb9qxv8RMc3ZciGF/ZzXgxptCX9QbfJT45nloJGxrR9AfBU6GiVNYKA5mrqu2KQ== @@ -6927,6 +7466,15 @@ set-function-name@^2.0.2: functions-have-names "^1.2.3" has-property-descriptors "^1.0.2" +set-proto@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/set-proto/-/set-proto-1.0.0.tgz#0760dbcff30b2d7e801fd6e19983e56da337565e" + integrity sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw== + dependencies: + dunder-proto "^1.0.1" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -6966,15 +7514,45 @@ shortid@^2.2.14: dependencies: nanoid "^2.1.0" -side-channel@^1.0.4, side-channel@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" - integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== +side-channel-list@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad" + integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA== dependencies: - call-bind "^1.0.7" es-errors "^1.3.0" - get-intrinsic "^1.2.4" - object-inspect "^1.13.1" + object-inspect "^1.13.3" + +side-channel-map@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42" + integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA== + dependencies: + call-bound "^1.0.2" + es-errors "^1.3.0" + get-intrinsic "^1.2.5" + object-inspect "^1.13.3" + +side-channel-weakmap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea" + integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A== + dependencies: + call-bound "^1.0.2" + es-errors "^1.3.0" + get-intrinsic "^1.2.5" + object-inspect "^1.13.3" + side-channel-map "^1.0.1" + +side-channel@^1.0.6, side-channel@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9" + integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw== + dependencies: + es-errors "^1.3.0" + object-inspect "^1.13.3" + side-channel-list "^1.0.0" + side-channel-map "^1.0.1" + side-channel-weakmap "^1.0.2" signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.7: version "3.0.7" @@ -7100,9 +7678,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.20" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz#e44ed19ed318dd1e5888f93325cee800f0f51b89" - integrity sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw== + version "3.0.21" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz#6d6e980c9df2b6fc905343a3b2d702a6239536c3" + integrity sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg== split-on-first@^1.0.0: version "1.1.0" @@ -7195,15 +7773,22 @@ statuses@2.0.1: integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== store2@^2.13.0: - version "2.14.3" - resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.3.tgz#24077d7ba110711864e4f691d2af941ec533deb5" - integrity sha512-4QcZ+yx7nzEFiV4BMLnr/pRa5HYzNITX2ri0Zh6sT9EyQHbBHacC6YigllUPU9X3D0f/22QCgfokpKs52YRrUg== + version "2.14.4" + resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.4.tgz#81b313abaddade4dcd7570c5cc0e3264a8f7a242" + integrity sha512-srTItn1GOvyvOycgxjAnPA63FZNwy0PTyUBFMHRM+hVFltAeoh0LmNBz9SZqUS9mMqGk8rfyWyXn3GH5ReJ8Zw== stream-chain@^2.2.5: version "2.2.5" resolved "https://registry.yarnpkg.com/stream-chain/-/stream-chain-2.2.5.tgz#b30967e8f14ee033c5b9a19bbe8a2cba90ba0d09" integrity sha512-1TJmBx6aSWqZ4tx7aTpBDXK0/e2hhcNSTV8+CbFJtDjbb+I1mZ8lHit0Grw9GRT+6JbIrrDd8esncgBi8aBXGA== +stream-events@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5" + integrity sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg== + dependencies: + stubs "^3.0.0" + stream-json@^1.8.0: version "1.9.1" resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-1.9.1.tgz#e3fec03e984a503718946c170db7d74556c2a187" @@ -7218,10 +7803,15 @@ stream-length@^1.0.2: dependencies: bluebird "^2.6.2" +stream-shift@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.3.tgz#85b8fab4d71010fc3ba8772e8046cc49b8a3864b" + integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ== + streamx@^2.15.0: - version "2.21.0" - resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.21.0.tgz#ef42a3b3fada6887ba06964443adbbbec60c5851" - integrity sha512-Qz6MsDZXJ6ur9u+b+4xCG18TluU7PGlRfXVAAjNiGsFrBUt/ioyLkxbFaKJygoPs+/kW4VyBj0bSj89Qu0IGyg== + version "2.21.1" + resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.21.1.tgz#f02979d8395b6b637d08a589fb514498bed55845" + integrity sha512-PhP9wUnFLa+91CPy3N6tiQsK+gnYyUNuk15S3YG/zjYE7RuPeCjJngqnzpC31ow0lzBHQ+QGO4cNJnd0djYUsw== dependencies: fast-fifo "^1.3.2" queue-tick "^1.0.1" @@ -7252,7 +7842,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.3: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -7279,22 +7869,26 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -string.prototype.trim@^1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4" - integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw== +string.prototype.trim@^1.2.10: + version "1.2.10" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81" + integrity sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA== dependencies: - call-bind "^1.0.7" + call-bind "^1.0.8" + call-bound "^1.0.2" + define-data-property "^1.1.4" define-properties "^1.2.1" - es-abstract "^1.23.0" + es-abstract "^1.23.5" es-object-atoms "^1.0.0" + has-property-descriptors "^1.0.2" -string.prototype.trimend@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229" - integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ== +string.prototype.trimend@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942" + integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ== dependencies: - call-bind "^1.0.7" + call-bind "^1.0.8" + call-bound "^1.0.2" define-properties "^1.2.1" es-object-atoms "^1.0.0" @@ -7379,6 +7973,11 @@ strtok3@^7.0.0: "@tokenizer/token" "^0.3.0" peek-readable "^5.1.3" +stubs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b" + integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw== + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -7414,9 +8013,9 @@ syslog@0.1.1-1: integrity sha512-7fn4sikkTRrc4kZk/i/ItCktnPD2qG+nKmgTVcuLr2VrY2V9adNhw9fN02HL6rTthwu2Og9Icr1GxZlaLp39Lg== tar-fs@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + version "2.1.2" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5" + integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA== dependencies: chownr "^1.1.1" mkdirp-classic "^0.5.2" @@ -7455,6 +8054,24 @@ tar@^6.0.2, tar@^6.1.11, tar@^6.1.2: mkdirp "^1.0.3" yallist "^4.0.0" +tdigest@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.2.tgz#96c64bac4ff10746b910b0e23b515794e12faced" + integrity sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA== + dependencies: + bintrees "1.0.2" + +teeny-request@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-9.0.0.tgz#18140de2eb6595771b1b02203312dfad79a4716d" + integrity sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g== + dependencies: + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + node-fetch "^2.6.9" + stream-events "^1.0.5" + uuid "^9.0.0" + telegram@2.19.8: version "2.19.8" resolved "https://registry.yarnpkg.com/telegram/-/telegram-2.19.8.tgz#d6c0217e67e2cc9513e4904c033ecd4b296293f7" @@ -7500,9 +8117,9 @@ test-exclude@^5.2.3: require-main-filename "^2.0.0" text-decoder@^1.1.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.2.tgz#63dd2401c43895cecb292e2407db184b50ad60ac" - integrity sha512-/MDslo7ZyWTA2vnk1j7XoDVfXsGk3tp+zFEJHJGm0UjIlQifonVFwlVbQDFh8KJzTBnT8ie115TYqir6bclddA== + version "1.2.3" + resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.3.tgz#b19da364d981b2326d5f43099c310cc80d770c65" + integrity sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA== dependencies: b4a "^1.6.4" @@ -7687,40 +8304,40 @@ type@^2.7.2: resolved "https://registry.yarnpkg.com/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486" integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ== -typed-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" - integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== - dependencies: - call-bind "^1.0.7" - es-errors "^1.3.0" - is-typed-array "^1.1.13" - -typed-array-byte-length@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67" - integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw== - dependencies: - call-bind "^1.0.7" - for-each "^0.3.3" - gopd "^1.0.1" - has-proto "^1.0.3" - is-typed-array "^1.1.13" - -typed-array-byte-offset@^1.0.2: +typed-array-buffer@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.3.tgz#3fa9f22567700cc86aaf86a1e7176f74b59600f2" - integrity sha512-GsvTyUHTriq6o/bHcTd0vM7OQ9JEdlvluu9YISaA7+KzDzPaIzEeDFNkTfhdE3MYcNhNi0vq/LlegYgIs5yPAw== + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536" + integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw== + dependencies: + call-bound "^1.0.3" + es-errors "^1.3.0" + is-typed-array "^1.1.14" + +typed-array-byte-length@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz#8407a04f7d78684f3d252aa1a143d2b77b4160ce" + integrity sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg== + dependencies: + call-bind "^1.0.8" + for-each "^0.3.3" + gopd "^1.2.0" + has-proto "^1.2.0" + is-typed-array "^1.1.14" + +typed-array-byte-offset@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz#ae3698b8ec91a8ab945016108aef00d5bff12355" + integrity sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ== dependencies: available-typed-arrays "^1.0.7" - call-bind "^1.0.7" + call-bind "^1.0.8" for-each "^0.3.3" - gopd "^1.0.1" - has-proto "^1.0.3" - is-typed-array "^1.1.13" - reflect.getprototypeof "^1.0.6" + gopd "^1.2.0" + has-proto "^1.2.0" + is-typed-array "^1.1.15" + reflect.getprototypeof "^1.0.9" -typed-array-length@^1.0.6: +typed-array-length@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d" integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg== @@ -7761,15 +8378,15 @@ uid2@0.0.x: resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz#033f3b1d5d32505f5ce5f888b9f3b667123c0a44" integrity sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA== -unbox-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" - integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== +unbox-primitive@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz#8d9d2c9edeea8460c7f35033a88867944934d1e2" + integrity sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw== dependencies: - call-bind "^1.0.2" + call-bound "^1.0.3" has-bigints "^1.0.2" - has-symbols "^1.0.3" - which-boxed-primitive "^1.0.2" + has-symbols "^1.1.0" + which-boxed-primitive "^1.1.1" undici-types@~6.20.0: version "6.20.0" @@ -7777,9 +8394,9 @@ undici-types@~6.20.0: integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg== undici@^5.11.0, undici@^5.22.0: - version "5.28.4" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.4.tgz#6b280408edb6a1a604a9b20340f45b422e373068" - integrity sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g== + version "5.28.5" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.5.tgz#b2b94b6bf8f1d919bc5a6f31f2c01deb02e54d4b" + integrity sha512-zICwjrDrcrUE0pyyJc1I2QzBkLM8FINsgOrt6WjA+BgajVq9Nxu2PbFFXUrAggLfDXlZGZBVZYw7WNV5KiBiBA== dependencies: "@fastify/busboy" "^2.0.0" @@ -7813,12 +8430,12 @@ unpipe@1.0.0, unpipe@~1.0.0: integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== update-browserslist-db@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5" - integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz#97e9c96ab0ae7bcac08e9ae5151d26e6bc6b5580" + integrity sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg== dependencies: escalade "^3.2.0" - picocolors "^1.1.0" + picocolors "^1.1.1" upper-case@^1.1.1: version "1.1.3" @@ -7893,12 +8510,17 @@ utils-merge@1.0.1, utils-merge@1.x.x, utils-merge@^1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== +uuid@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294" + integrity sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ== + uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^8.3.2: +uuid@^8.0.0, uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== @@ -7985,6 +8607,11 @@ web-push@3.6.6: jws "^4.0.0" minimist "^1.2.5" +web-streams-polyfill@^3.0.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz#2073b91a2fdb1fbfbd401e7de0ac9f8214cecb4b" + integrity sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw== + webdav@4.11.4: version "4.11.4" resolved "https://registry.yarnpkg.com/webdav/-/webdav-4.11.4.tgz#700fd81faf02cef38f76804203e3c47b0bb61741" @@ -8014,6 +8641,20 @@ webidl-conversions@^7.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== +websocket-driver@>=0.5.1: + version "0.7.4" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" + integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== + dependencies: + http-parser-js ">=0.5.1" + safe-buffer ">=5.1.0" + websocket-extensions ">=0.1.1" + +websocket-extensions@>=0.1.1: + version "0.1.4" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== + websocket@^1.0.34: version "1.0.35" resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.35.tgz#374197207d7d4cc4c36cbf8a1bb886ee52a07885" @@ -8067,35 +8708,35 @@ whatwg-url@^5.0.0: tr46 "~0.0.3" webidl-conversions "^3.0.0" -which-boxed-primitive@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.0.tgz#2d850d6c4ac37b95441a67890e19f3fda8b6c6d9" - integrity sha512-Ei7Miu/AXe2JJ4iNF5j/UphAgRoma4trE6PtisM09bPygb3egMH3YLW/befsWb1A1AxvNSFidOFTB18XtnIIng== +which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz#d76ec27df7fa165f18d5808374a5fe23c29b176e" + integrity sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA== dependencies: is-bigint "^1.1.0" - is-boolean-object "^1.2.0" - is-number-object "^1.1.0" - is-string "^1.1.0" - is-symbol "^1.1.0" + is-boolean-object "^1.2.1" + is-number-object "^1.1.1" + is-string "^1.1.1" + is-symbol "^1.1.1" -which-builtin-type@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.0.tgz#58042ac9602d78a6d117c7e811349df1268ba63c" - integrity sha512-I+qLGQ/vucCby4tf5HsLmGueEla4ZhwTBSqaooS+Y0BuxN4Cp+okmGuV+8mXZ84KDI9BA+oklo+RzKg0ONdSUA== +which-builtin-type@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz#89183da1b4907ab089a6b02029cc5d8d6574270e" + integrity sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q== dependencies: - call-bind "^1.0.7" + call-bound "^1.0.2" function.prototype.name "^1.1.6" has-tostringtag "^1.0.2" is-async-function "^2.0.0" - is-date-object "^1.0.5" + is-date-object "^1.1.0" is-finalizationregistry "^1.1.0" is-generator-function "^1.0.10" - is-regex "^1.1.4" + is-regex "^1.2.1" is-weakref "^1.0.2" isarray "^2.0.5" - which-boxed-primitive "^1.0.2" + which-boxed-primitive "^1.1.0" which-collection "^1.0.2" - which-typed-array "^1.1.15" + which-typed-array "^1.1.16" which-collection@^1.0.2: version "1.0.2" @@ -8112,15 +8753,16 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== -which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.2: - version "1.1.16" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.16.tgz#db4db429c4706feca2f01677a144278e4a8c216b" - integrity sha512-g+N+GAWiRj66DngFwHvISJd+ITsyphZvD1vChfVg6cEdnzy53GzB3oy0fUNlvhz7H7+MiqhYr26qxQShCpKTTQ== +which-typed-array@^1.1.16, which-typed-array@^1.1.18, which-typed-array@^1.1.2: + version "1.1.18" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.18.tgz#df2389ebf3fbb246a71390e90730a9edb6ce17ad" + integrity sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA== dependencies: available-typed-arrays "^1.0.7" - call-bind "^1.0.7" + call-bind "^1.0.8" + call-bound "^1.0.3" for-each "^0.3.3" - gopd "^1.0.1" + gopd "^1.2.0" has-tostringtag "^1.0.2" which@^1.2.9, which@^1.3.0: @@ -8205,6 +8847,15 @@ wrap-ansi@^5.1.0: string-width "^3.0.0" strip-ansi "^5.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" @@ -8237,7 +8888,7 @@ write-file-atomic@^2.4.2: imurmurhash "^0.1.4" signal-exit "^3.0.2" -ws@8.18.0, ws@^8.13.0, ws@^8.4.0, ws@^8.9.0: +ws@8.18.0, ws@^8.13.0, ws@^8.18.0, ws@^8.9.0: version "8.18.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== @@ -8285,6 +8936,14 @@ xml2js@^0.5.0: sax ">=0.6.0" xmlbuilder "~11.0.0" +"xml2js@^0.5.0 || ^0.6.2": + version "0.6.2" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499" + integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA== + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + xml@0.0.12: version "0.0.12" resolved "https://registry.yarnpkg.com/xml/-/xml-0.0.12.tgz#f08b347109912be00285785f46f15ad8e50a5f67" @@ -8342,6 +9001,11 @@ y18n@^4.0.0: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + yaeti@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" @@ -8370,6 +9034,11 @@ yargs-parser@^13.0.0, yargs-parser@^13.1.2: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + yargs@^13.2.2: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" @@ -8386,6 +9055,19 @@ yargs@^13.2.2: y18n "^4.0.0" yargs-parser "^13.1.2" +yargs@^17.7.2: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yauzl@2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" @@ -8394,6 +9076,11 @@ yauzl@2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + yubikeyotp@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/yubikeyotp/-/yubikeyotp-0.2.0.tgz#8bdc51122cd00ed8c919b9c9caeba851b272aa7d" diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 5870d1932a48..40ae27a92ad9 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.46"; + version = "4.0.47"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - hash = "sha256-mq2N2Fn4j7d4eSTsR1kBktOr97rWyEBQnIVCkNa8FsA="; + hash = "sha256-MaoGB4zD9QWRuV5xqQnFbdF52H6cvcB79DXllb18x/8="; }; patches = lib.optional stdenv.hostPlatform.isDarwin ./UNUSED-darwin.patch; diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 16504673e8e5..37d867e827d4 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -1,62 +1,68 @@ -{ stdenv -, lib -, nixosTests -, nix-update-script -, buildGoModule -, fetchFromGitHub -, installShellFiles -, pkg-config -, gtk3 -, libayatana-appindicator -, libX11 -, libXcursor -, libXxf86vm -, Cocoa -, IOKit -, Kernel -, UserNotifications -, WebKit -, ui ? false -, netbird-ui +{ + stdenv, + lib, + nixosTests, + nix-update-script, + buildGoModule, + fetchFromGitHub, + installShellFiles, + pkg-config, + gtk3, + libayatana-appindicator, + libX11, + libXcursor, + libXxf86vm, + Cocoa, + IOKit, + Kernel, + UserNotifications, + WebKit, + ui ? false, + netbird-ui, }: let modules = - if ui then { - "client/ui" = "netbird-ui"; - } else { - client = "netbird"; - management = "netbird-mgmt"; - signal = "netbird-signal"; - }; + if ui then + { + "client/ui" = "netbird-ui"; + } + else + { + client = "netbird"; + management = "netbird-mgmt"; + signal = "netbird-signal"; + }; in buildGoModule rec { pname = "netbird"; - version = "0.35.2"; + version = "0.36.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; rev = "v${version}"; - hash = "sha256-CvKJiv3CyCRp0wyH+OZejOChcumnMOrA7o9wL4ElJio="; + hash = "sha256-ZAKVjBjffinOyHhzln/ny7tooZwtKHfMEDb/Uy0k6Gw="; }; - vendorHash = "sha256-CgfZZOiFDLf6vCbzovpwzt7FlO9BnzNSdR8e5U+xCDQ="; + vendorHash = "sha256-xZz2JkD3yD7tuXVFlMm2g1hRBItkGmO9OvnLdUfqai0="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; - buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && ui) [ - gtk3 - libayatana-appindicator - libX11 - libXcursor - libXxf86vm - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && ui) [ - Cocoa - IOKit - Kernel - UserNotifications - WebKit - ]; + buildInputs = + lib.optionals (stdenv.hostPlatform.isLinux && ui) [ + gtk3 + libayatana-appindicator + libX11 + libXcursor + libXxf86vm + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && ui) [ + Cocoa + IOKit + Kernel + UserNotifications + WebKit + ]; subPackages = lib.attrNames modules; @@ -78,26 +84,31 @@ buildGoModule rec { --replace-fail 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' ''; - postInstall = lib.concatStringsSep "\n" - (lib.mapAttrsToList - (module: binary: '' - mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary} - '' + lib.optionalString (!ui) '' - installShellCompletion --cmd ${binary} \ - --bash <($out/bin/${binary} completion bash) \ - --fish <($out/bin/${binary} completion fish) \ - --zsh <($out/bin/${binary} completion zsh) - '') - modules) + lib.optionalString (stdenv.hostPlatform.isLinux && ui) '' - mkdir -p $out/share/pixmaps - cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png + postInstall = + lib.concatStringsSep "\n" ( + lib.mapAttrsToList ( + module: binary: + '' + mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary} + '' + + lib.optionalString (!ui) '' + installShellCompletion --cmd ${binary} \ + --bash <($out/bin/${binary} completion bash) \ + --fish <($out/bin/${binary} completion fish) \ + --zsh <($out/bin/${binary} completion zsh) + '' + ) modules + ) + + lib.optionalString (stdenv.hostPlatform.isLinux && ui) '' + mkdir -p $out/share/pixmaps + cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png - mkdir -p $out/share/applications - cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop + mkdir -p $out/share/applications + cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop - substituteInPlace $out/share/applications/netbird.desktop \ - --replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" - ''; + substituteInPlace $out/share/applications/netbird.desktop \ + --replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" + ''; passthru = { tests.netbird = nixosTests.netbird; @@ -110,7 +121,10 @@ buildGoModule rec { changelog = "https://github.com/netbirdio/netbird/releases/tag/v${version}"; description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls"; license = licenses.bsd3; - maintainers = with maintainers; [ vrifox saturn745 ]; + maintainers = with maintainers; [ + vrifox + saturn745 + ]; mainProgram = "netbird"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index df23115bb549..79dc5dd6a318 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -677,6 +677,7 @@ mapAliases { libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 libdwg = throw "libdwg has been removed as upstream is unmaintained, the code doesn't build without significant patches, and the package had no reverse dependencies"; # Added 2024-12-28 libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05 + libgda = lib.warnOnInstantiate "‘libgda’ has been renamed to ‘libgda5’" libgda5; # Added 2025-01-21 libgme = game-music-emu; # Added 2022-07-20 libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78ec7043d8a8..abec87a7de8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2220,7 +2220,11 @@ with pkgs; easyaudiosync = qt6Packages.callPackage ../applications/audio/easyaudiosync {}; easycrypt = callPackage ../applications/science/logic/easycrypt { - why3 = pkgs.why3.override { ideSupport = false; }; + why3 = pkgs.why3.override { + ideSupport = false; + version = "1.7.2"; + coqPackages = { coq = null; flocq = null; }; + }; }; easycrypt-runtest = callPackage ../applications/science/logic/easycrypt/runtest.nix { }; @@ -7951,6 +7955,10 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; + framac = callPackage ../by-name/fr/framac/package.nix { + why3 = why3.override { version = "1.7.2"; coqPackages = coqPackages_8_18; }; + }; + fswatch = callPackage ../development/tools/misc/fswatch { inherit (darwin.apple_sdk.frameworks) CoreServices; autoreconfHook = buildPackages.autoreconfHook269; @@ -9538,7 +9546,7 @@ with pkgs; extraOnly = true; }; - libgda = callPackage ../development/libraries/libgda { }; + libgda5 = callPackage ../development/libraries/libgda/5.x.nix { }; libgda6 = callPackage ../development/libraries/libgda/6.x.nix { }; @@ -12990,10 +12998,6 @@ with pkgs; barrier = libsForQt5.callPackage ../applications/misc/barrier { }; - bespokesynth = darwin.apple_sdk_11_0.callPackage ../applications/audio/bespokesynth { - inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit CoreServices CoreAudioKit IOBluetooth MetalKit; - }; - bespokesynth-with-vst2 = bespokesynth.override { enableVST2 = true; }; @@ -13780,6 +13784,7 @@ with pkgs; hugin = callPackage ../applications/graphics/hugin { wxGTK = wxGTK32; + openexr = openexr_3; }; huggle = libsForQt5.callPackage ../applications/misc/huggle { }; @@ -14374,12 +14379,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - mmex = callPackage ../applications/office/mmex { - wxGTK32 = wxGTK32.override { - withWebKit = true; - }; - }; - mmlgui = callPackage ../applications/audio/mmlgui { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; libvgm = libvgm.override { @@ -17241,9 +17240,7 @@ with pkgs; stdenv = gccStdenv; }; - why3 = callPackage ../applications/science/logic/why3 { - coqPackages = coqPackages_8_18; - }; + why3 = callPackage ../applications/science/logic/why3 { }; yices = callPackage ../applications/science/logic/yices { gmp-static = gmp.override { withStatic = true; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 726fadf86573..21c60bb1f8f2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -962,7 +962,9 @@ let lambda-term = callPackage ../development/ocaml-modules/lambda-term { }; lambdapi = callPackage ../development/ocaml-modules/lambdapi { - why3 = pkgs.why3.override { ocamlPackages = self; }; + why3 = pkgs.why3.override { ocamlPackages = self; + version = "1.7.2"; coqPackages = pkgs.coqPackages_8_18; + }; }; lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf0feb06e024..94ed6ef64689 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27,6 +27,8 @@ self: super: with self; { aafigure = callPackage ../development/python-modules/aafigure { }; + airportsdata = callPackage ../development/python-modules/airportsdata { }; + aardwolf = callPackage ../development/python-modules/aardwolf { }; abjad = callPackage ../development/python-modules/abjad { }; @@ -6608,11 +6610,7 @@ self: super: with self; { jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { }; - jaxlib-build = callPackage ../development/python-modules/jaxlib rec { - # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. - inherit (pkgs.config) cudaSupport; - IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; - }; + jaxlib-build = callPackage ../development/python-modules/jaxlib { }; jaxlib = jaxlib-bin; @@ -10329,6 +10327,8 @@ self: super: with self; { outlines = callPackage ../development/python-modules/outlines { }; + outlines-core = callPackage ../development/python-modules/outlines-core { }; + overly = callPackage ../development/python-modules/overly { }; overpy = callPackage ../development/python-modules/overpy { }; @@ -14154,6 +14154,8 @@ self: super: with self; { reverse-geocode = callPackage ../development/python-modules/reverse-geocode { }; + rfc3161-client = callPackage ../development/python-modules/rfc3161-client { }; + rfc3339 = callPackage ../development/python-modules/rfc3339 { }; rfc3339-validator = callPackage ../development/python-modules/rfc3339-validator { };