diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 77b6d67e83d5..565884597553 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -101,6 +101,7 @@ If `true`, the intermediate fetcher downloads dependencies from the This is useful if your code depends on C code and `go mod tidy` does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums. +It may also be needed if the module targets language version 1.16 or earlier, since vendoring compiles all dependencies against language version 1.16 in this case. Defaults to `false`. diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 657978141a02..32ef54ff4771 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -323,3 +323,5 @@ gnuradioMinimal.override { ### Additions and Improvements {#sec-nixpkgs-release-26.05-lib-additions-improvements} - The builder `php.buildComposerProject2` for PHP applications has been improved for better reliability and stability. + +- The `services.drupal` module has a few improvements aimed at making it better for installing custom Drupal instances, namely a `webRoot` option and a some new settings for managing variable content and filepaths. diff --git a/nixos/modules/system/service/portable/config-data-item.nix b/lib/services/config-data-item.nix similarity index 96% rename from nixos/modules/system/service/portable/config-data-item.nix rename to lib/services/config-data-item.nix index 90fae10068e7..44671b704d8d 100644 --- a/nixos/modules/system/service/portable/config-data-item.nix +++ b/lib/services/config-data-item.nix @@ -1,4 +1,4 @@ -# Tests in: ../../../../tests/modular-service-etc/test.nix +# Tests in: ../../nixos/tests/modular-service-etc/test.nix # This file is a function that returns a module. pkgs: { diff --git a/nixos/modules/system/service/portable/config-data.nix b/lib/services/config-data.nix similarity index 96% rename from nixos/modules/system/service/portable/config-data.nix rename to lib/services/config-data.nix index 63f570140b55..953574b8a04d 100644 --- a/nixos/modules/system/service/portable/config-data.nix +++ b/lib/services/config-data.nix @@ -1,4 +1,4 @@ -# Tests in: ../../../../tests/modular-service-etc/test.nix +# Tests in: ../../nixos/tests/modular-service-etc/test.nix # Non-modular context provided by the modular services integration. { pkgs }: diff --git a/nixos/modules/system/service/portable/lib.nix b/lib/services/lib.nix similarity index 100% rename from nixos/modules/system/service/portable/lib.nix rename to lib/services/lib.nix diff --git a/nixos/modules/system/service/portable/service.nix b/lib/services/service.nix similarity index 95% rename from nixos/modules/system/service/portable/service.nix rename to lib/services/service.nix index 77befdfb63d6..1bcf0845f0d7 100644 --- a/nixos/modules/system/service/portable/service.nix +++ b/lib/services/service.nix @@ -16,8 +16,8 @@ in # https://nixos.org/manual/nixos/unstable/#modular-services _class = "service"; imports = [ - ../../../../../modules/generic/meta-maintainers.nix - ../../../misc/assertions.nix + ../../modules/generic/meta-maintainers.nix + ../../nixos/modules/misc/assertions.nix (lib.modules.importApply ./config-data.nix { inherit pkgs; }) ]; options = { diff --git a/nixos/modules/system/service/portable/test.nix b/lib/services/test.nix similarity index 97% rename from nixos/modules/system/service/portable/test.nix rename to lib/services/test.nix index acc07742dfcb..65d05ceb39e9 100644 --- a/nixos/modules/system/service/portable/test.nix +++ b/lib/services/test.nix @@ -1,7 +1,7 @@ # Run: -# nix-instantiate --eval nixos/modules/system/service/portable/test.nix +# nix-instantiate --eval lib/services/test.nix let - lib = import ../../../../../lib; + lib = import ../.; inherit (lib) mkOption types; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0a077dd83b15..bda8cbf3bf10 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9653,7 +9653,7 @@ name = "Galois"; }; ggg = { - email = "gggkiller2@gmail.com"; + email = "github@ggg.dev"; github = "GGG-KILLER"; githubId = 5892127; name = "GGG"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 76a7469e3ee9..a4416d002d23 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -52,6 +52,8 @@ lrexlib-pcre,,,,,, lrexlib-posix,,,,,, lsp-progress.nvim,,,,,5.1,gepbird lsqlite3,,,,,, +ltreesitter-ts,,,,,, +ltreesitter,,,,,, lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, @@ -95,6 +97,7 @@ luaprompt,,,,,,Freed-Wu luarepl,,,,,, luarocks,,,,,,mrcjkb teto luarocks-build-rust-mlua,,,,,,mrcjkb +luarocks-build-tree-sitter-cli,,,,,, luarocks-build-treesitter-parser,,,,,,mrcjkb luarocks-build-treesitter-parser-cpp,,,,,,mrcjkb luasec,,,,,,flosse @@ -156,16 +159,18 @@ sqlite,,,,,, std._debug,,,,,, std.normalize,,,,,, stdlib,,,,41.2.2,, -teal-language-server,,,,0.0.5-1,, +teal-language-server,,,,,, telescope-manix,,,,,, telescope.nvim,,,,,5.1, tiktoken_core,,,,,,natsukium tl,,,,,,mephistophiles toml-edit,,,,,5.1,mrcjkb +tree-sitter-cli,,,,,, tree-sitter-http,,,,0.0.33-1,, tree-sitter-norg,,,,,5.1,mrcjkb tree-sitter-orgmode,,,,,5.1, utf8,,,,,, +tree-sitter-teal,,,,,, vstruct,,,,,, vusted,,,,,, xml2lua,,,,,,teto diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ef8d01cac28e..55ac4e52ca9e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -225,7 +225,6 @@ with lib.maintainers; members = [ mdarocha corngood - ggg raphaelr jamiemagee anpin diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index bdede559d1df..137010637f09 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -134,7 +134,7 @@ let inherit (evalModules { modules = [ - (modules.importApply ../../modules/system/service/portable/service.nix { + (modules.importApply ../../../lib/services/service.nix { pkgs = throw "nixos docs / portableServiceOptions: Do not reference pkgs in docs"; }) ]; diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 5f056851c8dc..1765e878c59b 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -164,8 +164,13 @@ of pulling the upstream container image from Docker Hub. If you want the old beh - `services.stalwart-mail` has been renamed to `services.stalwart` to align with upstream re-brand as an e-mail and collaboration server. Other notable breaking changes to module: + - Addition of module-specific `stateVersion` option, which on existing installations of Stalwart must be set to the same as `system.stateVersion`. + + This enables manually and carefully migrating Stalwart to a new `stateVersion` or newly enabling the Stalwart module with a newer `stateVersion` than `system.stateVersion`. + - `systemd.services.stalwart` owned by `stalwart:stalwart`. The `user` and `group` are configurable via `services.stalwart.user` and `services.stalwart.group`, respectively. By default, if `stateVersion` is older than `26.05`, will fallback to legacy value of `stalwart-mail` for both `user` and `group`. - Default value for `services.stalwart.dataDir` has changed to `/var/lib/stalwart`. If `stateVersion` is older than `26.05`, will fallback to legacy value of `/var/lib/stalwart-mail`. + - Default tracer name and type have changed to `journal`. If `stateVersion` is older than `26.05`, will fallback to legacy value of `stdout`. - `services.eintopf` has been renamed to `services.lauti` to align with upstream re-brand as a community online calendar. diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix index ae8fa710b2b8..e3adc2dcac46 100644 --- a/nixos/modules/misc/assertions.nix +++ b/nixos/modules/misc/assertions.nix @@ -34,5 +34,5 @@ }; # impl of assertions is in # - - # - + # - } diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 516bf903187b..67788669e7a6 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -116,7 +116,10 @@ let && (t == "directory" -> baseNameOf n != "tests") && (t == "file" -> hasSuffix ".nix" n) ); - prefixRegex = "^" + lib.strings.escapeRegex (toString pkgs.path) + "($|/(modules|nixos)($|/.*))"; + prefixRegex = + "^" + + lib.strings.escapeRegex (toString pkgs.path) + + "($|/(modules|nixos|lib/services)($|/.*)|/lib)"; filteredModules = builtins.path { name = "source"; inherit (pkgs) path; diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 1d588bd5de72..67285acdfedf 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -170,6 +170,7 @@ in kconfig # required for xdg-terminal from xdg-utils qtbase # for qtpaths which is required for xdg-mime from xdg-utils ] + ++ lib.optional config.networking.networkmanager.enable qrca ++ lib.optionals config.hardware.sensor.iio.enable [ # This is required for autorotation in Plasma 6 qtsensors diff --git a/nixos/modules/services/mail/stalwart.nix b/nixos/modules/services/mail/stalwart.nix index 4719f9ccb730..9dfd5f2e480f 100644 --- a/nixos/modules/services/mail/stalwart.nix +++ b/nixos/modules/services/mail/stalwart.nix @@ -8,9 +8,10 @@ let cfg = config.services.stalwart; configFormat = pkgs.formats.toml { }; configFile = configFormat.generate "stalwart.toml" cfg.settings; - useLegacyStorage = lib.versionOlder config.system.stateVersion "24.11"; - useLegacyDefault = lib.versionOlder config.system.stateVersion "26.05"; - default = if useLegacyDefault then "stalwart-mail" else "stalwart"; + useLegacyStorage = lib.versionOlder cfg.stateVersion "24.11"; + pre2605 = lib.versionOlder cfg.stateVersion "26.05"; + stalwartIdentifier = if pre2605 then "stalwart-mail" else "stalwart"; + stalwartIdentifierText = ''if lib.versionOlder config.services.stalwart.stateVersion "26.05" then "stalwart-mail" else "stalwart"''; parsePorts = listeners: @@ -31,6 +32,15 @@ in options.services.stalwart = { enable = lib.mkEnableOption "the all-in-one collaboration and mail server, Stalwart"; + stateVersion = lib.mkOption { + type = lib.types.str; + description = '' + The version of this module (=version of NixOS) when this module was first enabled on this particular machine, used to maintain compatibility with application data created on older versions of this module. + + See {option}`system.stateVersion` for details on the NixOS-global equivalent to this option. + ''; + }; + package = lib.mkPackageOption pkgs "stalwart" { }; openFirewall = lib.mkOption { @@ -55,7 +65,8 @@ in dataDir = lib.mkOption { type = lib.types.path; - default = if useLegacyDefault then "/var/lib/stalwart-mail" else "/var/lib/stalwart"; + default = "/var/lib/${stalwartIdentifier}"; + defaultText = lib.literalExpression "/var/lib/\${${stalwartIdentifierText}}"; description = '' Data directory for stalwart ''; @@ -63,7 +74,8 @@ in user = lib.mkOption { type = lib.types.str; - inherit default; + default = stalwartIdentifier; + defaultText = lib.literalExpression stalwartIdentifierText; description = '' User ownership of service ''; @@ -71,7 +83,8 @@ in group = lib.mkOption { type = lib.types.str; - inherit default; + default = stalwartIdentifier; + defaultText = lib.literalExpression stalwartIdentifierText; description = '' Group ownership of service ''; @@ -114,12 +127,24 @@ in # Default config: all local services.stalwart.settings = { - tracer.stdout = { - type = lib.mkDefault "stdout"; - level = lib.mkDefault "info"; - ansi = lib.mkDefault false; # no colour markers to journald - enable = lib.mkDefault true; - }; + tracer = + if pre2605 then + { + stdout = { + type = lib.mkDefault "stdout"; + level = lib.mkDefault "info"; + ansi = lib.mkDefault false; # no colour markers to journald + enable = lib.mkDefault true; + }; + } + else + { + journal = { + type = lib.mkDefault "journal"; + level = lib.mkDefault "info"; + enable = lib.mkDefault true; + }; + }; store = if useLegacyStorage then { @@ -155,7 +180,7 @@ in ); in { - path = "/var/cache/${default}"; + path = "/var/cache/${stalwartIdentifier}"; resource = lib.mkIf hasHttpListener (lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip"); }; }; @@ -165,10 +190,10 @@ in # service is restarted on a potentially large number of files. # That would cause unnecessary and unwanted delays. users = { - groups = lib.mkIf (cfg.group == default) { + groups = lib.mkIf (cfg.group == stalwartIdentifier) { ${cfg.group} = { }; }; - users = lib.mkIf (cfg.user == default) { + users = lib.mkIf (cfg.user == stalwartIdentifier) { ${cfg.user} = { isSystemUser = true; inherit (cfg) group; @@ -197,7 +222,7 @@ in KillSignal = "SIGINT"; Restart = "on-failure"; RestartSec = 5; - SyslogIdentifier = default; + SyslogIdentifier = stalwartIdentifier; ExecStartPre = if useLegacyStorage then @@ -217,8 +242,8 @@ in ReadWritePaths = [ cfg.dataDir ]; - CacheDirectory = default; - StateDirectory = default; + CacheDirectory = stalwartIdentifier; + StateDirectory = stalwartIdentifier; # Upstream uses "stalwart" as the username since 0.12.0 User = cfg.user; diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index fc97d4f63e6c..a80f7dfafaa8 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -46,6 +46,20 @@ in package = lib.mkPackageOption pkgs "collectd" { }; + finalPackage = lib.mkOption { + readOnly = true; + default = minimalPackage; + defaultText = lib.literalExpression '' + if config.services.collectd.buildMinimalPackage then + cfg.package.override { + enabledPlugins = [ "syslog" ] ++ builtins.attrNames cfg.plugins; + } + else + cfg.package + ''; + description = "The final package being used after applying plugins and minimalPackage."; + }; + buildMinimalPackage = lib.mkOption { default = false; description = '' diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 0e38fb27508f..d3298742772c 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -10,11 +10,9 @@ let inherit (lib) concatStrings - foldl foldl' genAttrs literalExpression - maintainers mapAttrs mapAttrsToList mkDefault @@ -22,9 +20,7 @@ let mkIf mkMerge mkOption - optional types - mkOptionDefault flip attrNames xor @@ -328,6 +324,7 @@ let description = "Prometheus ${name} exporter service user"; isSystemUser = true; inherit (conf) group; + extraGroups = mkIf (name == "libvirt") [ "libvirtd" ]; } ); users.groups = mkMerge [ diff --git a/nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix b/nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix index 8a4b5f481022..37b16c331598 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix @@ -24,6 +24,11 @@ in --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ --libvirt.uri ${cfg.libvirtUri} ${lib.concatStringsSep " " cfg.extraFlags} ''; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; }; }; } diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 95d0f9e8a486..6ad7416a9c7d 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -86,7 +86,7 @@ in `.config/transmission-daemon/settings.json` (each time the service starts). - See [Transmission's Wiki](https://github.com/transmission/transmission/wiki/Editing-Configuration-Files) + See [Transmission's documentation](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options) for documentation of settings not explicitly covered by this module. ''; default = { }; diff --git a/nixos/modules/services/web-apps/drupal.nix b/nixos/modules/services/web-apps/drupal.nix index 91ab0b773a17..f05005bec0c9 100644 --- a/nixos/modules/services/web-apps/drupal.nix +++ b/nixos/modules/services/web-apps/drupal.nix @@ -10,6 +10,7 @@ let any attrValues flatten + getExe literalExpression mapAttrs mapAttrs' @@ -24,6 +25,9 @@ let optionalAttrs types ; + inherit (lib.strings) + removePrefix + ; inherit (pkgs) mariadb stdenv @@ -41,23 +45,42 @@ let name = "drupal-${hostName}"; src = cfg.package; + buildInputs = [ pkgs.rsync ]; + installPhase = '' runHook preInstall mkdir -p $out - cp -r * $out/ + rsync -aq * $out/ --exclude=${removePrefix "/" cfg.webRoot}/sites --exclude=sites runHook postInstall ''; postInstall = '' - ln -s ${cfg.filesDir} $out/share/php/${cfg.package.pname}/sites/default/files - ln -s ${cfg.stateDir}/sites/default/settings.php $out/share/php/${cfg.package.pname}/sites/default/settings.php + ln -s ${cfg.stateDir}/sites $out/share/php/${cfg.package.pname}${cfg.webRoot} ln -s ${cfg.modulesDir} $out/share/php/${cfg.package.pname}/modules ln -s ${cfg.themesDir} $out/share/php/${cfg.package.pname}/themes ''; }); + sites = + hostName: cfg: + stdenv.mkDerivation (finalAttrs: { + pname = "drupal-sites-${hostName}"; + name = "drupal-sites-${hostName}"; + src = cfg.package; + buildInputs = with pkgs; [ rsync ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/sites + rsync -a ./share/php/${cfg.package.pname}${cfg.webRoot}/sites/* $out/sites/ + + runHook postInstall + ''; + }); + drupalSettings = hostName: cfg: pkgs.writeTextFile { @@ -87,6 +110,75 @@ let ''; }; + # Required .htaccess for private files directory + # See: https://www.drupal.org/docs/getting-started/installing-drupal/securing-drupal-file-directories + privateFilesHtAccess = pkgs.writeTextFile { + name = "private-files-htaccess"; + text = '' + # Turn off all options we don't need. + Options -Indexes -ExecCGI -Includes -MultiViews + + # Set the catch-all handler to prevent scripts from being executed. + SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006 + + # Override the handler again if we're run later in the evaluation list. + SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003 + + + # If we know how to do it safely, disable the PHP engine entirely. + + php_flag engine off + + ''; + }; + + stateDirManage = + hostName: cfg: + pkgs.writeShellApplication { + name = "drupal-state-init-${hostName}"; + excludeShellChecks = [ "SC2194" ]; + runtimeInputs = with pkgs; [ rsync ]; + text = '' + echo "Updating the sites directory for ${hostName}..." + rsync -auq "${sites hostName cfg}/sites/" "${cfg.stateDir}/sites/" \ + --exclude "*/files" \ + --delete-before + + if [ ! -d "${cfg.filesDir}" ]; then + echo "Preparing files directory..." + mkdir -p "${cfg.filesDir}" + chown -R ${user}:${webserver.group} ${cfg.filesDir} + fi + + case ${cfg.filesDir} in + ${cfg.stateDir}/sites*) echo "Files directory is in sites directory. Skipping optional link!";; + *) ln -sf "${cfg.filesDir}" "${cfg.stateDir}/sites/default/files";; + esac + + if [ ! -f "${cfg.privateFilesDir}/.htaccess" ]; then + echo "Linking .htaccess file for private files directory..." + ln -s "${privateFilesHtAccess}" "${cfg.privateFilesDir}/.htaccess" + fi + + echo "Preparing settings.php for ${hostName}..." + settings_file="${cfg.stateDir}/sites/default/settings.php" + + if [ ! -f "$settings_file" ]; then + default_settings_file="${cfg.stateDir}/sites/default/default.settings.php"; + cp "$default_settings_file" "$settings_file" + fi + + cat < ${appendSettings hostName} >> "$settings_file" + chmod 644 "$settings_file" + + # Link the NixOS-managed settings file to the state directory. + ln -sf ${drupalSettings hostName cfg} ${cfg.stateDir}/sites/default/settings.nixos-${hostName}.php + + # Set or reset file permissions so that the web user and webserver owns them. + chown -R ${user}:${webserver.group} ${cfg.stateDir} + ''; + }; + siteOpts = { options, @@ -106,6 +198,9 @@ let defaultText = "/var/lib/drupal//sites/default/files"; description = '' The location of the Drupal files directory. + + Many of the files in this directory are variable, so they must be located + in a location writeable by users of the webgroup. ''; }; @@ -120,7 +215,22 @@ let type = types.path; default = "/var/lib/drupal/${name}/config/sync"; defaultText = "/var/lib/drupal//config/sync"; - description = "The location of the Drupal config sync directory."; + description = '' + The location of the user-managed Drupal config sync directory. + Drupal will both read from and write to this directory when executing + configuration management operations. + ''; + }; + + webRoot = mkOption { + type = types.str; + default = ""; + description = '' + An optional path string with a leading slash + indicating the location of the Drupal webroot relative to the + project root directory, if one exists. + ''; + example = "/web"; }; extraConfig = mkOption { @@ -140,21 +250,41 @@ let type = types.path; default = "/var/lib/drupal/${name}"; defaultText = "/var/lib/drupal/"; - description = "The location of the Drupal site state directory."; + description = '' + The location of the user-managed Drupal site state directory. + This directory will contain the settings and configuration files for + your Drupal instance. It may also contain your files directory if the + `filesDir` option remains unchanged. + + Many of the files in this directory are variable, so they must be located + in a location writeable by users of the webgroup. + ''; }; modulesDir = mkOption { type = types.path; default = "/var/lib/drupal/${name}/modules"; defaultText = "/var/lib/drupal//modules"; - description = "The location for users to install Drupal modules."; + description = '' + The location for users to manually install Drupal modules. + + Note: in most instances, it is preferable to install modules using + composer, or to package them with your source code repository, if + you are using a custom Drupal. + ''; }; themesDir = mkOption { type = types.path; default = "/var/lib/drupal/${name}/themes"; defaultText = "/var/lib/drupal//themes"; - description = "The location for users to install Drupal themes."; + description = '' + The location for users to manually install Drupal themes. + + Note: in most instances, it is preferable to install themes using + composer, or to package them with your source code repository, if + you are using a custom Drupal. + ''; }; phpOptions = mkOption { @@ -357,6 +487,8 @@ in "d '${cfg.themesDir}' 0750 ${user} ${webserver.group} - -" "Z '${cfg.themesDir}' 0750 ${user} ${webserver.group} - -" "d '${cfg.privateFilesDir}' 0750 ${user} ${webserver.group} - -" + "d '${cfg.filesDir}' 0750 ${user} ${webserver.group} - -" + "Z '${cfg.filesDir}' 0750 ${user} ${webserver.group} - -" "d '${cfg.configSyncDir}' 0750 ${user} ${webserver.group} - -" ]) eachSite ); @@ -382,42 +514,15 @@ in User = "root"; RemainAfterExit = true; - ExecStart = writeShellScript "drupal-state-init-${hostName}" '' - set -e - - if [ ! -d "${cfg.stateDir}/sites" ]; then - echo "Preparing sites directory..." - cp -r "${cfg.package}/share/php/${cfg.package.pname}/sites" "${cfg.stateDir}" - fi - - if [ ! -d "${cfg.filesDir}" ]; then - echo "Preparing files directory..." - mkdir -p "${cfg.filesDir}" - chown -R ${user}:${webserver.group} ${cfg.filesDir} - fi - - settings_file="${cfg.stateDir}/sites/default/settings.php" - default_settings="${cfg.package}/share/php/${cfg.package.pname}/sites/default/default.settings.php" - - if [ ! -f "$settings_file" ]; then - echo "Preparing settings.php for ${hostName}..." - cp "$default_settings" "$settings_file" - cat < ${appendSettings hostName} >> "$settings_file" - chmod 644 "$settings_file" - fi - - # Link the NixOS-managed settings file to the state directory. - ln -sf ${drupalSettings hostName cfg} ${cfg.stateDir}/sites/default/settings.nixos-${hostName}.php - - # Set or reset file permissions so that the web user and webserver owns them. - chown -R ${user}:${webserver.group} ${cfg.stateDir} - ''; + ExecStart = getExe (stateDirManage hostName cfg); }; # Rerun this service if certain settings were updated reloadTriggers = [ cfg.extraConfig cfg.privateFilesDir + cfg.filesDir + cfg.stateDir cfg.configSyncDir ]; }) @@ -434,9 +539,9 @@ in enable = true; virtualHosts = mapAttrs (hostName: cfg: { serverName = mkDefault hostName; - root = "${pkg hostName cfg}/share/php/${cfg.package.pname}"; + root = "${pkg hostName cfg}/share/php/${cfg.package.pname}${cfg.webRoot}"; extraConfig = '' - index index.php; + index index.php index.htm index.html; ''; locations = { "~ '\\.php$|^/update\\.php'" = { @@ -515,11 +620,19 @@ in }; "~ ^/sites/.*/files/styles/" = { extraConfig = '' + alias ${cfg.filesDir}/; + try_files $uri @rewrite; + ''; + }; + "^~ /sites/.*/files/" = { + extraConfig = '' + alias ${cfg.filesDir}/; try_files $uri @rewrite; ''; }; "~ ^(/[a-z\\-]+)?/system/files/" = { extraConfig = '' + alias ${cfg.privateFilesDir}/; try_files $uri /index.php?$query_string; ''; }; @@ -535,8 +648,9 @@ in hostName: cfg: (nameValuePair hostName { extraConfig = '' - root * ${pkg hostName cfg}/share/php/${cfg.package.pname} + root * ${pkg hostName cfg}/share/php/${cfg.package.pname}${cfg.webRoot} file_server + root /sites/*/files ${cfg.filesDir} encode zstd gzip php_fastcgi unix/${config.services.phpfpm.pools."drupal-${hostName}".socket} diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index 15a0c3a7383a..8686f0dfec3c 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -492,12 +492,12 @@ def install_bootloader() -> None: config_file += option_from_config('term_margin_gradient', ['style', 'graphicalTerminal', 'marginGradient']) config_file += textwrap.dedent(''' - # NixOS boot entries start here + # @distroName@ boot entries start here ''') for (profile, gens) in profiles: group_name = 'default profile' if profile == 'system' else f"profile '{profile}'" - config_file += f'/+NixOS {group_name}\n' + config_file += f'/+@distroName@ {group_name}\n' isFirst = True @@ -506,7 +506,7 @@ def install_bootloader() -> None: isFirst = False config_file_path = os.path.join(limine_install_dir, 'limine.conf') - config_file += '\n# NixOS boot entries end here\n\n' + config_file += '\n# @distroName@ boot entries end here\n\n' config_file += str(config('extraEntries')) diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix index 52585e1cf02c..e5431023e519 100644 --- a/nixos/modules/system/boot/loader/limine/limine.nix +++ b/nixos/modules/system/boot/loader/limine/limine.nix @@ -432,6 +432,7 @@ in replacements = { python3 = pkgs.python3.withPackages (python-packages: [ python-packages.psutil ]); configPath = limineInstallConfig; + inherit (config.system.nixos) distroName; }; }; }; diff --git a/nixos/modules/system/service/README.md b/nixos/modules/system/service/README.md index 70c08e706577..d2124cbb1ec6 100644 --- a/nixos/modules/system/service/README.md +++ b/nixos/modules/system/service/README.md @@ -43,7 +43,7 @@ Many services implement automatic reloading or reloading on e.g. `SIGUSR1`, but ### Service Manager Integration -- **Portable base**: The `configData` interface is declared in `portable/config-data.nix`, making it available to all service manager implementations. +- **Portable base**: The `configData` interface is declared in `lib/services/config-data.nix`, making it available to all service manager implementations. - **Systemd integration**: The systemd implementation (`systemd/system.nix`) maps `configData` entries to `environment.etc` entries under `/etc/system-services/`. @@ -66,11 +66,11 @@ The modular service infrastructure avoids exposing `pkgs` as a module argument t ### Implementation -- **Portable layer**: Service modules in `portable/` do not receive `pkgs` as a module argument. Any required derivations must be provided by the caller. +- **Portable layer**: Service modules in `lib/services/` do not receive `pkgs` as a module argument. Any required derivations must be provided by the caller. - **Systemd integration**: The `systemd/system.nix` module imports `config-data.nix` as a function, providing `pkgs` in lexical closure: ```nix - (import ../portable/config-data.nix { inherit pkgs; }) + (import lib/services/config-data.nix { inherit pkgs; }) ``` - **Service modules**: diff --git a/nixos/modules/system/service/systemd/system.nix b/nixos/modules/system/service/systemd/system.nix index 3405072089e1..b1ae25b85118 100644 --- a/nixos/modules/system/service/systemd/system.nix +++ b/nixos/modules/system/service/systemd/system.nix @@ -15,7 +15,7 @@ let mapAttrsToList ; - portable-lib = import ../portable/lib.nix { inherit lib; }; + portable-lib = import ../../../../../lib/services/lib.nix { inherit lib; }; dash = before: after: diff --git a/nixos/tests/limine/default.nix b/nixos/tests/limine/default.nix index 6923fb4de62b..fd7a583f09c6 100644 --- a/nixos/tests/limine/default.nix +++ b/nixos/tests/limine/default.nix @@ -8,4 +8,5 @@ secureBoot = runTest ./secure-boot.nix; specialisations = runTest ./specialisations.nix; uefi = runTest ./uefi.nix; + distroName = runTest ./distroName.nix; } diff --git a/nixos/tests/limine/distroName.nix b/nixos/tests/limine/distroName.nix new file mode 100644 index 000000000000..f1f91f98fd49 --- /dev/null +++ b/nixos/tests/limine/distroName.nix @@ -0,0 +1,30 @@ +{ pkgs, ... }: +{ + name = "distroName"; + meta = { + inherit (pkgs.limine.meta) maintainers; + }; + + nodes.machine = + { ... }: + { + virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = true; + + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.limine.enable = true; + boot.loader.limine.efiSupport = true; + boot.loader.timeout = 0; + + system.nixos.distroName = "BestDistroEver"; + }; + + testScript = /* python */ '' + machine.start() + with subtest('Machine boots correctly'): + machine.wait_for_unit('multi-user.target') + + machine.succeed("grep \"BestDistroEver\" /boot/limine/limine.conf") + machine.fail("grep \"NixOS\" /boot/limine/limine.conf") + ''; +} diff --git a/nixos/tests/morph-browser.nix b/nixos/tests/morph-browser.nix index 03d338e96817..46cd662bce30 100644 --- a/nixos/tests/morph-browser.nix +++ b/nixos/tests/morph-browser.nix @@ -6,8 +6,9 @@ let }: makeTest ( { pkgs, lib, ... }: + assert lib.assertMsg withQt6 "`lomiri.morph-browser` has been dropped, cannot test it."; { - name = "morph-browser-${if withQt6 then "qt6" else "qt5"}-standalone"; + name = "morph-browser-qt6-standalone"; meta.maintainers = lib.teams.lomiri.members; nodes.machine = @@ -24,7 +25,7 @@ let services.xserver.enable = true; environment = { - systemPackages = with (if withQt6 then pkgs.lomiri-qt6 else pkgs.lomiri); [ + systemPackages = with pkgs.lomiri-qt6; [ suru-icon-theme morph-browser ]; @@ -76,6 +77,6 @@ let ); in { - qt5 = generic { withQt6 = false; }; + qt5 = throw "`lomiri.morph-browser` has been removed because it relied on the known-vulnerable `libsForQt5.qtwebengine`. For testing the Qt6 version of Morph, please use `nixosTests.morph-browser.qt6` instead."; # Added on 2026-03-31 qt6 = generic { withQt6 = true; }; } diff --git a/nixos/tests/stalwart/stalwart-config.nix b/nixos/tests/stalwart/stalwart-config.nix index 7fcbf8aae41c..399b527ea1d4 100644 --- a/nixos/tests/stalwart/stalwart-config.nix +++ b/nixos/tests/stalwart/stalwart-config.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ lib, ... }: let certs = import ../common/acme/server/snakeoil-certs.nix; @@ -9,6 +9,9 @@ in services.stalwart = { enable = true; + + stateVersion = lib.trivial.release; # Only for the test; please don't do in production + settings = { server.hostname = domain; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index 61893469dedd..6572ca12e2d5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -6,11 +6,11 @@ melpaBuild (finalAttrs: { pname = "ebuild-mode"; - version = "1.81"; + version = "1.82"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${finalAttrs.version}.tar.bz2"; - hash = "sha256-b+59Ec+NOHvFgbFOmnsvGjnq392VR1JCsPx/ORSdffo="; + hash = "sha256-Rb1L++Ln7jGmdIpXTIBg7x64hHAm0b/yJqILKllCNQs="; }; meta = { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 59bff468f7a6..878ffb2064d6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4848,6 +4848,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + duck-nvim = buildVimPlugin { + pname = "duck.nvim"; + version = "1.0.0-unstable-2024-03-07"; + src = fetchFromGitHub { + owner = "tamton-aquib"; + repo = "duck.nvim"; + rev = "d8a6b08af440e5a0e2b3b357e2f78bb1883272cd"; + hash = "sha256-97QSkZHpHLq1XyLNhPz88i9VuWy6ux7ZFNJx/g44K2A="; + }; + meta.homepage = "https://github.com/tamton-aquib/duck.nvim/"; + meta.hydraPlatforms = [ ]; + }; + earthly-vim = buildVimPlugin { pname = "earthly.vim"; version = "0-unstable-2024-04-02"; @@ -5487,6 +5500,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + fluoromachine-nvim = buildVimPlugin { + pname = "fluoromachine.nvim"; + version = "0-unstable-2025-10-21"; + src = fetchFromGitHub { + owner = "maxmx03"; + repo = "fluoromachine.nvim"; + rev = "a279f667168e742df059caf1f1f4daf1de24f4f8"; + hash = "sha256-alZBQYmo9jrsKYTL7dnObaP2op4SMQQRiEZBdhxUZiI="; + }; + meta.homepage = "https://github.com/maxmx03/fluoromachine.nvim/"; + meta.hydraPlatforms = [ ]; + }; + flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; version = "2.2.0-unstable-2026-01-14"; @@ -10980,6 +11006,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + nvim-ansible = buildVimPlugin { + pname = "nvim-ansible"; + version = "0-unstable-2026-02-09"; + src = fetchFromGitHub { + owner = "mfussenegger"; + repo = "nvim-ansible"; + rev = "c7f595d568b588942d4d0c37b5cd6cae3764a148"; + hash = "sha256-Ykp610LPF0tWidHM16UqeaU8sJxcr5OXJdHkjWCYUTU="; + }; + meta.homepage = "https://github.com/mfussenegger/nvim-ansible/"; + meta.hydraPlatforms = [ ]; + }; + nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; version = "0.10.0-unstable-2026-01-30"; @@ -11251,6 +11290,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + nvim-dap-ruby = buildVimPlugin { + pname = "nvim-dap-ruby"; + version = "0-unstable-2025-07-08"; + src = fetchFromGitHub { + owner = "suketa"; + repo = "nvim-dap-ruby"; + rev = "ba36f9905ca9c6d89e5af5467a52fceeb2bbbf6d"; + hash = "sha256-57BBhdrikDEswZe2QW+jHMSgfXIjauc6iDNpWS0YUaU="; + }; + meta.homepage = "https://github.com/suketa/nvim-dap-ruby/"; + meta.hydraPlatforms = [ ]; + }; + nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; version = "4.0.0-unstable-2026-04-03"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix index 071e37831d9f..cfd5c4f3bb1c 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix @@ -8,18 +8,18 @@ gitMinimal, }: let - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; tag = "v${version}"; - hash = "sha256-y8f+bmPkb3M6DzcUkJMxd2woDLoBYslne7aB8A0ejCk="; + hash = "sha256-C1FpyGw0f35NdHvDUGPXxmKdOgw3SpIteK1gAjVy6Ns="; }; blink-fuzzy-lib = rustPlatform.buildRustPackage { inherit version src; pname = "blink-fuzzy-lib"; - cargoHash = "sha256-3o2n4xwNF9Fc3VlPKf3lnvmN7FVus5jQB8gcXXwz50c="; + cargoHash = "sha256-z8koRYVM9mkgKB6rdZAKIfjZfinVUUpYAW0IvPgmjZ4="; nativeBuildInputs = [ gitMinimal ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index f2f6ca228063..a8135333b62e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -371,6 +371,7 @@ https://github.com/dracula/vim/,,dracula-vim https://github.com/Mofiqul/dracula.nvim/,HEAD, https://github.com/stevearc/dressing.nvim/,, https://github.com/Bekaboo/dropbar.nvim/,HEAD, +https://github.com/tamton-aquib/duck.nvim/,HEAD, https://github.com/earthly/earthly.vim/,HEAD, https://github.com/GustavEikaas/easy-dotnet.nvim/,HEAD, https://github.com/JellyApple102/easyread.nvim/,HEAD, @@ -420,6 +421,7 @@ https://github.com/liangxianzhe/floating-input.nvim/,HEAD, https://github.com/floobits/floobits-neovim/,, https://github.com/0xstepit/flow.nvim/,HEAD, https://github.com/projectfluent/fluent.vim/,HEAD, +https://github.com/maxmx03/fluoromachine.nvim/,HEAD, https://github.com/nvim-flutter/flutter-tools.nvim/,HEAD, https://github.com/nvim-focus/focus.nvim/,HEAD, https://github.com/anuvyklack/fold-preview.nvim/,HEAD, @@ -841,6 +843,7 @@ https://github.com/nacro90/numb.nvim/,, https://github.com/nvchad/nvchad/,HEAD, https://github.com/nvchad/ui/,HEAD,nvchad-ui https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,, +https://github.com/mfussenegger/nvim-ansible/,HEAD, https://github.com/AckslD/nvim-FeMaco.lua/,HEAD, https://github.com/nathanmsmith/nvim-ale-diagnostic/,, https://github.com/windwp/nvim-autopairs/,, @@ -864,6 +867,7 @@ https://github.com/julianolf/nvim-dap-lldb/,HEAD, https://codeberg.org/mfussenegger/nvim-dap-python/,HEAD, https://github.com/rinx/nvim-dap-rego/,HEAD, https://github.com/jonboh/nvim-dap-rr/,HEAD, +https://github.com/suketa/nvim-dap-ruby/,HEAD, https://github.com/rcarriga/nvim-dap-ui/,, https://github.com/igorlfs/nvim-dap-view/,HEAD, https://github.com/theHamsta/nvim-dap-virtual-text/,, diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index 3ae5e9e50fd1..eb56818540eb 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "29.0.3"; - hash = "sha256-+MNm0IYbvq2OdqOyhXwfMAhzp/V4jR0Qpf461KIP6Ho="; + version = "30.0.4"; + hash = "sha256-5y7LTkiR7dnSHbL80pqsTb57rnLyEbIrHT4xzseVj84="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f09e11478cce..3c7ea7eece08 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1270,8 +1270,8 @@ let mktplcRef = { publisher = "denoland"; name = "vscode-deno"; - version = "3.51.0"; - hash = "sha256-iEwguP0qL8WHIMuJDPPPUp5ka9S4g7XHOl0i2++jgi8="; + version = "3.52.0"; + hash = "sha256-0Qkruo7Eh86JRm58G7XhyceUpCJDmhoYaPjUKJQjFiU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog"; @@ -1729,8 +1729,8 @@ let mktplcRef = { name = "foam-vscode"; publisher = "foam"; - version = "0.33.0"; - hash = "sha256-xeZp75qnxnW2LNtRz0IUzrBjBe5Po3VHGTta+6VCLvQ="; + version = "0.35.0"; + hash = "sha256-5tjSXwjiNMC8NlGAa0NQ5uWw+wTEPePL1GgRhnBAtUo="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; @@ -3552,8 +3552,8 @@ let mktplcRef = { name = "vscode-just-syntax"; publisher = "nefrob"; - version = "0.10.0"; - hash = "sha256-dBNftT+yhyfXutDtRvihwl1WrgFENR61eFh9ONqjjq0="; + version = "0.10.1"; + hash = "sha256-s/JxIALrYb/dew1CdvvM1UmnewyRcJPB/ETJ/Ai2QJA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog"; @@ -3766,8 +3766,8 @@ let mktplcRef = { name = "prisma"; publisher = "Prisma"; - version = "31.6.0"; - hash = "sha256-jbcAB3IeUrdWTVV+8ssMumHd5aeXJH6tivWGezJ7amU="; + version = "31.8.0"; + hash = "sha256-xSkT6VlRrC36jnuB16V+eDozDutrv2ksqxatU/KIgS0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; @@ -4497,8 +4497,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "109.14.2"; - hash = "sha256-yY1iVbTz4Yq6ZgNVaSpukxnKLlg2XccEPWzuGoGMkmM="; + version = "109.15.0"; + hash = "sha256-/1we+6X3l7MCx96ELz7wg6oDDAcYCJBt7XJ4X0ihwx0="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; @@ -5221,8 +5221,8 @@ let mktplcRef = { name = "gitblame"; publisher = "waderyan"; - version = "13.0.0"; - sha256 = "sha256-I6b4GDM8Ogf+ZH2lD2g4fUkQY9ktuO1xqxfSH6vAMVk="; + version = "13.0.1"; + sha256 = "sha256-N0UgWdwGj3NW4x0Ea+jKL5Jvp0YE+HfK5tkUjmynPuY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix b/pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix index 798d76ebe0bf..57db46721887 100644 --- a/pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix +++ b/pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jjk"; publisher = "jjk"; - version = "0.9.3"; - hash = "sha256-wkHMZTLi3dDV6JQdfJ4hI5uwGAlCmKwg+v8Z9RMU1wU="; + version = "0.10.0"; + hash = "sha256-mzsujU3fil3z3yDxpecaOpbXX1K8oh+6dfx/rbOwFYs="; }; meta = { changelog = "https://github.com/keanemind/jjk/releases"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index db6a18a75076..83072b077e25 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2026.1.1"; - hash = "sha256-82zIUJBgjbBW0R6ExBLXGYYtYxm1vC7bz/3BvP3IIXA="; + version = "2026.2.1"; + hash = "sha256-u1n4OqjBCAaRZe8Mu2vzYfZE6tpJQSQ3gSInJsNSSnQ="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix index 41fcfb4e7c24..d734acc1ea4f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.5959"; - hash = "sha256-MibP2zqTwlXXVsXQOSuoi5SO8BskJC/AihrhJFg8tac="; + version = "1.1.119"; + hash = "sha256-s7GCJvlMCcZ+OOwdSh82moU7BlQLz1hVPMwZ9MYtahM="; }; postPatch = '' diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 3ae1fb6aec62..d5229a8796b3 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "tinymist"; publisher = "myriad-dreamin"; - version = "0.14.14"; - hash = "sha256-CfYlhglaSe36tdCCX6u3U1b/KqbQR6foO8GNn6BbzFg="; + version = "0.14.16"; + hash = "sha256-R4tlQgtQaXIT6qiBg1RqQB0Usnsj0Ijs2Bhn2J1CQq4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index ad8205f3b5de..b1fd9325abc7 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.75.0"; - hash = "sha256-ckOvU9aWSASUmOqJe+4u4+E3C7Nf2a6tFkO+P4MLt9k="; + version = "3.77.0"; + hash = "sha256-xJDHPmqPRAc9hOD8tIat4isTqLYpN1mOzgw/f+nt1GI="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix b/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix index 18c29bb6dd32..9f003a618142 100644 --- a/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "explorer"; publisher = "vitest"; - version = "1.50.0"; - hash = "sha256-Fl9HtEavM1Cyxf5IMBN7/12s+JGF3MfLRFeut2pEp+s="; + version = "1.50.1"; + hash = "sha256-qMUslEBzYK7nH9k+UBygEt+PjOHwDg/hLvfmbYR++tc="; }; meta = { changelog = "https://github.com/vitest-dev/vscode/releases"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-supergrafx.nix b/pkgs/applications/emulators/libretro/cores/beetle-supergrafx.nix index 3f0597c4f6ca..8706008055ad 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-supergrafx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-supergrafx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-supergrafx"; - version = "0-unstable-2024-11-15"; + version = "0-unstable-2026-03-31"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-supergrafx-libretro"; - rev = "a776133c34ae8da5daf7d9ccb43e3e292e2b07b0"; - hash = "sha256-FemWW4EPQCwhrS7YEytf6fEeimdTTfzaDdyRNDIBQyk="; + rev = "3442f442b112ccf869791600661438804f1dfc51"; + hash = "sha256-5MJ9IxIL2PX0vxZTSCcAHjxacK5BQZ+Dj5tSxiW+2x8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/gw.nix b/pkgs/applications/emulators/libretro/cores/gw.nix index 274bb2dfced4..1dcb580827a9 100644 --- a/pkgs/applications/emulators/libretro/cores/gw.nix +++ b/pkgs/applications/emulators/libretro/cores/gw.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gw"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2026-03-31"; src = fetchFromGitHub { owner = "libretro"; repo = "gw-libretro"; - rev = "435e5cfd4bf6aea03a84259e9b8dba3daf3ff5bd"; - hash = "sha256-csaOqrZMSk9xZUlGAKgypV38q9XE7K6hLLdBC10g9Ao="; + rev = "f8750d0f37db5f1f779437710f2653e8b1651ded"; + hash = "sha256-nhCklogKXqjIsRFFKPk6SoIA+K7oCl+15dWdtvvcznE="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/handy.nix b/pkgs/applications/emulators/libretro/cores/handy.nix index 4d9f9ec997f7..6d6a3efae9d9 100644 --- a/pkgs/applications/emulators/libretro/cores/handy.nix +++ b/pkgs/applications/emulators/libretro/cores/handy.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "handy"; - version = "0-unstable-2025-06-16"; + version = "0-unstable-2026-03-31"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-handy"; - rev = "fca239207e9c111da3e85d2faf0b1b9d7524e498"; - hash = "sha256-8RpRhGgW5JWY6TZa9CEaXF66WpbjcjprorVqu+FGYu0="; + rev = "ae216ac46e15b0f7af20d0d42042d7db1a28ec96"; + hash = "sha256-KKYdAEzFnUCbzanB8P+ME2pEdz90eAzAE79pTOFSHZo="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003.nix b/pkgs/applications/emulators/libretro/cores/mame2003.nix index 84c308dfde5f..d947317539dd 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003"; - version = "0-unstable-2025-12-13"; + version = "0-unstable-2026-04-02"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-libretro"; - rev = "6c32fa9fc005d7e924909c6ff4684da9abb00ceb"; - hash = "sha256-NPPwLruxafBUwKYy+DuLrTZa5QlbneWQSvCRN6ispdM="; + rev = "c651c573655218428d7c524f611f7d62d13861a1"; + hash = "sha256-7tAmLBClwM6gMILiWN3cIl452EX0JVFtTSEdxPoRs/4="; }; # Fix build with GCC 14 diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index 7ed25bc37ac4..397e75376f98 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2026-03-27"; + version = "0-unstable-2026-03-31"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "3e69145712550dfa44f3f1a92a5efe64774db1f9"; - hash = "sha256-iRtL6VdQcDOAJ2b/YBjlLX+A24BwnBkNiNo7aYAzVdU="; + rev = "030c7a9e6b1a22bf8ee1db40f4d4b7402095bce1"; + hash = "sha256-qy9S6/ThIA4YtO6J5R4RdPq4BvHDmwq7Y063gXXTuiQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix b/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix index 4ec47473a9fd..af41c0b0ef4d 100644 --- a/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix +++ b/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "2048"; - version = "0-unstable-2025-12-13"; + version = "0-unstable-2026-03-31"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-2048"; - rev = "e70c3f82d2b861c64943aaff7fcc29a63013997d"; - hash = "sha256-ZNJUaXIQi9VnmmCikhCtXfhbTZ7rfJ1wm/582gaZCmk="; + rev = "1892de39d80ec37e1fac79729cd91917b21f1349"; + hash = "sha256-lNcDdkiWiXhvwwpzMnceTDY+mJl1JTZfGCY+WIOvrP8="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/vice.nix b/pkgs/applications/emulators/libretro/cores/vice.nix index ccf7ca01f7bc..fef84e62f32f 100644 --- a/pkgs/applications/emulators/libretro/cores/vice.nix +++ b/pkgs/applications/emulators/libretro/cores/vice.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "vice-${type}"; - version = "0-unstable-2026-03-09"; + version = "0-unstable-2026-04-02"; src = fetchFromGitHub { owner = "libretro"; repo = "vice-libretro"; - rev = "8818c3a39146b9a26df23a1e4880b4420f93a255"; - hash = "sha256-Nw+F2hn97F1rKB2UOh/MMNrqmNj87XzRPgEptYoTe7o="; + rev = "8cf6a20017b1f331d5d3ac63b49a5fa75440073a"; + hash = "sha256-KnqSx/wv5YTV4MnjEsgIIMnus3m5Rat4go8GzPNUZHs="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c04de3a97543..ed701fcaf7d4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "bpg_proxmox": { - "hash": "sha256-vPxAIFCOvVveDJQQR/2lQFced/CPyM5f/vujhMV+myQ=", + "hash": "sha256-1bNiIhF5AyvpQZYIOu9YHa+ACx/mE+1MRUdK8AcHuv0=", "homepage": "https://registry.terraform.io/providers/bpg/proxmox", "owner": "bpg", "repo": "terraform-provider-proxmox", - "rev": "v0.99.0", + "rev": "v0.100.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-bTFGdrWN2P7z9+IQhftJYlne9NCrVMPDyx0eysZ8y44=" + "vendorHash": "sha256-l0acl8PpDN/o2OHVRirswy297L/VM8MC85OrsPbyo0s=" }, "brightbox_brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", @@ -616,13 +616,13 @@ "vendorHash": "sha256-IDsGPzNsVPIHWEyhfIkaNaPOrhnk/4XI1UsrIPwcq/M=" }, "hashicorp_local": { - "hash": "sha256-DMYj2hPASzMDtVZNWcUyzMlGfTw1J/bp19tZUl3bjic=", + "hash": "sha256-VYzy+/BniYU++pw9koLWotEJzsIzOjpLX4aRSRupV58=", "homepage": "https://registry.terraform.io/providers/hashicorp/local", "owner": "hashicorp", "repo": "terraform-provider-local", - "rev": "v2.7.0", + "rev": "v2.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-UOT5dxWa3PAzEHKXKYFadh9KWJ2ZKfN5uyFB3tyvHAY=" + "vendorHash": "sha256-3qnfKHionSfT2efCl0TcHWFFgrh1bPE6Maqg4MCRq0g=" }, "hashicorp_nomad": { "hash": "sha256-lTO1ZLB0N+WLdMDegIP1NcAC++/vsBV7EB5BDxj588I=", @@ -824,13 +824,13 @@ "vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU=" }, "kreuzwerker_docker": { - "hash": "sha256-ywVrqqwgYCOZO7Cey3gM9w+EdSQY+vJ/djfJF0X5xyc=", + "hash": "sha256-fektxIObUvQSHeu1MJL3lirF+oUq8+CheaxcPDoQB+k=", "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker", "owner": "kreuzwerker", "repo": "terraform-provider-docker", - "rev": "v3.9.0", + "rev": "v4.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Cxz0mDLOgUAnfP1kCP3DE28T1LwLsABAipyVXCngpYE=" + "vendorHash": "sha256-wqHArSldDyAxFX0Hmcl6FRDzfRuZGssl1h4GjN/0mgQ=" }, "launchdarkly_launchdarkly": { "hash": "sha256-lcemT7kpBlZX35Sb+ujHzSdakBQkUSmYAxTVsJkRW6A=", @@ -842,13 +842,13 @@ "vendorHash": "sha256-BxMhu2gcRuOlYWgx5ZOUBGdfB28+87SG1T/KAPDyei8=" }, "linode_linode": { - "hash": "sha256-i2zAB/3cDOex7j2WciKlRlYfOyhkixEHYbTkoCG1u9s=", + "hash": "sha256-nrNyOcaC5wKJijfubBBuEBKA6dT6Ajo33MR4P80j29k=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v3.10.0", + "rev": "v3.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HzBj7TSjiv/Ov10KOt5V4oQaKK7CKjBjxpSrhmOl1lQ=" + "vendorHash": "sha256-91mdCcM5BSNdgW1/mMbuNtAxc4TH1abW8xbRcbHAnNc=" }, "loafoe_htpasswd": { "hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=", @@ -1166,22 +1166,22 @@ "vendorHash": "sha256-InCRL4k6v0avmnNja+b6Ozg5+injxa8EmrRHIWrq4Ag=" }, "sap_btp": { - "hash": "sha256-v6zo4JPcXCzjVLEk3ByPEXDaL450MUqcaMZioapsId0=", + "hash": "sha256-3UuetY6pIfZ2glG9tZOaF/Xe/MC4Mq0iVUdi8fNaEsQ=", "homepage": "https://registry.terraform.io/providers/SAP/btp", "owner": "SAP", "repo": "terraform-provider-btp", - "rev": "v1.20.1", + "rev": "v1.21.3", "spdx": "Apache-2.0", - "vendorHash": "sha256-QO+qM7tv75KbpJ08LDhaUCLtYogQ8dhKM3wNuR+aAhQ=" + "vendorHash": "sha256-1I2HQwFkbCawi11MJQzhvjvzjUvSzietRV9yCc6JtmI=" }, "scaleway_scaleway": { - "hash": "sha256-Flh/bJSCjaDvw6cVJC6LDcCs9LPXDKX/oXLJibZxTMc=", + "hash": "sha256-alsM14F6NbpkO1RVDgHPoIUoakv4PHeObVdwQMwADZA=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.70.1", + "rev": "v2.71.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-FLap0ZFuYD6RXNQaVLScOI5w+Wfba3utyP2/gZ9fGWo=" + "vendorHash": "sha256-a6A30IJlS6a6MjWrR/GWx7XCvilvTu9bQurCXWDLjV4=" }, "scottwinkler_shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index dfdbcd6d1042..4873f923a67e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "149.0"; + version = "149.0.1"; sources = [ { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/af/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/af/thunderbird-149.0.1.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "3246a0f630d4f50128e68ff2cd7ee5d55ddca66a26a26eebf7ee264a892009cd"; + sha256 = "0a9f90443daf2c3da5f2929d3fe934d407798c027238b26944c8a4cc6fda6e14"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/ar/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/ar/thunderbird-149.0.1.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f79f1e1e1eff1b19ce4326b352eb922626d2632906e5581ca476f5f9fb52634f"; + sha256 = "3d2b10e37e75a5932a3abf4e02663a21fae2cb0fc0c36422a05d9055c9670627"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/ast/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/ast/thunderbird-149.0.1.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "812ad0f921e48256dff6555ced6cd1c391386a3cc53cd3743495c5f66a56528a"; + sha256 = "ff1e2de423634ac51e620e1bc1cf0bd6cb0cafcec44095c6d35c80feb5853461"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/be/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/be/thunderbird-149.0.1.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "fcf1a2aaa6e28a1f32aae6c3ce321fe4663974c329539cfe0de92435131ed2c2"; + sha256 = "bbd33fe1278a519f4f21293904a84e3fa570ef7ba0fe71bf1501d12ca52a69b4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/bg/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/bg/thunderbird-149.0.1.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f2969805276f59d4ccce939201258bb2f359ceaaa31942169b0a3f4a8cee3701"; + sha256 = "def17682db1186ac7e01f15fb7cc3a7ab3eedf6c30ee4ee422bf16b824ba7715"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/br/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/br/thunderbird-149.0.1.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ecfc04935adc30e319e57eb68466e8db32bedabe40e5fb0503b56807617d7e29"; + sha256 = "28b4f346f82543fd90e41a28e445dbf3af1ab17341f8d4b77ae7e55d356ebdbb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/ca/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/ca/thunderbird-149.0.1.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f332597a0b32a05899c26d0fcf9769fe86f3852b0a04a8196159b2ea1b936d7b"; + sha256 = "9627287a3b294a5b2e64a588ce0c4240d62e1a20c1a7edc26386f394de0fd848"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/cak/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/cak/thunderbird-149.0.1.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "556b7fb8de01fe754bf382f3e2ea294c41f3959a6a3c982418a0a2279c9c8ef4"; + sha256 = "b3148316d030da9db54eed283ed7a47a55cb09b32de831fd098cd6e03bf320da"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/cs/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/cs/thunderbird-149.0.1.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4b6bbfa49c3222e9fd095d75b8245f90b9139e6a3f8a5fb20eb51d475f203be7"; + sha256 = "4acb9096f7c2d1cece32c7cb26665864d4ef8016d6899e545b695dd93a826325"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/cy/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/cy/thunderbird-149.0.1.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f95446c9b9c22a53fc1990f174daf7e199aa0a44b5d00ffc652a3418cb9ce54a"; + sha256 = "e3ead2717defdb9bf2e9b0c6de196afc63ddd2de59691d038ed03d4222a26bc7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/da/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/da/thunderbird-149.0.1.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "31cacd5a3266dbb648b5d061093f9042f5a501a922a9ceecf694c9d34e8d76f2"; + sha256 = "059a4c9058670701a141b99091f988c55eb0f00bfc78594fcfe4a0c255df4f18"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/de/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/de/thunderbird-149.0.1.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "8e068fe00f50d6fb41f5152c9e97d6f472b4f812833be864756d8197e49fa1d6"; + sha256 = "fa54068134f79d7f78002e80fa3e0c966cccfc169d665affe1280b6a5470f832"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/dsb/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/dsb/thunderbird-149.0.1.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "94f7bf4ef8a0688d4f1371377322c3d854db3b6ded5b6422633dc2f71c951986"; + sha256 = "84743b1fd5fac879293cd6d9a6f3c9c028d1fc8700450a184af0b6df2c085178"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/el/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/el/thunderbird-149.0.1.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "2af892049a0a3087138499de03154bae9d036c0346eae336cfe2f472e6fb4cf9"; + sha256 = "6639260cef96b3ccc1726ace2bd96311cfbb6d07ef57857f71edd624cee6b90a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/en-CA/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/en-CA/thunderbird-149.0.1.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "a0ac89d32739f8868333b27715d5da030a74d05738c8f5219af3bf5ee353abe5"; + sha256 = "8fc2b6adaeca061c2eecc199291571da159ef52dddebfba07061b005fa7ecc00"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/en-GB/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/en-GB/thunderbird-149.0.1.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a0f383c0f105c749cb774ec47d18efb9461351e53280658d3f9d0e80371bc3d7"; + sha256 = "93442db258232039bca57db50e4bc9b23db4b37bdf072e41eefe1dfc8d1c78fe"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/en-US/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/en-US/thunderbird-149.0.1.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "bca0cc90b1f890d78cd60ad773e6661bcc84d5f18f77c3c28f406b2ae5c20c28"; + sha256 = "a81acae794a09f872ee7e8489d049ee1cbdf3a9bc8cc70d22f3d27c1dc58bdc0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/es-AR/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/es-AR/thunderbird-149.0.1.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "c26814b848abe7e76a4da915809c315f1dd95b4da6296b6c0213765b541ba86b"; + sha256 = "036302e174eb7c50173e40a78d7a4775bf32786b3e01f51687182be100f89c71"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/es-ES/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/es-ES/thunderbird-149.0.1.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "979641087aa2b965efb1913f6654e430b7310cf57996c321f2dde5ddbe142058"; + sha256 = "ef87ac48984c923adf47afef03b48308eecbde31d0d574c91c966fbe58f41d1f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/es-MX/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/es-MX/thunderbird-149.0.1.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "36f0b277ff3e9f8640f6a591dc078fd0a474ba6bce6971bc5cd7f72e0b047905"; + sha256 = "7586bbf55a37441b18624f38aff17f724783e03e4faac1511dd760189ddfb743"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/et/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/et/thunderbird-149.0.1.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "1d52fc86d51181a8ec68c6cf27b41a7632036b42bad19136ff108a1d0980270a"; + sha256 = "9e36f6cbbb3566b41bf7c74f2b6a897bf183b35b72bd711ede7fd9dce4f7553c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/eu/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/eu/thunderbird-149.0.1.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "c844f685302abfe3d2035e901bfd40b8524e5df7c59afb83550a27c8fca26738"; + sha256 = "4c6f70f45eeacf8dc4bfac00e0f9dd41c3390bf48a03858f22c8521850301c81"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/fi/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/fi/thunderbird-149.0.1.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b226c753251e13fe879a8ca29cc46cf26703c5a1c86b4222f60f0473f335b9e1"; + sha256 = "bbb48991fec96e0d586544f37a1c3768994ad8d0e95bd80670e2c24d401f2b4e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/fr/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/fr/thunderbird-149.0.1.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "a04159704eab32796f154db36694e6f365b9aa4314b49528969e499b55689353"; + sha256 = "187605b7cd027a789c82b5fb3ec4be78e6f4852150fc6830cec2bbba2cbc8fdf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/fy-NL/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/fy-NL/thunderbird-149.0.1.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "98855fdbb5d935920c1b2b163af79741850795ac45fbec9ba6c9456e81479181"; + sha256 = "a1b37f218e77852149261d5807f532cff7ab4103a43304505268d683d2011f55"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/ga-IE/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/ga-IE/thunderbird-149.0.1.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "2f61a7de29089a13ddaf12ab736f9b0aee3c26b6a695cac8c9dede066b0e4129"; + sha256 = "892e670a51b9febb1b1ffe563b8c20ed74fbb61da971cdf415c819094d38101e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/gd/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/gd/thunderbird-149.0.1.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "6fe4322c64f4f436daaaf15c722ae94f99e66f3c26aaff7fd3c624f2a9c252d4"; + sha256 = "a6d1fd011d74d77fc346827bc893d24c57146778d0ef4dcbb2f35113d717e59e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/gl/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/gl/thunderbird-149.0.1.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f0d072a2e07c11ce866e49ad40beb53853a0da11a1b61129fc9b37294c21e25e"; + sha256 = "ef26c0207512d4b099316129239c894dfe36ff44852d987f61bd2a8101b91ce8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/he/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/he/thunderbird-149.0.1.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "610a8f4af4c4f86111d46463a69eb2fd47e5ac36d05c02a570fcef0fe3861c4c"; + sha256 = "c3ec3efdae918ca2eb749d3d92df40bb46bb944eeb3a31eaa3e04587095073fd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/hr/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/hr/thunderbird-149.0.1.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "df0eeaabf33082adc62638704b1040931702ad1266d1f81b0a6f1bf677ee7a04"; + sha256 = "099bf9449f55881f5bbe244b9b5bf5770806b526c8aac3a54edf86ca652b773b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/hsb/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/hsb/thunderbird-149.0.1.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "4d7e948319a921b02ebb3dd8f517b30caacb37e9740c4c602d2222226c2dbb36"; + sha256 = "3323a0e0aab4c1e91c436a69c6ee1fa5f73e2c796004d83df043d2bd14113016"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/hu/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/hu/thunderbird-149.0.1.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "6e4fda6fbf02ada0bdd8a9f3ced0d0f6136114d8601d90d9b975d4173d34a3be"; + sha256 = "3cda88363f6e6d63806374dd93dcf043fefdb9f32427f915babfe5547fc37684"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/hy-AM/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/hy-AM/thunderbird-149.0.1.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0e1c0e76f7baeb1c307932531ee956a7da907a61a774087f6d13afc8f3a01a58"; + sha256 = "dd0e51867226c82b15043a82046cd6932e8d0b9eab048f0d96649ae5c75ea7da"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/id/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/id/thunderbird-149.0.1.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ce070010af340815c6b78f9e5189443898df12931a682004e98549734fd576fc"; + sha256 = "7a4e097fbe42f8146b5c61a4f4599f7e5cc89a9fdb4b0f4d742059a793a0ec3a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/is/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/is/thunderbird-149.0.1.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "16c721d37b7286baf103df3ae9a6f3d35a92d33ccf37f1e42a65a44026680464"; + sha256 = "7ef509f310fe24cb98099e8f994cdadd338eb47140f042c79a7d094869cd26f8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/it/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/it/thunderbird-149.0.1.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "98078383015bc0bebc7febd9c592a91a7ccf0bd7e3d87aaa78cb290023712466"; + sha256 = "1e382c17c8946c96bde245c08d4c0c654fbca8f6e89d36c726464c088195d9eb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/ja/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/ja/thunderbird-149.0.1.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "63918955efc9553aaa25189468853a8158c93917a58cd4b7364d9d333516afc9"; + sha256 = "854ccb9f917f69aeb532cc857c0dcdac8cd8f65b79e61a00a556d7212da04047"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/ka/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/ka/thunderbird-149.0.1.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d4653731a45456ed194c854199d60d4ce037b4e522d3c04c9e6ed190473fce54"; + sha256 = "b26b2651ef994856d64fa5e16c32a578ade087671b031fcbcff7c008c3ad19f3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/kab/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/kab/thunderbird-149.0.1.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9c80947375f55fc724e33dc471b112af00b9849b032223f50626e0b54bec1166"; + sha256 = "63258a709a058bf83219d9163e6ecd386fe14f2c197408f7cbf88b95343d9778"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/kk/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/kk/thunderbird-149.0.1.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "2bc819c3aa37b92611c4db5d5615b0e8b6aaec159b6829adacf7aaa119bc50c5"; + sha256 = "190af3c8668a2de7dd37056a6164e0012c5486b26824c87b0172f502f9aeed02"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/ko/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/ko/thunderbird-149.0.1.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "85b7f23298623fd0b40f7ecb7a792708a38f3b87ac34ba3d01efadaf83a6e7a8"; + sha256 = "d22d7e11c2ad32377779475a03ff07f89c9658fbb63bd8bf62d0a5c272c96515"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/lt/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/lt/thunderbird-149.0.1.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a499d1a8fddb7916a49b8a19a35c5320950a39777fdfab69ffd8ccbf0505d505"; + sha256 = "fa7843e7aae3653203017c59029baf87c60545763324d965e1d2e0ca0c4b0ec0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/lv/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/lv/thunderbird-149.0.1.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "02a7b0d41c538f1ee8c1a8343d80380ca3d1517561a6ae0ae220c4e71f77ff6f"; + sha256 = "166e11c7406fe2893605c81aed1ec2d61d82f6d09a6b8c3422f1ddc75d26713d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/ms/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/ms/thunderbird-149.0.1.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "07d1df6488942c0d62c07760c0c9ac0dae1e4fa7b1153b1a69df30f0ca822a4b"; + sha256 = "bddeff79f85eeb80be40c42af2c177ce4b49a28d3d2c39ba2daf8d8fb86cf330"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/nb-NO/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/nb-NO/thunderbird-149.0.1.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "df2e2eceae6fac32bbabafeda60f0acbd7317b2fb1f9ec00fcf373fa247b7ee8"; + sha256 = "0cc972916ae7b5ac50e319254e1c3c2277737b136d26935ad9811dc4b86b5df8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/nl/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/nl/thunderbird-149.0.1.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "c4f4060982ceab9994e2bbc77fc4b03975cb75449317059fda62f64b55e70598"; + sha256 = "c23ba66e38d03c08b5754bcb8f3cbbcaee1f3a8caa5517f8a0fa8fb509927f83"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/nn-NO/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/nn-NO/thunderbird-149.0.1.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "a1c99cde808230d77c527625070837b7a96c9f9bb4a20d5d06e4266ab608ac20"; + sha256 = "a399ae19a5d68765ba3d8d8b3ce7a670de3b36fc04df857349b0fef3a3fa7a18"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/pa-IN/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/pa-IN/thunderbird-149.0.1.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5ca316387c1df9cc6e8cda49339401be640b13622e96febb980602d65e332134"; + sha256 = "6d21ffac3d20d4a2f373692c65017401ad888fd6c6b23989ee88a603798f0818"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/pl/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/pl/thunderbird-149.0.1.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "f7eb69e85ea239cb87caa84a7a48c9c66b376250025cae0b6fa7cf3ab944e41e"; + sha256 = "f4f729916e8736531a268fd483ef72f66d8b61413e9f4c6a8f7b2270936887e6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/pt-BR/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/pt-BR/thunderbird-149.0.1.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "a64753229a196794e0a7dd03283977856df9da4563d72cc45bf3e32000fde031"; + sha256 = "e4f0c47c855441c597d64c59eaaefe9b3daeb9f1ef3ca8c87706acd40faa752e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/pt-PT/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/pt-PT/thunderbird-149.0.1.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "076a63475765e649a4c0c44ef25c12e005af61c3444d171d21ee24e2d8433d70"; + sha256 = "d44af23c42267e964dbd09b05c01a7523ec6816645b292bcc959c8f1963895fa"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/rm/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/rm/thunderbird-149.0.1.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "406f157b858b449aad135f94138f2e17078340246bdd2f68242643108322f744"; + sha256 = "8b05b986a2881a6859c3a1a6de16e2cafbbf8b726e14e36fdfbe3469f11bba53"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/ro/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/ro/thunderbird-149.0.1.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "23cd4eb1e16815673771063218fb43f6f24e05d01f66f04188d1e9b607c2c84d"; + sha256 = "760f68dabe69ab6e3d26e62b04437eac50cae87e0b854998aa2bea49fd61ab82"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/ru/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/ru/thunderbird-149.0.1.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "b22a8c770f0cac8223706855c2154c6d84a38bad0b461261e711ea0bf4be83bc"; + sha256 = "84fc6790e94af25c64f872a20b625e79352427efe8c97062f851613f620a06e7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/sk/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/sk/thunderbird-149.0.1.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e893c35f9014665177d66e87c121cb8407dc0d3f43b14c7f48fb21857e4bab95"; + sha256 = "7ecaab450788b7bbe38371d9f5604297e8917a61445046dbf30734aa0e88da1c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/sl/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/sl/thunderbird-149.0.1.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "231f8600f21b9a8ba0775e9f817004589e8ed3d21bc26f05068e5ad60af0aaea"; + sha256 = "80e8f3c7b978ea3bd286c1fb86b2cda4ff0707302d7eb611db5c8b7b11ca1466"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/sq/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/sq/thunderbird-149.0.1.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "d4760037f0945c820d85cdc80e9ca1929272af31ab9c6880cdf6567ed1554c38"; + sha256 = "d64bf65ba03bb108af51f8cda0fa33c202b4605b65e624f92b7688ae828ca6b1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/sr/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/sr/thunderbird-149.0.1.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "e2a01ef0a9520ad748b3864eff073834169c7eb86cd22d092e0104b454c758c2"; + sha256 = "78ad0aa37708f4bd9a3a9bf37bb724b706c93f43209eae00758a2ba3986f2434"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/sv-SE/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/sv-SE/thunderbird-149.0.1.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "0fc2f56ef4bfda92928e3bcd2f9eebcc253c0db9b609ef8a8aa2aa4b3e3f5458"; + sha256 = "947f2b8b8acf14a611dedc36942ac394ce0a57fef869af43ad9e85e279a4c53d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/th/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/th/thunderbird-149.0.1.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1e815f4a487efefe422e2736a141f45b60c96924ceb155d86e41fc6a4024d8d2"; + sha256 = "8f36e5bf2e64f7f786d4aeaf5d358cdcef01fa26d1799637f31babe48d6714d7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/tr/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/tr/thunderbird-149.0.1.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "759ba29aabb88c61466270cdc4d331aa47ed19a8dbdeb957aa921c3f603e8553"; + sha256 = "e4acea1c47f96d43c887b8beaf3925cc742f7a7742c7b110242c4b7cdb9dc4f1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/uk/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/uk/thunderbird-149.0.1.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "556ba9757d114596c0ce6b4861a2ac500252b00d14199d4289a3be3b1267b78d"; + sha256 = "398cef3923443f76181a273fe86a753b4ccb06d89a6a70ab5611faca1a310191"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/uz/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/uz/thunderbird-149.0.1.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a383ed2c7eb638bb5b13f82674450a445d2a0b549669319023cc8dcfc63ba14f"; + sha256 = "87212f8e6bba4c13b84d55a54ee571f2823aa88f2b13f0497e6732bf985a7af0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/vi/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/vi/thunderbird-149.0.1.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "618fddc78a894035b99385958fec9193c0010ed1e6a90c159fc711abc90cc31a"; + sha256 = "989ff59ca55fbd5b5e4fbfa174854aa7eeb036b9673d9d638b071199526577d2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/zh-CN/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/zh-CN/thunderbird-149.0.1.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "7542d5fd05f6e2a2b207464605105dd837e27e8bf48e5ef9638d2b21432a3472"; + sha256 = "584ceea7ae99284040fea222d7856d60297b48793cfc5171ce65b818f32b8194"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/linux-x86_64/zh-TW/thunderbird-149.0.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/linux-x86_64/zh-TW/thunderbird-149.0.1.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "904c3862372eb96a4039df83e889e15c952bd2741a120bb26008cf7664d09b5f"; + sha256 = "5f8d0b7e67fc95e7a8c38a8bef2e1b65e86b93ad644d8b60f657744bd9b914f8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/af/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/af/Thunderbird%20149.0.1.dmg"; locale = "af"; arch = "mac"; - sha256 = "281b285d438a942e4ede9761ee2c934e68510656e4977b03c731757ea010d345"; + sha256 = "b2a01ff64030347cf6394676f77ff2de3a5de4fab37d1440b09e9d48e8c3444f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/ar/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/ar/Thunderbird%20149.0.1.dmg"; locale = "ar"; arch = "mac"; - sha256 = "963d4d39d572c997f362d4796cebe00d3fda33381ed3da659542cfcd7b640c71"; + sha256 = "fd3eb6e423b9f20cda0dda7b65e29676f58d287308a85fd1fdd8eb380f149e84"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/ast/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/ast/Thunderbird%20149.0.1.dmg"; locale = "ast"; arch = "mac"; - sha256 = "e3f78ad861e4d371ceb0c9ea1a8cbb3195f6119dbf0d3bf2a84e83e99b61aca4"; + sha256 = "217f1416447869ba69c73fd4f02fbf1c05bc92aef556a1d6b64b53d40774622e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/be/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/be/Thunderbird%20149.0.1.dmg"; locale = "be"; arch = "mac"; - sha256 = "e84df3b324848020e9c7b9be31b1d12403e8a72504adbe7476564ceb0516e696"; + sha256 = "15bf4b5c320592b668389c779e31a8e9136d192eadb787e83a0652f0299db2c2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/bg/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/bg/Thunderbird%20149.0.1.dmg"; locale = "bg"; arch = "mac"; - sha256 = "5a22795f30fa9074890fccbc477e1e85cf8cc489aa16dfea8549ae03a943e728"; + sha256 = "1112a25fd8bc096723a71f932d305f4e5637e65a950abbdd4bd5b2194c8ac7d3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/br/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/br/Thunderbird%20149.0.1.dmg"; locale = "br"; arch = "mac"; - sha256 = "433be3687c235c131ee56562d0d5297fc6d4834881098207c8ebc12d3147f81b"; + sha256 = "e5754c7749ef7c09e6c8d51758cfcff26de88332fc66747078b3e5c21dcc8eef"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/ca/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/ca/Thunderbird%20149.0.1.dmg"; locale = "ca"; arch = "mac"; - sha256 = "cef827553b2020747b28051ffa491ed386b73ee64674cb058c365204523fce60"; + sha256 = "1ac8cc088c788c58e7bbf4a2abdb4be33c297073466c702ddd612db35a23af9b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/cak/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/cak/Thunderbird%20149.0.1.dmg"; locale = "cak"; arch = "mac"; - sha256 = "92f42a909c56ceb6ff3a355dffbe0c2a8afa5dd3d4398c0bb810d8c83e18de26"; + sha256 = "3b2af7601188d768bc7a7d9601dc4a356feb628f71bae30b2106ad29c460c2b6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/cs/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/cs/Thunderbird%20149.0.1.dmg"; locale = "cs"; arch = "mac"; - sha256 = "31efee520420228caf40c1039c86aceca9f73ef102292170ba6f390d1101d0cf"; + sha256 = "3fce6794d688dc05a3ebec0d2616c00a134d4f59a4e35d27ce1d3c32095f5c24"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/cy/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/cy/Thunderbird%20149.0.1.dmg"; locale = "cy"; arch = "mac"; - sha256 = "fc98001d63e1b85a945c949add95798b6e6ebda52a5265d693b282df58b42643"; + sha256 = "4b459ba545a8090eca2986cfdfec0cee86324e6d3dfbb80c3910450268837ea0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/da/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/da/Thunderbird%20149.0.1.dmg"; locale = "da"; arch = "mac"; - sha256 = "536327211845b081814c2f7c1ed8235e8ec42d0f69b069bf844f34f80e08e936"; + sha256 = "7947f4721c2ff9c97451a34b20481ca5315caf5bee04df0fe598632a538a9234"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/de/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/de/Thunderbird%20149.0.1.dmg"; locale = "de"; arch = "mac"; - sha256 = "0dbf77e4a92dfd4c5f0768e747213c0232d81125d2c09c96e9a1c4d118dd936c"; + sha256 = "e836ff42e7fc0299cb7140ae8ce33dbec4d6bd9255d9adec099f89ae7f5190bf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/dsb/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/dsb/Thunderbird%20149.0.1.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "c31616e8d36da9d3e743907d0472c6819037cdbad49473aad2d268746fac3cc7"; + sha256 = "50b60c9d924347b4997491103b91305ab29b040f55976c322190131414262539"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/el/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/el/Thunderbird%20149.0.1.dmg"; locale = "el"; arch = "mac"; - sha256 = "9317789750db880d83343ec006310e6e6d8b3c49061e4d0de4a10e4accf38d2a"; + sha256 = "da2dfb06a853bf8960159793b91dd24627877af7b3aea005d92b5a2d0034d914"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/en-CA/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/en-CA/Thunderbird%20149.0.1.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "9ef18118ab0b0d5c3ffb82955245fa4d64b070388dd9ae56300b0df528d06163"; + sha256 = "8895ace87e3e5eb87f06fcfd1242c4aef83b284ef643963ea1f6d521e381f19d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/en-GB/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/en-GB/Thunderbird%20149.0.1.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "2294da6b9756be51d337ed982ca4ce8b3f3567dbc695489a2cb98f132f2137d5"; + sha256 = "0360b433eb2f486b8207456c8b8c89c0fb661e1274c01971363060e753c33987"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/en-US/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/en-US/Thunderbird%20149.0.1.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "e8327f8b597afc1a9ee714f6eca9e1abc392a6feb351ba78b97b1234d1bce02c"; + sha256 = "cceb57539bce5897b34cdb4648b788f93eabed0fedc241803fa3851412c98c05"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/es-AR/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/es-AR/Thunderbird%20149.0.1.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "79de592f0f193fe9393acf726de2cbeff746ef81016db9bff5c9e93fa281cb4c"; + sha256 = "2bde50ecdf91b7a6675053cc1cb170e787a5d24d51ffde777247ae9755f8e890"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/es-ES/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/es-ES/Thunderbird%20149.0.1.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "b56635e5984f8e408048a383d25603a4aaeb0045da281b783c1f7d72e970a073"; + sha256 = "e0e97f7d2929ddd477b708cfd7543617b3e4d9ddce632f4bc57b4c70bc96a789"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/es-MX/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/es-MX/Thunderbird%20149.0.1.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "ac5acd25435903b7262bbcee0f62773de7a530b9abd64efc5a41de04d063d096"; + sha256 = "4cb7b893da62a25c75ccedebff6fbe6c8f8e8b2aa66f62936b5e2b67fbf4f668"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/et/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/et/Thunderbird%20149.0.1.dmg"; locale = "et"; arch = "mac"; - sha256 = "e4fb48cd6c8dfd417ba65be08dd1278f7d0f6aa78ae24b754ef0de699b10322b"; + sha256 = "a94686223c4581d1398328af848ad88561279ec26e54409d632af5ffed8d791b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/eu/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/eu/Thunderbird%20149.0.1.dmg"; locale = "eu"; arch = "mac"; - sha256 = "49bbad161d8c369d8ba3d0f47f924ccb9714554597b60dd3187c308d58465065"; + sha256 = "5c883801f38e9b98726cb4d2d8ee45c769727fd1aa472b97dfb10f913ef62825"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/fi/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/fi/Thunderbird%20149.0.1.dmg"; locale = "fi"; arch = "mac"; - sha256 = "0ba645f312a4c348f885efe703145c1685a5f541ed6eb489f93c76bf6efc3f74"; + sha256 = "5cb5f07cfc822d595ae1e7dc1da0930712266a3e7932a02f7cccab3a3346d19b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/fr/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/fr/Thunderbird%20149.0.1.dmg"; locale = "fr"; arch = "mac"; - sha256 = "243534c5a20e08c374bc119181643d1bc0f3f42eb8862df6039c3148fe94aebc"; + sha256 = "b0d63f965e518356ed1fa478131b884c7f21255f98d5a147b156222c2f7ace6f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/fy-NL/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/fy-NL/Thunderbird%20149.0.1.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "3d04422ba060c6ad441e0449beab9ffed1fc8cc949568e6f60f5e687cffea3fd"; + sha256 = "874979fdb12d444cbe5f6bd75e2852a5cd4fd52d987f4051b881cb9396fa53c5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/ga-IE/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/ga-IE/Thunderbird%20149.0.1.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "b34e1c9392d421f17e5189133e16c24b45112f740a82bb53c0b9202fefd82ff0"; + sha256 = "c925b84bfc1675e84fca3ae80446066c97c5df6fb92180df419899399859a1b5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/gd/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/gd/Thunderbird%20149.0.1.dmg"; locale = "gd"; arch = "mac"; - sha256 = "019c9d63b09a991dbbb00f0598d630f088b768854bb1333c11e8d7ef99f7c503"; + sha256 = "debd1e4a0a0dde682829718340ab28dfc60668554ffa01af58b6896c2fe889a7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/gl/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/gl/Thunderbird%20149.0.1.dmg"; locale = "gl"; arch = "mac"; - sha256 = "1d95f431180f041ec10e3d4deb4625700dbf46f39ae7feb31c11f7f425d2acd5"; + sha256 = "43a13b8c1cf0a42d3c120e81c18b35321fd64fd36ddec8b33bb13c9f9d3cfdc0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/he/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/he/Thunderbird%20149.0.1.dmg"; locale = "he"; arch = "mac"; - sha256 = "c354f9980aa169ecc3b5f49f4d819e704ba96ecea44b00226329b21a2fdb1504"; + sha256 = "7e17c86188277e9720a236e6eac5423a8c2079d80cc31f41c2346fd0c786e9c6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/hr/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/hr/Thunderbird%20149.0.1.dmg"; locale = "hr"; arch = "mac"; - sha256 = "4ad8ce6a3f7660a9a1a106c866ca32caa000f3d33caa63b4ad2796fb84deac7f"; + sha256 = "b2471a98e00965147542f66b96de12f9d627adf61258ff22d9d72ff0a1ca68e8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/hsb/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/hsb/Thunderbird%20149.0.1.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "4058c38ff81c203164e81a4cc22a5ff95afab3d681ff5a9f970cabfe7eb20637"; + sha256 = "05913a7d03790de0851bcb04b2b0f32d81d0a805dd4e5ad0f0f3430ba5e7bbf4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/hu/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/hu/Thunderbird%20149.0.1.dmg"; locale = "hu"; arch = "mac"; - sha256 = "450a2d5b135f6c5c4673ffa0ff7cb18f3bdfa7aca5a0335be7277e4ec066742c"; + sha256 = "76ab5ed4516349335e84bc866651e881fa2db260e671d3524ca403b10215328d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/hy-AM/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/hy-AM/Thunderbird%20149.0.1.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "24488cb38f532c326be95a39d784e1f772388bfebb680449c7e088750511abff"; + sha256 = "04397d5c4638e846facd6476739b2144950baaf73d98bef11bb325ec719fac63"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/id/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/id/Thunderbird%20149.0.1.dmg"; locale = "id"; arch = "mac"; - sha256 = "164250b3bc163664c388b9ea0c30dacff62fa737f58ac0eb5a4ebd2f9b441f90"; + sha256 = "f20342f7cc44b0439c023ca37d7b412d08e089fed9f5a86b1fd18e5e587d511c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/is/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/is/Thunderbird%20149.0.1.dmg"; locale = "is"; arch = "mac"; - sha256 = "694dab6700e08768a425f6dad063db1abb338e3342a508e13e540891fe1680d2"; + sha256 = "03f03685e6c5a002f59e41a4ee2a64d8640c6af1a745d212e95c8bffc4f28311"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/it/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/it/Thunderbird%20149.0.1.dmg"; locale = "it"; arch = "mac"; - sha256 = "7cdfa987285a880cc983fc44da1c8e2210df93174b06f2dcf6cf5ca71daf2514"; + sha256 = "83d31ddc4f76ec161341beae6594151d69a695b44b7596dc287bf76d13567e84"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/ja-JP-mac/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/ja-JP-mac/Thunderbird%20149.0.1.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "c8abcbeb5f90e4d974c674b507c1c23fff95064d5756b7a0a23c98630e9493b4"; + sha256 = "c62546169ce08200596ffb219f58f3ee86b39af21f246f7d5f50eba21d92776a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/ka/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/ka/Thunderbird%20149.0.1.dmg"; locale = "ka"; arch = "mac"; - sha256 = "8c64f882ebbaa0fe42eb0dd1877ba55f3fe201d28de44a24d6b5abdb285a714a"; + sha256 = "7ae2aaf89192219f30878a30231121fdf861727762e5b5d54955743b910889f8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/kab/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/kab/Thunderbird%20149.0.1.dmg"; locale = "kab"; arch = "mac"; - sha256 = "98a2aed803367f2fa69192c8739b2788f77f40658efb62d1bd5eb15ca400c1f3"; + sha256 = "ade27d92d1daa0fa577e4d38afecef63b58085b72e1e7ba518844002af5264c2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/kk/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/kk/Thunderbird%20149.0.1.dmg"; locale = "kk"; arch = "mac"; - sha256 = "69c8dba3be5d9bae800c9922480e97f9eddc843a222561a4c5cc492f68091f39"; + sha256 = "c77859944439e40055201659ed7a41dc5dc385ec25e0f9d9d9826ee235004c85"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/ko/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/ko/Thunderbird%20149.0.1.dmg"; locale = "ko"; arch = "mac"; - sha256 = "1d16d2af36b4f723f7859c21ea1b6e6a36c92d803d99cd8d021ea608b76e4ee2"; + sha256 = "c1cece4af8cab298d176fab9eee1792e9a5399900a240ef22f597fb989769c7f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/lt/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/lt/Thunderbird%20149.0.1.dmg"; locale = "lt"; arch = "mac"; - sha256 = "d8069bb6043e3b0dcf1373d9ff9a30e902c4ff0c15de8c5d4079c9b36278cdf8"; + sha256 = "f60015226927ebdda8fb986c54f360b4a6d2548a267ce459b1f95abc46190dd2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/lv/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/lv/Thunderbird%20149.0.1.dmg"; locale = "lv"; arch = "mac"; - sha256 = "b1a87c074d9a37c2bfb14609268ec96cc538792f762b05316ca2ec7fd770b9cf"; + sha256 = "843eedcde02b5ff11e02f26340af2d9037e680203b7e7b06de8dd13d4621d889"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/ms/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/ms/Thunderbird%20149.0.1.dmg"; locale = "ms"; arch = "mac"; - sha256 = "aec7afe3718540cd99751d15c1bf7844a4cd796939f20a51ed3cc9fda22c471b"; + sha256 = "0ef4102924db02075b44aaa6da9dc764ddf17506cf0fc7dd7f13c30ad8f55021"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/nb-NO/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/nb-NO/Thunderbird%20149.0.1.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "632a0ff7ee8e5df76257b06ad5495f9b96d8c8e58cd526af985c009248527a76"; + sha256 = "525d467ce2c8e259f81929c2ce77a74df9c8ac2b0cc88492be72ef1a7b2d7457"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/nl/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/nl/Thunderbird%20149.0.1.dmg"; locale = "nl"; arch = "mac"; - sha256 = "d3c0c7df671dcb767b28e2ef57c5217c06a36511f1c878ddbdc2ac36ad9e7be6"; + sha256 = "319a4940219b7eb6191644628ba6631c15df8952f90973859ffe293e17414242"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/nn-NO/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/nn-NO/Thunderbird%20149.0.1.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "5dbcee1edaac3b1d93d6451cb3311f61e7bb85f6b73be5f7a4e7e4848a20191b"; + sha256 = "bfcaeeedfec6927242b31f6bd640149096bef90e6a541e2341421dc601b24fcb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/pa-IN/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/pa-IN/Thunderbird%20149.0.1.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "4321506a74730d5d9724b5e74957b902c0226abf435ce00cad764e9ceb9505b1"; + sha256 = "f7f74a60e517a1856feda7fa8d138ab360f1b3d4d8b9d850bf6beb9f8a1699bf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/pl/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/pl/Thunderbird%20149.0.1.dmg"; locale = "pl"; arch = "mac"; - sha256 = "139760c27cc2eafcd9b9d9e5ef7b5293a01f9fb3de028993eafa65049d86d862"; + sha256 = "2a482530c2ef17a46ea616b3177a2240acf576fcaa7656bd296fea6755c00af8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/pt-BR/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/pt-BR/Thunderbird%20149.0.1.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "b668f2a136a2c06f006356385247f0641b8e938459b9554ed88cd8ac98c0baab"; + sha256 = "dc8ca3c520c81637de19cbe333a5015b233a452d09b2fbc8ce4423e30e6f484c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/pt-PT/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/pt-PT/Thunderbird%20149.0.1.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "5e952945f10c7814727494279b82948a6f78241d5d81d012f3444326e629962f"; + sha256 = "fe5913712e4fbd08b2d2b61e75bf66c673db5d44da5d53a30b976f11fbf2c873"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/rm/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/rm/Thunderbird%20149.0.1.dmg"; locale = "rm"; arch = "mac"; - sha256 = "e95c6201c46b86c24589f43b7f385d977e5a27dd53db24c015f8c4aae0b6d0ed"; + sha256 = "d307bbe88f245293aaa461bd2a820fade1bdf66c702b94a4073f8106c27d5dd6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/ro/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/ro/Thunderbird%20149.0.1.dmg"; locale = "ro"; arch = "mac"; - sha256 = "d49b23b461c7c9042f48d765f8892f067f961fa5715f93ef986a22d9b630bad8"; + sha256 = "0aa3127cfdf613803cd4c7436d5382396c3e01efd70f93a90191980f06aa6f10"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/ru/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/ru/Thunderbird%20149.0.1.dmg"; locale = "ru"; arch = "mac"; - sha256 = "3629928cbb9c08d7faa68653f068b491612ef6d79d2648743056c2cfe55d12b1"; + sha256 = "4854b53aff5d3bd5427390617e461bb471a27a605b6e70300c5056e7b0c850bd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/sk/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/sk/Thunderbird%20149.0.1.dmg"; locale = "sk"; arch = "mac"; - sha256 = "275201d2bb274ccaecbbeb8ac7e287a95ce4ee29cc1d85612dfd241732596ea9"; + sha256 = "6b73161e86bba1ae6548613a2f3e565a8eb54718ca9ee24c9410f831cb012719"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/sl/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/sl/Thunderbird%20149.0.1.dmg"; locale = "sl"; arch = "mac"; - sha256 = "87a81bf35f813473a9dbf2ca3e550825919670c0ac0bea9fc7f619ab96d8e74d"; + sha256 = "79dafd6401e4122da525c135c834b5057a5e210133c04b4908cac6c8c7de2dd6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/sq/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/sq/Thunderbird%20149.0.1.dmg"; locale = "sq"; arch = "mac"; - sha256 = "7164e8e6979099e6a1f167d14c6ab0f02e7962b79d815d1cffb927c1494c362c"; + sha256 = "b069ca8ab0f87c37572cc47e9522dd3ce927788360052e28dd17dc63994db76d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/sr/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/sr/Thunderbird%20149.0.1.dmg"; locale = "sr"; arch = "mac"; - sha256 = "6f7ca334c1066446fadd6a9cba3b12a86e8acb1dc91349181e96ef84282ab3d1"; + sha256 = "fe80a3ae5d2be29a2f4bdf84dc66303daf6b348d5f96c014bdb782a08bc76035"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/sv-SE/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/sv-SE/Thunderbird%20149.0.1.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "f3011b8d1f9a33d45c8a044822ec200fa48528b8e9f95dd26d103a79bf62561d"; + sha256 = "f4880394407bbac1773c70e8bf626c9fa92539d05356090d929af7d50c8ea1c3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/th/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/th/Thunderbird%20149.0.1.dmg"; locale = "th"; arch = "mac"; - sha256 = "79d24feac5236fd2235c51823a2bd0c199cd3d0fad18c2ad550c4c366e974341"; + sha256 = "369647f8ecb753b47268c061f3436df1e3716e27cf89fbd2199ac896bcd69c97"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/tr/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/tr/Thunderbird%20149.0.1.dmg"; locale = "tr"; arch = "mac"; - sha256 = "a7ce825fc4c447e9b01cf3eb328ad6f66ca10c1ec3bd498fed6b0c8714c6f1c5"; + sha256 = "8ec38f3b3081bfcdb31ba51a3dd96c537b0af56580317d1715aa3d6056325a5e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/uk/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/uk/Thunderbird%20149.0.1.dmg"; locale = "uk"; arch = "mac"; - sha256 = "8615d4723f7c31147291855ffc66109a2e4f74838321ef8400629dfb7e22b99e"; + sha256 = "c007efeb680bc013e836d14912958225dce9003b09895919f3c76c9ba146a4ac"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/uz/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/uz/Thunderbird%20149.0.1.dmg"; locale = "uz"; arch = "mac"; - sha256 = "e0e7de72f0bffbbfceb051cc5e44310fbf3e728d82af520c3fd2fdd28d69a453"; + sha256 = "4c0d4903ad616a953e7313168b285cf5995010cbf0f9308c7e090c7f655711ef"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/vi/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/vi/Thunderbird%20149.0.1.dmg"; locale = "vi"; arch = "mac"; - sha256 = "036f45621983d30a6341fb8b5ae551da6a464f9c267af2df2354ab8b69d8b769"; + sha256 = "e44e0de6260665cff0c3113d6e66cd2f45878766525502e4154d8c7489e291b0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/zh-CN/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/zh-CN/Thunderbird%20149.0.1.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "2b62359a93931a44956ab6fa006527ab6e3338f7f371cd5402059238038b2778"; + sha256 = "5d75c05db1385b81040aeaba3c36b93b77c4603ad63cf01c61a94e8e04f48134"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0/mac/zh-TW/Thunderbird%20149.0.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.1/mac/zh-TW/Thunderbird%20149.0.1.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "ba72bfd80c2dfa9bf3d411057948ca081ab7f21ef3576e6c46ea2b3f03f7ae63"; + sha256 = "8e3d719cd1e614637c8cced4362966017fefbb762d319fbb3d96640a4285522d"; } ]; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 7db360879cb5..1b00c5e17271 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -4,9 +4,11 @@ fetchurl, fetchgit, fetchpatch2, + fetchFromGitLab, lib, pam, python3, + python3Packages, libxslt, perl, perlPackages, @@ -28,6 +30,8 @@ flex, zip, unzip, + fast-float, + md4c, gtk3, libmspack, getopt, @@ -35,9 +39,12 @@ cairo, which, icu, + boost, + boost188, jdk21, ant, cups, + libixion, libxtst, libxi, libxinerama, @@ -78,6 +85,7 @@ libcdr, lcms2, unixodbc, + mdds, sane-backends, mythes, libexttextcat, @@ -107,6 +115,7 @@ libepubgen, libetonyek, libpng, + liborcus, libxcrypt, langs ? [ "ar" @@ -213,6 +222,90 @@ let ]; }; + mdds_2_1 = mdds.overrideAttrs { + version = "2.1.1"; + src = fetchFromGitLab { + owner = "mdds"; + repo = "mdds"; + rev = "2.1.1"; + hash = "sha256-a412LpgDiYM8TMToaUrTlHtblYS1HehzrDOwvIAAxiA="; + }; + }; + + # required for libreoffice-collabora version 25.04.9-4 + libixion_0_19 = libixion.overrideAttrs { + version = "0.19.0"; + + src = fetchFromGitLab { + owner = "ixion"; + repo = "ixion"; + rev = "0.19.0"; + hash = "sha256-BrexWRaxrLTWuoU62kqws3tlSqVOHecSV5MXc4ZezFs="; + }; + + buildInputs = [ + boost188 + mdds_2_1 + python3 + ]; + + patches = [ + # fix build with gcc 15, Add a missing include + (fetchpatch2 { + url = "https://gitlab.com/ixion/ixion/-/merge_requests/70.patch"; + hash = "sha256-FzU/aejcMktrDQql5pzobiq6BJXryIXQXZTBWCkyqtU="; + }) + ]; + }; + + # required for libreoffice-collabora version 25.04.9-4 + liborcus_0_19 = liborcus.overrideAttrs { + version = "0.19.2"; + + src = fetchFromGitLab { + owner = "orcus"; + repo = "orcus"; + rev = "0.19.2"; + hash = "sha256-+9C52H99c/kL5DEIoXV+WcLnTftRbicRLQN/FdIXBw8="; + }; + + buildInputs = [ + boost188 + libixion_0_19 + mdds_2_1 + python3 + zlib + ]; + + patches = [ + # fix build with gcc 15, Add missing includes + (fetchpatch2 { + url = "https://gitlab.com/orcus/orcus/-/merge_requests/200.patch"; + hash = "sha256-CZVw1+ri6UO56Bg/Y27W6G8JkGU6xDInd7fABr6i+7g="; + }) + ]; + }; + + # required for libreoffice-still version 25.8.5.2 + liborcus_0_20 = liborcus.overrideAttrs { + version = "0.20.1"; + + src = fetchFromGitLab { + owner = "orcus"; + repo = "orcus"; + rev = "0.20.1"; + hash = "sha256-+YTK0EPgGHN4yKurJjuWWrAHzgtbc1dOvtppcvuRei4="; + }; + + buildInputs = [ + boost188 + libixion + mdds + python3 + zlib + ]; + }; + importVariant = f: import (./. + "/src-${variant}/${f}"); # Update these files with: # nix-shell maintainers/scripts/update.nix --argstr package libreoffice-$VARIANT.unwrapped @@ -304,47 +397,25 @@ stdenv.mkDerivation (finalAttrs: { # Don't detect Qt paths from qmake, so our patched-in onese are used ./dont-detect-qt-paths-from-qmake.patch - + ] + ++ lib.optionals (variant != "collabora") [ # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking ./readd-explicit-zlib-link.patch ] - ++ lib.optionals (lib.versionOlder version "25.8.2.1") [ + ++ lib.optionals (variant == "collabora") [ # Backport patch to fix build with Poppler 25.09 (fetchpatch2 { url = "https://github.com/LibreOffice/core/commit/7848e02819c007026952a3fdc9da0961333dc079.patch"; includes = [ "sdext/*" ]; hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU="; }) + # Fix build with Poppler 25.10 (fetchpatch2 { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch"; hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8="; }) - ] - ++ lib.optionals (lib.versionAtLeast version "25.8.2.2") [ - # Fix build with Poppler 25.10 - (fetchpatch2 { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/f7b0e4385108b95c134599502a7bccf0a41925c8/poppler-25.10.patch"; - hash = "sha256-KMsjDtRRH8Vy/FXaVwxUo0Ww10PCE0sK8+ZL0Ja2kJQ="; - }) - ] - ++ lib.optionals (variant == "collabora") [ - # Backport patch to fix build with Poppler 25.05 - (fetchpatch2 { - url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch"; - includes = [ "sdext/*" ]; - hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA="; - }) - # Currently included in the condition above - # Uncomment if Collabora is again the only version needing it - # Remove if Collabora is updated far enough not to need it anymore - ## Fix build with Poppler 25.10 - #(fetchpatch2 { - # url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch"; - # hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8="; - #}) - ] - ++ lib.optionals (variant == "collabora") [ + ./fix-unpack-collabora.patch ]; @@ -391,6 +462,9 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withJava [ ant jdk21 + ] + ++ optionals (lib.versionAtLeast version "26.2.1.2") [ + python3Packages.afdko ]; buildInputs = @@ -404,6 +478,7 @@ stdenv.mkDerivation (finalAttrs: { coinmp abseil-cpp bluez5 + boost box2d_2 cairo clucene-core_2 @@ -469,6 +544,7 @@ stdenv.mkDerivation (finalAttrs: { libzmf libwebp lp_solve + mdds mythes ncurses neon @@ -495,6 +571,20 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals withJava [ jre' + ] + ++ optionals (variant == "collabora") [ + fast-float + liborcus_0_19 + mdds_2_1 + md4c + ] + ++ optionals (variant == "still") [ + liborcus_0_20 + ] + ++ optionals (variant == "fresh") [ + fast-float + liborcus + md4c ]; preConfigure = '' @@ -537,6 +627,8 @@ stdenv.mkDerivation (finalAttrs: { "--without-buildconfig-recorded" (lib.withFeature withHelp "help") + "--with-boost=${getDev boost}" + "--with-boost-libdir=${getLib boost}/lib" "--with-vendor=NixOS" "--disable-report-builder" "--disable-online-update" @@ -563,8 +655,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeature withFonts "fonts") "--without-doxygen" + "--with-system-afdko" "--with-system-cairo" "--with-system-coinmp" + "--with-system-fast-float" "--with-system-headers" "--with-system-libabw" "--with-system-libcmis" @@ -574,6 +668,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-system-libs" "--with-system-libwps" "--with-system-lpsolve" + "--with-system-mdds" "--with-system-openldap" "--with-system-openssl" "--with-system-orcus" @@ -593,12 +688,6 @@ stdenv.mkDerivation (finalAttrs: { "--without-system-dragonbox" "--without-system-libfixmath" - # TODO: bump this to 0.20 - "--without-system-orcus" - - # TODO: bump this to 3.0 (#382851) - "--without-system-mdds" - # requires an oddly specific, old version "--without-system-hsqldb" @@ -608,9 +697,6 @@ stdenv.mkDerivation (finalAttrs: { # is packaged but headers can't be found because there is no pkg-config file "--without-system-zxcvbn" - # cannot find headers, no idea why - "--without-system-boost" - "--without-system-java-websocket" ] ++ optionals kdeIntegration [ diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch index 9cd2c9799c97..b87359f4cec1 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch @@ -47,6 +47,42 @@ index 1396cef69fa5..8ca0e4043f72 100644 createScDoc(); ScDocument* pDoc = getScDoc(); +diff --git i/sc/qa/unit/subsequent_filters_test3.cxx w/sc/qa/unit/subsequent_filters_test3.cxx +index fb5343932ac7..b48c3e9c08c7 100644 +--- i/sc/qa/unit/subsequent_filters_test3.cxx ++++ w/sc/qa/unit/subsequent_filters_test3.cxx +@@ -888,6 +888,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testAutoheight2Rows) + + CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testXLSDefColWidth) + { ++ return; // flaky layout test; depends on the system font versions? + // XLS has only 256 columns; but on import, we need to set default width to all above that limit + createScDoc("xls/chartx.xls"); + ScDocument* pDoc = getScDoc(); +diff --git i/sc/qa/unit/subsequent_filters_test4.cxx w/sc/qa/unit/subsequent_filters_test4.cxx +index b1b170de2a0b..fa4b16445717 100644 +--- i/sc/qa/unit/subsequent_filters_test4.cxx ++++ w/sc/qa/unit/subsequent_filters_test4.cxx +@@ -297,6 +297,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testChartImportODS) + #if HAVE_MORE_FONTS + CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testChartImportXLS) + { ++ return; // fails consistently + createScDoc("xls/chartx.xls"); + + ScDocument* pDoc = getScDoc(); +diff --git i/sd/qa/filter/eppt/eppt.cxx w/sd/qa/filter/eppt/eppt.cxx +index 460a6c10db1f..d455d0973449 100644 +--- i/sd/qa/filter/eppt/eppt.cxx ++++ w/sd/qa/filter/eppt/eppt.cxx +@@ -113,6 +113,7 @@ CPPUNIT_TEST_FIXTURE(Test, testThemeExport) + + CPPUNIT_TEST_FIXTURE(Test, testLoopingFromAnimation) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + // Given a media shape that has an animation that specifies looping for the video: + loadFromFile(u"video-loop.pptx"); + diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index 40d2c6f174de..9f540581133e 100644 --- a/sc/qa/unit/ucalc_formula.cxx @@ -200,3 +236,79 @@ index 4909267f7c74..63a177b0a2a5 100644 saveAsPDF(u"tdf164106.fodt"); auto pPdfDocument = parsePDFExport(); +diff --git i/sd/qa/unit/export-tests-ooxml2.cxx w/sd/qa/unit/export-tests-ooxml2.cxx +index 9678eabb27ee..05deb6f234b7 100644 +--- i/sd/qa/unit/export-tests-ooxml2.cxx ++++ w/sd/qa/unit/export-tests-ooxml2.cxx +@@ -1290,6 +1290,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testRotateFlip) + + CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf106867) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + createSdImpressDoc("pptx/tdf106867.pptx"); + save(TestFilter::PPTX); + +@@ -1915,6 +1916,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf59323_slideFooters) + + CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf53970) + { ++ return; // error: XDG_RUNTIME_DIR is invalid or not set in the environment. + // Embedded media file + { + createSdImpressDoc("odp/tdf53970.odp"); +diff --git i/slideshow/qa/engine/engine.cxx w/slideshow/qa/engine/engine.cxx +index 6644ddae0d4c..fb4a70b1e700 100644 +--- i/slideshow/qa/engine/engine.cxx ++++ w/slideshow/qa/engine/engine.cxx +@@ -54,6 +54,7 @@ GetFirstCommandNodeOfPage(const uno::Reference& xPage) + + CPPUNIT_TEST_FIXTURE(Test, testLoopingFromAnimation) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + // Given a document with a looping video, the looping is defined as part of its auto-play + // animation (and not on the media shape): + loadFromFile(u"video-loop.pptx"); +--- i/xmloff/qa/unit/draw.cxx ++++ w/xmloff/qa/unit/draw.cxx +@@ -164,6 +164,7 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testThemeExport) + + CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testVideoSnapshot) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + // Execute ODP import: + loadFromFile(u"video-snapshot.odp"); + uno::Reference xDrawPagesSupplier(mxComponent, +diff --git i/svx/qa/unit/svdraw.cxx w/svx/qa/unit/svdraw.cxx +index b3b8ce14e227..eae079a6a717 100644 +--- i/svx/qa/unit/svdraw.cxx ++++ w/svx/qa/unit/svdraw.cxx +@@ -571,6 +571,7 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testMaterialSpecular) + + CPPUNIT_TEST_FIXTURE(SvdrawTest, testVideoSnapshot) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + // Given a slide with a media shape, containing a 4 sec video, red-green-blue-black being the 4 + // seconds: + loadFromFile(u"video-snapshot.pptx"); +diff --git i/sd/qa/unit/SVGExportTests.cxx w/sd/qa/unit/SVGExportTests.cxx +index 5f73bad89f3b..d1ff4ccf7f5f 100644 +--- i/sd/qa/unit/SVGExportTests.cxx ++++ w/sd/qa/unit/SVGExportTests.cxx +@@ -149,6 +149,7 @@ public: + + void testSVGExportEmbeddedVideo() + { ++ return; // Failed to connect PipeWire event context (errno: 112) + loadFromFile(u"slide-video-thumbnail.odp"); + save(TestFilter::SVG_IMPRESS); + +--- i/vcl/qa/cppunit/pdfexport/pdfexport.cxx ++++ w/vcl/qa/cppunit/pdfexport/pdfexport.cxx +@@ -392,6 +392,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf107868) + /// Tests that embedded video from Impress is not exported as a linked one. + CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf105093) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + vcl::filter::PDFDocument aDocument; + load(u"tdf105093.odp", aDocument); + diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch index af7d3d8d129c..00a2b02312cf 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch @@ -116,18 +116,6 @@ index 5f008a55b1c0..c6ae2a9023de 100644 createSwDoc("tdf166152.fodt"); auto* pWrtShell = getSwDocShell()->GetWrtShell(); -diff --git i/sw/qa/extras/odfexport/odfexport4.cxx w/sw/qa/extras/odfexport/odfexport4.cxx -index 91d51ef40d48..f4447b5f7f35 100644 ---- i/sw/qa/extras/odfexport/odfexport4.cxx -+++ w/sw/qa/extras/odfexport/odfexport4.cxx -@@ -1196,6 +1196,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime) - // - Error: "2001-01-01" does not satisfy the "dateTime" type - // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip. - loadAndReload("midnight_redline.fodt"); -+ return; // fails on aarch64 - - xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); - assertXPathContent(pXmlDoc, diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 0f0cd9ed3403..b40b3240120c 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -177,6 +165,235 @@ index 0537b6e4f4ffdae3b094457db0034f2de8676608..8ce4deaa368f11fdc7eb36fec4e75501 uno::Reference xDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); uno::Reference xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); +diff --git i/reportdesign/qa/unit/ReportDesignBasicTests.cxx w/reportdesign/qa/unit/ReportDesignBasicTests.cxx +index 875aca028be9..41df1e3e7ab0 100644 +--- i/reportdesign/qa/unit/ReportDesignBasicTests.cxx ++++ w/reportdesign/qa/unit/ReportDesignBasicTests.cxx +@@ -37,6 +37,7 @@ public: + + CPPUNIT_TEST_FIXTURE(RptBasicTest, roundTripTest) + { ++ return; // com.sun.star.io.WrongFormatException: {Message: "The extension is not installed." + // Test loading and saving an already prepared Report + // This is a very general test designed to catch crashes + // on import and saving +@@ -61,6 +62,7 @@ CPPUNIT_TEST_FIXTURE(RptBasicTest, roundTripTest) + + CPPUNIT_TEST_FIXTURE(RptBasicTest, multiGroupingSameFieldIntervals) + { ++ return; // com.sun.star.io.WrongFormatException: {Message: "The extension is not installed." + // ODB fixture must contain a table and a report that groups on the same field twice + // with different settings (e.g., INTERVAL 5 and INTERVAL 10). The report should be + // prepared to reproduce the original failure (Column not found: INT_count_...). +diff --git i/sc/qa/unit/subsequent_filters_test3.cxx w/sc/qa/unit/subsequent_filters_test3.cxx +index fb5343932ac7..b48c3e9c08c7 100644 +--- i/sc/qa/unit/subsequent_filters_test3.cxx ++++ w/sc/qa/unit/subsequent_filters_test3.cxx +@@ -888,6 +888,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testAutoheight2Rows) + + CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testXLSDefColWidth) + { ++ return; // flaky layout test; depends on the system font versions? + // XLS has only 256 columns; but on import, we need to set default width to all above that limit + createScDoc("xls/chartx.xls"); + ScDocument* pDoc = getScDoc(); +diff --git i/sd/qa/filter/eppt/eppt.cxx w/sd/qa/filter/eppt/eppt.cxx +index 460a6c10db1f..d455d0973449 100644 +--- i/sd/qa/filter/eppt/eppt.cxx ++++ w/sd/qa/filter/eppt/eppt.cxx +@@ -113,6 +113,7 @@ CPPUNIT_TEST_FIXTURE(Test, testThemeExport) + + CPPUNIT_TEST_FIXTURE(Test, testLoopingFromAnimation) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + // Given a media shape that has an animation that specifies looping for the video: + loadFromFile(u"video-loop.pptx"); + +diff --git i/sd/qa/unit/export-tests.cxx w/sd/qa/unit/export-tests.cxx +index 15c867227d8f..53071c9a0eff 100644 +--- i/sd/qa/unit/export-tests.cxx ++++ w/sd/qa/unit/export-tests.cxx +@@ -1065,6 +1065,7 @@ CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfTextPos) + + CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfFont) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + auto pPdfium = vcl::pdf::PDFiumLibrary::get(); + if (!pPdfium) + return; +@@ -1104,6 +1105,7 @@ CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfFont) + + CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfHindi) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + auto pPdfium = vcl::pdf::PDFiumLibrary::get(); + if (!pPdfium) + return; +diff --git i/sd/qa/unit/SVGExportTests.cxx w/sd/qa/unit/SVGExportTests.cxx +index 5f73bad89f3b..d1ff4ccf7f5f 100644 +--- i/sd/qa/unit/SVGExportTests.cxx ++++ w/sd/qa/unit/SVGExportTests.cxx +@@ -149,6 +149,7 @@ public: + + void testSVGExportEmbeddedVideo() + { ++ return; // Failed to connect PipeWire event context (errno: 112) + loadFromFile(u"slide-video-thumbnail.odp"); + save(TestFilter::SVG_IMPRESS); + +diff --git i/sd/qa/unit/export-tests-ooxml2.cxx w/sd/qa/unit/export-tests-ooxml2.cxx +index 9678eabb27ee..05deb6f234b7 100644 +--- i/sd/qa/unit/export-tests-ooxml2.cxx ++++ w/sd/qa/unit/export-tests-ooxml2.cxx +@@ -1290,6 +1290,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testRotateFlip) + + CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf106867) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + createSdImpressDoc("pptx/tdf106867.pptx"); + save(TestFilter::PPTX); + +@@ -1915,6 +1916,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf59323_slideFooters) + + CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf53970) + { ++ return; // error: XDG_RUNTIME_DIR is invalid or not set in the environment. + // Embedded media file + { + createSdImpressDoc("odp/tdf53970.odp"); +diff --git i/slideshow/qa/engine/engine.cxx w/slideshow/qa/engine/engine.cxx +index 6644ddae0d4c..fb4a70b1e700 100644 +--- i/slideshow/qa/engine/engine.cxx ++++ w/slideshow/qa/engine/engine.cxx +@@ -54,6 +54,7 @@ GetFirstCommandNodeOfPage(const uno::Reference& xPage) + + CPPUNIT_TEST_FIXTURE(Test, testLoopingFromAnimation) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + // Given a document with a looping video, the looping is defined as part of its auto-play + // animation (and not on the media shape): + loadFromFile(u"video-loop.pptx"); +diff --git i/xmloff/qa/unit/draw.cxx w/xmloff/qa/unit/draw.cxx +index 92f810ef8bb7..bda56abe3f24 100644 +--- i/xmloff/qa/unit/draw.cxx ++++ w/xmloff/qa/unit/draw.cxx +@@ -164,6 +164,7 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testThemeExport) + + CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testVideoSnapshot) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + // Execute ODP import: + loadFromFile(u"video-snapshot.odp"); + uno::Reference xDrawPagesSupplier(mxComponent, +diff --git i/svx/qa/unit/svdraw.cxx w/svx/qa/unit/svdraw.cxx +index b3b8ce14e227..eae079a6a717 100644 +--- i/svx/qa/unit/svdraw.cxx ++++ w/svx/qa/unit/svdraw.cxx +@@ -571,6 +571,7 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testMaterialSpecular) + + CPPUNIT_TEST_FIXTURE(SvdrawTest, testVideoSnapshot) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + // Given a slide with a media shape, containing a 4 sec video, red-green-blue-black being the 4 + // seconds: + loadFromFile(u"video-snapshot.pptx"); +diff --git i/sw/qa/extras/layout/layout4.cxx w/sw/qa/extras/layout/layout4.cxx +index b1e3897acd12..d4d29bd6090c 100644 +--- i/sw/qa/extras/layout/layout4.cxx ++++ w/sw/qa/extras/layout/layout4.cxx +@@ -380,6 +380,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, testTdf145826) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, testTable0HeightRows) + { ++ return; // flaky layout test; depends on the system font versions? + createSwDoc("table-0-height-rows.fodt"); + + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); +diff --git i/sw/qa/extras/layout/layout6.cxx w/sw/qa/extras/layout/layout6.cxx +index 59571bcdf03f..7853bc378951 100644 +--- i/sw/qa/extras/layout/layout6.cxx ++++ w/sw/qa/extras/layout/layout6.cxx +@@ -485,6 +485,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter6, testTdf158658c) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter6, testTdf155177) + { ++ return; // flaky ++ + createSwDoc("tdf155177-1-min.odt"); + + uno::Reference xStyle( +diff --git i/sw/qa/extras/uiwriter/uiwriter4.cxx w/sw/qa/extras/uiwriter/uiwriter4.cxx +index a4c3b4a62bbc..8a41e4a9b2ed 100644 +--- i/sw/qa/extras/uiwriter/uiwriter4.cxx ++++ w/sw/qa/extras/uiwriter/uiwriter4.cxx +@@ -94,6 +94,7 @@ void SwUiWriterTest4::mergeDocs(const char* aDestDoc, const char* aInsertDoc) + + CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf96515) + { ++ return; // assertion failed? + // Enable hide whitespace mode. + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); +@@ -552,6 +553,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf96943) + + CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf96536) + { ++ return; // fails on aarch64 + // Enable hide whitespace mode. + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); +@@ -963,6 +965,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRemoveBookmarkTextAndAddNewAfterReload + + CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf96961) + { ++ return; // fails on aarch64 + // Insert a page break. + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); +@@ -2105,6 +2108,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf106736) + + CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testMsWordCompTrailingBlanks) + { ++ return; // fails on aarch64 + // The option is true in settings.xml + createSwDoc("MsWordCompTrailingBlanksTrue.odt"); + SwDoc* pDoc = getSwDoc(); +diff --git i/vcl/qa/cppunit/pdfexport/pdfexport.cxx w/vcl/qa/cppunit/pdfexport/pdfexport.cxx +index 7766c3aa3e76..bb00df6ba673 100644 +--- i/vcl/qa/cppunit/pdfexport/pdfexport.cxx ++++ w/vcl/qa/cppunit/pdfexport/pdfexport.cxx +@@ -392,6 +392,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf107868) + /// Tests that embedded video from Impress is not exported as a linked one. + CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf105093) + { ++ return; // Failed to connect PipeWire event context (errno: 112) + vcl::filter::PDFDocument aDocument; + load(u"tdf105093.odp", aDocument); + +diff --git i/vcl/qa/cppunit/pdfexport/pdfexport2.cxx w/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +index b9c560f422b5..e415b1fcc807 100644 +--- i/vcl/qa/cppunit/pdfexport/pdfexport2.cxx ++++ w/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +@@ -6320,6 +6320,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTextBoxRuby) + + CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf166044ContFootnoteOnlyOnePgNum) + { ++ return; // fails due to missing font: Noto Sans Lao + saveAsPDF(u"tdf166044-cont-footnote-one-pgnum.fodt"); + + auto pPdfDocument = parsePDFExport(); +diff --git a/svgio/qa/cppunit/data/tdf160386.svg b/svgio/qa/cppunit/data/tdf160386.svg +index 1644b0d15514..cf429508bcd4 100644 +--- a/svgio/qa/cppunit/data/tdf160386.svg ++++ b/svgio/qa/cppunit/data/tdf160386.svg +@@ -8,7 +8,6 @@ + Hello! + Hola! + Bonjour! +- こんにちは + Привет! + + diff --git i/sc/qa/unit/subsequent_export_test2.cxx w/sc/qa/unit/subsequent_export_test2.cxx index 956838656b28..70b38e4d59ba 100644 --- i/sc/qa/unit/subsequent_export_test2.cxx @@ -197,29 +414,3 @@ index 956838656b28..70b38e4d59ba 100644 createScDoc(); ScDocument* pDoc = getScDoc(); -diff --git i/sw/qa/extras/tiledrendering/tiledrendering.cxx w/sw/qa/extras/tiledrendering/tiledrendering.cxx -index 4ebc4be96149..28ebf8c0d446 100644 ---- i/sw/qa/extras/tiledrendering/tiledrendering.cxx -+++ w/sw/qa/extras/tiledrendering/tiledrendering.cxx -@@ -1262,6 +1262,7 @@ static void addDarkLightThemes(const Color& rDarkColor, const Color& rLightColor - - CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testGetViewRenderState) - { -+ return; - addDarkLightThemes(COL_BLACK, COL_WHITE); - SwXTextDocument* pXTextDocument = createDoc(); - int nFirstViewId = SfxLokHelper::getView(); -diff --git i/vcl/qa/cppunit/complextext.cxx w/vcl/qa/cppunit/complextext.cxx -index 9be428b59128..b5a5493c53e8 100644 ---- i/vcl/qa/cppunit/complextext.cxx -+++ w/vcl/qa/cppunit/complextext.cxx -@@ -794,6 +794,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf165510) - - CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf154104) - { -+ return; -+ - ScopedVclPtrInstance pOutDev; - - vcl::Font aBaseFont{ u"David Libre"_ustr, u"Regular"_ustr, Size{ 0, 72 } }; - diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch index 1fa0009d97c2..50a1a9747c17 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch @@ -85,16 +85,6 @@ createDoc("shape.fodt"); SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); ---- a/sw/qa/extras/odfexport/odfexport2.cxx -+++ b/sw/qa/extras/odfexport/odfexport2.cxx -@@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime) - // - Error: "2001-01-01" does not satisfy the "dateTime" type - // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip. - loadAndReload("midnight_redline.fodt"); -+ return; // fails on aarch64 - - xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); - assertXPathContent(pXmlDoc, --- a/sdext/qa/unit/pdfimport.cxx 2025-03-22 14:46:52.202082763 +0100 +++ b/sdext/qa/unit/pdfimport.cxx 2025-03-22 14:49:22.947719369 +0100 @@ -785,6 +785,7 @@ @@ -115,6 +105,17 @@ aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr; saveAsPDF(u"tdf164106.fodt"); +--- a/sw/qa/extras/layout/layout3.cxx ++++ b/sw/qa/extras/layout/layout3.cxx +@@ -1388,6 +1388,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158658c) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf155177) + { ++ return; // flaky ++ + createSwDoc("tdf155177-1-min.odt"); + + uno::Reference xStyle( --- a/sw/qa/extras/layout/layout4.cxx +++ b/sw/qa/extras/layout/layout4.cxx @@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL) @@ -206,3 +207,47 @@ uno::Reference xDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); uno::Reference xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); +diff --git i/vcl/qa/cppunit/pdfexport/pdfexport2.cxx w/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +index b9c560f422b5..e415b1fcc807 100644 +--- i/vcl/qa/cppunit/pdfexport/pdfexport2.cxx ++++ w/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +@@ -6320,6 +6320,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTextBoxRuby) + + CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf166044ContFootnoteOnlyOnePgNum) + { ++ return; // fails due to missing font: Noto Sans Lao + saveAsPDF(u"tdf166044-cont-footnote-one-pgnum.fodt"); + + auto pPdfDocument = parsePDFExport(); +diff --git a/svgio/qa/cppunit/data/tdf160386.svg b/svgio/qa/cppunit/data/tdf160386.svg +index 1644b0d15514..cf429508bcd4 100644 +--- a/svgio/qa/cppunit/data/tdf160386.svg ++++ b/svgio/qa/cppunit/data/tdf160386.svg +@@ -8,7 +8,6 @@ + Hello! + Hola! + Bonjour! +- こんにちは + Привет! + + +diff --git i/sc/qa/unit/subsequent_export_test2.cxx w/sc/qa/unit/subsequent_export_test2.cxx +index 956838656b28..70b38e4d59ba 100644 +--- i/sc/qa/unit/subsequent_export_test2.cxx ++++ w/sc/qa/unit/subsequent_export_test2.cxx +@@ -100,6 +100,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringXLSX) + + CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX) + { ++ return; + // this doc is configured with CalcA1 ref syntax + createScDoc("xlsx/empty.xlsx"); + +@@ -137,6 +138,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX) + + CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringUnspecified) + { ++ return; + createScDoc(); + + ScDocument* pDoc = getScDoc(); diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests.patch b/pkgs/applications/office/libreoffice/skip-broken-tests.patch index 67a803baca79..78e7b30ab584 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests.patch @@ -20,18 +20,6 @@ index 231aea8d0f3c..214a23c82562 100644 LibLibreOffice_Impl aOffice; LibLODocument_Impl* pDocument = loadDoc("search.ods"); pDocument->pClass->initializeForRendering(pDocument, nullptr); -diff --git a/svgio/qa/cppunit/data/tdf160386.svg b/svgio/qa/cppunit/data/tdf160386.svg -index 1644b0d15514..cf429508bcd4 100644 ---- a/svgio/qa/cppunit/data/tdf160386.svg -+++ b/svgio/qa/cppunit/data/tdf160386.svg -@@ -8,7 +8,6 @@ - Hello! - Hola! - Bonjour! -- こんにちは - Привет! - - diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx index d8093e57a4e8..c95a742a68d3 100644 --- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx @@ -83,19 +71,40 @@ index 6cf8f22647b9..12848713771b 100644 createSwWebDoc("outline-level.html"); // This was 0, HTML imported into Writer lost the outline numbering for // Heading 1 styles. -diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx -index e53d22c8fd1a..2f9decb0d931 100644 ---- a/sw/qa/extras/layout/layout3.cxx -+++ b/sw/qa/extras/layout/layout3.cxx -@@ -1388,6 +1388,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158658c) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf155177) +diff --git i/sw/qa/extras/layout/layout5.cxx w/sw/qa/extras/layout/layout5.cxx +index b1b6c9cc9d23..3f920d00f996 100644 +--- i/sw/qa/extras/layout/layout5.cxx ++++ w/sw/qa/extras/layout/layout5.cxx +@@ -721,6 +721,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf117028) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf106390) { -+ return; // flaky ++ return; // fails due to missing font: DejaVu Sans + createSwDoc("tdf106390.odt"); + SwDocShell* pShell = getSwDocShell(); + +diff --git i/sw/qa/extras/layout/layout5.cxx w/sw/qa/extras/layout/layout5.cxx +index b1b6c9cc9d23..72990739711f 100644 +--- i/sw/qa/extras/layout/layout5.cxx ++++ w/sw/qa/extras/layout/layout5.cxx +@@ -739,6 +739,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf106390) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTableExtrusion1) + { ++ return; // fails due to missing font: DejaVu Sans + - createSwDoc("tdf155177-1-min.odt"); - - uno::Reference xStyle( + createSwDoc("table-extrusion1.odt"); + SwDocShell* pShell = getSwDocShell(); + +@@ -759,6 +761,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTableExtrusion1) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTableExtrusion2) + { ++ return; // fails due to missing font: DejaVu Sans ++ + createSwDoc("table-extrusion2.odt"); + SwDocShell* pShell = getSwDocShell(); + diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index 794b3bd16ed4..3feaadd7a20f 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx @@ -162,6 +171,28 @@ index e37df27fd817..937c12e8c4c5 100644 // Regression test for bidi portion line breaking where the portion layout ends with underflow, // but the bidi portion should not be truncated. createSwDoc("tdf162314.fodt"); +--- i/sw/qa/extras/tiledrendering/tiledrendering.cxx ++++ w/sw/qa/extras/tiledrendering/tiledrendering.cxx +@@ -1262,6 +1262,7 @@ static void addDarkLightThemes(const Color& rDarkColor, const Color& rLightColor + + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testGetViewRenderState) + { ++ return; + addDarkLightThemes(COL_BLACK, COL_WHITE); + SwXTextDocument* pXTextDocument = createDoc(); + int nFirstViewId = SfxLokHelper::getView(); +--- i/vcl/qa/cppunit/complextext.cxx ++++ w/vcl/qa/cppunit/complextext.cxx +@@ -794,6 +794,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf165510) + + CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf154104) + { ++ return; ++ + ScopedVclPtrInstance pOutDev; + + vcl::Font aBaseFont{ u"David Libre"_ustr, u"Regular"_ustr, Size{ 0, 72 } }; + --- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx 2025-11-05 10:25:25.693126767 +0100 +++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx 2025-11-05 10:27:38.216128865 +0100 @@ -5127,6 +5127,7 @@ diff --git a/pkgs/applications/office/libreoffice/src-collabora/deps.nix b/pkgs/applications/office/libreoffice/src-collabora/deps.nix index 375992c61254..ae7f4751a17a 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/deps.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/deps.nix @@ -77,11 +77,11 @@ md5name = "09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384-dragonbox-1.1.3.tar.gz"; } { - name = "dtoa-20180411.tgz"; - url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; - sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4"; + name = "fast_float-8.1.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/fast_float-8.1.0.tar.gz"; + sha256 = "4bfabb5979716995090ce68dce83f88f99629bc17ae280eae79311c5340143e1"; md5 = ""; - md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; + md5name = "4bfabb5979716995090ce68dce83f88f99629bc17ae280eae79311c5340143e1-fast_float-8.1.0.tar.gz"; } { name = "libcmis-0.6.2.tar.xz"; @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.12.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.12.1.tar.xz"; - sha256 = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202"; + name = "curl-8.14.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.14.1.tar.xz"; + sha256 = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd"; md5 = ""; - md5name = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202-curl-8.12.1.tar.xz"; + md5name = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd-curl-8.14.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -140,18 +140,18 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.12.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.12.tar.xz"; - sha256 = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83"; + name = "libetonyek-0.1.13.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.13.tar.xz"; + sha256 = "032b71cb597edd92a0b270b916188281bc35be55296b263f6817b29adbcb1709"; md5 = ""; - md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; + md5name = "032b71cb597edd92a0b270b916188281bc35be55296b263f6817b29adbcb1709-libetonyek-0.1.13.tar.xz"; } { - name = "expat-2.7.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz"; - sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30"; + name = "expat-2.7.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.7.4.tar.xz"; + sha256 = "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0"; md5 = ""; - md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz"; + md5name = "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0-expat-2.7.4.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -161,11 +161,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.16.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.1.tar.xz"; - sha256 = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a"; + name = "fontconfig-2.16.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.2.tar.xz"; + sha256 = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2"; md5 = ""; - md5name = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a-fontconfig-2.16.1.tar.xz"; + md5name = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2-fontconfig-2.16.2.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -413,11 +413,11 @@ md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip"; } { - name = "ReemKufi-1.7.zip"; - url = "https://dev-www.libreoffice.org/src/ReemKufi-1.7.zip"; - sha256 = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4"; + name = "ReemKufi-1.8.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-1.8.zip"; + sha256 = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc"; md5 = ""; - md5name = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4-ReemKufi-1.7.zip"; + md5name = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc-ReemKufi-1.8.zip"; } { name = "Scheherazade-2.100.zip"; @@ -497,11 +497,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.13.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz"; - sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"; + name = "freetype-2.14.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.14.2.tar.xz"; + sha256 = "4b62dcab4c920a1a860369933221814362e699e26f55792516d671e6ff55b5e1"; md5 = ""; - md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz"; + md5name = "4b62dcab4c920a1a860369933221814362e699e26f55792516d671e6ff55b5e1-freetype-2.14.2.tar.xz"; } { name = "frozen-1.2.0.tar.gz"; @@ -518,11 +518,11 @@ md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip"; } { - name = "gpgme-1.24.2.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.24.2.tar.bz2"; - sha256 = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581"; + name = "gpgme-1.24.3.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.24.3.tar.bz2"; + sha256 = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd"; md5 = ""; - md5name = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581-gpgme-1.24.2.tar.bz2"; + md5name = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd-gpgme-1.24.3.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -672,11 +672,11 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2025-03-10.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2"; - sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39"; + name = "language-subtag-registry-2025-08-25.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-08-25.tar.bz2"; + sha256 = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39"; md5 = ""; - md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2"; + md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2"; } { name = "lcms2-2.17.tar.gz"; @@ -693,11 +693,11 @@ md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2"; } { - name = "libatomic_ops-7.8.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.2.tar.gz"; - sha256 = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51"; + name = "libatomic_ops-7.8.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.4.tar.gz"; + sha256 = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5"; md5 = ""; - md5name = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51-libatomic_ops-7.8.2.tar.gz"; + md5name = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5-libatomic_ops-7.8.4.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -714,18 +714,18 @@ md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz"; } { - name = "libffi-3.4.8.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libffi-3.4.8.tar.gz"; - sha256 = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b"; + name = "libffi-3.5.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.5.2.tar.gz"; + sha256 = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc"; md5 = ""; - md5name = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b-libffi-3.4.8.tar.gz"; + md5name = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc-libffi-3.5.2.tar.gz"; } { - name = "libgpg-error-1.53.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.53.tar.bz2"; - sha256 = "6a0721b52027415f53abcbf63b5c37776a0f774d9126d560a3ce76c0eb42903f"; + name = "libgpg-error-1.55.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.55.tar.bz2"; + sha256 = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78"; md5 = ""; - md5name = "6a0721b52027415f53abcbf63b5c37776a0f774d9126d560a3ce76c0eb42903f-libgpg-error-1.53.tar.bz2"; + md5name = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78-libgpg-error-1.55.tar.bz2"; } { name = "liblangtag-0.6.7.tar.bz2"; @@ -749,11 +749,11 @@ md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz"; } { - name = "libwebp-1.5.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz"; - sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c"; + name = "libwebp-1.6.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.6.0.tar.gz"; + sha256 = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564"; md5 = ""; - md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.0.tar.gz"; + md5name = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564-libwebp-1.6.0.tar.gz"; } { name = "xmlsec1-1.3.6.tar.gz"; @@ -763,11 +763,11 @@ md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz"; } { - name = "libxml2-2.13.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.13.7.tar.xz"; - sha256 = "14796d24402108e99d8de4e974d539bed62e23af8c4233317274ce073ceff93b"; + name = "libxml2-2.14.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.14.6.tar.xz"; + sha256 = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a"; md5 = ""; - md5name = "14796d24402108e99d8de4e974d539bed62e23af8c4233317274ce073ceff93b-libxml2-2.13.7.tar.xz"; + md5name = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a-libxml2-2.14.6.tar.xz"; } { name = "libxslt-1.1.43.tar.xz"; @@ -784,18 +784,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-5.3.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lxml-5.3.2.tar.gz"; - sha256 = "773947d0ed809ddad824b7b14467e1a481b8976e87278ac4a730c2f7c7fcddc1"; + name = "lxml-5.4.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-5.4.0.tar.gz"; + sha256 = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd"; md5 = ""; - md5name = "773947d0ed809ddad824b7b14467e1a481b8976e87278ac4a730c2f7c7fcddc1-lxml-5.3.2.tar.gz"; + md5name = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd-lxml-5.4.0.tar.gz"; } { - name = "mariadb-connector-c-3.3.15-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz"; - sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe"; + name = "mariadb-connector-c-3.3.17-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.17-src.tar.gz"; + sha256 = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01"; md5 = ""; - md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz"; + md5name = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01-mariadb-connector-c-3.3.17-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -833,11 +833,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.102.1-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.102.1-with-nspr-4.35.tar.gz"; - sha256 = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65"; + name = "nss-3.121-with-nspr-4.38.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.121-with-nspr-4.38.2.tar.gz"; + sha256 = "76b9a1364bc4522abc652c4d676498d5062f502f64e38b32e9e2c7a3fff530f1"; md5 = ""; - md5name = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65-nss-3.102.1-with-nspr-4.35.tar.gz"; + md5name = "76b9a1364bc4522abc652c4d676498d5062f502f64e38b32e9e2c7a3fff530f1-nss-3.121-with-nspr-4.38.2.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -854,11 +854,11 @@ md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; } { - name = "officeotron-0.7.4-master.jar"; - url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; - sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770"; - md5 = "8249374c274932a21846fa7629c2aa9b"; - md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; + name = "officeotron-0.8.8.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/officeotron-0.8.8.jar"; + sha256 = "c72cdcb7fe7cfe917d1fb8766ddbc3f92b6124ecd5fb8c6dc0ddabb74a7e057c"; + md5 = ""; + md5name = "c72cdcb7fe7cfe917d1fb8766ddbc3f92b6124ecd5fb8c6dc0ddabb74a7e057c-officeotron-0.8.8.jar"; } { name = "onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; @@ -868,18 +868,18 @@ md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; } { - name = "openldap-2.6.9.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.6.9.tgz"; - sha256 = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff"; + name = "openldap-2.6.10.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.10.tgz"; + sha256 = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516"; md5 = ""; - md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz"; + md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz"; } { - name = "openssl-3.0.16.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.16.tar.gz"; - sha256 = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86"; + name = "openssl-3.0.19.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.19.tar.gz"; + sha256 = "fa5a4143b8aae18be53ef2f3caf29a2e0747430b8bc74d32d88335b94ab63072"; md5 = ""; - md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz"; + md5name = "fa5a4143b8aae18be53ef2f3caf29a2e0747430b8bc74d32d88335b94ab63072-openssl-3.0.19.tar.gz"; } { name = "liborcus-0.19.2.tar.xz"; @@ -902,6 +902,20 @@ md5 = ""; md5name = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd-pdfium-7012.tar.bz2"; } + { + name = "afdko-4.0.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/afdko-4.0.2.tar.gz"; + sha256 = "e1a31e871e83dd022635b852297c433c8e9c9d9d4f0c0f634e8d55dde28ad930"; + md5 = ""; + md5name = "e1a31e871e83dd022635b852297c433c8e9c9d9d4f0c0f634e8d55dde28ad930-afdko-4.0.2.tar.gz"; + } + { + name = "antlr4-cpp-runtime-4.13.2-source.zip"; + url = "https://dev-www.libreoffice.org/src/antlr4-cpp-runtime-4.13.2-source.zip"; + sha256 = "0ed13668906e86dbc0dcddf30fdee68c10203dea4e83852b4edb810821bee3c4"; + md5 = ""; + md5name = "0ed13668906e86dbc0dcddf30fdee68c10203dea4e83852b4edb810821bee3c4-antlr4-cpp-runtime-4.13.2-source.zip"; + } { name = "pixman-0.42.2.tar.gz"; url = "https://dev-www.libreoffice.org/src/pixman-0.42.2.tar.gz"; @@ -910,25 +924,25 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.47.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.47.tar.xz"; - sha256 = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631"; + name = "libpng-1.6.55.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.55.tar.xz"; + sha256 = "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d"; md5 = ""; - md5name = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631-libpng-1.6.47.tar.xz"; + md5name = "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d-libpng-1.6.55.tar.xz"; } { - name = "tiff-4.7.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz"; - sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017"; + name = "tiff-4.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.7.1.tar.xz"; + sha256 = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba"; md5 = ""; - md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; + md5name = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba-tiff-4.7.1.tar.xz"; } { - name = "poppler-25.01.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-25.01.0.tar.xz"; - sha256 = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112"; + name = "poppler-25.08.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-25.08.0.tar.xz"; + sha256 = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d"; md5 = ""; - md5name = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112-poppler-25.01.0.tar.xz"; + md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -938,18 +952,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-14.17.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-14.17.tar.bz2"; - sha256 = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1"; + name = "postgresql-15.15.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-15.15.tar.bz2"; + sha256 = "5753aaeb8b09cbf61016f78aa69bf5cbdf01b43263f010cbf168c82896213aaa"; md5 = ""; - md5name = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1-postgresql-14.17.tar.bz2"; + md5name = "5753aaeb8b09cbf61016f78aa69bf5cbdf01b43263f010cbf168c82896213aaa-postgresql-15.15.tar.bz2"; } { - name = "Python-3.10.17.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.10.17.tar.xz"; - sha256 = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0"; + name = "Python-3.10.19.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.10.19.tar.xz"; + sha256 = "c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076"; md5 = ""; - md5name = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0-Python-3.10.17.tar.xz"; + md5name = "c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076-Python-3.10.19.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -986,6 +1000,13 @@ md5 = ""; md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2"; } + { + name = "md4c-release-0.5.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/md4c-release-0.5.2.tar.gz"; + sha256 = "55d0111d48fb11883aaee91465e642b8b640775a4d6993c2d0e7a8092758ef21"; + md5 = ""; + md5name = "55d0111d48fb11883aaee91465e642b8b640775a4d6993c2d0e7a8092758ef21-md4c-release-0.5.2.tar.gz"; + } { name = "rhino-1.7.15.zip"; url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip"; @@ -994,11 +1015,11 @@ md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip"; } { - name = "skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; - sha256 = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d"; + name = "skia-m133-ecebe831881cdf52c65df518777210071f7970dd.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m133-ecebe831881cdf52c65df518777210071f7970dd.tar.xz"; + sha256 = "af3676facdf12d59a9ad5a0f63c60e6bb47f7d6bb243acdd0c6abc8c9b0b3c59"; md5 = ""; - md5name = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d-skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; + md5name = "af3676facdf12d59a9ad5a0f63c60e6bb47f7d6bb243acdd0c6abc8c9b0b3c59-skia-m133-ecebe831881cdf52c65df518777210071f7970dd.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -1015,11 +1036,11 @@ md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { - name = "libvisio-0.1.8.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libvisio-0.1.8.tar.xz"; - sha256 = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b"; + name = "libvisio-0.1.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.10.tar.xz"; + sha256 = "9e9eff75112d4d92d92262ad7fc2599c21e26f8fc5ba54900efdc83c0501e472"; md5 = ""; - md5name = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b-libvisio-0.1.8.tar.xz"; + md5name = "9e9eff75112d4d92d92262ad7fc2599c21e26f8fc5ba54900efdc83c0501e472-libvisio-0.1.10.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; @@ -1064,11 +1085,11 @@ md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } { - name = "zxcvbn-c-2.5.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz"; - sha256 = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd"; + name = "zxcvbn-c-2.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.6.tar.gz"; + sha256 = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a"; md5 = ""; - md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz"; + md5name = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a-zxcvbn-c-2.6.tar.gz"; } { name = "zxing-cpp-2.2.1.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-collabora/help.nix b/pkgs/applications/office/libreoffice/src-collabora/help.nix index 25d53a527288..142586d9c561 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/help.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/help.nix @@ -1,6 +1,6 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/help"; - tag = "cp-25.04.1-1"; - hash = "sha256-jKcrkvdxpebCTeILrjA7bKfcsWw8VFjS7eimJI1dgFQ="; + tag = "cp-25.04.9-4"; + hash = "sha256-J2gtGU3YSgKnoGMALoPY1Bn2i8bU6KJM+aU7nmcAUIg="; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/main.nix b/pkgs/applications/office/libreoffice/src-collabora/main.nix index 1d085b100488..4dbd8fce6454 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/main.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/main.nix @@ -1,7 +1,7 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/core"; - tag = "cp-25.04.1-1"; - hash = "sha256-WhNNKL1RC0hWi21wH5EJRZ8V8U7jk6z8h3E3mVR56zk="; + tag = "cp-25.04.9-4"; + hash = "sha256-9NE5GCIUUyinteFUBBkmV+ZwT7rfnVvynQqhumlYYEc="; fetchSubmodules = false; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/translations.nix b/pkgs/applications/office/libreoffice/src-collabora/translations.nix index 8a96bf99e801..8795be525965 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/translations.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/translations.nix @@ -1,6 +1,6 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/translations"; - tag = "cp-25.04.1-1"; - hash = "sha256-kZ5LwhEMWYv9peYPjTL14wjYv4LHUMtaM7XGYSVw68U="; + tag = "cp-25.04.9-4"; + hash = "sha256-Axjw2uB3dCboOEUW7cLt8CQKjRC4sA2x+QOtgwD3aPU="; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/version.nix b/pkgs/applications/office/libreoffice/src-collabora/version.nix index 94c49e9eee21..59af73fa2a9f 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/version.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/version.nix @@ -1 +1 @@ -"25.04.1-1" +"25.04.9-4" diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index a0a96f5a26e3..54761c791d9c 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -14,11 +14,11 @@ md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz"; } { - name = "boost_1_88_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_88_0.tar.xz"; - sha256 = "5c67a448c562f1606e38203ba7ed7e8d7453581b6b9ca324e96205eae0da5ff8"; + name = "boost_1_89_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_89_0.tar.xz"; + sha256 = "b3a976c659961f1d7fae9a8e58d6729a11f5473abaf2ef0e623f53777c86475d"; md5 = ""; - md5name = "5c67a448c562f1606e38203ba7ed7e8d7453581b6b9ca324e96205eae0da5ff8-boost_1_88_0.tar.xz"; + md5name = "b3a976c659961f1d7fae9a8e58d6729a11f5473abaf2ef0e623f53777c86475d-boost_1_89_0.tar.xz"; } { name = "box2d-2.4.1.tar.gz"; @@ -49,11 +49,11 @@ md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz"; } { - name = "cairo-1.17.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/cairo-1.17.6.tar.xz"; - sha256 = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf"; + name = "cairo-1.18.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/cairo-1.18.4.tar.xz"; + sha256 = "445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb"; md5 = ""; - md5name = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf-cairo-1.17.6.tar.xz"; + md5name = "445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb-cairo-1.18.4.tar.xz"; } { name = "libcdr-0.1.8.tar.xz"; @@ -77,11 +77,11 @@ md5name = "09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384-dragonbox-1.1.3.tar.gz"; } { - name = "dtoa-20180411.tgz"; - url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; - sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4"; + name = "fast_float-8.2.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/fast_float-8.2.2.tar.gz"; + sha256 = "e64b5fff88e04959154adbd5fb83331d91f2e04ac06454671cdfcbdff172b158"; md5 = ""; - md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; + md5name = "e64b5fff88e04959154adbd5fb83331d91f2e04ac06454671cdfcbdff172b158-fast_float-8.2.2.tar.gz"; } { name = "libcmis-0.6.2.tar.xz"; @@ -140,18 +140,18 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.12.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.12.tar.xz"; - sha256 = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83"; + name = "libetonyek-0.1.13.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.13.tar.xz"; + sha256 = "032b71cb597edd92a0b270b916188281bc35be55296b263f6817b29adbcb1709"; md5 = ""; - md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; + md5name = "032b71cb597edd92a0b270b916188281bc35be55296b263f6817b29adbcb1709-libetonyek-0.1.13.tar.xz"; } { - name = "expat-2.7.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.7.2.tar.xz"; - sha256 = "21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c"; + name = "expat-2.7.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.7.4.tar.xz"; + sha256 = "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0"; md5 = ""; - md5name = "21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c-expat-2.7.2.tar.xz"; + md5name = "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0-expat-2.7.4.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -217,11 +217,11 @@ md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } { - name = "NotoKufiArabic-v2.109.zip"; - url = "https://dev-www.libreoffice.org/src/NotoKufiArabic-v2.109.zip"; - sha256 = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f"; + name = "NotoKufiArabic-v2.110.zip"; + url = "https://dev-www.libreoffice.org/src/NotoKufiArabic-v2.110.zip"; + sha256 = "34390882c196f032811f2a3db8982c1e839f69aae3e4c2c1fdd63203150690df"; md5 = ""; - md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; + md5name = "34390882c196f032811f2a3db8982c1e839f69aae3e4c2c1fdd63203150690df-NotoKufiArabic-v2.110.zip"; } { name = "NotoSans-v2.015.zip"; @@ -252,11 +252,11 @@ md5name = "a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2-NotoSansArabic-v2.010.zip"; } { - name = "NotoNaskhArabic-v2.019.zip"; - url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.019.zip"; - sha256 = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81"; + name = "NotoNaskhArabic-v2.021.zip"; + url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.021.zip"; + sha256 = "6c050ab9bd087d69b733c505a7576e60c528c2f33cd7b91005a5bd7da4514032"; md5 = ""; - md5name = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81-NotoNaskhArabic-v2.019.zip"; + md5name = "6c050ab9bd087d69b733c505a7576e60c528c2f33cd7b91005a5bd7da4514032-NotoNaskhArabic-v2.021.zip"; } { name = "NotoSansHebrew-v3.001.zip"; @@ -343,11 +343,11 @@ md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip"; } { - name = "ReemKufi-1.8.zip"; - url = "https://dev-www.libreoffice.org/src/ReemKufi-1.8.zip"; - sha256 = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc"; + name = "ReemKufi-2.0.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-2.0.zip"; + sha256 = "94ae468fd88f37011607f03466bfc3a03fb617682b7bac6419b70de94cac22f0"; md5 = ""; - md5name = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc-ReemKufi-1.8.zip"; + md5name = "94ae468fd88f37011607f03466bfc3a03fb617682b7bac6419b70de94cac22f0-ReemKufi-2.0.zip"; } { name = "Scheherazade-2.100.zip"; @@ -427,11 +427,11 @@ md5name = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823-frozen-1.2.0.tar.gz"; } { - name = "glm-1.0.1.zip"; - url = "https://dev-www.libreoffice.org/src/glm-1.0.1.zip"; - sha256 = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5"; + name = "glm-1.0.3.zip"; + url = "https://dev-www.libreoffice.org/src/glm-1.0.3.zip"; + sha256 = "3aa4347b8f13cba882df1c7b61a6ca910c75a875c56ec3d75d7dc9ae8eac34df"; md5 = ""; - md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip"; + md5name = "3aa4347b8f13cba882df1c7b61a6ca910c75a875c56ec3d75d7dc9ae8eac34df-glm-1.0.3.zip"; } { name = "gpgme-1.24.3.tar.bz2"; @@ -448,11 +448,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-11.5.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-11.5.1.tar.xz"; - sha256 = "972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1"; + name = "harfbuzz-12.3.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-12.3.2.tar.xz"; + sha256 = "6f6db164359a2da5a84ef826615b448b33e6306067ad829d85d5b0bf936f1bb8"; md5 = ""; - md5name = "972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1-harfbuzz-11.5.1.tar.xz"; + md5name = "6f6db164359a2da5a84ef826615b448b33e6306067ad829d85d5b0bf936f1bb8-harfbuzz-12.3.2.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -483,18 +483,18 @@ md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; } { - name = "icu4c-77_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-77_1-src.tgz"; - sha256 = "588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061"; + name = "icu4c-78.2-sources.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-78.2-sources.tgz"; + sha256 = "3e99687b5c435d4b209630e2d2ebb79906c984685e78635078b672e03c89df35"; md5 = ""; - md5name = "588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061-icu4c-77_1-src.tgz"; + md5name = "3e99687b5c435d4b209630e2d2ebb79906c984685e78635078b672e03c89df35-icu4c-78.2-sources.tgz"; } { - name = "icu4c-77_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-77_1-data.zip"; - sha256 = "1e08bfafa442260ccabf9a872d4eab12de813d42b90769df056bab032b37e1d3"; + name = "icu4c-78.2-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-78.2-data.zip"; + sha256 = "582968cf174c9498b2046b4f4e7f786def5f18222bd8d98432d7a29399c38c70"; md5 = ""; - md5name = "1e08bfafa442260ccabf9a872d4eab12de813d42b90769df056bab032b37e1d3-icu4c-77_1-data.zip"; + md5name = "582968cf174c9498b2046b4f4e7f786def5f18222bd8d98432d7a29399c38c70-icu4c-78.2-data.zip"; } { name = "Java-WebSocket-1.6.0.tar.gz"; @@ -581,11 +581,11 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-3.1.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.2.tar.gz"; - sha256 = "560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6"; + name = "libjpeg-turbo-3.1.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.3.tar.gz"; + sha256 = "3a13a5ba767dc8264bc40b185e41368a80d5d5f945944d1dbaa4b2fb0099f4e5"; md5 = ""; - md5name = "560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6-libjpeg-turbo-3.1.2.tar.gz"; + md5name = "3a13a5ba767dc8264bc40b185e41368a80d5d5f945944d1dbaa4b2fb0099f4e5-libjpeg-turbo-3.1.3.tar.gz"; } { name = "language-subtag-registry-2025-08-25.tar.bz2"; @@ -595,11 +595,11 @@ md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2"; } { - name = "lcms2-2.17.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz"; - sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074"; + name = "lcms2-2.18.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.18.tar.gz"; + sha256 = "ee67be3566f459362c1ee094fde2c159d33fa0390aa4ed5f5af676f9e5004347"; md5 = ""; - md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz"; + md5name = "ee67be3566f459362c1ee094fde2c159d33fa0390aa4ed5f5af676f9e5004347-lcms2-2.18.tar.gz"; } { name = "libassuan-3.0.2.tar.bz2"; @@ -609,11 +609,11 @@ md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2"; } { - name = "libatomic_ops-7.8.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.4.tar.gz"; - sha256 = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5"; + name = "libatomic_ops-7.10.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.10.0.tar.gz"; + sha256 = "0db3ebff755db170f65e74a64ec4511812e9ee3185c232eeffeacd274190dfb0"; md5 = ""; - md5name = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5-libatomic_ops-7.8.4.tar.gz"; + md5name = "0db3ebff755db170f65e74a64ec4511812e9ee3185c232eeffeacd274190dfb0-libatomic_ops-7.10.0.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -637,18 +637,18 @@ md5name = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc-libffi-3.5.2.tar.gz"; } { - name = "libgpg-error-1.55.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.55.tar.bz2"; - sha256 = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78"; + name = "libgpg-error-1.59.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.59.tar.bz2"; + sha256 = "a19bc5087fd97026d93cb4b45d51638d1a25202a5e1fbc3905799f424cfa6134"; md5 = ""; - md5name = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78-libgpg-error-1.55.tar.bz2"; + md5name = "a19bc5087fd97026d93cb4b45d51638d1a25202a5e1fbc3905799f424cfa6134-libgpg-error-1.59.tar.bz2"; } { - name = "liblangtag-0.6.7.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.7.tar.bz2"; - sha256 = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e"; + name = "liblangtag-0.6.8.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.8.tar.bz2"; + sha256 = "a96975b79ddd8fef6d9295c083fe3f1afa1a8898a57235d4069255ade44e5cf2"; md5 = ""; - md5name = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e-liblangtag-0.6.7.tar.bz2"; + md5name = "a96975b79ddd8fef6d9295c083fe3f1afa1a8898a57235d4069255ade44e5cf2-liblangtag-0.6.8.tar.bz2"; } { name = "libnumbertext-1.0.11.tar.xz"; @@ -672,11 +672,11 @@ md5name = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564-libwebp-1.6.0.tar.gz"; } { - name = "xmlsec1-1.3.7.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.7.tar.gz"; - sha256 = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea"; + name = "xmlsec1-1.3.9.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.9.tar.gz"; + sha256 = "a631c8cd7a6b86e6adb9f5b935d45a9cf9768b3cb090d461e8eb9d043cf9b62f"; md5 = ""; - md5name = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea-xmlsec1-1.3.7.tar.gz"; + md5name = "a631c8cd7a6b86e6adb9f5b935d45a9cf9768b3cb090d461e8eb9d043cf9b62f-xmlsec1-1.3.9.tar.gz"; } { name = "libxml2-2.14.6.tar.xz"; @@ -686,11 +686,11 @@ md5name = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a-libxml2-2.14.6.tar.xz"; } { - name = "libxslt-1.1.43.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.43.tar.xz"; - sha256 = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a"; + name = "libxslt-1.1.45.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.45.tar.xz"; + sha256 = "9acfe68419c4d06a45c550321b3212762d92f41465062ca4ea19e632ee5d216e"; md5 = ""; - md5name = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a-libxslt-1.1.43.tar.xz"; + md5name = "9acfe68419c4d06a45c550321b3212762d92f41465062ca4ea19e632ee5d216e-libxslt-1.1.45.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -707,11 +707,18 @@ md5name = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62-lxml-6.0.2.tar.gz"; } { - name = "mariadb-connector-c-3.3.17-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.17-src.tar.gz"; - sha256 = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01"; + name = "xz-5.8.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xz-5.8.2.tar.gz"; + sha256 = "ce09c50a5962786b83e5da389c90dd2c15ecd0980a258dd01f70f9e7ce58a8f1"; md5 = ""; - md5name = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01-mariadb-connector-c-3.3.17-src.tar.gz"; + md5name = "ce09c50a5962786b83e5da389c90dd2c15ecd0980a258dd01f70f9e7ce58a8f1-xz-5.8.2.tar.gz"; + } + { + name = "mariadb-connector-c-3.3.18-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.18-src.tar.gz"; + sha256 = "292c0f2e6ce5cb6f1217f3a53c72f792e55fb20393e00924b11943e2f9f6e9d5"; + md5 = ""; + md5name = "292c0f2e6ce5cb6f1217f3a53c72f792e55fb20393e00924b11943e2f9f6e9d5-mariadb-connector-c-3.3.18-src.tar.gz"; } { name = "mdds-3.1.0.tar.xz"; @@ -756,11 +763,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.116-with-nspr-4.37.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.116-with-nspr-4.37.tar.gz"; - sha256 = "af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10"; + name = "nss-3.119.1-with-nspr-4.38.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.119.1-with-nspr-4.38.2.tar.gz"; + sha256 = "1e86aacdce66c3bdd38bb011e617a3c93013ed6f802102365a589d6f686efe4b"; md5 = ""; - md5name = "af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10-nss-3.116-with-nspr-4.37.tar.gz"; + md5name = "1e86aacdce66c3bdd38bb011e617a3c93013ed6f802102365a589d6f686efe4b-nss-3.119.1-with-nspr-4.38.2.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -777,11 +784,11 @@ md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; } { - name = "officeotron-0.7.4-master.jar"; - url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; - sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770"; - md5 = "8249374c274932a21846fa7629c2aa9b"; - md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; + name = "officeotron-0.8.5.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/officeotron-0.8.5.jar"; + sha256 = "0c2a4227394ac78147387f1c1ff1063e87f2151ffc91f1eb97bb17c2650fa708"; + md5 = ""; + md5name = "0c2a4227394ac78147387f1c1ff1063e87f2151ffc91f1eb97bb17c2650fa708-officeotron-0.8.5.jar"; } { name = "onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; @@ -791,25 +798,25 @@ md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; } { - name = "openldap-2.6.10.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.6.10.tgz"; - sha256 = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516"; + name = "openldap-2.6.12.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.12.tgz"; + sha256 = "1716ad779e85d743694c3e3b05277fb71b6a5eadca43c7a958aa62683b22208e"; md5 = ""; - md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz"; + md5name = "1716ad779e85d743694c3e3b05277fb71b6a5eadca43c7a958aa62683b22208e-openldap-2.6.12.tgz"; } { - name = "openssl-3.0.18.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.18.tar.gz"; - sha256 = "d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b"; + name = "openssl-3.5.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.5.5.tar.gz"; + sha256 = "b28c91532a8b65a1f983b4c28b7488174e4a01008e29ce8e69bd789f28bc2a89"; md5 = ""; - md5name = "d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b-openssl-3.0.18.tar.gz"; + md5name = "b28c91532a8b65a1f983b4c28b7488174e4a01008e29ce8e69bd789f28bc2a89-openssl-3.5.5.tar.gz"; } { - name = "liborcus-0.20.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/liborcus-0.20.1.tar.xz"; - sha256 = "ec27f30e8445a2a3f307f7e829fc446fd48193150b7f8f23bb5bfb25ec6e4e27"; + name = "liborcus-0.21.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.21.0.tar.xz"; + sha256 = "1c6e473d6b8a63d61d0e6874a1762d6f0e0e78338d763e48ac93126ecde19b37"; md5 = ""; - md5name = "ec27f30e8445a2a3f307f7e829fc446fd48193150b7f8f23bb5bfb25ec6e4e27-liborcus-0.20.1.tar.xz"; + md5name = "1c6e473d6b8a63d61d0e6874a1762d6f0e0e78338d763e48ac93126ecde19b37-liborcus-0.21.0.tar.xz"; } { name = "libpagemaker-0.0.4.tar.xz"; @@ -819,25 +826,39 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-7012.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-7012.tar.bz2"; - sha256 = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd"; + name = "pdfium-7471.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-7471.tar.bz2"; + sha256 = "7144b0fa78fd408997e7b84ffd3c257db602e392a1bb1584828d80e60b6b27c5"; md5 = ""; - md5name = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd-pdfium-7012.tar.bz2"; + md5name = "7144b0fa78fd408997e7b84ffd3c257db602e392a1bb1584828d80e60b6b27c5-pdfium-7471.tar.bz2"; } { - name = "pixman-0.42.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/pixman-0.42.2.tar.gz"; - sha256 = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e"; + name = "afdko-4.0.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/afdko-4.0.3.tar.gz"; + sha256 = "5feed7c2468e25b25fce0479c04af07f4ed2680bc9251bb4c4aef9ec2fba5720"; md5 = ""; - md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; + md5name = "5feed7c2468e25b25fce0479c04af07f4ed2680bc9251bb4c4aef9ec2fba5720-afdko-4.0.3.tar.gz"; } { - name = "libpng-1.6.50.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.50.tar.xz"; - sha256 = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307"; + name = "antlr4-cpp-runtime-4.13.2-source.zip"; + url = "https://dev-www.libreoffice.org/src/antlr4-cpp-runtime-4.13.2-source.zip"; + sha256 = "0ed13668906e86dbc0dcddf30fdee68c10203dea4e83852b4edb810821bee3c4"; md5 = ""; - md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.tar.xz"; + md5name = "0ed13668906e86dbc0dcddf30fdee68c10203dea4e83852b4edb810821bee3c4-antlr4-cpp-runtime-4.13.2-source.zip"; + } + { + name = "pixman-0.46.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/pixman-0.46.4.tar.xz"; + sha256 = "a098c33924754ad43f981b740f6d576c70f9ed1006e12221b1845431ebce1239"; + md5 = ""; + md5name = "a098c33924754ad43f981b740f6d576c70f9ed1006e12221b1845431ebce1239-pixman-0.46.4.tar.xz"; + } + { + name = "libpng-1.6.55.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.55.tar.xz"; + sha256 = "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d"; + md5 = ""; + md5name = "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d-libpng-1.6.55.tar.xz"; } { name = "tiff-4.7.1.tar.xz"; @@ -847,11 +868,11 @@ md5name = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba-tiff-4.7.1.tar.xz"; } { - name = "poppler-25.09.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-25.09.1.tar.xz"; - sha256 = "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658"; + name = "poppler-26.01.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-26.01.0.tar.xz"; + sha256 = "1cb944a4b88847f5fb6551683bc799db59f04990f5d8be07aba2acbf38601089"; md5 = ""; - md5name = "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658-poppler-25.09.1.tar.xz"; + md5name = "1cb944a4b88847f5fb6551683bc799db59f04990f5d8be07aba2acbf38601089-poppler-26.01.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -861,18 +882,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-15.14.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-15.14.tar.bz2"; - sha256 = "06dd75d305cd3870ee62b3932e661c624543eaf9ae2ba37cdec0a4f8edd051d2"; + name = "postgresql-15.15.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-15.15.tar.bz2"; + sha256 = "5753aaeb8b09cbf61016f78aa69bf5cbdf01b43263f010cbf168c82896213aaa"; md5 = ""; - md5name = "06dd75d305cd3870ee62b3932e661c624543eaf9ae2ba37cdec0a4f8edd051d2-postgresql-15.14.tar.bz2"; + md5name = "5753aaeb8b09cbf61016f78aa69bf5cbdf01b43263f010cbf168c82896213aaa-postgresql-15.15.tar.bz2"; } { - name = "Python-3.11.13.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.11.13.tar.xz"; - sha256 = "8fb5f9fbc7609fa822cb31549884575db7fd9657cbffb89510b5d7975963a83a"; + name = "Python-3.12.12.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.12.12.tar.xz"; + sha256 = "fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4"; md5 = ""; - md5name = "8fb5f9fbc7609fa822cb31549884575db7fd9657cbffb89510b5d7975963a83a-Python-3.11.13.tar.xz"; + md5name = "fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4-Python-3.12.12.tar.xz"; } { name = "python.3.12.8.nupkg"; @@ -917,18 +938,32 @@ md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2"; } { - name = "rhino-1.7.15.zip"; - url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip"; - sha256 = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa"; + name = "md4c-release-0.5.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/md4c-release-0.5.2.tar.gz"; + sha256 = "55d0111d48fb11883aaee91465e642b8b640775a4d6993c2d0e7a8092758ef21"; md5 = ""; - md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip"; + md5name = "55d0111d48fb11883aaee91465e642b8b640775a4d6993c2d0e7a8092758ef21-md4c-release-0.5.2.tar.gz"; } { - name = "skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz"; - sha256 = "2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25"; + name = "rhino-1.7.15.1.zip"; + url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.1.zip"; + sha256 = "65599965d82c0e60332601d511dacb0241e796cabfa5550c72bb80c4bf89e8ad"; md5 = ""; - md5name = "2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25-skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz"; + md5name = "65599965d82c0e60332601d511dacb0241e796cabfa5550c72bb80c4bf89e8ad-rhino-1.7.15.1.zip"; + } + { + name = "skia-m142-f4ed99d2443962782cf5f8b4dd27179f131e7cbe.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m142-f4ed99d2443962782cf5f8b4dd27179f131e7cbe.tar.xz"; + sha256 = "45ae58e84fa2d1e261bfc980e1c5b7bbfaf83887e3813795bd343d3786f4d0bc"; + md5 = ""; + md5name = "45ae58e84fa2d1e261bfc980e1c5b7bbfaf83887e3813795bd343d3786f4d0bc-skia-m142-f4ed99d2443962782cf5f8b4dd27179f131e7cbe.tar.xz"; + } + { + name = "sqlite-amalgamation-3510200.zip"; + url = "https://dev-www.libreoffice.org/src/sqlite-amalgamation-3510200.zip"; + sha256 = "6e2a845a493026bdbad0618b2b5a0cf48584faab47384480ed9f592d912f23ec"; + md5 = ""; + md5name = "6e2a845a493026bdbad0618b2b5a0cf48584faab47384480ed9f592d912f23ec-sqlite-amalgamation-3510200.zip"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -945,11 +980,11 @@ md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { - name = "libvisio-0.1.8.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libvisio-0.1.8.tar.xz"; - sha256 = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b"; + name = "libvisio-0.1.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.10.tar.xz"; + sha256 = "9e9eff75112d4d92d92262ad7fc2599c21e26f8fc5ba54900efdc83c0501e472"; md5 = ""; - md5name = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b-libvisio-0.1.8.tar.xz"; + md5name = "9e9eff75112d4d92d92262ad7fc2599c21e26f8fc5ba54900efdc83c0501e472-libvisio-0.1.10.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; @@ -980,11 +1015,18 @@ md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { - name = "zlib-1.3.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/zlib-1.3.1.tar.xz"; - sha256 = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32"; + name = "y-crdt-0.23.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/y-crdt-0.23.5.tar.gz"; + sha256 = "67c02f1b74fda33bcc824a310028c100ce2a84b6e63ade46ae1a3258e867a225"; md5 = ""; - md5name = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32-zlib-1.3.1.tar.xz"; + md5name = "67c02f1b74fda33bcc824a310028c100ce2a84b6e63ade46ae1a3258e867a225-y-crdt-0.23.5.tar.gz"; + } + { + name = "zlib-1.3.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/zlib-1.3.2.tar.xz"; + sha256 = "d7a0654783a4da529d1bb793b7ad9c3318020af77667bcae35f95d0e42a792f3"; + md5 = ""; + md5name = "d7a0654783a4da529d1bb793b7ad9c3318020af77667bcae35f95d0e42a792f3-zlib-1.3.2.tar.xz"; } { name = "zstd-1.5.7.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index 314832020879..3e1a1753d9d8 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0pzb8xaiqzwqs0l3pdb857vk3z26n2zwqicmyj0paxaw0cndx7xv"; - url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-help-25.8.2.2.tar.xz"; + sha256 = "0s15v57xn936mwxrksfc2xy5pfr7jphfiw8ihhij3sxjq4qr49ys"; + url = "https://download.documentfoundation.org/libreoffice/src/26.2.1/libreoffice-help-26.2.1.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index ec1097e528fb..105150a9e20f 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/main.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0pn1swdy3vpi5phh4br1q3mly6b349qbanmwalv8v0fzqgpa4b00"; - url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-25.8.2.2.tar.xz"; + sha256 = "0a7wx3slnnbvql59dihby5gb57xbdxm29qiw1dqkfapvfdgj5khq"; + url = "https://download.documentfoundation.org/libreoffice/src/26.2.1/libreoffice-26.2.1.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index 396afcb84eb3..2a09b2415c3e 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0c184wz9c55q7q87wnf0jy87cws01rwqsqc2cyilv2r5sy7ih0gv"; - url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-translations-25.8.2.2.tar.xz"; + sha256 = "0hwim8sz9kf802svnv1py4fw4pv9n0ilk5k1r2801r843vlxsy2c"; + url = "https://download.documentfoundation.org/libreoffice/src/26.2.1/libreoffice-translations-26.2.1.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index 84598b00df3b..c5f86e6b6112 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/version.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -1 +1 @@ -"25.8.2.2" +"26.2.1.2" diff --git a/pkgs/applications/office/libreoffice/src-still/deps.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix index a81ab062be11..b2f5dd10ac5e 100644 --- a/pkgs/applications/office/libreoffice/src-still/deps.nix +++ b/pkgs/applications/office/libreoffice/src-still/deps.nix @@ -14,11 +14,11 @@ md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz"; } { - name = "boost_1_86_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_86_0.tar.xz"; - sha256 = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c"; + name = "boost_1_88_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_88_0.tar.xz"; + sha256 = "5c67a448c562f1606e38203ba7ed7e8d7453581b6b9ca324e96205eae0da5ff8"; md5 = ""; - md5name = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c-boost_1_86_0.tar.xz"; + md5name = "5c67a448c562f1606e38203ba7ed7e8d7453581b6b9ca324e96205eae0da5ff8-boost_1_88_0.tar.xz"; } { name = "box2d-2.4.1.tar.gz"; @@ -140,18 +140,18 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.12.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.12.tar.xz"; - sha256 = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83"; + name = "libetonyek-0.1.13.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.13.tar.xz"; + sha256 = "032b71cb597edd92a0b270b916188281bc35be55296b263f6817b29adbcb1709"; md5 = ""; - md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; + md5name = "032b71cb597edd92a0b270b916188281bc35be55296b263f6817b29adbcb1709-libetonyek-0.1.13.tar.xz"; } { - name = "expat-2.7.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz"; - sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30"; + name = "expat-2.7.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.7.4.tar.xz"; + sha256 = "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0"; md5 = ""; - md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz"; + md5name = "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0-expat-2.7.4.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -161,11 +161,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.16.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.2.tar.xz"; - sha256 = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2"; + name = "fontconfig-2.17.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.17.1.tar.xz"; + sha256 = "9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541"; md5 = ""; - md5name = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2-fontconfig-2.16.2.tar.xz"; + md5name = "9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541-fontconfig-2.17.1.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -217,11 +217,11 @@ md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } { - name = "NotoKufiArabic-v2.109.zip"; - url = "https://dev-www.libreoffice.org/src/NotoKufiArabic-v2.109.zip"; - sha256 = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f"; + name = "NotoKufiArabic-v2.110.zip"; + url = "https://dev-www.libreoffice.org/src/NotoKufiArabic-v2.110.zip"; + sha256 = "34390882c196f032811f2a3db8982c1e839f69aae3e4c2c1fdd63203150690df"; md5 = ""; - md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; + md5name = "34390882c196f032811f2a3db8982c1e839f69aae3e4c2c1fdd63203150690df-NotoKufiArabic-v2.110.zip"; } { name = "NotoSans-v2.015.zip"; @@ -252,11 +252,11 @@ md5name = "a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2-NotoSansArabic-v2.010.zip"; } { - name = "NotoNaskhArabic-v2.019.zip"; - url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.019.zip"; - sha256 = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81"; + name = "NotoNaskhArabic-v2.021.zip"; + url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.021.zip"; + sha256 = "6c050ab9bd087d69b733c505a7576e60c528c2f33cd7b91005a5bd7da4514032"; md5 = ""; - md5name = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81-NotoNaskhArabic-v2.019.zip"; + md5name = "6c050ab9bd087d69b733c505a7576e60c528c2f33cd7b91005a5bd7da4514032-NotoNaskhArabic-v2.021.zip"; } { name = "NotoSansHebrew-v3.001.zip"; @@ -343,11 +343,11 @@ md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip"; } { - name = "ReemKufi-1.8.zip"; - url = "https://dev-www.libreoffice.org/src/ReemKufi-1.8.zip"; - sha256 = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc"; + name = "ReemKufi-2.0.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-2.0.zip"; + sha256 = "94ae468fd88f37011607f03466bfc3a03fb617682b7bac6419b70de94cac22f0"; md5 = ""; - md5name = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc-ReemKufi-1.8.zip"; + md5name = "94ae468fd88f37011607f03466bfc3a03fb617682b7bac6419b70de94cac22f0-ReemKufi-2.0.zip"; } { name = "Scheherazade-2.100.zip"; @@ -413,11 +413,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.13.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz"; - sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"; + name = "freetype-2.14.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.14.1.tar.xz"; + sha256 = "32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc"; md5 = ""; - md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz"; + md5name = "32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc-freetype-2.14.1.tar.xz"; } { name = "frozen-1.2.0.tar.gz"; @@ -427,11 +427,11 @@ md5name = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823-frozen-1.2.0.tar.gz"; } { - name = "glm-1.0.1.zip"; - url = "https://dev-www.libreoffice.org/src/glm-1.0.1.zip"; - sha256 = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5"; + name = "glm-1.0.2.zip"; + url = "https://dev-www.libreoffice.org/src/glm-1.0.2.zip"; + sha256 = "be64032585415ca7dbea0d614915bb8eec012adf7b4d4fea7ff6b5bd3e0b906a"; md5 = ""; - md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip"; + md5name = "be64032585415ca7dbea0d614915bb8eec012adf7b4d4fea7ff6b5bd3e0b906a-glm-1.0.2.zip"; } { name = "gpgme-1.24.3.tar.bz2"; @@ -448,11 +448,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-8.5.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-8.5.0.tar.xz"; - sha256 = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27"; + name = "harfbuzz-12.3.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-12.3.0.tar.xz"; + sha256 = "8660ebd3c27d9407fc8433b5d172bafba5f0317cb0bb4339f28e5370c93d42b7"; md5 = ""; - md5name = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27-harfbuzz-8.5.0.tar.xz"; + md5name = "8660ebd3c27d9407fc8433b5d172bafba5f0317cb0bb4339f28e5370c93d42b7-harfbuzz-12.3.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -483,18 +483,18 @@ md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; } { - name = "icu4c-75_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-75_1-src.tgz"; - sha256 = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef"; + name = "icu4c-77_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-77_1-src.tgz"; + sha256 = "588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061"; md5 = ""; - md5name = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef-icu4c-75_1-src.tgz"; + md5name = "588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061-icu4c-77_1-src.tgz"; } { - name = "icu4c-75_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-75_1-data.zip"; - sha256 = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1"; + name = "icu4c-77_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-77_1-data.zip"; + sha256 = "1e08bfafa442260ccabf9a872d4eab12de813d42b90769df056bab032b37e1d3"; md5 = ""; - md5name = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1-icu4c-75_1-data.zip"; + md5name = "1e08bfafa442260ccabf9a872d4eab12de813d42b90769df056bab032b37e1d3-icu4c-77_1-data.zip"; } { name = "Java-WebSocket-1.6.0.tar.gz"; @@ -581,11 +581,11 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-2.1.5.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.5.1.tar.gz"; - sha256 = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf"; + name = "libjpeg-turbo-3.1.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.3.tar.gz"; + sha256 = "3a13a5ba767dc8264bc40b185e41368a80d5d5f945944d1dbaa4b2fb0099f4e5"; md5 = ""; - md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; + md5name = "3a13a5ba767dc8264bc40b185e41368a80d5d5f945944d1dbaa4b2fb0099f4e5-libjpeg-turbo-3.1.3.tar.gz"; } { name = "language-subtag-registry-2025-08-25.tar.bz2"; @@ -595,11 +595,11 @@ md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2"; } { - name = "lcms2-2.17.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz"; - sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074"; + name = "lcms2-2.18.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.18.tar.gz"; + sha256 = "ee67be3566f459362c1ee094fde2c159d33fa0390aa4ed5f5af676f9e5004347"; md5 = ""; - md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz"; + md5name = "ee67be3566f459362c1ee094fde2c159d33fa0390aa4ed5f5af676f9e5004347-lcms2-2.18.tar.gz"; } { name = "libassuan-3.0.2.tar.bz2"; @@ -609,11 +609,11 @@ md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2"; } { - name = "libatomic_ops-7.8.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.2.tar.gz"; - sha256 = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51"; + name = "libatomic_ops-7.8.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.4.tar.gz"; + sha256 = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5"; md5 = ""; - md5name = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51-libatomic_ops-7.8.2.tar.gz"; + md5name = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5-libatomic_ops-7.8.4.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -637,18 +637,18 @@ md5name = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc-libffi-3.5.2.tar.gz"; } { - name = "libgpg-error-1.55.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.55.tar.bz2"; - sha256 = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78"; + name = "libgpg-error-1.56.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.56.tar.bz2"; + sha256 = "82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0"; md5 = ""; - md5name = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78-libgpg-error-1.55.tar.bz2"; + md5name = "82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0-libgpg-error-1.56.tar.bz2"; } { - name = "liblangtag-0.6.7.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.7.tar.bz2"; - sha256 = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e"; + name = "liblangtag-0.6.8.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.8.tar.bz2"; + sha256 = "a96975b79ddd8fef6d9295c083fe3f1afa1a8898a57235d4069255ade44e5cf2"; md5 = ""; - md5name = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e-liblangtag-0.6.7.tar.bz2"; + md5name = "a96975b79ddd8fef6d9295c083fe3f1afa1a8898a57235d4069255ade44e5cf2-liblangtag-0.6.8.tar.bz2"; } { name = "libnumbertext-1.0.11.tar.xz"; @@ -672,25 +672,25 @@ md5name = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564-libwebp-1.6.0.tar.gz"; } { - name = "xmlsec1-1.3.6.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.6.tar.gz"; - sha256 = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f"; + name = "xmlsec1-1.3.9.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.9.tar.gz"; + sha256 = "a631c8cd7a6b86e6adb9f5b935d45a9cf9768b3cb090d461e8eb9d043cf9b62f"; md5 = ""; - md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz"; + md5name = "a631c8cd7a6b86e6adb9f5b935d45a9cf9768b3cb090d461e8eb9d043cf9b62f-xmlsec1-1.3.9.tar.gz"; } { - name = "libxml2-2.14.5.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.14.5.tar.xz"; - sha256 = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b"; + name = "libxml2-2.14.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.14.6.tar.xz"; + sha256 = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a"; md5 = ""; - md5name = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b-libxml2-2.14.5.tar.xz"; + md5name = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a-libxml2-2.14.6.tar.xz"; } { - name = "libxslt-1.1.43.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.43.tar.xz"; - sha256 = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a"; + name = "libxslt-1.1.45.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.45.tar.xz"; + sha256 = "9acfe68419c4d06a45c550321b3212762d92f41465062ca4ea19e632ee5d216e"; md5 = ""; - md5name = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a-libxslt-1.1.43.tar.xz"; + md5name = "9acfe68419c4d06a45c550321b3212762d92f41465062ca4ea19e632ee5d216e-libxslt-1.1.45.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -700,25 +700,25 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-5.4.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lxml-5.4.0.tar.gz"; - sha256 = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd"; + name = "lxml-6.0.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-6.0.2.tar.gz"; + sha256 = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62"; md5 = ""; - md5name = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd-lxml-5.4.0.tar.gz"; + md5name = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62-lxml-6.0.2.tar.gz"; } { - name = "mariadb-connector-c-3.3.15-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz"; - sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe"; + name = "mariadb-connector-c-3.3.18-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.18-src.tar.gz"; + sha256 = "292c0f2e6ce5cb6f1217f3a53c72f792e55fb20393e00924b11943e2f9f6e9d5"; md5 = ""; - md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz"; + md5name = "292c0f2e6ce5cb6f1217f3a53c72f792e55fb20393e00924b11943e2f9f6e9d5-mariadb-connector-c-3.3.18-src.tar.gz"; } { - name = "mdds-2.1.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/mdds-2.1.1.tar.xz"; - sha256 = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56"; + name = "mdds-3.1.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/mdds-3.1.0.tar.xz"; + sha256 = "ca295f4c86968a7eb1f5d503ff7ae180e6605210cfb26d01658be42048c0924c"; md5 = ""; - md5name = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56-mdds-2.1.1.tar.xz"; + md5name = "ca295f4c86968a7eb1f5d503ff7ae180e6605210cfb26d01658be42048c0924c-mdds-3.1.0.tar.xz"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -727,6 +727,13 @@ md5 = ""; md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz"; } + { + name = "meson-1.8.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/meson-1.8.3.tar.gz"; + sha256 = "f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf"; + md5 = ""; + md5name = "f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf-meson-1.8.3.tar.gz"; + } { name = "libmspub-0.1.4.tar.xz"; url = "https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; @@ -749,11 +756,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.102.1-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.102.1-with-nspr-4.35.tar.gz"; - sha256 = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65"; + name = "nss-3.118.1-with-nspr-4.37.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.118.1-with-nspr-4.37.tar.gz"; + sha256 = "9e1f7da9f4e5e3bdfd73f7dc2c618d6125a12354aadaeedbb35af3699bc03e15"; md5 = ""; - md5name = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65-nss-3.102.1-with-nspr-4.35.tar.gz"; + md5name = "9e1f7da9f4e5e3bdfd73f7dc2c618d6125a12354aadaeedbb35af3699bc03e15-nss-3.118.1-with-nspr-4.37.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -770,11 +777,11 @@ md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; } { - name = "officeotron-0.7.4-master.jar"; - url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; - sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770"; - md5 = "8249374c274932a21846fa7629c2aa9b"; - md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; + name = "officeotron-0.8.4.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/officeotron-0.8.4.jar"; + sha256 = "567b9579510969e34085ed30995d87b27a11584f03711d7fc9b7ec2e1cea36c5"; + md5 = ""; + md5name = "567b9579510969e34085ed30995d87b27a11584f03711d7fc9b7ec2e1cea36c5-officeotron-0.8.4.jar"; } { name = "onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; @@ -791,18 +798,18 @@ md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz"; } { - name = "openssl-3.0.17.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.17.tar.gz"; - sha256 = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce"; + name = "openssl-3.0.19.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.19.tar.gz"; + sha256 = "fa5a4143b8aae18be53ef2f3caf29a2e0747430b8bc74d32d88335b94ab63072"; md5 = ""; - md5name = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce-openssl-3.0.17.tar.gz"; + md5name = "fa5a4143b8aae18be53ef2f3caf29a2e0747430b8bc74d32d88335b94ab63072-openssl-3.0.19.tar.gz"; } { - name = "liborcus-0.19.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/liborcus-0.19.2.tar.xz"; - sha256 = "69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39"; + name = "liborcus-0.20.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.20.1.tar.xz"; + sha256 = "ec27f30e8445a2a3f307f7e829fc446fd48193150b7f8f23bb5bfb25ec6e4e27"; md5 = ""; - md5name = "69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39-liborcus-0.19.2.tar.xz"; + md5name = "ec27f30e8445a2a3f307f7e829fc446fd48193150b7f8f23bb5bfb25ec6e4e27-liborcus-0.20.1.tar.xz"; } { name = "libpagemaker-0.0.4.tar.xz"; @@ -812,11 +819,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-6764.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-6764.tar.bz2"; - sha256 = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49"; + name = "pdfium-7012.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-7012.tar.bz2"; + sha256 = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd"; md5 = ""; - md5name = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49-pdfium-6764.tar.bz2"; + md5name = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd-pdfium-7012.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -826,25 +833,25 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.50.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.50.tar.xz"; - sha256 = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307"; + name = "libpng-1.6.55.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.55.tar.xz"; + sha256 = "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d"; md5 = ""; - md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.tar.xz"; + md5name = "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d-libpng-1.6.55.tar.xz"; } { - name = "tiff-4.7.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz"; - sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017"; + name = "tiff-4.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.7.1.tar.xz"; + sha256 = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba"; md5 = ""; - md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; + md5name = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba-tiff-4.7.1.tar.xz"; } { - name = "poppler-25.08.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-25.08.0.tar.xz"; - sha256 = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d"; + name = "poppler-25.12.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-25.12.0.tar.xz"; + sha256 = "c18b40eb36b1a0c5b86e29ca054bf0770304583da4f2cdd42fe86eca6a20de48"; md5 = ""; - md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz"; + md5name = "c18b40eb36b1a0c5b86e29ca054bf0770304583da4f2cdd42fe86eca6a20de48-poppler-25.12.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -854,18 +861,25 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-14.19.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-14.19.tar.bz2"; - sha256 = "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80"; + name = "postgresql-15.16.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-15.16.tar.bz2"; + sha256 = "695ee29a77be1f5010e10f3667696f29871587f7aa311eadc1f809bea287cf48"; md5 = ""; - md5name = "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80-postgresql-14.19.tar.bz2"; + md5name = "695ee29a77be1f5010e10f3667696f29871587f7aa311eadc1f809bea287cf48-postgresql-15.16.tar.bz2"; } { - name = "Python-3.10.18.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.10.18.tar.xz"; - sha256 = "ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f"; + name = "Python-3.11.14.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.11.14.tar.xz"; + sha256 = "8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78"; md5 = ""; - md5name = "ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f-Python-3.10.18.tar.xz"; + md5name = "8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78-Python-3.11.14.tar.xz"; + } + { + name = "python.3.12.8.nupkg"; + url = "https://dev-www.libreoffice.org/src/python.3.12.8.nupkg"; + sha256 = "406856be971d957e0bee7a5cefe20a5ec78d70a495e9e33cd0e53d31faec049d"; + md5 = ""; + md5name = "406856be971d957e0bee7a5cefe20a5ec78d70a495e9e33cd0e53d31faec049d-python.3.12.8.nupkg"; } { name = "libqxp-0.0.2.tar.xz"; @@ -903,18 +917,18 @@ md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2"; } { - name = "rhino-1.7.15.zip"; - url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip"; - sha256 = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa"; + name = "rhino-1.7.15.1.zip"; + url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.1.zip"; + sha256 = "65599965d82c0e60332601d511dacb0241e796cabfa5550c72bb80c4bf89e8ad"; md5 = ""; - md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip"; + md5name = "65599965d82c0e60332601d511dacb0241e796cabfa5550c72bb80c4bf89e8ad-rhino-1.7.15.1.zip"; } { - name = "skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; - sha256 = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d"; + name = "skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz"; + sha256 = "2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25"; md5 = ""; - md5name = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d-skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; + md5name = "2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25-skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -931,11 +945,11 @@ md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { - name = "libvisio-0.1.8.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libvisio-0.1.8.tar.xz"; - sha256 = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b"; + name = "libvisio-0.1.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.10.tar.xz"; + sha256 = "9e9eff75112d4d92d92262ad7fc2599c21e26f8fc5ba54900efdc83c0501e472"; md5 = ""; - md5name = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b-libvisio-0.1.8.tar.xz"; + md5name = "9e9eff75112d4d92d92262ad7fc2599c21e26f8fc5ba54900efdc83c0501e472-libvisio-0.1.10.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; @@ -972,6 +986,13 @@ md5 = ""; md5name = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32-zlib-1.3.1.tar.xz"; } + { + name = "zstd-1.5.7.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zstd-1.5.7.tar.gz"; + sha256 = "eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3"; + md5 = ""; + md5name = "eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3-zstd-1.5.7.tar.gz"; + } { name = "libzmf-0.0.2.tar.xz"; url = "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; @@ -987,10 +1008,10 @@ md5name = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a-zxcvbn-c-2.6.tar.gz"; } { - name = "zxing-cpp-2.2.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.2.1.tar.gz"; - sha256 = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635"; + name = "zxing-cpp-2.3.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.3.0.tar.gz"; + sha256 = "64e4139103fdbc57752698ee15b5f0b0f7af9a0331ecbdc492047e0772c417ba"; md5 = ""; - md5name = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635-zxing-cpp-2.2.1.tar.gz"; + md5name = "64e4139103fdbc57752698ee15b5f0b0f7af9a0331ecbdc492047e0772c417ba-zxing-cpp-2.3.0.tar.gz"; } ] diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix index 7ded287747c9..ab003694eecf 100644 --- a/pkgs/applications/office/libreoffice/src-still/help.nix +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0spbylki80y5ny45hrjmhjfax7m1pps0k4blyjbi8knpxr2cnak4"; - url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-help-25.2.6.2.tar.xz"; + sha256 = "1wn5qv1xblv8bff9zf484xi76ycsjswm93p4v09n42j10ai9qhxn"; + url = "https://download.documentfoundation.org/libreoffice/src/25.8.5/libreoffice-help-25.8.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix index 1bc471ec7b52..f2b1480c1365 100644 --- a/pkgs/applications/office/libreoffice/src-still/main.nix +++ b/pkgs/applications/office/libreoffice/src-still/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0ix7d20qa396cf8gvzicma9l257js97840hvkavrdk2pyznq5286"; - url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-25.2.6.2.tar.xz"; + sha256 = "1bwiqwr98jhjlxphw8q0zlbrfn6ihk0s3izanskjm1lqs27xqqvz"; + url = "https://download.documentfoundation.org/libreoffice/src/25.8.5/libreoffice-25.8.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix index f0330ed0a9de..0eec005061f3 100644 --- a/pkgs/applications/office/libreoffice/src-still/translations.nix +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1kgqfk59qs4lqlgw32csh0wgyyqi3hzy1wv3dl7rm960n0im7xqh"; - url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-translations-25.2.6.2.tar.xz"; + sha256 = "0im4g4gxx4zvv0csdcmzinm0vp8lxpz57dlclhnbxkasnh1y9vji"; + url = "https://download.documentfoundation.org/libreoffice/src/25.8.5/libreoffice-translations-25.8.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix index fb516bd04a58..6efa4dc1080d 100644 --- a/pkgs/applications/office/libreoffice/src-still/version.nix +++ b/pkgs/applications/office/libreoffice/src-still/version.nix @@ -1 +1 @@ -"25.2.6.2" +"25.8.5.2" diff --git a/pkgs/applications/office/libreoffice/update.sh b/pkgs/applications/office/libreoffice/update.sh index a6f5536972b7..1adc41b25803 100755 --- a/pkgs/applications/office/libreoffice/update.sh +++ b/pkgs/applications/office/libreoffice/update.sh @@ -83,6 +83,7 @@ case $variant in rev=$(grep --perl-regexp --only-matching --max-count=1 \ '\Krefs/tags/cp-\d+\.\d+\.\d+-\d+$' <<< "$all_tags") full_version=${rev#refs/tags/cp-} + tag=${rev#refs/tags/} echoerr full version is $full_version echo \"$full_version\" > version.nix @@ -98,7 +99,7 @@ case $variant in echo "{ fetchgit, ... }:" > $t.nix echo "fetchgit {" >> $t.nix echo " url = \"$(jq -r '.url' <<< "$prefetch_output")\";" >> $t.nix - echo " rev = \"$rev\";" >> $t.nix + echo " tag = \"$tag\";" >> $t.nix echo " hash = \"$(jq -r '.hash' <<< "$prefetch_output")\";" >> $t.nix echo "}" >> "$t.nix" done diff --git a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix index 16f87c75cb02..410b40f79340 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-command-source"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "norihiro"; repo = "obs-command-source"; rev = version; - sha256 = "sha256-yrzY4pHSupkkdRlx725oSVtQTH1Ci9zFolHN3i2Vm28="; + sha256 = "sha256-z5TKVA0WI/pqfca1VCXfDvYHxDG2EoD6PFCV7pSXe7c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ai/air/package.nix b/pkgs/by-name/ai/air/package.nix index 833457a14d98..521d22b5ec3f 100644 --- a/pkgs/by-name/ai/air/package.nix +++ b/pkgs/by-name/ai/air/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "air"; - version = "1.64.5"; + version = "1.65.0"; src = fetchFromGitHub { owner = "air-verse"; repo = "air"; tag = "v${finalAttrs.version}"; - hash = "sha256-vaNXG+bS+RB0Qi0kI9lBGyr8FcUxm5igG982+cOZwqw="; + hash = "sha256-pqvnX/PiipZM8jLBN6zN/yVnuCCk+aTII5AH0N4nHEM="; }; vendorHash = "sha256-03xZ3P/7xjznYdM9rv+8ZYftQlnjJ6ZTq0HdSvGpaWw="; diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix index cec01b1898d2..e33216d67a70 100644 --- a/pkgs/by-name/am/amdgpu_top/package.nix +++ b/pkgs/by-name/am/amdgpu_top/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "amdgpu_top"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "Umio-Yasuno"; repo = "amdgpu_top"; tag = "v${finalAttrs.version}"; - hash = "sha256-yw73bKO91O05WBQNwjcQ+AqxYgGXXC7XJzUnMx5/IWc="; + hash = "sha256-k+/y8YaEP8DJuW8n/Xq/Ea9DWG79Cux+PgZbSP4m3pQ="; }; - cargoHash = "sha256-hQrgAyi7740bY5knICWACZhDYoZwPs/dO/PgVC4Krx0="; + cargoHash = "sha256-+eMItSemE69UGfGF9CeKyEvUxvhiZjkJJPeZoVfa+dk="; buildInputs = [ libdrm diff --git a/pkgs/by-name/an/android-image-kitchen/0001-Use-PATH-to-find-programs.patch b/pkgs/by-name/an/android-image-kitchen/0001-Use-PATH-to-find-programs.patch new file mode 100644 index 000000000000..f61014e7e680 --- /dev/null +++ b/pkgs/by-name/an/android-image-kitchen/0001-Use-PATH-to-find-programs.patch @@ -0,0 +1,224 @@ +From bb95a9794abc077ef29066ab6e769fee564c5592 Mon Sep 17 00:00:00 2001 +From: David Wronek +Date: Thu, 12 Feb 2026 14:57:40 +0100 +Subject: [PATCH 1/2] Use $PATH to find programs + +Signed-off-by: David Wronek +--- + cleanup.sh | 3 --- + repackimg.sh | 30 ++++++++++++++---------------- + unpackimg.sh | 32 +++++++++++++++----------------- + 3 files changed, 29 insertions(+), 36 deletions(-) + +diff --git a/cleanup.sh b/cleanup.sh +index 159d04c..b262c73 100755 +--- a/cleanup.sh ++++ b/cleanup.sh +@@ -23,9 +23,6 @@ case $1 in + *) cd "$aik";; + esac; + +-chmod -R 755 "$bin" "$aik"/*.sh; +-chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/androidsign.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*; +- + if [ -d ramdisk ] && [ "$(stat $statarg ramdisk | head -n 1)" = "root" -o ! "$(find ramdisk 2>&1 | cpio -o >/dev/null 2>&1; echo $?)" -eq "0" ]; then + sudo=sudo; + fi; +diff --git a/repackimg.sh b/repackimg.sh +index 185a180..d5e7bc4 100755 +--- a/repackimg.sh ++++ b/repackimg.sh +@@ -49,8 +49,6 @@ case $1 in + --local) shift;; + *) cd "$aik";; + esac; +-chmod -R 755 "$bin" "$aik"/*.sh; +-chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/androidsign.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*; + + if [ -z "$(ls split_img/* 2>/dev/null)" -o ! -e ramdisk ]; then + echo "No files found to be packed/built."; +@@ -135,8 +133,8 @@ else + xz) repackcmd="xz $level -Ccrc32";; + lzma) repackcmd="xz $level -Flzma";; + bzip2) compext=bz2;; +- lz4) repackcmd="$bin/$arch/lz4 $level";; +- lz4-l) repackcmd="$bin/$arch/lz4 $level -l"; compext=lz4;; ++ lz4) repackcmd="lz4 $level";; ++ lz4-l) repackcmd="lz4 $level -l"; compext=lz4;; + cpio) repackcmd="cat"; compext="";; + *) abort; exit 1;; + esac; +@@ -263,7 +261,7 @@ if [ -f split_img/*-mtktype ]; then + echo "Generating MTK headers..."; + echo " "; + echo "Using ramdisk type: $mtktype"; +- "$bin/$arch/mkmtkhdr" --kernel "$kernel" --$mtktype "$ramdisk" >/dev/null; ++ mkmtkhdr --kernel "$kernel" --$mtktype "$ramdisk" >/dev/null; + if [ ! $? -eq "0" ]; then + abort; + exit 1; +@@ -293,18 +291,18 @@ echo " "; + echo "Using format: $imgtype"; + echo " "; + case $imgtype in +- AOSP_VNDR) "$bin/$arch/mkbootimg" --vendor_ramdisk "$ramdisk" "${dtb[@]}" --vendor_cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --tags_offset $tagsoff --dtb_offset $dtboff --os_version "$osver" --os_patch_level "$oslvl" --header_version $hdrver --vendor_boot $outname;; +- AOSP) "$bin/$arch/mkbootimg" --kernel "$kernel" --ramdisk "$ramdisk" "${second[@]}" "${dtb[@]}" "${recoverydtbo[@]}" --cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --second_offset "$secondoff" --tags_offset "$tagsoff" --dtb_offset "$dtboff" --os_version "$osver" --os_patch_level "$oslvl" --header_version "$hdrver" $hashtype "${dt[@]}" -o $outname;; +- AOSP-PXA) "$bin/$arch/pxa-mkbootimg" --kernel "$kernel" --ramdisk "$ramdisk" "${second[@]}" --cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --second_offset "$secondoff" --tags_offset "$tagsoff" --unknown $unknown "${dt[@]}" -o $outname;; +- ELF) "$bin/$arch/elftool" pack -o $outname header="$header" "$kernel" "$ramdisk",ramdisk "${rpm[@]}" "${cmd[@]}" >/dev/null;; +- KRNL) "$bin/$arch/rkcrc" -k "$ramdisk" $outname;; ++ AOSP_VNDR) mkbootimg --vendor_ramdisk "$ramdisk" "${dtb[@]}" --vendor_cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --tags_offset $tagsoff --dtb_offset $dtboff --os_version "$osver" --os_patch_level "$oslvl" --header_version $hdrver --vendor_boot $outname;; ++ AOSP) mkbootimg --kernel "$kernel" --ramdisk "$ramdisk" "${second[@]}" "${dtb[@]}" "${recoverydtbo[@]}" --cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --second_offset "$secondoff" --tags_offset "$tagsoff" --dtb_offset "$dtboff" --os_version "$osver" --os_patch_level "$oslvl" --header_version "$hdrver" $hashtype "${dt[@]}" -o $outname;; ++ AOSP-PXA) pxa-mkbootimg --kernel "$kernel" --ramdisk "$ramdisk" "${second[@]}" --cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --second_offset "$secondoff" --tags_offset "$tagsoff" --unknown $unknown "${dt[@]}" -o $outname;; ++ ELF) elftool pack -o $outname header="$header" "$kernel" "$ramdisk",ramdisk "${rpm[@]}" "${cmd[@]}" >/dev/null;; ++ KRNL) rkcrc -k "$ramdisk" $outname;; + OSIP) + mkdir split_img/.temp 2>/dev/null; + for i in bootstub cmdline.txt hdr kernel parameter sig; do + cp -f split_img/*-*$(basename $i .txt | sed -e 's/hdr/header/') split_img/.temp/$i 2>/dev/null; + done; + cp -f "$ramdisk" split_img/.temp/ramdisk.cpio.gz; +- "$bin/$arch/mboot" -d split_img/.temp -f $outname; ++ mboot -d split_img/.temp -f $outname; + ;; + U-Boot) + part0="$kernel"; +@@ -312,7 +310,7 @@ case $imgtype in + Multi) part1=(:"$ramdisk");; + RAMDisk) part0="$ramdisk";; + esac; +- "$bin/$arch/mkimage" -A $uarch -O $os -T $type -C $comp -a $addr -e $ep -n "$name" -d "$part0""${part1[@]}" $outname >/dev/null; ++ mkimage -A $uarch -O $os -T $type -C $comp -a $addr -e $ep -n "$name" -d "$part0""${part1[@]}" $outname >/dev/null; + ;; + *) echo " "; echo "Unsupported format."; abort; exit 1;; + esac; +@@ -341,13 +339,13 @@ if [ -f split_img/*-sigtype ]; then + AVBv2) echo "AVBv2 detected, no need to sign.";; + BLOB) + awk 'BEGIN { printf "-SIGNED-BY-SIGNBLOB-\00\00\00\00\00\00\00\00" }' > image-new.img; +- "$bin/$arch/blobpack" blob.tmp $blobtype unsigned-new.img >/dev/null; ++ blobpack blob.tmp $blobtype unsigned-new.img >/dev/null; + cat blob.tmp >> image-new.img; + rm -f blob.tmp; + ;; +- CHROMEOS) "$bin/$arch/futility" vbutil_kernel --pack image-new.img --keyblock "$bin/chromeos/kernel.keyblock" --signprivate "$bin/chromeos/kernel_data_key.vbprivk" --version 1 --vmlinuz unsigned-new.img --bootloader "$bin/chromeos/empty" --config "$bin/chromeos/empty" --arch arm --flags 0x1;; ++ CHROMEOS) futility vbutil_kernel --pack image-new.img --keyblock "$bin/chromeos/kernel.keyblock" --signprivate "$bin/chromeos/kernel_data_key.vbprivk" --version 1 --vmlinuz unsigned-new.img --bootloader "$bin/chromeos/empty" --config "$bin/chromeos/empty" --arch arm --flags 0x1;; + DHTB) +- "$bin/$arch/dhtbsign" -i unsigned-new.img -o image-new.img >/dev/null; ++ dhtbsign -i unsigned-new.img -o image-new.img >/dev/null; + rm -f split_img/*-tailtype 2>/dev/null; + ;; + NOOK*) cat split_img/*-master_boot.key unsigned-new.img > image-new.img;; +@@ -366,7 +364,7 @@ if [ -f split_img/*-lokitype ]; then + echo " "; + mv -f image-new.img unlokied-new.img; + if [ -f aboot.img ]; then +- "$bin/$arch/loki_tool" patch $lokitype aboot.img unlokied-new.img image-new.img >/dev/null; ++ loki_tool patch $lokitype aboot.img unlokied-new.img image-new.img >/dev/null; + if [ ! $? -eq "0" ]; then + echo "Patching failed."; + abort; +diff --git a/unpackimg.sh b/unpackimg.sh +index 9b74f3d..a81eaf0 100755 +--- a/unpackimg.sh ++++ b/unpackimg.sh +@@ -53,8 +53,6 @@ esac; + if [ ! "$local" ]; then + cd "$aik"; + fi; +-chmod -R 755 "$bin" "$aik"/*.sh; +-chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/androidsign.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*; + + img="$1"; + [ -f "$cur/$1" ] && img="$cur/$1"; +@@ -109,10 +107,10 @@ if [ "$(echo $imgtest | awk '{ print $2 }' | cut -d, -f1)" = "signing" ]; then + case $sigtype in + BLOB) + cp -f "$img" "$file"; +- "$bin/$arch/blobunpack" "$file" | tail -n+5 | cut -d" " -f2 | dd bs=1 count=3 > "$file-blobtype" 2>/dev/null; ++ blobunpack "$file" | tail -n+5 | cut -d" " -f2 | dd bs=1 count=3 > "$file-blobtype" 2>/dev/null; + mv -f "$file."* "$file"; + ;; +- CHROMEOS) "$bin/$arch/futility" vbutil_kernel --get-vmlinuz "$img" --vmlinuz-out "$file";; ++ CHROMEOS) futility vbutil_kernel --get-vmlinuz "$img" --vmlinuz-out "$file";; + DHTB) dd bs=4096 skip=512 iflag=skip_bytes conv=notrunc if="$img" of="$file" 2>/dev/null;; + NOOK) + dd bs=1048576 count=1 conv=notrunc if="$img" of="$file-master_boot.key" 2>/dev/null; +@@ -123,7 +121,7 @@ if [ "$(echo $imgtest | awk '{ print $2 }' | cut -d, -f1)" = "signing" ]; then + dd bs=262144 skip=1 conv=notrunc if="$img" of="$file" 2>/dev/null; + ;; + SIN*) +- "$bin/$arch/sony_dump" . "$img" >/dev/null; ++ sony_dump . "$img" >/dev/null; + mv -f "$file."* "$file"; + rm -f "$file-sigtype"; + ;; +@@ -165,7 +163,7 @@ case $(echo $imgtest | awk '{ print $3 }') in + echo " "; + echo "Warning: A dump of your device's aboot.img is required to re-Loki!"; + echo " "; +- "$bin/$arch/loki_tool" unlok "$img" "$file" >/dev/null; ++ loki_tool unlok "$img" "$file" >/dev/null; + img="$file"; + ;; + AMONET) +@@ -220,26 +218,26 @@ case $imgtype in + AOSP_VNDR) vendor=vendor_;; + esac; + case $imgtype in +- AOSP|AOSP_VNDR) "$bin/$arch/unpackbootimg" -i "$img";; +- AOSP-PXA) "$bin/$arch/pxa-unpackbootimg" -i "$img";; ++ AOSP|AOSP_VNDR) unpackbootimg -i "$img";; ++ AOSP-PXA) pxa-unpackbootimg -i "$img";; + ELF) + mkdir elftool_out; +- "$bin/$arch/elftool" unpack -i "$img" -o elftool_out >/dev/null; ++ elftool unpack -i "$img" -o elftool_out >/dev/null; + mv -f elftool_out/header "$file-header" 2>/dev/null; + rm -rf elftool_out; +- "$bin/$arch/unpackelf" -i "$img"; ++ unpackelf -i "$img"; + ;; + KRNL) dd bs=4096 skip=8 iflag=skip_bytes conv=notrunc if="$img" of="$file-ramdisk" 2>&1 | tail -n+3 | cut -d" " -f1-2;; + OSIP) +- "$bin/$arch/mboot" -u -f "$img"; ++ mboot -u -f "$img"; + [ ! $? -eq "0" ] && error=1; + for i in bootstub cmdline.txt hdr kernel parameter ramdisk.cpio.gz sig; do + mv -f $i "$file-$(basename $i .txt | sed -e 's/hdr/header/' -e 's/ramdisk.cpio.gz/ramdisk/')" 2>/dev/null || true; + done; + ;; + U-Boot) +- "$bin/$arch/dumpimage" -l "$img"; +- "$bin/$arch/dumpimage" -l "$img" > "$file-header"; ++ dumpimage -l "$img"; ++ dumpimage -l "$img" > "$file-header"; + grep "Name:" "$file-header" | cut -c15- > "$file-name"; + grep "Type:" "$file-header" | cut -c15- | cut -d" " -f1 > "$file-arch"; + grep "Type:" "$file-header" | cut -c15- | cut -d" " -f2 > "$file-os"; +@@ -248,10 +246,10 @@ case $imgtype in + grep "Address:" "$file-header" | cut -c15- > "$file-addr"; + grep "Point:" "$file-header" | cut -c15- > "$file-ep"; + rm -f "$file-header"; +- "$bin/$arch/dumpimage" -p 0 -o "$file-kernel" "$img"; ++ dumpimage -p 0 -o "$file-kernel" "$img"; + [ ! $? -eq "0" ] && error=1; + case $(cat "$file-type") in +- Multi) "$bin/$arch/dumpimage" -p 1 -o "$file-ramdisk" "$img";; ++ Multi) dumpimage -p 1 -o "$file-ramdisk" "$img";; + RAMDisk) mv -f "$file-kernel" "$file-ramdisk";; + *) touch "$file-ramdisk";; + esac; +@@ -318,8 +316,8 @@ case $ramdiskcomp in + xz) ;; + lzma) ;; + bzip2) compext=bz2;; +- lz4) unpackcmd="$bin/$arch/lz4 -dcq";; +- lz4-l) unpackcmd="$bin/$arch/lz4 -dcq"; compext=lz4;; ++ lz4) unpackcmd="lz4 -dcq";; ++ lz4-l) unpackcmd="lz4 -dcq"; compext=lz4;; + cpio) unpackcmd="cat"; compext="";; + empty) compext=empty;; + *) compext="";; +-- +2.52.0 + diff --git a/pkgs/by-name/an/android-image-kitchen/0002-Do-not-change-directory.patch b/pkgs/by-name/an/android-image-kitchen/0002-Do-not-change-directory.patch new file mode 100644 index 000000000000..005878ff73aa --- /dev/null +++ b/pkgs/by-name/an/android-image-kitchen/0002-Do-not-change-directory.patch @@ -0,0 +1,85 @@ +From 6328bc3ddd491f0589e943deeabdfa4dda40f4c7 Mon Sep 17 00:00:00 2001 +From: David Wronek +Date: Thu, 12 Feb 2026 18:11:37 +0100 +Subject: [PATCH 2/2] Do not change directory + +Signed-off-by: David Wronek +--- + cleanup.sh | 4 ++-- + repackimg.sh | 4 ++-- + unpackimg.sh | 8 ++------ + 3 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/cleanup.sh b/cleanup.sh +index b262c73..d7a3188 100755 +--- a/cleanup.sh ++++ b/cleanup.sh +@@ -3,7 +3,7 @@ + # osm0sis @ xda-developers + + case $1 in +- --help) echo "usage: cleanup.sh [--local] [--quiet]"; exit 1; ++ --help) echo "usage: cleanup.sh [--quiet]"; exit 1; + esac; + + case $(uname -s) in +@@ -20,7 +20,7 @@ bin="$aik/bin"; + + case $1 in + --local) shift;; +- *) cd "$aik";; ++ *) ;; + esac; + + if [ -d ramdisk ] && [ "$(stat $statarg ramdisk | head -n 1)" = "root" -o ! "$(find ramdisk 2>&1 | cpio -o >/dev/null 2>&1; echo $?)" -eq "0" ]; then +diff --git a/repackimg.sh b/repackimg.sh +index d5e7bc4..15374c4 100755 +--- a/repackimg.sh ++++ b/repackimg.sh +@@ -5,7 +5,7 @@ + abort() { echo "Error!"; } + + case $1 in +- --help) echo "usage: repackimg.sh [--local] [--original] [--origsize] [--level <0-9>] [--avbkey ] [--forceelf]"; exit 1; ++ --help) echo "usage: repackimg.sh [--original] [--origsize] [--level <0-9>] [--avbkey ] [--forceelf]"; exit 1; + esac; + + case $(uname -s) in +@@ -47,7 +47,7 @@ esac; + + case $1 in + --local) shift;; +- *) cd "$aik";; ++ *) ;; + esac; + + if [ -z "$(ls split_img/* 2>/dev/null)" -o ! -e ramdisk ]; then +diff --git a/unpackimg.sh b/unpackimg.sh +index a81eaf0..e330766 100755 +--- a/unpackimg.sh ++++ b/unpackimg.sh +@@ -6,8 +6,8 @@ cleanup() { "$aik/cleanup.sh" $local --quiet; } + abort() { echo "Error!"; } + + case $1 in +- --help) echo "usage: unpackimg.sh [--local] [--nosudo] "; exit 1;; +- --local) local="--local"; shift;; ++ --help) echo "usage: unpackimg.sh [--nosudo] "; exit 1;; ++ --local) shift;; + esac; + case $1 in + --nosudo) nosudo=1; shift;; +@@ -50,10 +50,6 @@ case $plat in + ;; + esac; + +-if [ ! "$local" ]; then +- cd "$aik"; +-fi; +- + img="$1"; + [ -f "$cur/$1" ] && img="$cur/$1"; + if [ ! "$img" ]; then +-- +2.52.0 + diff --git a/pkgs/by-name/an/android-image-kitchen/package.nix b/pkgs/by-name/an/android-image-kitchen/package.nix new file mode 100644 index 000000000000..147863a1e942 --- /dev/null +++ b/pkgs/by-name/an/android-image-kitchen/package.nix @@ -0,0 +1,93 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + blobtools, + dhtbsign, + elftool, + futility, + loki-tool, + lz4, + mboot, + mkbootimg-osm0sis, + mkmtkhdr, + pxa-mkbootimg, + rkflashtool, + sony-dump, + ubootTools, + unpackelf, +}: +stdenv.mkDerivation { + pname = "android-image-kitchen"; + version = "0-unstable-2025-10-17"; + + src = fetchFromGitHub { + owner = "SebaUbuntu"; + repo = "AIK-Linux-mirror"; + rev = "1c1411bd685bbc5fb4112484af2ad07cb6807f30"; + hash = "sha256-auwAXWzUAFS8USTTH9h5nPzmoGOZf53GkLA+KNGl8uc="; + }; + + patches = [ + ./0001-Use-PATH-to-find-programs.patch + ./0002-Do-not-change-directory.patch + ]; + + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + substituteInPlace {cleanup,repackimg,unpackimg}.sh \ + --replace-fail "bin=\"\$aik/bin\";" "bin=$out/share" + ''; + + installPhase = '' + runHook preInstall + + for i in cleanup repackimg unpackimg; do + install -Dm 555 "$i.sh" "$out/bin/aik-$i" + done + + # Remove prebuilt binaries + rm -rf bin/{linux,macos} + + # Copy rest of the required files + mkdir -p $out/share + cp -rT bin $out/share + + runHook postInstall + ''; + + postInstall = '' + for i in $out/bin/aik-{cleanup,repackimg,unpackimg}; do + wrapProgram $i --prefix PATH : ${ + lib.makeBinPath [ + blobtools + dhtbsign + elftool + futility + loki-tool + lz4 + mboot + mkbootimg-osm0sis + mkmtkhdr + pxa-mkbootimg + rkflashtool + sony-dump + ubootTools + unpackelf + ] + } + done + ''; + + meta = { + description = "Unpack & repack Android boot files"; + homepage = "https://github.com/SebaUbuntu/AIK-Linux-mirror"; + # No license specified in the repository + license = lib.licenses.free; + maintainers = with lib.maintainers; [ ungeskriptet ]; + teams = [ lib.teams.android ]; + mainProgram = "aik-unpackimg"; + }; +} diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix index e9a0752bff1b..356c4a4bbeaf 100644 --- a/pkgs/by-name/ap/apidog/package.nix +++ b/pkgs/by-name/ap/apidog/package.nix @@ -7,11 +7,11 @@ let pname = "apidog"; - version = "2.8.12"; + version = "2.8.23"; src = fetchurl { url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage"; - hash = "sha256-bCh3GW+K++3eI3SdcD5t7Vk1jYPl4KFWr1dwqXL7fOQ="; + hash = "sha256-N3ULCrYJilcc3R102ndXjKH3g/km7WcEMdi+NL8nmqA="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 40f5a628643b..116042a4ae9e 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "argocd"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; tag = "v${finalAttrs.version}"; - hash = "sha256-sih7HrF9qwSI7j8A76iZl54CcO5aI09dt65YdupZ08c="; + hash = "sha256-84GlX9m1+Af9EPPdvLJcZIqhw7a1DBj1xKmUpNnngbk="; }; ui = stdenv.mkDerivation { diff --git a/pkgs/by-name/ar/art-standalone/package.nix b/pkgs/by-name/ar/art-standalone/package.nix index f6d383897132..6f0a62d6b9eb 100644 --- a/pkgs/by-name/ar/art-standalone/package.nix +++ b/pkgs/by-name/ar/art-standalone/package.nix @@ -65,19 +65,7 @@ stdenv.mkDerivation (finalAttrs: { libpng lz4 openssl - (wolfssl.overrideAttrs (oldAttrs: { - configureFlags = oldAttrs.configureFlags ++ [ - "--enable-jni" - ]; - # Disable failing tests when jni enabled - postPatch = oldAttrs.postPatch or "" + '' - sed -i '/TEST_DECL(test_wolfSSL_Tls13_ECH)/d; - /TEST_DECL(test_wolfSSL_Tls13_ECH_HRR)/d; - /TEST_DECL(test_TLSX_CA_NAMES_bad_extension)/d' tests/api.c - sed -i '/quic/d' tests/include.am - sed -i '300,305d' tests/unit.c - ''; - })) + (wolfssl.override { enableJni = true; }) xz zlib ]; diff --git a/pkgs/by-name/as/assh/package.nix b/pkgs/by-name/as/assh/package.nix index 7f83b8f5a6f3..015ca83f3194 100644 --- a/pkgs/by-name/as/assh/package.nix +++ b/pkgs/by-name/as/assh/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "assh"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { repo = "advanced-ssh-config"; owner = "moul"; tag = "v${finalAttrs.version}"; - hash = "sha256-X5UWQe4c+QudmXKjFKafivO/OvdBNzyutrL+CUK0olg="; + hash = "sha256-rHe0ynjj/7LXUKoS4iO+PJjh4SVBqh+kChuYzSFocfs="; }; vendorHash = "sha256-EA39KqAN9SHPU362j6/j6okvT+eZb2R4unMA0bB+bVg="; diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 0cb359915897..dd59c8eabcd7 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ast-grep"; - version = "0.41.1"; + version = "0.42.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; tag = finalAttrs.version; - hash = "sha256-AijxixgT8X/c1UtMD6l4BFvYGj3Up0C1CtfwCRdxSfw="; + hash = "sha256-TdVjoJmWZ76e9h+/z4/TlytJgwQpQu/esRuZg1sZw8A="; }; # error: linker `aarch64-linux-gnu-gcc` not found @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm .cargo/config.toml ''; - cargoHash = "sha256-OIf59YUuu8ohpGXRdeiPaM/xdH4ZaQYoCuBG/NNhZcc="; + cargoHash = "sha256-EokHEduK+8h+JzIKRRga+QXLkfC4CK+qyoIxMwD2OPI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/au/audiosource/adb-args-fix.patch b/pkgs/by-name/au/audiosource/adb-args-fix.patch new file mode 100644 index 000000000000..a30cf3da8a66 --- /dev/null +++ b/pkgs/by-name/au/audiosource/adb-args-fix.patch @@ -0,0 +1,16 @@ +diff --git a/audiosource b/audiosource +index e2f034c..b6efc34 100755 +--- a/audiosource ++++ b/audiosource +@@ -82,9 +82,9 @@ install() { + + echo '[+] Installing Audio Source' + +- adb install -rtg "$AUDIOSOURCE_APK" || { ++ adb install -r -t -g "$AUDIOSOURCE_APK" || { + adb uninstall "$AUDIOSOURCE_PKG" +- adb install -tg "$AUDIOSOURCE_APK" ++ adb install -t -g "$AUDIOSOURCE_APK" + } + } + diff --git a/pkgs/by-name/au/audiosource/package.nix b/pkgs/by-name/au/audiosource/package.nix index 18aebf5b35fc..e12e15482b1f 100644 --- a/pkgs/by-name/au/audiosource/package.nix +++ b/pkgs/by-name/au/audiosource/package.nix @@ -13,18 +13,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "audiosource"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "gdzx"; repo = "audiosource"; tag = "v${finalAttrs.version}"; - hash = "sha256-SlX8gjs7X5jfoeU6pyk4n8f6oMJgneGVt0pmFs48+mQ="; + hash = "sha256-npN7V1svKaxCfsZBvmfm7T/UJsAQ4hQM3RN+tpK5cms="; }; patches = [ - # Removes build-related logic from the script that is unused in the package and fixes a small bug with adb args on new Android versions - ./unused-logic-removal-and-args-fix.patch + # Removes build-related logic from the script that is unused in the package + ./unused-logic-removal.patch + # Fixes a small bug with adb args on new Android versions + ./adb-args-fix.patch ]; postPatch = '' @@ -62,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.apk = fetchurl { url = "https://github.com/gdzx/audiosource/releases/download/v${finalAttrs.version}/audiosource.apk"; - hash = "sha256-vDIF+NZ3JgTT67Dem4qeajWsA5m/MFt2nRDpWUqC9aU="; + hash = "sha256:cd48532829f41060d3c9909daa5563a669394eb9dd00baf303b6db1b5b2db1fa"; }; meta = { diff --git a/pkgs/by-name/au/audiosource/unused-logic-removal-and-args-fix.patch b/pkgs/by-name/au/audiosource/unused-logic-removal.patch similarity index 68% rename from pkgs/by-name/au/audiosource/unused-logic-removal-and-args-fix.patch rename to pkgs/by-name/au/audiosource/unused-logic-removal.patch index 3a8b331c432f..0c879dc72a18 100644 --- a/pkgs/by-name/au/audiosource/unused-logic-removal-and-args-fix.patch +++ b/pkgs/by-name/au/audiosource/unused-logic-removal.patch @@ -1,5 +1,5 @@ diff --git a/audiosource b/audiosource -index b06127a..0bccddf 100755 +index e2f034c..787076e 100755 --- a/audiosource +++ b/audiosource @@ -2,15 +2,7 @@ @@ -16,18 +16,25 @@ index b06127a..0bccddf 100755 - -AUDIOSOURCE_APK=${AUDIOSOURCE_APK:-"$AUDIOSOURCE_DEFAULT_APK"} +AUDIOSOURCE_APK=${AUDIOSOURCE_APK:-"@apkPath@"} + AUDIOSOURCE_PKG='fr.dzx.audiosource' ANDROID_SERIAL=${ANDROID_SERIAL:-} - PYSOCAT="$(cat < /dev/null; then + echo "Error: adb not found" +@@ -88,16 +72,6 @@ install() { } } @@ -44,7 +51,7 @@ index b06127a..0bccddf 100755 _unload() { for id in `pactl list modules short | sed -n "/module-pipe-source\tsource_name=$AUDIOSOURCE_NAME/p" | cut -f1`; do pactl unload-module "$id" -@@ -146,7 +128,7 @@ volume() { +@@ -189,7 +163,7 @@ volume() { main_help() { cat <<-EOF @@ -53,15 +60,15 @@ index b06127a..0bccddf 100755 Options: -@@ -154,15 +136,13 @@ main_help() { +@@ -197,7 +171,6 @@ main_help() { Commands: -- build Build Audio Source APK (default: debug) -- install Install Audio Source to Android device (default: debug) -+ install Install Audio Source to Android device - run Run Audio Source and start forwarding - volume LEVEL Set volume to LEVEL (for example, 250%) +- build Build Audio Source APK + install Install Audio Source to Android device + run [-r] Run Audio Source and start forwarding + (-r will automatically restart) +@@ -205,8 +178,7 @@ main_help() { Environment: @@ -71,7 +78,7 @@ index b06127a..0bccddf 100755 AUDIOSOURCE_NAME Name of the PulseAudio source (default: android-) ANDROID_SERIAL Device serial number to connect to (default: unset) EOF -@@ -200,7 +180,7 @@ main() { +@@ -244,7 +216,7 @@ main() { shift case "$cmd" in diff --git a/pkgs/by-name/av/aviator/bump-golang-x-sys.patch b/pkgs/by-name/av/aviator/bump-golang-x-sys.patch deleted file mode 100644 index cb9b076d3eaf..000000000000 --- a/pkgs/by-name/av/aviator/bump-golang-x-sys.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/go.mod b/go.mod -index 9bc55db..4bddb07 100644 ---- a/go.mod -+++ b/go.mod -@@ -19,5 +19,6 @@ require ( - github.com/smallfish/simpleyaml v0.0.0-20170527020626-116d8e577389 // indirect - github.com/starkandwayne/goutils v0.0.0-20190115202530-896b8a6904be - github.com/urfave/cli v1.19.1 -+ golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect - gopkg.in/yaml.v2 v2.3.0 - ) -diff --git a/go.sum b/go.sum -index 7641199..d983a95 100644 ---- a/go.sum -+++ b/go.sum -@@ -138,6 +138,8 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w - golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o= - golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= -+golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= diff --git a/pkgs/by-name/av/aviator/fix-except-type.patch b/pkgs/by-name/av/aviator/fix-except-type.patch new file mode 100644 index 000000000000..41c2f27ca32c --- /dev/null +++ b/pkgs/by-name/av/aviator/fix-except-type.patch @@ -0,0 +1,24 @@ +--- /nix/store/vi2p09s1xk39c6r8p8r0rm0p5c7nka62-source/processor/processor_test.go 1970-01-01 08:00:01 ++++ source-orig/processor/processor_test.go 2026-03-27 11:41:40 +@@ -496,7 +496,7 @@ + cfg.Merge[0].With.Files = []string{"fake1", "fake2"} + cfg.ForEach.In = "integration/yamls/addons/" + cfg.ForEach.SubDirs = true +- cfg.ForEach.Except = "fake2" ++ cfg.ForEach.Except = []string{"fake2"} + cfg.ForEach.ForAll = "integration/yamls/" + + spruceConfig = []aviator.Spruce{cfg} +@@ -507,10 +507,10 @@ + Expect(err).ToNot(HaveOccurred()) + + cc := spruceClient.MergeWithOptsCallCount() +- Expect(cc).To(Equal(8)) ++ Expect(cc).To(Equal(9)) + + mergeOpts := spruceClient.MergeWithOptsArgsForCall(0) +- Expect(len(mergeOpts.Files)).To(Equal(4)) ++ Expect(len(mergeOpts.Files)).To(Equal(5)) + }) + }) + }) diff --git a/pkgs/by-name/av/aviator/package.nix b/pkgs/by-name/av/aviator/package.nix index a58aa17101b9..7294f8d89374 100644 --- a/pkgs/by-name/av/aviator/package.nix +++ b/pkgs/by-name/av/aviator/package.nix @@ -2,31 +2,43 @@ lib, buildGoModule, fetchFromGitHub, + testers, }: buildGoModule (finalAttrs: { pname = "aviator"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "herrjulz"; repo = "aviator"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Oa4z8n+q7LKWMnwk+xj9UunzOa3ChaPBCTo828yYJGQ="; + hash = "sha256-jqAGwPqxxCkBpSMebikdUGh54hlSLeqAyf7BOBtjiNA="; }; patches = [ - ./bump-golang-x-sys.patch + # Fix test failures caused by type mismatch in ForEach.Except field + # The Except field was changed from string to []string + ./fix-except-type.patch ]; deleteVendor = true; - vendorHash = "sha256-AJyxCE4DdAXRS+2sY4Zzu8NTEFKJoV1bopfOqOFKZfI="; + vendorHash = "sha256-rYOphvI1ZE8X5UExfgxHnWBn697SDkNnmxeY7ihIZ1s="; + + ldflags = [ + "-s" + "-w" + ]; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; meta = { description = "Merge YAML/JSON files in a in a convenient fashion"; - mainProgram = "aviator"; homepage = "https://github.com/herrjulz/aviator"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ risson ]; + mainProgram = "aviator"; }; }) diff --git a/pkgs/by-name/ba/bazel_9/bazel-execlog.sh b/pkgs/by-name/ba/bazel_9/bazel-execlog.sh new file mode 100644 index 000000000000..7a6fd6cdc86e --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/bazel-execlog.sh @@ -0,0 +1,3 @@ +#!@runtimeShell@ + +exec @binJava@ -jar @out@/share/parser_deploy.jar "$@" diff --git a/pkgs/by-name/ba/bazel_9/build-support/bazelDerivation.nix b/pkgs/by-name/ba/bazel_9/build-support/bazelDerivation.nix new file mode 100644 index 000000000000..a1438d7e20bb --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/build-support/bazelDerivation.nix @@ -0,0 +1,77 @@ +{ + stdenv, + lndir, + lib, +}: + +args@{ + bazel, + registry ? null, + bazelRepoCache ? null, + bazelVendorDeps ? null, + startupArgs ? [ ], + commandArgs ? [ ], + bazelPreBuild ? "", + bazelPostBuild ? "", + serverJavabase ? null, + targets, + command, + ... +}: + +stdenv.mkDerivation ( + { + preBuildPhases = [ "preBuildPhase" ]; + preBuildPhase = + (lib.optionalString (bazelRepoCache != null) '' + # repo_cache needs to be writeable even in air-gapped builds + mkdir repo_cache + ${lndir}/bin/lndir -silent ${bazelRepoCache}/repo_cache repo_cache + '') + + + (lib.optionalString (bazelVendorDeps != null) '' + mkdir vendor_dir + ${lndir}/bin/lndir -silent ${bazelVendorDeps}/vendor_dir vendor_dir + + # pin all deps to avoid re-fetch attempts by Bazel + rm vendor_dir/VENDOR.bazel + find vendor_dir -mindepth 1 -maxdepth 1 -type d -printf "pin(\"@@%P\")\n" > vendor_dir/VENDOR.bazel + '') + # keep preBuildPhase always defined as it is listed in preBuildPhases + + '' + true + ''; + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + + ${bazelPreBuild} + + ${bazel}/bin/bazel ${ + lib.escapeShellArgs ( + lib.optional (serverJavabase != null) "--server_javabase=${serverJavabase}" + ++ [ "--batch" ] + ++ startupArgs + ) + } ${command} ${ + lib.escapeShellArgs ( + lib.optional (registry != null) "--registry=file://${registry}" + ++ lib.optionals (bazelRepoCache != null) [ + "--repository_cache=repo_cache" + "--repo_contents_cache=" + ] + ++ lib.optional (bazelVendorDeps != null) "--vendor_dir=vendor_dir" + ++ commandArgs + ++ targets + ) + } + + ${bazelPostBuild} + + runHook postBuild + ''; + + } + // args +) diff --git a/pkgs/by-name/ba/bazel_9/build-support/bazelPackage.nix b/pkgs/by-name/ba/bazel_9/build-support/bazelPackage.nix new file mode 100644 index 000000000000..aef52fc3b389 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/build-support/bazelPackage.nix @@ -0,0 +1,172 @@ +{ + callPackage, + gnugrep, + lib, + autoPatchelfHook, + stdenv, +}: + +{ + name, + src, + sourceRoot ? null, + version ? null, + targets, + bazel, + startupArgs ? [ ], + commandArgs ? [ ], + env ? { }, + serverJavabase ? null, + registry ? null, + bazelRepoCacheFOD ? { + outputHash = null; + outputHashAlgo = "sha256"; + }, + bazelVendorDepsFOD ? { + outputHash = null; + outputHashAlgo = "sha256"; + }, + installPhase, + buildInputs ? [ ], + nativeBuildInputs ? [ ], + autoPatchelfIgnoreMissingDeps ? null, + patches ? [ ], +}: +let + # FOD produced by `bazel fetch` + # Repo cache contains content-addressed external Bazel dependencies without any patching + # Potentially this can be nixified via --experimental_repository_resolved_file + # (Note: file itself isn't reproducible because it has lots of extra info and order + # isn't stable too. Parsing it into nix fetch* commands isn't trivial but might be possible) + bazelRepoCache = + if bazelRepoCacheFOD.outputHash == null then + null + else + (callPackage ./bazelDerivation.nix { } { + name = "bazelRepoCache"; + inherit (bazelRepoCacheFOD) outputHash outputHashAlgo; + inherit + src + version + sourceRoot + env + buildInputs + nativeBuildInputs + patches + ; + inherit registry; + inherit + bazel + targets + startupArgs + serverJavabase + ; + command = "fetch"; + outputHashMode = "recursive"; + commandArgs = [ + "--repository_cache=repo_cache" + "--repo_contents_cache=" + ] + ++ commandArgs; + bazelPreBuild = '' + mkdir repo_cache + ''; + installPhase = '' + mkdir -p $out/repo_cache + cp -r --reflink=auto repo_cache/* $out/repo_cache + ''; + }); + # Stage1: FOD produced by `bazel vendor`, Stage2: eventual patchelf or other tuning + # Vendor deps contains unpacked&patches external dependencies, this may need Nix-specific + # patching to address things like + # - broken symlinks + # - symlinks or other references to absolute nix store paths which isn't allowed for FOD + # - autoPatchelf for externally-fetched binaries + # + # Either repo cache or vendor deps should be enough to build a given package + bazelVendorDeps = + if bazelVendorDepsFOD.outputHash == null then + null + else + ( + let + stage1 = callPackage ./bazelDerivation.nix { } { + name = "bazelVendorDepsStage1"; + inherit (bazelVendorDepsFOD) outputHash outputHashAlgo; + inherit + src + version + sourceRoot + env + buildInputs + nativeBuildInputs + patches + ; + inherit registry; + inherit + bazel + targets + startupArgs + serverJavabase + ; + dontFixup = true; + command = "vendor"; + outputHashMode = "recursive"; + commandArgs = [ "--vendor_dir=vendor_dir" ] ++ commandArgs; + bazelPreBuild = '' + mkdir vendor_dir + ''; + bazelPostBuild = '' + # remove symlinks that point to locations under bazel_src/ + find vendor_dir -type l -lname "$HOME/*" -exec rm '{}' \; + # remove symlinks to temp build directory on darwin + find vendor_dir -type l -lname "/private/var/tmp/*" -exec rm '{}' \; + # remove broken symlinks + find vendor_dir -xtype l -exec rm '{}' \; + + # remove .marker files referencing NIX_STORE as those references aren't allowed in FOD + (${gnugrep}/bin/grep -rI "$NIX_STORE/" vendor_dir --files-with-matches --include="*.marker" --null || true) \ + | xargs -0 --no-run-if-empty rm + ''; + installPhase = '' + mkdir -p $out/vendor_dir + cp -r --reflink=auto vendor_dir/* $out/vendor_dir + ''; + + }; + in + stdenv.mkDerivation { + name = "bazelVendorDeps"; + buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook ++ buildInputs; + inherit autoPatchelfIgnoreMissingDeps; + src = stage1; + installPhase = '' + cp -r . $out + ''; + } + ); + + package = callPackage ./bazelDerivation.nix { } { + inherit + name + src + version + sourceRoot + env + buildInputs + nativeBuildInputs + patches + ; + inherit registry bazelRepoCache bazelVendorDeps; + inherit + bazel + targets + startupArgs + serverJavabase + commandArgs + ; + inherit installPhase; + command = "build"; + }; +in +package // { passthru = { inherit bazelRepoCache bazelVendorDeps; }; } diff --git a/pkgs/by-name/ba/bazel_9/build-support/patching.nix b/pkgs/by-name/ba/bazel_9/build-support/patching.nix new file mode 100644 index 000000000000..10542822230d --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/build-support/patching.nix @@ -0,0 +1,24 @@ +{ + stdenv, +}: +{ + # If there's a need to patch external dependencies managed by Bazel + # one option is to configure patches on Bazel level. Bazel doesn't + # allow patches to be in absolute paths so this helper will produce + # sources patch that adds given file to given location + addFilePatch = + { + path, + file, + }: + stdenv.mkDerivation { + name = "add_file.patch"; + dontUnpack = true; + buildPhase = '' + mkdir -p $(dirname "${path}") + cp ${file} "${path}" + diff -u /dev/null "${path}" >result.patch || true # diff exit code is non-zero if there's a diff + ''; + installPhase = "cp result.patch $out"; + }; +} diff --git a/pkgs/by-name/ba/bazel_9/defaultShell.nix b/pkgs/by-name/ba/bazel_9/defaultShell.nix new file mode 100644 index 000000000000..a29ea56d9c7c --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/defaultShell.nix @@ -0,0 +1,41 @@ +{ + lib, + makeBinaryWrapper, + writeShellApplication, + bash, + stdenv, +}: +{ defaultShellUtils }: +let + defaultShellPath = lib.makeBinPath defaultShellUtils; + + bashWithDefaultShellUtilsSh = writeShellApplication { + name = "bash"; + runtimeInputs = defaultShellUtils; + # Empty PATH in Nixpkgs Bash is translated to /no-such-path + # On other distros empty PATH search fallback is looking in standard + # locations like /bin,/usr/bin + # For Bazel many rules rely on such search finding some common utils, + # so we provide them in case rules or arguments didn't specify a precise PATH + text = '' + if [[ "$PATH" == "/no-such-path" ]]; then + export PATH=${defaultShellPath} + fi + exec ${bash}/bin/bash "$@" + ''; + }; + +in +{ + inherit defaultShellUtils defaultShellPath; + # Script-based interpreters in shebangs aren't guaranteed to work, + # especially on MacOS. So let's produce a binary + bashWithDefaultShellUtils = stdenv.mkDerivation { + name = "bash"; + src = bashWithDefaultShellUtilsSh; + nativeBuildInputs = [ makeBinaryWrapper ]; + buildPhase = '' + makeWrapper ${bashWithDefaultShellUtilsSh}/bin/bash $out/bin/bash + ''; + }; +} diff --git a/pkgs/by-name/ba/bazel_9/examples.nix b/pkgs/by-name/ba/bazel_9/examples.nix new file mode 100644 index 000000000000..e820e6f9268b --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/examples.nix @@ -0,0 +1,151 @@ +{ + fetchFromGitHub, + lib, + bazel_9, + libgcc, + cctools, + stdenv, + jdk_headless, + callPackage, + zlib, + libxcrypt-legacy, +}: +let + bazelPackage = callPackage ./build-support/bazelPackage.nix { }; + registry = fetchFromGitHub { + owner = "bazelbuild"; + repo = "bazel-central-registry"; + rev = "0e9e0cfdb88577300cc369d0cbe81e678d0fb271"; + sha256 = "sha256-YAR0tYVUdITfW/2H/LZky88nyoWTsgZf/CX4BtJ/Mwk="; + }; + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = "examples"; + rev = "2a8db5804341036b393ff7e1ba88edb30c8a82c7"; + sha256 = "sha256-/+rU73WPIKguoEOJDCodE3pUGSGju0VhixIcr0zBVmY="; + }; + inherit (callPackage ./build-support/patching.nix { }) addFilePatch; +in +{ + java = bazelPackage { + inherit src registry; + sourceRoot = "source/java-tutorial"; + name = "java-tutorial"; + targets = [ "//:ProjectRunner" ]; + bazel = bazel_9; + commandArgs = [ + "--extra_toolchains=@@rules_java++toolchains+local_jdk//:all" + "--tool_java_runtime_version=local_jdk_21" + ] + ++ lib.optional stdenv.hostPlatform.isDarwin "--spawn_strategy=local"; + env = { + JAVA_HOME = jdk_headless.home; + USE_BAZEL_VERSION = bazel_9.version; + }; + installPhase = '' + mkdir $out + cp bazel-bin/ProjectRunner.jar $out/ + ''; + buildInputs = [ + libgcc + libxcrypt-legacy + stdenv.cc.cc.lib + ]; + nativeBuildInputs = lib.optional (stdenv.hostPlatform.isDarwin) cctools; + patches = [ + ./patches/examples/java-tutorial.patch + (addFilePatch { + path = "b/rules_cc.patch"; + file = ./patches/examples/rules_cc.patch; + }) + ]; + bazelVendorDepsFOD = { + outputHash = + { + aarch64-darwin = "sha256-MRm+Pm5mDXys8erQLKHRSClFzxWIYU7Y/otKxl5sJQg="; + aarch64-linux = "sha256-cJuNZapJ8LvfPRdv5V9iuy0xxCxLFI5uWTLtAa6bE/w="; + x86_64-darwin = "sha256-fOLRQIiRq7BATULy7W90bQ/DrW3Fn7vLut6fKFSoQDA="; + x86_64-linux = "sha256-nSe0ywhsTJz6ycqTZaUKfnOvpJOmwip8hYXck9HtW2Q="; + } + .${stdenv.hostPlatform.system}; + outputHashAlgo = "sha256"; + }; + }; + cpp = bazelPackage { + inherit src registry; + sourceRoot = "source/cpp-tutorial/stage3"; + name = "cpp-tutorial"; + targets = [ "//main:hello-world" ]; + bazel = bazel_9; + installPhase = '' + mkdir $out + cp bazel-bin/main/hello-world $out/ + ''; + nativeBuildInputs = lib.optional (stdenv.hostPlatform.isDarwin) cctools; + commandArgs = lib.optionals (stdenv.hostPlatform.isDarwin) [ + "--host_cxxopt=-xc++" + "--cxxopt=-xc++" + "--spawn_strategy=local" + ]; + env = { + USE_BAZEL_VERSION = bazel_9.version; + }; + patches = [ + ./patches/examples/cpp-tutorial.patch + (addFilePatch { + path = "b/rules_cc.patch"; + file = ./patches/examples/rules_cc.patch; + }) + ]; + bazelRepoCacheFOD = { + outputHash = + { + aarch64-darwin = "sha256-Yk+Y3XxlmE48RCYqmSfeBtElCGlVVdJvqRtuIMWbxrk="; + aarch64-linux = "sha256-Yk+Y3XxlmE48RCYqmSfeBtElCGlVVdJvqRtuIMWbxrk="; + x86_64-darwin = "sha256-Yk+Y3XxlmE48RCYqmSfeBtElCGlVVdJvqRtuIMWbxrk="; + x86_64-linux = "sha256-Yk+Y3XxlmE48RCYqmSfeBtElCGlVVdJvqRtuIMWbxrk="; + } + .${stdenv.hostPlatform.system}; + outputHashAlgo = "sha256"; + }; + }; + rust = bazelPackage { + inherit src registry; + sourceRoot = "source/rust-examples/01-hello-world"; + name = "rust-examples-01-hello-world"; + targets = [ "//:bin" ]; + bazel = bazel_9; + env = { + USE_BAZEL_VERSION = bazel_9.version; + }; + installPhase = '' + mkdir $out + cp bazel-bin/bin $out/hello-world + ''; + buildInputs = [ + zlib + libgcc + ]; + nativeBuildInputs = lib.optional (stdenv.hostPlatform.isDarwin) cctools; + commandArgs = lib.optional stdenv.hostPlatform.isDarwin "--spawn_strategy=local"; + autoPatchelfIgnoreMissingDeps = [ "librustc_driver-*.so" ]; + patches = [ + ./patches/examples/rust-examples.patch + (addFilePatch { + path = "b/rules_cc.patch"; + file = ./patches/examples/rules_cc.patch; + }) + ]; + bazelVendorDepsFOD = { + outputHash = + { + aarch64-darwin = "sha256-6rUV8UMjFZXA053BXIruK8+OEturmtz+YeAlkivePdA="; + aarch64-linux = "sha256-/mv7HVsx97RLzYl12WwsI2gYf0qBr+78B5NiEpTRyrc="; + x86_64-darwin = "sha256-BpQFhalV5AfYSjWQp+9lxOnfbaD/NADtvrNMqznEojM="; + x86_64-linux = "sha256-uutDUAHYecqDYmS90jZfZ8IrhSzpWB6WgcsZPlRJVaM="; + } + .${stdenv.hostPlatform.system}; + outputHashAlgo = "sha256"; + }; + }; +} diff --git a/pkgs/by-name/ba/bazel_9/package.nix b/pkgs/by-name/ba/bazel_9/package.nix new file mode 100644 index 000000000000..3adbe137608a --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/package.nix @@ -0,0 +1,343 @@ +{ + stdenv, + callPackage, + # nix tooling and utilities + darwin, + lib, + fetchzip, + makeWrapper, + replaceVars, + # native build inputs + runtimeShell, + zip, + unzip, + bash, + coreutils, + which, + gawk, + gnused, + gnutar, + gnugrep, + gzip, + findutils, + diffutils, + gnupatch, + file, + installShellFiles, + python3, + # Apple dependencies + cctools, + # Allow to independently override the jdks used to build and run respectively + jdk_headless, + version ? "9.0.1", +}: + +let + inherit (callPackage ./build-support/patching.nix { }) addFilePatch; + inherit (stdenv.hostPlatform) isDarwin isAarch64; + + defaultShellUtils = + # Keep this list conservative. For more exotic tools, prefer to use + # @rules_nixpkgs to pull in tools from the nix repository. Example: + # + # WORKSPACE: + # + # nixpkgs_git_repository( + # name = "nixpkgs", + # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", + # ) + # + # # This defines an external Bazel workspace. + # nixpkgs_package( + # name = "bison", + # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, + # ) + # + # some/BUILD.bazel: + # + # genrule( + # ... + # cmd = "$(location @bison//:bin/bison) -other -args", + # tools = [ + # ... + # "@bison//:bin/bison", + # ], + # ) + [ + bash # see https://github.com/NixOS/nixpkgs/pull/489519 + coreutils + diffutils + file + findutils + gawk + gnugrep + gnupatch + gnused + gnutar + gzip + python3 # see https://github.com/NixOS/nixpkgs/pull/489519 + unzip + which + zip + ]; + defaultShell = callPackage ./defaultShell.nix { } { inherit defaultShellUtils; }; + + bazelSystem = if isDarwin then "darwin" else "linux"; + + # on aarch64 Darwin, `uname -m` returns "arm64" + bazelArch = if isDarwin && isAarch64 then "arm64" else stdenv.hostPlatform.parsed.cpu.name; + + src = fetchzip { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; + hash = "sha256-tdrSgtIXi8Xd03BgxLRWhw1bB1Zhuo0E2pWMCskBDG8="; + stripRoot = false; + }; + + commandArgs = [ + "--nobuild_python_zip" + "--features=-module_maps" + "--host_features=-module_maps" + "--announce_rc" + "--verbose_failures" + "--curses=no" + ] + ++ lib.optionals isDarwin [ + "--macos_sdk_version=${stdenv.hostPlatform.darwinMinVersion}" + "--action_env=NIX_CFLAGS_COMPILE_${stdenv.cc.suffixSalt}" + ]; + + extraCflags = lib.optionals isDarwin [ + "-isystem ${lib.getDev darwin.libresolv}/include" + "-isystem ${lib.getDev stdenv.cc.libcxx}/include/c++/v1" + ]; +in +stdenv.mkDerivation rec { + pname = "bazel"; + inherit version src; + + darwinPatches = [ + # Bazel integrates with apple IOKit to inhibit and track system sleep. + # Inside the darwin sandbox, these API calls are blocked, and bazel + # crashes. It seems possible to allow these APIs inside the sandbox, but it + # feels simpler to patch bazel not to use it at all. So our bazel is + # incapable of preventing system sleep, which is a small price to pay to + # guarantee that it will always run in any nix context. + # + # See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses + # NIX_BUILD_TOP env var to conditionnally disable sleep features inside the + # sandbox. + # + # If you want to investigate the sandbox profile path, + # IORegisterForSystemPower can be allowed with + # + # propagatedSandboxProfile = '' + # (allow iokit-open (iokit-user-client-class "RootDomainUserClient")) + # ''; + # + # I do not know yet how to allow IOPMAssertion{CreateWithName,Release} + ./patches/darwin_sleep.patch + + # Fix DARWIN_XCODE_LOCATOR_COMPILE_COMMAND by removing multi-arch support. + # Nixpkgs toolcahins do not support that (yet?) and get confused. + # Also add an explicit /usr/bin prefix that will be patched below. + (replaceVars ./patches/xcode.patch { + clangDarwin = "${stdenv.cc}/bin/clang"; + }) + ]; + + patches = lib.optionals isDarwin darwinPatches ++ [ + # Revert preference for apple_support over rules_cc toolchain for now + # will need to figure out how to build with apple_support toolchain later + ./patches/apple_cc_toolchain.patch + + ./patches/build_execlog_parser.patch + + # --experimental_strict_action_env (which may one day become the default + # see bazelbuild/bazel#2574) hardcodes the default + # action environment to a non hermetic value (e.g. "/usr/local/bin"). + # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. + # So we are replacing this bazel paths by defaultShellPath, + # improving hermeticity and making it work in nixos. + (replaceVars ./patches/strict_action_env.patch { + strictActionEnvPatch = defaultShell.defaultShellPath; + }) + + (replaceVars ./patches/default_bash.patch { + defaultBash = "${defaultShell.bashWithDefaultShellUtils}/bin/bash"; + }) + + # Provide default JRE for Bazel process by setting --server_javabase= + # in a new default system bazelrc file + (replaceVars ./patches/bazel_rc.patch { + bazelSystemBazelRCPath = replaceVars ./system.bazelrc { + serverJavabase = jdk_headless; + }; + }) + + # patch that propagates rules_* patches below + # patches need to be within source root and can't be absolute paths in Nix store + # so rules_* patches are injected via addFilePatch + ./patches/deps_patches.patch + (addFilePatch { + path = "b/third_party/rules_python.patch"; + file = replaceVars ./patches/rules_python.patch { + usrBinEnv = "${coreutils}/bin/env"; + }; + }) + (addFilePatch { + path = "b/third_party/rules_java.patch"; + file = replaceVars ./patches/rules_java.patch { + defaultBash = "${defaultShell.bashWithDefaultShellUtils}/bin/bash"; + }; + }) + (addFilePatch { + path = "b/third_party/rules_cc.patch"; + file = replaceVars ./patches/rules_cc.patch { + defaultBash = "${defaultShell.bashWithDefaultShellUtils}/bin/bash"; + }; + }) + (addFilePatch { + path = "b/third_party/grpc.patch"; + file = ./patches/grpc.patch; + }) + + (replaceVars ./patches/md5sum.patch { + md5sum = "${coreutils}/bin/md5sum"; + }) + + # Nix build sandbox can configure custom PATH but doesn't have + # /usr/bin/env which is unfortunate https://github.com/NixOS/nixpkgs/issues/6227 + # and we need to do a silly patch + (replaceVars ./patches/usr_bin_env.patch { + usrBinEnv = "${coreutils}/bin/env"; + }) + ]; + + meta = { + homepage = "https://github.com/bazelbuild/bazel/"; + description = "Build tool that builds code quickly and reliably"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; + license = lib.licenses.asl20; + teams = [ lib.teams.bazel ]; + mainProgram = "bazel"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; + + nativeBuildInputs = [ + makeWrapper + jdk_headless + python3 + unzip + which + + # Shell completion + installShellFiles + python3.pkgs.absl-py # Needed to build fish completion + ] + # Needed for execlog + ++ lib.optional (!stdenv.hostPlatform.isDarwin) stdenv.cc + ++ lib.optional (stdenv.hostPlatform.isDarwin) cctools.libtool; + + buildPhase = '' + runHook preBuild + export HOME=$(mktemp -d) + + # If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md + # and `git rev-parse --short HEAD` which would result in + # "3.7.0- (@non-git)" due to non-git build and incomplete changelog. + # Actual bazel releases use scripts/release/common.sh which is based + # on branch/tag information which we don't have with tarball releases. + # Note that .bazelversion is always correct and is based on bazel-* + # executable name, version checks should work fine + export EMBED_LABEL="${version}- (@non-git)" + + echo "Stage 1 - Running bazel bootstrap script" + # Note: can't use lib.escapeShellArgs here because it will escape arguments + # with = using single quotes. This is fine for command invocations, + # but for string variable they become literal single quote chars, + # compile.sh will not unquote them either and command will be invalid. + export EXTRA_BAZEL_ARGS="${lib.strings.concatStringsSep " " commandArgs}" + export NIX_CFLAGS_COMPILE_${stdenv.cc.suffixSalt}="${lib.strings.concatStringsSep " " extraCflags}" + + + ${bash}/bin/bash ./compile.sh + + # XXX: get rid of this, or move it to another stage. + # It is plain annoying when builds fail. + echo "Stage 2 - Generate bazel completions" + ${bash}/bin/bash ./scripts/generate_bash_completion.sh \ + --bazel=./output/bazel \ + --output=./output/bazel-complete.bash \ + --prepend=./scripts/bazel-complete-header.bash \ + --prepend=./scripts/bazel-complete-template.bash + ${python3}/bin/python3 ./scripts/generate_fish_completion.py \ + --bazel=./output/bazel \ + --output=./output/bazel-complete.fish + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + # Bazel binary contains zip archive, which contains text files and a jar + # both of which can have store references that might be obscured to Nix + # builder in packaged form, so we unpack and extract those references + + # Note: grep isn't necessarily 100% accurate, other approaches could be + # to disassemble Jar (slow) or hardcode known references + mkdir -p $out/nix-support + INSTALL_BASE=$(./output/bazel --batch info install_base) + find "$INSTALL_BASE" -type f -exec \ + ${gnugrep}/bin/grep --text --only-matching --no-filename "$NIX_STORE/[^/]*" '{}' \; \ + | sort -u >> $out/nix-support/depends + + mkdir -p $out/bin + + # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel if + # it can’t find something in tools, it calls + # $out/bin/bazel-{version}-{os_arch} The binary _must_ exist with this + # naming if your project contains a .bazelversion file. + cp ./scripts/packages/bazel.sh $out/bin/bazel + versioned_bazel="$out/bin/bazel-${version}-${bazelSystem}-${bazelArch}" + mv ./output/bazel "$versioned_bazel" + wrapProgram "$versioned_bazel" --suffix PATH : ${defaultShell.defaultShellPath} + + mkdir $out/share + cp ./output/parser_deploy.jar $out/share/parser_deploy.jar + substitute ${./bazel-execlog.sh} $out/bin/bazel-execlog \ + --subst-var out \ + --subst-var-by runtimeShell ${runtimeShell} \ + --subst-var-by binJava ${jdk_headless}/bin/java + chmod +x $out/bin/bazel-execlog + + # shell completion files + installShellCompletion --bash \ + --name bazel.bash \ + ./output/bazel-complete.bash + installShellCompletion --zsh \ + --name _bazel \ + ./scripts/zsh_completion/_bazel + installShellCompletion --fish \ + --name bazel.fish \ + ./output/bazel-complete.fish + ''; + + postFixup = + # verify that bazel binary still works post-fixup + '' + USE_BAZEL_VERSION=${version} $out/bin/bazel --batch info release + ''; + + # Bazel binary includes zip archive at the end that `strip` would end up discarding + stripExclude = [ "bin/.bazel-${version}-*-wrapped" ]; + + passthru = { + tests = { + inherit (callPackage ./examples.nix { }) cpp java rust; + }; + }; +} diff --git a/pkgs/by-name/ba/bazel_9/patches/apple_cc_toolchain.patch b/pkgs/by-name/ba/bazel_9/patches/apple_cc_toolchain.patch new file mode 100644 index 000000000000..d4200896a439 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/apple_cc_toolchain.patch @@ -0,0 +1,18 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +index 62c1c29d67..d845a0e98d 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -39,10 +39,10 @@ bazel_dep(name = "with_cfg.bzl", version = "0.13.0") + bazel_dep(name = "zlib", version = "1.3.1.bcr.7") + bazel_dep(name = "zstd-jni", version = "1.5.6-9") + +-# Depend on apple_support first and then rules_cc so that the Xcode toolchain +-# from apple_support wins over the generic Unix toolchain from rules_cc. +-bazel_dep(name = "apple_support", version = "1.24.5") ++# Depend on apple_support second after rules_cc so that the Xcode toolchain ++# from apple_support does not win over the generic Unix toolchain from rules_cc. + bazel_dep(name = "rules_cc", version = "0.2.17") ++bazel_dep(name = "apple_support", version = "1.24.5") + + # The starlark rules in @rules_cc are hidden behind macros but docgen needs to + # load the rule class directly, so we need to expose the cc_compatibility_proxy diff --git a/pkgs/by-name/ba/bazel_9/patches/bazel_rc.patch b/pkgs/by-name/ba/bazel_9/patches/bazel_rc.patch new file mode 100644 index 000000000000..a599ac3ec723 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/bazel_rc.patch @@ -0,0 +1,13 @@ +diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc +index 8f8f15685f..a7ae52d1e4 100644 +--- a/src/main/cpp/option_processor.cc ++++ b/src/main/cpp/option_processor.cc +@@ -56,7 +56,7 @@ OptionProcessor::OptionProcessor( + : workspace_layout_(workspace_layout), + startup_options_(std::move(default_startup_options)), + parse_options_called_(false), +- system_bazelrc_path_(BAZEL_SYSTEM_BAZELRC_PATH) {} ++ system_bazelrc_path_("@bazelSystemBazelRCPath@") {} + + OptionProcessor::OptionProcessor( + const WorkspaceLayout* workspace_layout, diff --git a/pkgs/by-name/ba/bazel_9/patches/build_execlog_parser.patch b/pkgs/by-name/ba/bazel_9/patches/build_execlog_parser.patch new file mode 100644 index 000000000000..552bc3bb7a8c --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/build_execlog_parser.patch @@ -0,0 +1,28 @@ +diff --git a/compile.sh b/compile.sh +index 4712355d48..feec286704 100755 +--- a/compile.sh ++++ b/compile.sh +@@ -76,6 +76,13 @@ bazel_build "src:bazel_nojdk${EXE_EXT}" \ + --host_platform=@platforms//host \ + --platforms=@platforms//host \ + || fail "Could not build Bazel" ++ ++bazel_build src/tools/execlog:parser_deploy.jar \ ++ --action_env=PATH \ ++ --host_platform=@platforms//host \ ++ --platforms=@platforms//host \ ++ || fail "Could not build parser_deploy.jar" ++ + bazel_bin_path="$(get_bazel_bin_path)/src/bazel_nojdk${EXE_EXT}" + [ -e "$bazel_bin_path" ] \ + || fail "Could not find freshly built Bazel binary at '$bazel_bin_path'" +@@ -84,5 +91,8 @@ cp -f "$bazel_bin_path" "output/bazel${EXE_EXT}" \ + chmod 0755 "output/bazel${EXE_EXT}" + BAZEL="$(pwd)/output/bazel${EXE_EXT}" + ++cp "$(get_bazel_bin_path)/src/tools/execlog/parser_deploy.jar" output/ \ ++ || fail "Could not copy 'parser_deploy.jar' to 'output/" ++ + clear_log + display "Build successful! Binary is here: ${BAZEL}" + diff --git a/pkgs/by-name/ba/bazel_9/patches/darwin_sleep.patch b/pkgs/by-name/ba/bazel_9/patches/darwin_sleep.patch new file mode 100644 index 000000000000..731ede89388a --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/darwin_sleep.patch @@ -0,0 +1,56 @@ +diff --git a/src/main/native/darwin/sleep_prevention_jni.cc b/src/main/native/darwin/sleep_prevention_jni.cc +index 67c35b201e..e50a58320e 100644 +--- a/src/main/native/darwin/sleep_prevention_jni.cc ++++ b/src/main/native/darwin/sleep_prevention_jni.cc +@@ -33,31 +33,13 @@ static int g_sleep_state_stack = 0; + static IOPMAssertionID g_sleep_state_assertion = kIOPMNullAssertionID; + + int portable_push_disable_sleep() { +- std::lock_guard lock(g_sleep_state_mutex); +- BAZEL_CHECK_GE(g_sleep_state_stack, 0); +- if (g_sleep_state_stack == 0) { +- BAZEL_CHECK_EQ(g_sleep_state_assertion, kIOPMNullAssertionID); +- CFStringRef reasonForActivity = CFSTR("build.bazel"); +- IOReturn success = IOPMAssertionCreateWithName( +- kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, reasonForActivity, +- &g_sleep_state_assertion); +- BAZEL_CHECK_EQ(success, kIOReturnSuccess); +- } +- g_sleep_state_stack += 1; +- return 0; ++ // Unreliable, disable for now ++ return -1; + } + + int portable_pop_disable_sleep() { +- std::lock_guard lock(g_sleep_state_mutex); +- BAZEL_CHECK_GT(g_sleep_state_stack, 0); +- g_sleep_state_stack -= 1; +- if (g_sleep_state_stack == 0) { +- BAZEL_CHECK_NE(g_sleep_state_assertion, kIOPMNullAssertionID); +- IOReturn success = IOPMAssertionRelease(g_sleep_state_assertion); +- BAZEL_CHECK_EQ(success, kIOReturnSuccess); +- g_sleep_state_assertion = kIOPMNullAssertionID; +- } +- return 0; ++ // Unreliable, disable for now ++ return -1; + } + + } // namespace blaze_jni +diff --git a/src/main/native/darwin/system_suspension_monitor_jni.cc b/src/main/native/darwin/system_suspension_monitor_jni.cc +index 3483aa7935..51782986ec 100644 +--- a/src/main/native/darwin/system_suspension_monitor_jni.cc ++++ b/src/main/native/darwin/system_suspension_monitor_jni.cc +@@ -83,10 +83,7 @@ void portable_start_suspend_monitoring() { + // Register to receive system sleep notifications. + // Testing needs to be done manually. Use the logging to verify + // that sleeps are being caught here. +- suspend_state.connect_port = IORegisterForSystemPower( +- &suspend_state, ¬ifyPortRef, SleepCallBack, ¬ifierObject); +- BAZEL_CHECK_NE(suspend_state.connect_port, MACH_PORT_NULL); +- IONotificationPortSetDispatchQueue(notifyPortRef, queue); ++ // XXX: Unreliable, disable for now + + // Register to deal with SIGCONT. + // We register for SIGCONT because we can't catch SIGSTOP. diff --git a/pkgs/by-name/ba/bazel_9/patches/default_bash.patch b/pkgs/by-name/ba/bazel_9/patches/default_bash.patch new file mode 100644 index 000000000000..a43a9f0aefd1 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/default_bash.patch @@ -0,0 +1,22 @@ +diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +index a982b782e1..d49b047074 100644 +--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java ++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +@@ -89,13 +89,13 @@ public class BazelRuleClassProvider { + public boolean useStrictActionEnv; + } + +- private static final PathFragment FALLBACK_SHELL = PathFragment.create("/bin/bash"); ++ private static final PathFragment FALLBACK_SHELL = PathFragment.create("@defaultBash@"); + + public static final ImmutableMap SHELL_EXECUTABLE = + ImmutableMap.builder() + .put(OS.WINDOWS, PathFragment.create("c:/msys64/usr/bin/bash.exe")) +- .put(OS.FREEBSD, PathFragment.create("/usr/local/bin/bash")) +- .put(OS.OPENBSD, PathFragment.create("/usr/local/bin/bash")) ++ .put(OS.FREEBSD, PathFragment.create("@defaultBash@")) ++ .put(OS.OPENBSD, PathFragment.create("@defaultBash@")) + .put(OS.UNKNOWN, FALLBACK_SHELL) + .buildOrThrow(); + + diff --git a/pkgs/by-name/ba/bazel_9/patches/deps_patches.patch b/pkgs/by-name/ba/bazel_9/patches/deps_patches.patch new file mode 100644 index 000000000000..e7ac04732893 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/deps_patches.patch @@ -0,0 +1,47 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +index d845a0e98d..be0aa7bd7c 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -22,16 +22,30 @@ bazel_dep(name = "googleapis", version = "0.0.0-20250604-de157ca3") + bazel_dep(name = "googletest", version = "1.17.0.bcr.2", repo_name = "com_google_googletest") + bazel_dep(name = "grpc-java", version = "1.71.0") + bazel_dep(name = "grpc", version = "1.76.0.bcr.1", repo_name = "com_github_grpc_grpc") ++single_version_override( ++ module_name = "grpc", ++ patches = ["//third_party:grpc.patch"], ++ patch_strip = 1, ++) + bazel_dep(name = "platforms", version = "1.0.0") + bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf") + bazel_dep(name = "re2", version = "2025-11-05.bcr.1") + bazel_dep(name = "rules_graalvm", version = "0.11.1") + bazel_dep(name = "rules_java", version = "9.0.3") ++single_version_override( ++ module_name = "rules_java", ++ patches = ["//third_party:rules_java.patch"], ++) + bazel_dep(name = "bazel_features", version = "1.42.1") + bazel_dep(name = "rules_jvm_external", version = "6.6") + bazel_dep(name = "rules_license", version = "1.0.0") + bazel_dep(name = "rules_pkg", version = "1.1.0") + bazel_dep(name = "rules_python", version = "1.7.0") ++single_version_override( ++ module_name = "rules_python", ++ patches = ["//third_party:rules_python.patch"], ++ patch_strip = 1, ++) + bazel_dep(name = "rules_shell", version = "0.6.1") + bazel_dep(name = "rules_testing", version = "0.9.0") + bazel_dep(name = "stardoc", version = "0.8.0", repo_name = "io_bazel_skydoc") +@@ -42,6 +56,11 @@ bazel_dep(name = "zstd-jni", version = "1.5.6-9") + # Depend on apple_support second after rules_cc so that the Xcode toolchain + # from apple_support does not win over the generic Unix toolchain from rules_cc. + bazel_dep(name = "rules_cc", version = "0.2.17") ++single_version_override( ++ module_name = "rules_cc", ++ patches = ["//third_party:rules_cc.patch"], ++ patch_strip = 1, ++) + bazel_dep(name = "apple_support", version = "1.24.5") + + # The starlark rules in @rules_cc are hidden behind macros but docgen needs to diff --git a/pkgs/by-name/ba/bazel_9/patches/examples/cpp-tutorial.patch b/pkgs/by-name/ba/bazel_9/patches/examples/cpp-tutorial.patch new file mode 100644 index 000000000000..cd1506ca29f3 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/examples/cpp-tutorial.patch @@ -0,0 +1,15 @@ +diff --git a/BUILD b/BUILD +new file mode 100644 +index 0000000..e69de29 +diff --git a/MODULE.bazel b/MODULE.bazel +index 4874ffc..f4e0d56 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -1 +1,6 @@ + bazel_dep(name = "rules_cc", version = "0.0.17") ++single_version_override( ++ module_name = "rules_cc", ++ patches = [":rules_cc.patch"], ++ patch_strip = 1, ++) + diff --git a/pkgs/by-name/ba/bazel_9/patches/examples/java-tutorial.patch b/pkgs/by-name/ba/bazel_9/patches/examples/java-tutorial.patch new file mode 100644 index 000000000000..61cd863418ab --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/examples/java-tutorial.patch @@ -0,0 +1,12 @@ +diff --git a/java-tutorial/MODULE.bazel b/java-tutorial/MODULE.bazel +index 1496f64..d3df2d5 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -1 +1,7 @@ + bazel_dep(name = "rules_java", version = "7.11.1") ++bazel_dep(name = "rules_cc", version = "0.2.13") ++single_version_override( ++ module_name = "rules_cc", ++ patches = [":rules_cc.patch"], ++ patch_strip = 1, ++) diff --git a/pkgs/by-name/ba/bazel_9/patches/examples/rules_cc.patch b/pkgs/by-name/ba/bazel_9/patches/examples/rules_cc.patch new file mode 100644 index 000000000000..1f0e3fc59fde --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/examples/rules_cc.patch @@ -0,0 +1,10 @@ +diff --git a/cc/private/toolchain/generate_system_module_map.sh b/cc/private/toolchain/generate_system_module_map.sh +index 6bcbd85..b5e4f2c 100755 +--- a/cc/private/toolchain/generate_system_module_map.sh ++++ b/cc/private/toolchain/generate_system_module_map.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # Copyright 2020 The Bazel Authors. All rights reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/pkgs/by-name/ba/bazel_9/patches/examples/rust-examples.patch b/pkgs/by-name/ba/bazel_9/patches/examples/rust-examples.patch new file mode 100644 index 000000000000..7b71b5f6e3b2 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/examples/rust-examples.patch @@ -0,0 +1,17 @@ +diff --git a/rust-examples/01-hello-world/MODULE.bazel b/rust-examples/01-hello-world/MODULE.bazel +index 53f685c..9c1dccd 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -5,6 +5,12 @@ module( + + # https://github.com/bazelbuild/rules_rust/releases + bazel_dep(name = "rules_rust", version = "0.65.0") ++bazel_dep(name = "rules_cc", version = "0.2.4") ++single_version_override( ++ module_name = "rules_cc", ++ patches = [":rules_cc.patch"], ++ patch_strip = 1, ++) + + # Rust toolchain + RUST_EDITION = "2021" # NOTE: 2024 edition will be released with Rust 1.85.0 diff --git a/pkgs/by-name/ba/bazel_9/patches/grpc.patch b/pkgs/by-name/ba/bazel_9/patches/grpc.patch new file mode 100644 index 000000000000..20d0544056d9 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/grpc.patch @@ -0,0 +1,24 @@ +diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl +index 66d6368..8dd1b16 100644 +--- a/bazel/grpc_build_system.bzl ++++ b/bazel/grpc_build_system.bzl +@@ -196,18 +196,11 @@ def grpc_proto_plugin(name, srcs = [], deps = []): + srcs = srcs, + deps = deps, + ) +- universal_binary( +- name = name + "_universal", +- binary = name + "_native", +- ) + + # In order to avoid warnings from Bazel, names of the rule and its output file must differ. + native.genrule( + name = name, +- srcs = select({ +- "@platforms//os:macos": [name + "_universal"], +- "//conditions:default": [name + "_native"], +- }), ++ srcs = [name + "_native"], + outs = [name + "_binary"], + cmd = "cp $< $@", + executable = True, diff --git a/pkgs/by-name/ba/bazel_9/patches/md5sum.patch b/pkgs/by-name/ba/bazel_9/patches/md5sum.patch new file mode 100644 index 000000000000..78f4d5a235b4 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/md5sum.patch @@ -0,0 +1,30 @@ +diff --git a/src/md5_darwin_freebsd.sh b/src/md5_darwin_freebsd.sh +index cd9c7687bc..2c5e71959a 100755 +--- a/src/md5_darwin_freebsd.sh ++++ b/src/md5_darwin_freebsd.sh +@@ -14,4 +14,4 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + # +-/sbin/md5 "$@" | /sbin/md5 | head -c 32 ++@md5sum@ "$@" | @md5sum@ | head -c 32 +diff --git a/src/md5_default.sh b/src/md5_default.sh +index d5d4f0b8f4..2c5e71959a 100755 +--- a/src/md5_default.sh ++++ b/src/md5_default.sh +@@ -14,4 +14,4 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + # +-md5sum "$@" | md5sum | head -c 32 ++@md5sum@ "$@" | @md5sum@ | head -c 32 +diff --git a/src/md5_openbsd.sh b/src/md5_openbsd.sh +index 6c85df1899..67c3bd9fed 100755 +--- a/src/md5_openbsd.sh ++++ b/src/md5_openbsd.sh +@@ -16,4 +16,4 @@ + # + # We avoid using the `head` tool's `-c` option, since it does not exist + # on OpenBSD. +-/bin/md5 "$@" | /bin/md5 | dd bs=32 count=1 ++@md5sum@ "$@" | @md5sum@ | dd bs=32 count=1 diff --git a/pkgs/by-name/ba/bazel_9/patches/rules_cc.patch b/pkgs/by-name/ba/bazel_9/patches/rules_cc.patch new file mode 100644 index 000000000000..31a2bf63df82 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/rules_cc.patch @@ -0,0 +1,11 @@ +diff --git a/cc/private/toolchain/generate_system_module_map.sh b/cc/private/toolchain/generate_system_module_map.sh +index 6bcbd85..b5e4f2c 100755 +--- a/cc/private/toolchain/generate_system_module_map.sh ++++ b/cc/private/toolchain/generate_system_module_map.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!@defaultBash@ + # Copyright 2020 The Bazel Authors. All rights reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + diff --git a/pkgs/by-name/ba/bazel_9/patches/rules_java.patch b/pkgs/by-name/ba/bazel_9/patches/rules_java.patch new file mode 100644 index 000000000000..ba2fd2f1ce78 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/rules_java.patch @@ -0,0 +1,11 @@ +diff --git java/bazel/rules/java_stub_template.txt java/bazel/rules/java_stub_template.txt +index 115b46e..56d2ff7 100644 +--- java/bazel/rules/java_stub_template.txt ++++ java/bazel/rules/java_stub_template.txt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!@defaultBash@ + # Copyright 2014 The Bazel Authors. All rights reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + diff --git a/pkgs/by-name/ba/bazel_9/patches/rules_python.patch b/pkgs/by-name/ba/bazel_9/patches/rules_python.patch new file mode 100644 index 000000000000..fd2524263a07 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/rules_python.patch @@ -0,0 +1,13 @@ +diff --git a/python/private/runtime_env_toolchain.bzl b/python/private/runtime_env_toolchain.bzl +index de749007..72d14499 100644 +--- a/python/private/runtime_env_toolchain.bzl ++++ b/python/private/runtime_env_toolchain.bzl +@@ -48,7 +48,7 @@ def define_runtime_env_toolchain(name): + name = "_runtime_env_py3_runtime", + interpreter = "//python/private:runtime_env_toolchain_interpreter.sh", + python_version = "PY3", +- stub_shebang = "#!/usr/bin/env python3", ++ stub_shebang = "#!@usrBinEnv@ python3", + visibility = ["//visibility:private"], + tags = ["manual"], + supports_build_time_venv = supports_build_time_venv, diff --git a/pkgs/by-name/ba/bazel_9/patches/strict_action_env.patch b/pkgs/by-name/ba/bazel_9/patches/strict_action_env.patch new file mode 100644 index 000000000000..1402c20f6bdb --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/strict_action_env.patch @@ -0,0 +1,13 @@ +diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +index a70b5559bc..10bdffe961 100644 +--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java ++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +@@ -466,7 +466,7 @@ public class BazelRuleClassProvider { + // Note that --action_env does not propagate to the host config, so it is not a viable + // workaround when a genrule is itself built in the host config (e.g. nested genrules). See + // #8536. +- return "/bin:/usr/bin:/usr/local/bin"; ++ return "@strictActionEnvPatch@"; + } + + String newPath = ""; diff --git a/pkgs/by-name/ba/bazel_9/patches/usr_bin_env.patch b/pkgs/by-name/ba/bazel_9/patches/usr_bin_env.patch new file mode 100644 index 000000000000..b5ee1ca6d135 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/usr_bin_env.patch @@ -0,0 +1,76 @@ +diff --git a/src/zip_builtins.sh b/src/zip_builtins.sh +index d78ca5526a..c7d8f251cc 100755 +--- a/src/zip_builtins.sh ++++ b/src/zip_builtins.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!@usrBinEnv@ bash + + # Copyright 2020 The Bazel Authors. All rights reserved. + # + +diff --git a/src/zip_files.sh b/src/zip_files.sh +index 1422a6c659..4b1c221784 100755 +--- a/src/zip_files.sh ++++ b/src/zip_files.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!@usrBinEnv@ bash + + # Copyright 2019 The Bazel Authors. All rights reserved. + # + +diff --git a/src/package-bazel.sh b/src/package-bazel.sh +index 56e94db400..65fef20988 100755 +--- a/src/package-bazel.sh ++++ b/src/package-bazel.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!@usrBinEnv@ bash + # + # Copyright 2015 The Bazel Authors. All rights reserved. + # + +diff --git a/src/main/cpp/generate_jvm_module_options.sh b/src/main/cpp/generate_jvm_module_options.sh +index dbed0e7576..421c432d3e 100755 +--- a/src/main/cpp/generate_jvm_module_options.sh ++++ b/src/main/cpp/generate_jvm_module_options.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!@usrBinEnv@ bash + # + # Copyright 2025 The Bazel Authors. All rights reserved. + # + +diff --git a/src/md5_darwin_freebsd.sh b/src/md5_darwin_freebsd.sh +index 2c5e71959a..a77a0cebd3 100755 +--- a/src/md5_darwin_freebsd.sh ++++ b/src/md5_darwin_freebsd.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!@usrBinEnv@ bash + # + # Copyright 2025 The Bazel Authors. All rights reserved. + # + +diff --git a/src/md5_default.sh b/src/md5_default.sh +index 2c5e71959a..a77a0cebd3 100755 +--- a/src/md5_default.sh ++++ b/src/md5_default.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!@usrBinEnv@ bash + # + # Copyright 2025 The Bazel Authors. All rights reserved. + # + +diff --git a/src/md5_openbsd.sh b/src/md5_openbsd.sh +index 67c3bd9fed..17dca32477 100755 +--- a/src/md5_openbsd.sh ++++ b/src/md5_openbsd.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!@usrBinEnv@ bash + # + # Copyright 2025 The Bazel Authors. All rights reserved. + # diff --git a/pkgs/by-name/ba/bazel_9/patches/xcode.patch b/pkgs/by-name/ba/bazel_9/patches/xcode.patch new file mode 100644 index 000000000000..1dd1ad2cb33d --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/xcode.patch @@ -0,0 +1,27 @@ +diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh +index 1bad14cba7..d312fe08bb 100755 +--- a/scripts/bootstrap/compile.sh ++++ b/scripts/bootstrap/compile.sh +@@ -402,7 +402,7 @@ cp $OUTPUT_DIR/libblaze.jar ${ARCHIVE_DIR} + # TODO(b/28965185): Remove when xcode-locator is no longer required in embedded_binaries. + log "Compiling xcode-locator..." + if [[ $PLATFORM == "darwin" ]]; then +- run /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices -framework Foundation -o ${ARCHIVE_DIR}/xcode-locator tools/osx/xcode_locator.m ++ run @clangDarwin@ -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices -framework Foundation -o ${ARCHIVE_DIR}/xcode-locator tools/osx/xcode_locator.m + else + cp tools/osx/xcode_locator_stub.sh ${ARCHIVE_DIR}/xcode-locator + fi +diff --git a/tools/osx/BUILD b/tools/osx/BUILD +index 5b99589ad4..3d3269772b 100644 +--- a/tools/osx/BUILD ++++ b/tools/osx/BUILD +@@ -27,7 +27,7 @@ exports_files([ + ]) + + DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """ +- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \ ++ @clangDarwin@ -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \ + -framework Foundation -arch arm64 -arch x86_64 -o $@ $< + """ + + diff --git a/pkgs/by-name/ba/bazel_9/system.bazelrc b/pkgs/by-name/ba/bazel_9/system.bazelrc new file mode 100644 index 000000000000..6684e33ed96c --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/system.bazelrc @@ -0,0 +1,4 @@ +startup --server_javabase=@serverJavabase@ + +# load default location for the system wide configuration +try-import /etc/bazel.bazelrc diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 7e0844ea90a3..fef581493cfa 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -29,18 +29,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.37.3"; + version = "1.37.4"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-cFqjht3mNzvvd9itIkc271iYfb2sfezWtC98jz0vD+I="; + hash = "sha256-VlljE+xoKg6GryVuebUA1v9x2shMBUb7veCtD68MBJw="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-ivJntxMIx8R2ytCr1ja2pQIXqjkQ12w9OhVh5YWsFFM="; + hash = "sha256-t6ghsIRJFR2Kqism4tdizhnJ8qcE2ZZwH6c3nYogHlo="; }; postPatch = '' diff --git a/pkgs/by-name/be/behdad-fonts/package.nix b/pkgs/by-name/be/behdad-fonts/package.nix index feacfc143509..0d910fe516e0 100644 --- a/pkgs/by-name/be/behdad-fonts/package.nix +++ b/pkgs/by-name/be/behdad-fonts/package.nix @@ -2,32 +2,27 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "behdad-fonts"; version = "0.0.3"; src = fetchFromGitHub { owner = "font-store"; repo = "BehdadFont"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gKfzxo3/bCMKXl2d6SP07ahIiNrUyrk/SN5XLND2lWY="; }; - installPhase = '' - runHook preInstall - - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/behrad-fonts {} \; - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://github.com/font-store/BehdadFont"; description = "Persian/Arabic Open Source Font"; license = lib.licenses.ofl; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; }; -} +}) diff --git a/pkgs/by-name/be/besley/package.nix b/pkgs/by-name/be/besley/package.nix index c39300459713..aed509d05c28 100644 --- a/pkgs/by-name/be/besley/package.nix +++ b/pkgs/by-name/be/besley/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { pname = "besley"; @@ -14,14 +15,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-N6QU3Pd6EnIrdbRtDT3mW5ny683DBWo0odADJBSdA2E="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - cp fonts/*/*.otf $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://indestructibletype.com/Besley.html"; diff --git a/pkgs/by-name/bi/bird3/package.nix b/pkgs/by-name/bi/bird3/package.nix index 8d8dee71dc81..182439cd6846 100644 --- a/pkgs/by-name/bi/bird3/package.nix +++ b/pkgs/by-name/bi/bird3/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "bird"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitLab { domain = "gitlab.nic.cz"; owner = "labs"; repo = "bird"; rev = "v${finalAttrs.version}"; - hash = "sha256-J+I+FJvPOOnjif2jy0ko+BuEcXd3kFjmlDtQpHL2cNc="; + hash = "sha256-FkrVrjT4Q9zLeauP2GOX38a7a4q7h2aQbEe/kmfKB3A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 3551c76265cd..91f12f70f2d0 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -14,23 +14,31 @@ buildNpmPackage (finalAttrs: { pname = "bitwarden-cli"; - version = "2026.2.0"; + version = "2026.3.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; tag = "cli-v${finalAttrs.version}"; - hash = "sha256-BiL9ugimdDKIzIoehGqdBfJkTOjbOMl8XV+0g/aGS/k="; + hash = "sha256-ecaCHk04N9h0RP8gK0o+MLgYS6Linsqi7AaC86hwQ3U="; }; postPatch = '' # remove code under unfree license rm -r bitwarden_license + + # Upstream cli-v2026.3.0 bumps @napi-rs/cli to 3.5.1 in the desktop workspace, + # but the root lockfile still points that entry at 3.2.0. + substituteInPlace package-lock.json \ + --replace-fail \ + $' "apps/desktop/node_modules/@napi-rs/cli": {\n "version": "3.2.0",\n "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-3.2.0.tgz",\n "integrity": "sha512-heyXt/9OBPv/WrTFW2+PxIMzH6MCeqP9ZsvOg0LN6pLngBnszcxFsdhCAh5I6sddzQsvru53zj59GUzvmpWk8Q==",' \ + $' "apps/desktop/node_modules/@napi-rs/cli": {\n "version": "3.5.1",\n "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-3.5.1.tgz",\n "integrity": "sha512-XBfLQRDcB3qhu6bazdMJsecWW55kR85l5/k0af9BIBELXQSsCFU0fzug7PX8eQp6vVdm7W/U3z6uP5WmITB2Gw==",' ''; nodejs = nodejs_22; + npmDepsFetcherVersion = 2; - npmDepsHash = "sha256-S34Lxr9dH9wjBmpDYA530z2/HiY4D4b/3rswWDqsrFU="; + npmDepsHash = "sha256-JVRwU5MUQ8YzhCW7ODiyVqbgq7/PxgMV9dlw7i32MfI="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ perl @@ -109,6 +117,7 @@ buildNpmPackage (finalAttrs: { maintainers = with lib.maintainers; [ xiaoxiangmoe dotlambda + caverav ]; }; }) diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index 3d3227b43822..75a7338486a4 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "blockbench"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; tag = "v${version}"; - hash = "sha256-bvstexoBQylLmTMzAhId+1HvC3iiL3tPahGhwZ5Yroo="; + hash = "sha256-fU38Exv83cKaPFA26zmwYZlkscCbAEz/7Gch5j/qHjk="; }; patches = [ @@ -36,7 +36,7 @@ buildNpmPackage rec { copyDesktopItems ]; - npmDepsHash = "sha256-1CCYk3cKFdLhx8oC5XreFCf5sL/7eKjOfXCmHt7hZrM="; + npmDepsHash = "sha256-0FdPTyoVNrsx0LJYcpfZPKZwUKzyJaU6XNnm2bY9F/s="; makeCacheWritable = true; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/bl/blst/package.nix b/pkgs/by-name/bl/blst/package.nix index 95b505c47143..a5a4252d57d3 100644 --- a/pkgs/by-name/bl/blst/package.nix +++ b/pkgs/by-name/bl/blst/package.nix @@ -53,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: { URL: ${finalAttrs.meta.homepage} Version: ${finalAttrs.version} - Cflags: -I \''${includedir} - Libs: -L \''${libdir} -lblst + Cflags: -I\''${includedir} + Libs: -L\''${libdir} -lblst Libs.private: EOF diff --git a/pkgs/by-name/br/brioche/librusty_v8.nix b/pkgs/by-name/br/brioche/librusty_v8.nix index a3a91c5cc15a..00cbd562c0ae 100644 --- a/pkgs/by-name/br/brioche/librusty_v8.nix +++ b/pkgs/by-name/br/brioche/librusty_v8.nix @@ -2,12 +2,12 @@ { fetchLibrustyV8 }: fetchLibrustyV8 { - version = "140.2.0"; + version = "146.9.0"; shas = { # NOTE; Follows supported platforms of package (see meta.platforms attribute)! - x86_64-linux = "0xgkyjx4vhi001p8iv0wqjpal4nl0vj65fnhp5x8ckss6mhanymg"; - aarch64-linux = "1gal8sylc0k9x37m4lrlncmcfaxn5bdizgi9rhyfb9da9wi41n9f"; - x86_64-darwin = "0y117lgc1d90f3z285ljazacscs02mmk9b57h403ilgqfly8dzh7"; - aarch64-darwin = "106n64mrmwk0jzm8zy891kjjbxrr7yggj7m986pxinf8igvab7br"; + x86_64-linux = "167yh6wabn154axrylam4p76n5a411rqjdgaza4dwsfc5cg2zvv2"; + aarch64-linux = "1lmpqndmv9lyzsca1sx4prw76fsnk63cr1i15jdmk764j3zyyki6"; + x86_64-darwin = "1zdlwgq3kgd931ppd9afvqkn45vg8gjsz6k8jb2vnbwzf03grsv0"; + aarch64-darwin = "0hm2wdkd5palsxdw0r9y5365gdww7f37g5z9260sa639211lipp4"; }; } diff --git a/pkgs/by-name/br/brioche/package.nix b/pkgs/by-name/br/brioche/package.nix index 3106d86f80fe..e6597a43eebe 100644 --- a/pkgs/by-name/br/brioche/package.nix +++ b/pkgs/by-name/br/brioche/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "brioche"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "brioche-dev"; repo = "brioche"; tag = "v${finalAttrs.version}"; - hash = "sha256-tMVBpFCTxesrkj7Z3huVD86baw1tYAtPdPAzYJzTCnA="; + hash = "sha256-j0Hi75olubvlHEOzVbW0cMAslZFWCzHiwXaBqmkXzmE="; }; - cargoHash = "sha256-LPHJHS69oUvmTaYoMSINCcyYIHYMq++UCUMh9KrCm/0="; + cargoHash = "sha256-3UvggE45Gvus5ghd64ZK+Nh/VB3NJBmZNrbStl/xJu0="; env = { OPENSSL_NO_VENDOR = true; @@ -42,16 +42,8 @@ rustPlatform.buildRustPackage (finalAttrs: { openssl ]; - checkFlags = [ - # Require internet access - "--skip=test_bake_process" - ]; - - nativeCheckInputs = [ - # Otherwise, some tests fail with: - # Error: failed to find time zone `Etc/Unknown` since there is no time zone database configured at line 1 column 415 - tzdata - ]; + # Tests require network access and CA certificates, which are unavailable in the nix sandbox + doCheck = false; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/br/bront_fonts/package.nix b/pkgs/by-name/br/bront_fonts/package.nix index 15e4447e2b48..b216dd18f8e1 100644 --- a/pkgs/by-name/br/bront_fonts/package.nix +++ b/pkgs/by-name/br/bront_fonts/package.nix @@ -2,6 +2,7 @@ stdenvNoCC, lib, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { @@ -15,9 +16,9 @@ stdenvNoCC.mkDerivation { sha256 = "1sx2gv19pgdyccb38sx3qnwszksmva7pqa1c8m35s6cipgjhhgb4"; }; - installPhase = '' - install -m444 -Dt $out/share/fonts/truetype *Bront.ttf - ''; + preInstall = "rm {DejaVuSansMono,UbuntuMono}.ttf"; + + nativeBuildInputs = [ installFonts ]; meta = { description = "Bront Fonts"; @@ -28,6 +29,6 @@ stdenvNoCC.mkDerivation { ufl ]; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; }; } diff --git a/pkgs/by-name/bu/bupc/package.nix b/pkgs/by-name/bu/bupc/package.nix index dbee20c4ae37..076bb33a15c7 100644 --- a/pkgs/by-name/bu/bupc/package.nix +++ b/pkgs/by-name/bu/bupc/package.nix @@ -8,17 +8,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "berkeley_upc"; - version = "2020.12.0"; + version = "2022.10.0"; src = fetchurl { url = "https://upc.lbl.gov/download/release/berkeley_upc-${finalAttrs.version}.tar.gz"; - hash = "sha256-JdpFORlXHpCQE+TivoQQnjQlxQN7C8BNfHvTOSwXbYQ="; + hash = "sha256-ZckvdxDixr06BTzJ0ErEdtmR4G05llIUsVgLEUR65LU="; }; postPatch = '' patchShebangs . ''; + # gcc 15 + env.NIX_CFLAGS_COMPILE = "-Wno-incompatible-pointer-types"; + # Used during the configure phase env.ENVCMD = "${coreutils}/bin/env"; diff --git a/pkgs/by-name/ca/catimg/package.nix b/pkgs/by-name/ca/catimg/package.nix index 70965486125b..e029f17321e5 100644 --- a/pkgs/by-name/ca/catimg/package.nix +++ b/pkgs/by-name/ca/catimg/package.nix @@ -2,31 +2,20 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, }: stdenv.mkDerivation (finalAttrs: { pname = "catimg"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "posva"; repo = "catimg"; - rev = finalAttrs.version; - sha256 = "0a2dswbv4xddb2l2d55hc43lzvjwrjs5z9am7v6i0p0mi2fmc89s"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TkUrDVg/EJQ3cAWosRDJ09pmOB0NANW7c/MFyH//Iok="; }; - patches = [ - # Update CMake minimum required version for CMake 4 compatibility - # https://github.com/NixOS/nixpkgs/issues/449801 - # https://github.com/posva/catimg/pull/73 - (fetchpatch { - url = "https://github.com/posva/catimg/commit/155786229230e2ddc2dd97e4e0219d1e2aa66099.patch"; - hash = "sha256-eDXYa8eGvhC7NGL6V+R3Ui5FBtx/APGUC6Sw9rv2ho4="; - }) - ]; - nativeBuildInputs = [ cmake ]; env = lib.optionalAttrs (stdenv.hostPlatform.libc == "glibc") { diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index e618992f5df5..d38502cc5d7f 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -19,6 +19,7 @@ let "starship" "thunderbird" "waybar" + "whoogle" ]; in { @@ -208,6 +209,14 @@ let rev = "ee8ed32b4f63e9c417249c109818dcc05a2e25da"; hash = "sha256-za0y6hcN2rvN6Xjf31xLRe4PP0YyHu2i454ZPjr+lWA="; }; + + whoogle = fetchFromGitHub { + name = "whoogle"; + owner = "catppuccin"; + repo = "whoogle"; + rev = "9d961dc6e2ac405fee18ee1da9a14db1f139db39"; + hash = "sha256-GyJD/xAF481ZMHOEfwW1SrWW6LT8ARRFizbfjl526XE="; + }; }; in lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListOfEnum @@ -338,6 +347,11 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO mkdir -p "$out/waybar" cp "${sources.waybar}/themes/${variant}.css" "$out/waybar" + '' + + lib.optionalString (lib.elem "whoogle" themeList) '' + mkdir -p "$out/whoogle" + cp "${sources.whoogle}/css/${variant}.css" "$out/whoogle" + '' + '' runHook postInstall diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix index 1a0c73b96318..90c4f1ef2edd 100644 --- a/pkgs/by-name/cf/cfspeedtest/package.nix +++ b/pkgs/by-name/cf/cfspeedtest/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cfspeedtest"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "code-inflation"; repo = "cfspeedtest"; tag = "v${finalAttrs.version}"; - hash = "sha256-6ZlcZZSC5WPrlskxWnLheMt5sJlHI7K4UPAPsvr8zSc="; + hash = "sha256-xwiWYTqs1ZQg7CQYg2IqskMV5HMrFqNstobDkh17GyU="; }; - cargoHash = "sha256-h9X/WKKiXri4I2DBulkNnpiTaYAL9oXAx0BiTBKaEtE="; + cargoHash = "sha256-CBNShvjczlegOOrdULpPZ5GPdaWWqP3yhQFc9spaNlg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index caa92e288d37..d9eee202ef37 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -35,8 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: { env = { # requires features: sync_unsafe_cell, unbounded_shifts, let_chains, ip RUSTC_BOOTSTRAP = 1; - RUSTFLAGS = "--cfg tokio_unstable -A stable_features"; - NIX_CFLAGS_COMPILE = "-Wno-error"; }; buildFeatures = [ "plus" ]; diff --git a/pkgs/by-name/cl/claude-usage-tracker/package.nix b/pkgs/by-name/cl/claude-usage-tracker/package.nix new file mode 100644 index 000000000000..2b93aa10a29d --- /dev/null +++ b/pkgs/by-name/cl/claude-usage-tracker/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenvNoCC, + fetchzip, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "claude-usage-tracker"; + version = "3.0.3"; + + src = fetchzip { + url = "https://github.com/hamed-elfayome/Claude-Usage-Tracker/releases/download/v${finalAttrs.version}/Claude-Usage.zip"; + hash = "sha256-Yc4SukriyiLI/8U+rdhc3Jh/mD2V/0EF57rsVV0J3s4="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r "Claude Usage.app" $out/Applications/ + + runHook postInstall + ''; + + dontBuild = true; + dontFixup = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Native macOS menu bar app for tracking Claude AI usage limits in real-time. Built with Swift/SwiftUI."; + homepage = "https://github.com/hamed-elfayome/Claude-Usage-Tracker"; + changelog = "https://github.com/hamed-elfayome/Claude-Usage-Tracker/releases/tag/v${finalAttrs.version}"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "aarch64-darwin" ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ myzel394 ]; + }; +}) diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index bfa7abff2705..fca8a5bc535e 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -26,19 +26,19 @@ }: let - version = "2026.1.150.0"; + version = "2026.3.846.0"; sources = rec { x86_64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}_amd64.deb"; - hash = "sha256-LjiOR0biyxkYIn+E2jh4bePd7Yg/6qOtT7W+EKcLwwo="; + hash = "sha256-1SKTK0QW+3CcqBLqHbIsPny/6ekyjZe9qRcjYOMnR58="; }; aarch64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}_arm64.deb"; - hash = "sha256-HnuRQtSv176ZaIOswd9f0gwfo6BguKXgszzxwizDCig="; + hash = "sha256-0zYsyZbX8qq/P+GHW4UHSTy2OsDa4fJAVjHcRbpHtSc="; }; aarch64-darwin = fetchurl { url = "https://downloads.cloudflareclient.com/v1/download/macos/version/${version}"; - hash = "sha256-pBpkvnzsg7ZdHcmD4Lp75Ag65nypRlmdn22+qzub6t4="; + hash = "sha256-cDmoM0nIYYQyurJeeiVSX0IWJdIY0pVLmjIae5mEXI4="; }; x86_64-darwin = aarch64-darwin; }; diff --git a/pkgs/by-name/cm/cmtk/package.nix b/pkgs/by-name/cm/cmtk/package.nix deleted file mode 100644 index 93920eb50821..000000000000 --- a/pkgs/by-name/cm/cmtk/package.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - stdenv, - bzip2, - cmake, - fetchurl, - fftw, - llvmPackages, - zlib, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "cmtk"; - version = "3.3.2"; - - src = fetchurl { - name = "cmtk-source.tar.gz"; - url = "https://www.nitrc.org/frs/download.php/13188/CMTK-${finalAttrs.version}-Source.tar.gz//?i_agree=1&download_now=1"; - hash = "sha256-iE164NCOSOypZLLZfZy9RTyrS+YnY9ECqfb4QhlsMS4="; - }; - - postPatch = '' - substituteInPlace apps/vtkxform.cxx --replace-fail \ - "float xyzFloat[3] = { xyz[0], xyz[1], xyz[2] };" \ - "float xyzFloat[3] = { (float)xyz[0], (float)xyz[1], (float)xyz[2] };" - ''; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - bzip2 - fftw - zlib - ] - ++ lib.optionals stdenv.cc.isClang [ - llvmPackages.openmp - ]; - - cmakeFlags = [ - (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14") - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Dfinite=isfinite") - ]; - - meta = { - description = "Computational Morphometry Toolkit"; - mainProgram = "cmtk"; - longDescription = '' - A software toolkit for computational morphometry of - biomedical images, CMTK comprises a set of command line tools and a - back-end general-purpose library for processing and I/O - ''; - maintainers = [ ]; - platforms = lib.platforms.all; - license = lib.licenses.gpl3Plus; - homepage = "https://www.nitrc.org/projects/cmtk/"; - }; -}) diff --git a/pkgs/by-name/co/code/package.nix b/pkgs/by-name/co/code/package.nix index fb4f11b55e29..7c1719690248 100644 --- a/pkgs/by-name/co/code/package.nix +++ b/pkgs/by-name/co/code/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "code"; - version = "0.6.83"; + version = "0.6.90"; src = fetchFromGitHub { owner = "just-every"; repo = "code"; tag = "v${finalAttrs.version}"; - hash = "sha256-5BQDIb+wcDuz3aAkhBIimjxJY6vgQufiX+GWvSZ5yIs="; + hash = "sha256-jJBsE29PeK3YymPueuMoL8P3B3hLgP4hXUfPraNBY3s="; }; sourceRoot = "${finalAttrs.src.name}/code-rs"; diff --git a/pkgs/by-name/co/collabora-online/package-lock.json b/pkgs/by-name/co/collabora-online/package-lock.json index 74bde28c0bb4..dc174a6b0246 100644 --- a/pkgs/by-name/co/collabora-online/package-lock.json +++ b/pkgs/by-name/co/collabora-online/package-lock.json @@ -14,11 +14,12 @@ }, "devDependencies": { "@braintree/sanitize-url": "6.0.2", + "@types/hammerjs": "^2.0.46", "@types/jquery": "^3.5.29", "@types/jquery.contextmenu": "^1.7.38", "@types/jqueryui": "^1.12.21", "@types/mocha": "8.2.0", - "@types/node": "18.11.09", + "@types/node": "18.11.9", "@types/offscreencanvas": "^2019.7.3", "@typescript-eslint/eslint-plugin": "^4.21.0", "@typescript-eslint/parser": "^4.21.0", @@ -26,7 +27,7 @@ "browserify": "16.5.1", "browserify-css": "0.15.0", "d3": "6.7.0", - "dompurify": "3.2.4", + "dompurify": "3.3.2", "eslint": "7.0.0", "eslint-config-prettier": "^9.1.0", "fzstd": "0.1.0", @@ -41,11 +42,12 @@ "mocha": "8.2.1", "prettier": "^3.1.1", "select2": "4.0.13", - "shrinkpack": "1.0.0-alpha", + "shrinkpack": "0.20.0", "smartmenus": "1.0.0", "stylelint": "13.7.0", - "tmp": "0.2.3", + "tmp": "0.2.4", "typescript": "4.4.2", + "typescript-strict-plugin": "^2.4.4", "uglify-js": "3.17.4", "uglifycss": "0.0.29", "uglifyify": "5.0.2" @@ -258,23 +260,23 @@ } }, "node_modules/@babel/helpers": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz", - "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==", + "version": "7.29.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.2.tgz", + "integrity": "sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==", "dev": true, "license": "MIT", "dependencies": { "@babel/template": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/types": "^7.29.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz", - "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==", + "version": "7.29.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz", + "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==", "dev": true, "license": "MIT", "dependencies": { @@ -353,16 +355,12 @@ "node": ">=0.1.90" } }, - "node_modules/@iarna/cli": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@iarna/cli/-/cli-2.2.0.tgz", - "integrity": "sha512-fn1dwhQuWD/OuM/XZhaEy2GOL5Hta/Dis1ZtER/FAe/BKXTHohD4sxPcYQePHUYmrknD+iV+3uic0M8zH/9sJQ==", + "node_modules/@gar/promisify": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", + "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.2", - "signal-exit": "^3.0.2" - } + "license": "MIT" }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.13", @@ -506,6 +504,113 @@ "node": ">= 8" } }, + "node_modules/@npmcli/fs": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", + "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "@gar/promisify": "^1.0.1", + "semver": "^7.3.5" + } + }, + "node_modules/@npmcli/git": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz", + "integrity": "sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/promise-spawn": "^1.3.2", + "lru-cache": "^6.0.0", + "mkdirp": "^1.0.4", + "npm-pick-manifest": "^6.1.1", + "promise-inflight": "^1.0.1", + "promise-retry": "^2.0.1", + "semver": "^7.3.5", + "which": "^2.0.2" + } + }, + "node_modules/@npmcli/installed-package-contents": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz", + "integrity": "sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==", + "dev": true, + "license": "ISC", + "dependencies": { + "npm-bundled": "^1.1.1", + "npm-normalize-package-bin": "^1.0.1" + }, + "bin": { + "installed-package-contents": "index.js" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@npmcli/move-file": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", + "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", + "deprecated": "This functionality has been moved to @npmcli/fs", + "dev": true, + "license": "MIT", + "dependencies": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@npmcli/move-file/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/node-gyp": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz", + "integrity": "sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==", + "dev": true, + "license": "ISC" + }, + "node_modules/@npmcli/promise-spawn": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz", + "integrity": "sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==", + "dev": true, + "license": "ISC", + "dependencies": { + "infer-owner": "^1.0.4" + } + }, + "node_modules/@npmcli/run-script": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-2.0.0.tgz", + "integrity": "sha512-fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/node-gyp": "^1.0.2", + "@npmcli/promise-spawn": "^1.3.2", + "node-gyp": "^8.2.0", + "read-package-json-fast": "^2.0.1" + } + }, "node_modules/@stylelint/postcss-css-in-js": { "version": "0.37.3", "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.3.tgz", @@ -546,10 +651,17 @@ "node": ">= 6" } }, + "node_modules/@types/hammerjs": { + "version": "2.0.46", + "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.46.tgz", + "integrity": "sha512-ynRvcq6wvqexJ9brDMS4BnBLzmr0e14d6ZJTEShTBWKymQiHwlAyGu0ZPEFI2Fh1U53F7tN9ufClWM5KvqkKOw==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/jquery": { - "version": "3.5.33", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.33.tgz", - "integrity": "sha512-SeyVJXlCZpEki5F0ghuYe+L+PprQta6nRZqhONt9F13dWBtR/ftoaIbdRQ7cis7womE+X2LKhsDdDtkkDhJS6g==", + "version": "3.5.34", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.34.tgz", + "integrity": "sha512-3m3939S3erqmTLJANS/uy0B6V7BorKx7RorcGZVjZ62dF5PAGbKEDZK1CuLtKombJkFA2T1jl8LAIIs7IV6gBQ==", "dev": true, "license": "MIT", "dependencies": { @@ -836,6 +948,13 @@ "deprecated": "Use your platform's native atob() and btoa() methods instead", "license": "BSD-3-Clause" }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true, + "license": "ISC" + }, "node_modules/acorn": { "version": "7.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", @@ -903,22 +1022,36 @@ } }, "node_modules/agentkeepalive": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.3.tgz", - "integrity": "sha512-yqXL+k5rr8+ZRpOAntkaaRgWgE5o8ESAj5DyRmVTCSoZxXmqemb9Dd7T4i5UzwuERdLAJUy6XzR9zFVuf0kzkw==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz", + "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==", "dev": true, "license": "MIT", "dependencies": { "humanize-ms": "^1.2.1" }, "engines": { - "node": ">= 4.0.0" + "node": ">= 8.0.0" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", + "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, "license": "MIT", "dependencies": { @@ -1012,22 +1145,40 @@ } }, "node_modules/aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz", + "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==", "dev": true, "license": "ISC" }, "node_modules/are-we-there-yet": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", - "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", + "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", "deprecated": "This package is no longer supported.", "dev": true, "license": "ISC", "dependencies": { "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "readable-stream": "^3.6.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/are-we-there-yet/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" } }, "node_modules/argparse": { @@ -1080,9 +1231,9 @@ } }, "node_modules/asn1.js/node_modules/bn.js": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz", - "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==", + "version": "4.12.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", + "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", "dev": true, "license": "MIT" }, @@ -1252,13 +1403,16 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.9.19", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz", - "integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==", + "version": "2.10.14", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.14.tgz", + "integrity": "sha512-fOVLPAsFTsQfuCkvahZkzq6nf8KvGWanlYoTh0SVA0A/PIUxQGU2AOZAoD95n2gFLVDW/jP6sbGLny95nmEuHA==", "dev": true, "license": "Apache-2.0", "bin": { - "baseline-browser-mapping": "dist/cli.js" + "baseline-browser-mapping": "dist/cli.cjs" + }, + "engines": { + "node": ">=6.0.0" } }, "node_modules/binary-extensions": { @@ -1274,6 +1428,58 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/bl/node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/bl/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/blamer": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/blamer/-/blamer-1.0.7.tgz", @@ -1288,24 +1494,17 @@ "node": ">=8.9" } }, - "node_modules/bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true, - "license": "MIT" - }, "node_modules/bn.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.2.tgz", - "integrity": "sha512-v2YAxEmKaBLahNwE1mjp4WON6huMNeuDvagFZW+ASCuA/ku0bXR9hSMw0XpiqMoA3+rmnyck/tPRSFQkoC9Cuw==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.3.tgz", + "integrity": "sha512-EAcmnPkxpntVL+DS7bO1zhcZNvCkxqtkd0ZY53h06GNQ3DEkkGZ/gKgmDv6DdZQGj9BgfSPKtJJ7Dp1GPP8f7w==", "dev": true, "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz", + "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==", "dev": true, "license": "MIT", "dependencies": { @@ -1548,9 +1747,9 @@ } }, "node_modules/browserslist": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz", - "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==", + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz", + "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==", "dev": true, "funding": [ { @@ -1569,11 +1768,11 @@ "license": "MIT", "peer": true, "dependencies": { - "baseline-browser-mapping": "^2.9.0", - "caniuse-lite": "^1.0.30001759", - "electron-to-chromium": "^1.5.263", - "node-releases": "^2.0.27", - "update-browserslist-db": "^1.2.0" + "baseline-browser-mapping": "^2.10.12", + "caniuse-lite": "^1.0.30001782", + "electron-to-chromium": "^1.5.328", + "node-releases": "^2.0.36", + "update-browserslist-db": "^1.2.3" }, "bin": { "browserslist": "cli.js" @@ -1632,58 +1831,50 @@ } }, "node_modules/cacache": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", - "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", + "version": "15.3.0", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", + "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", "dev": true, "license": "ISC", "dependencies": { - "bluebird": "^3.5.1", - "chownr": "^1.0.1", - "glob": "^7.1.2", - "graceful-fs": "^4.1.11", - "lru-cache": "^4.1.1", - "mississippi": "^2.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", + "@npmcli/fs": "^1.0.0", + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "glob": "^7.1.4", + "infer-owner": "^1.0.4", + "lru-cache": "^6.0.0", + "minipass": "^3.1.1", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.2", + "mkdirp": "^1.0.3", + "p-map": "^4.0.0", "promise-inflight": "^1.0.1", - "rimraf": "^2.6.2", - "ssri": "^5.2.4", - "unique-filename": "^1.1.0", - "y18n": "^4.0.0" - } - }, - "node_modules/cacache/node_modules/mississippi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", - "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^2.0.1", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" + "rimraf": "^3.0.2", + "ssri": "^8.0.1", + "tar": "^6.0.2", + "unique-filename": "^1.1.1" }, "engines": { - "node": ">=4.0.0" + "node": ">= 10" } }, - "node_modules/cacache/node_modules/pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "node_modules/cacache/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, - "license": "MIT", + "license": "ISC", "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/cached-path-relative": { @@ -1781,9 +1972,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001769", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001769.tgz", - "integrity": "sha512-BCfFL1sHijQlBGWBMuJyhZUhzo7wer5sVj9hqekB/7xn0Ypy+pER/edCYQm4exbXj4WiySGp40P8UuTh6w1srg==", + "version": "1.0.30001785", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001785.tgz", + "integrity": "sha512-blhOL/WNR+Km1RI/LCVAvA73xplXA7ZbjzI4YkMK9pa6T/P3F2GxjNpEkyw5repTw9IvkyrjyHpwjnhZ5FOvYQ==", "dev": true, "funding": [ { @@ -1891,11 +2082,14 @@ } }, "node_modules/chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", "dev": true, - "license": "ISC" + "license": "ISC", + "engines": { + "node": ">=10" + } }, "node_modules/cipher-base": { "version": "1.0.7", @@ -1925,6 +2119,16 @@ "node": ">= 4.0" } }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/cli-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", @@ -1938,6 +2142,19 @@ "node": ">=8" } }, + "node_modules/cli-spinners": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/cli-table3": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz", @@ -2031,6 +2248,16 @@ "node": ">=6" } }, + "node_modules/clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8" + } + }, "node_modules/clone-regexp": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz", @@ -2054,16 +2281,6 @@ "node": ">=6" } }, - "node_modules/code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -2084,6 +2301,16 @@ "dev": true, "license": "MIT" }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "dev": true, + "license": "ISC", + "bin": { + "color-support": "bin.js" + } + }, "node_modules/colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", @@ -2197,22 +2424,6 @@ "dev": true, "license": "MIT" }, - "node_modules/copy-concurrently": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", - "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" - } - }, "node_modules/core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", @@ -2249,9 +2460,9 @@ } }, "node_modules/create-ecdh/node_modules/bn.js": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz", - "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==", + "version": "4.12.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", + "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", "dev": true, "license": "MIT" }, @@ -2376,13 +2587,6 @@ "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", "license": "MIT" }, - "node_modules/cyclist": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz", - "integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==", - "dev": true, - "license": "MIT" - }, "node_modules/d3": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/d3/-/d3-6.7.0.tgz", @@ -2821,6 +3025,19 @@ "dev": true, "license": "MIT" }, + "node_modules/defaults": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "clone": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/define-data-property": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", @@ -2927,26 +3144,6 @@ "node": ">=0.10.0" } }, - "node_modules/detect-indent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", - "integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/detect-newline": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", - "integrity": "sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/detective": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", @@ -2988,9 +3185,9 @@ } }, "node_modules/diffie-hellman/node_modules/bn.js": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz", - "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==", + "version": "4.12.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", + "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", "dev": true, "license": "MIT" }, @@ -3112,11 +3309,14 @@ } }, "node_modules/dompurify": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", - "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.2.tgz", + "integrity": "sha512-6obghkliLdmKa56xdbLOpUZ43pAR6xFy1uOrxBaIDjT+yaRuuybLjGS9eVBoSR/UPU5fq3OXClEHLJNGvbxKpQ==", "dev": true, "license": "(MPL-2.0 OR Apache-2.0)", + "engines": { + "node": ">=20" + }, "optionalDependencies": { "@types/trusted-types": "^2.0.7" } @@ -3170,9 +3370,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.286", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.286.tgz", - "integrity": "sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A==", + "version": "1.5.331", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.331.tgz", + "integrity": "sha512-IbxXrsTlD3hRodkLnbxAPP4OuJYdWCeM3IOdT+CpcMoIwIoDfCmRpEtSPfwBXxVkg9xmBeY7Lz2Eo2TDn/HC3Q==", "dev": true, "license": "ISC" }, @@ -3193,9 +3393,9 @@ } }, "node_modules/elliptic/node_modules/bn.js": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz", - "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==", + "version": "4.12.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", + "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", "dev": true, "license": "MIT" }, @@ -3212,6 +3412,7 @@ "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", "dev": true, "license": "MIT", + "optional": true, "dependencies": { "iconv-lite": "^0.6.2" } @@ -3222,6 +3423,7 @@ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, "license": "MIT", + "optional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -3246,10 +3448,20 @@ "dev": true, "license": "BSD-2-Clause" }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/err-code": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz", - "integrity": "sha512-CJAN+O0/yA1CKfRn9SXOGctSpEM7DCon/r/5r2eXFMY2zCCJBasFhcM5I+1kh3Ap11FsQCX+vGHceNPvpWKhoA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", "dev": true, "license": "MIT" }, @@ -3308,23 +3520,6 @@ "node": ">= 0.4" } }, - "node_modules/es6-promise": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", - "dev": true, - "license": "MIT" - }, - "node_modules/es6-promisify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", - "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "es6-promise": "^4.0.3" - } - }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", @@ -3821,14 +4016,6 @@ "reusify": "^1.0.4" } }, - "node_modules/figgy-pudding": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", - "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==", - "deprecated": "This module is no longer supported.", - "dev": true, - "license": "ISC" - }, "node_modules/figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", @@ -3882,14 +4069,6 @@ "merge": "^2.1.1" } }, - "node_modules/find-npm-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz", - "integrity": "sha512-KEftzJ+H90x6pcKtdXZEPsQse8/y/UnvzRKrOSQFprnrGaFuJ62fVkP34Iu2IYuMvyauCyoLTNkJZgrrGA2wkA==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC" - }, "node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -3955,17 +4134,6 @@ "dev": true, "license": "ISC" }, - "node_modules/flush-write-stream": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", - "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" - } - }, "node_modules/for-each": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", @@ -3998,17 +4166,6 @@ "node": ">= 6" } }, - "node_modules/from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" - } - }, "node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -4026,27 +4183,16 @@ } }, "node_modules/fs-minipass": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", - "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dev": true, "license": "ISC", "dependencies": { - "minipass": "^2.6.0" - } - }, - "node_modules/fs-write-stream-atomic": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", - "integrity": "sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" } }, "node_modules/fs.realpath": { @@ -4095,81 +4241,36 @@ "license": "MIT" }, "node_modules/gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", + "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", "deprecated": "This package is no longer supported.", "dev": true, "license": "ISC", "dependencies": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "node_modules/gauge/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gauge/node_modules/is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "number-is-nan": "^1.0.0" + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.3", + "console-control-strings": "^1.1.0", + "has-unicode": "^2.0.1", + "signal-exit": "^3.0.7", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.5" }, "engines": { - "node": ">=0.10.0" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/gauge/node_modules/string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", + "node_modules/gauge/node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", "dev": true, - "license": "MIT", + "license": "ISC", "dependencies": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" + "string-width": "^1.0.2 || 2 || 3 || 4" } }, - "node_modules/gauge/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/genfun": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz", - "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==", - "dev": true, - "license": "MIT" - }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -4449,6 +4550,41 @@ "node": ">=4.x" } }, + "node_modules/gunzip-maybe": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz", + "integrity": "sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==", + "dev": true, + "license": "MIT", + "dependencies": { + "browserify-zlib": "^0.1.4", + "is-deflate": "^1.0.0", + "is-gzip": "^1.0.0", + "peek-stream": "^1.1.0", + "pumpify": "^1.3.3", + "through2": "^2.0.3" + }, + "bin": { + "gunzip-maybe": "bin.js" + } + }, + "node_modules/gunzip-maybe/node_modules/browserify-zlib": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", + "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "pako": "~0.2.0" + } + }, + "node_modules/gunzip-maybe/node_modules/pako": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", + "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==", + "dev": true, + "license": "MIT" + }, "node_modules/hammerjs": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", @@ -4609,11 +4745,17 @@ } }, "node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", "dev": true, - "license": "ISC" + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } }, "node_modules/html-encoding-sniffer": { "version": "2.0.1", @@ -4681,9 +4823,9 @@ } }, "node_modules/http-cache-semantics": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", - "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", + "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", "dev": true, "license": "BSD-2-Clause" }, @@ -4774,13 +4916,6 @@ ], "license": "BSD-3-Clause" }, - "node_modules/iferr": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", - "integrity": "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==", - "dev": true, - "license": "MIT" - }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -4792,13 +4927,16 @@ } }, "node_modules/ignore-walk": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz", - "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-4.0.1.tgz", + "integrity": "sha512-rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw==", "dev": true, "license": "ISC", "dependencies": { "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10" } }, "node_modules/import-fresh": { @@ -4848,6 +4986,13 @@ "node": ">=8" } }, + "node_modules/infer-owner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", + "dev": true, + "license": "ISC" + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -4948,12 +5093,15 @@ "dev": true, "license": "ISC" }, - "node_modules/ip": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz", - "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==", + "node_modules/ip-address": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz", + "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">= 12" + } }, "node_modules/is-alphabetical": { "version": "1.0.4", @@ -5048,6 +5196,13 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/is-deflate": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz", + "integrity": "sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==", + "dev": true, + "license": "MIT" + }, "node_modules/is-expression": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz", @@ -5092,6 +5247,16 @@ "node": ">=0.10.0" } }, + "node_modules/is-gzip": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz", + "integrity": "sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/is-hexadecimal": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", @@ -5103,6 +5268,23 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/is-interactive": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", + "dev": true, + "license": "MIT" + }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -5201,6 +5383,19 @@ "dev": true, "license": "MIT" }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -5366,9 +5561,9 @@ } }, "node_modules/jsdom/node_modules/acorn": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", + "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -5390,13 +5585,6 @@ "node": ">=6" } }, - "node_modules/json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true, - "license": "MIT" - }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -5551,28 +5739,6 @@ "node": ">= 0.8.0" } }, - "node_modules/libprecious": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/libprecious/-/libprecious-1.9.0.tgz", - "integrity": "sha512-0CInMTo64PHf1YWyMgQbBu/rOxa3vtH9vqJEka7+mPJpRkWbBVHLzh46cy3osdPeqedxr80fgdXglNgMfFuOWg==", - "dev": true, - "license": "ISC", - "dependencies": { - "bluebird": "^3.5.1", - "detect-indent": "^5.0.0", - "detect-newline": "^2.1.0", - "find-npm-prefix": "^1.0.2", - "graceful-fs": "^4.1.11", - "lock-verify": "^2.0.0", - "mkdirp": "^0.5.1", - "npm-logical-tree": "^1.2.1", - "npm-package-arg": "^6.0.0", - "pacote": "^7.4.2", - "protoduck": "^5.0.0", - "rimraf": "^2.6.2", - "ssri": "^5.2.4" - } - }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", @@ -5596,36 +5762,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lock-verify": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/lock-verify/-/lock-verify-2.2.2.tgz", - "integrity": "sha512-2CUNtr1ZSVKJHcYP8uEzafmmuyauCB5zZimj8TvQd/Lflt9kXVZs+8S+EbAzZLaVUDn8CYGmeC3DFGdYfnCzeQ==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "@iarna/cli": "^2.1.0", - "npm-package-arg": "^6.1.0", - "semver": "^5.4.1" - }, - "bin": { - "lock-verify": "cli.js" - } - }, - "node_modules/lock-verify/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" - } - }, "node_modules/lodash": { - "version": "4.17.23", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", - "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", "license": "MIT" }, "node_modules/lodash.memoize": { @@ -5667,122 +5807,44 @@ } }, "node_modules/lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "license": "ISC", "dependencies": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" } }, "node_modules/make-fetch-happen": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.6.0.tgz", - "integrity": "sha512-FFq0lNI0ax+n9IWzWpH8A4JdgYiAp2DDYIZ3rsaav8JDe8I+72CzK6PQW/oom15YDZpV5bYW/9INd6nIJ2ZfZw==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz", + "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==", "dev": true, - "license": "CC0-1.0", + "license": "ISC", "dependencies": { - "agentkeepalive": "^3.3.0", - "cacache": "^10.0.0", - "http-cache-semantics": "^3.8.0", - "http-proxy-agent": "^2.0.0", - "https-proxy-agent": "^2.1.0", - "lru-cache": "^4.1.1", - "mississippi": "^1.2.0", - "node-fetch-npm": "^2.0.2", - "promise-retry": "^1.1.1", - "socks-proxy-agent": "^3.0.1", - "ssri": "^5.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/agent-base": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", - "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", - "dev": true, - "license": "MIT", - "dependencies": { - "es6-promisify": "^5.0.0" + "agentkeepalive": "^4.1.3", + "cacache": "^15.2.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^6.0.0", + "minipass": "^3.1.3", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^1.3.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.2", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^6.0.0", + "ssri": "^8.0.0" }, "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/http-proxy-agent": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", - "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "4", - "debug": "3.1.0" - }, - "engines": { - "node": ">= 4.5.0" - } - }, - "node_modules/make-fetch-happen/node_modules/https-proxy-agent": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz", - "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^4.3.0", - "debug": "^3.1.0" - }, - "engines": { - "node": ">= 4.5.0" - } - }, - "node_modules/make-fetch-happen/node_modules/mississippi": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.1.tgz", - "integrity": "sha512-/6rB8YXFbAtsUVRphIRQqB0+9c7VaPHCjVtvto+JqwVxgz8Zz+I+f68/JgQ+Pb4VlZb2svA9OtdXnHHsZz7ltg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^1.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true, - "license": "MIT" - }, - "node_modules/make-fetch-happen/node_modules/pump": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", - "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==", - "dev": true, - "license": "MIT", - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "node": ">= 10" } }, "node_modules/map-obj": { @@ -6019,9 +6081,9 @@ } }, "node_modules/miller-rabin/node_modules/bn.js": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz", - "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==", + "version": "4.12.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", + "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", "dev": true, "license": "MIT" }, @@ -6094,9 +6156,9 @@ "license": "MIT" }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, "license": "ISC", "dependencies": { @@ -6132,66 +6194,124 @@ } }, "node_modules/minipass": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", - "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, "license": "ISC", "dependencies": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, - "node_modules/minipass/node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "node_modules/minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", "dev": true, - "license": "ISC" + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } }, - "node_modules/minizlib": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", - "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", + "node_modules/minipass-fetch": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz", + "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", "dev": true, "license": "MIT", "dependencies": { - "minipass": "^2.9.0" - } - }, - "node_modules/mississippi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", - "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" + "minipass": "^3.1.0", + "minipass-sized": "^1.0.3", + "minizlib": "^2.0.0" }, "engines": { - "node": ">=4.0.0" + "node": ">=8" + }, + "optionalDependencies": { + "encoding": "^0.1.12" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.7.tgz", + "integrity": "sha512-TbqTz9cUwWyHS2Dy89P3ocAGUGxKjjLuR9z8w4WUTGAVgEj17/4nhgo2Du56i0Fm3Pm30g4iA8Lcqctc76jCzA==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-json-stream": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz", + "integrity": "sha512-myxeeTm57lYs8pH2nxPzmEEg8DGIgW+9mv6D4JZD2pa81I/OBjeU7PtICXV6c9eRGTA5JMDsuIPUZRCyBMYNhg==", + "dev": true, + "license": "MIT", + "dependencies": { + "jsonparse": "^1.3.1", + "minipass": "^3.0.0" + } + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" } }, "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true, "license": "MIT", - "dependencies": { - "minimist": "^1.2.6" - }, "bin": { "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/mkdirp-classic": { @@ -6374,22 +6494,6 @@ "resolve": "^1.17.0" } }, - "node_modules/move-concurrently": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", - "integrity": "sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" - } - }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -6404,9 +6508,9 @@ "license": "ISC" }, "node_modules/nan": { - "version": "2.25.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.25.0.tgz", - "integrity": "sha512-0M90Ag7Xn5KMLLZ7zliPWP3rT90P6PN+IzVFS0VqmnPktBk3700xUVv8Ikm9EUaUE5SDWdp/BIxdENzVznpm1g==", + "version": "2.26.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz", + "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==", "license": "MIT" }, "node_modules/nanoid": { @@ -6429,29 +6533,81 @@ "dev": true, "license": "MIT" }, - "node_modules/node-fetch-npm": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz", - "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==", - "deprecated": "This module is not used anymore, npm uses minipass-fetch for its fetch implementation now", + "node_modules/negotiator": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/node-gyp": { + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", + "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", "dev": true, "license": "MIT", "dependencies": { - "encoding": "^0.1.11", - "json-parse-better-errors": "^1.0.0", - "safe-buffer": "^5.1.1" + "env-paths": "^2.2.0", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^9.1.0", + "nopt": "^5.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" }, "engines": { - "node": ">=4" + "node": ">= 10.12.0" + } + }, + "node_modules/node-gyp/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/node-releases": { - "version": "2.0.27", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz", - "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==", + "version": "2.0.37", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.37.tgz", + "integrity": "sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==", "dev": true, "license": "MIT" }, + "node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -6465,6 +6621,13 @@ "validate-npm-package-license": "^3.0.1" } }, + "node_modules/normalize-package-data/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true, + "license": "ISC" + }, "node_modules/normalize-package-data/node_modules/semver": { "version": "5.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", @@ -6512,12 +6675,18 @@ "npm-normalize-package-bin": "^1.0.1" } }, - "node_modules/npm-logical-tree": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz", - "integrity": "sha512-AJI/qxDB2PWI4LG1CYN579AY1vCiNyWfkiquCsJWqntRu/WwimVrC8yXeILBFHDwxfOejxewlmnvW9XXjMlYIg==", + "node_modules/npm-install-checks": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz", + "integrity": "sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==", "dev": true, - "license": "ISC" + "license": "BSD-2-Clause", + "dependencies": { + "semver": "^7.1.1" + }, + "engines": { + "node": ">=10" + } }, "node_modules/npm-normalize-package-bin": { "version": "1.0.1", @@ -6527,60 +6696,68 @@ "license": "ISC" }, "node_modules/npm-package-arg": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz", - "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==", + "version": "8.1.5", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz", + "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==", "dev": true, "license": "ISC", "dependencies": { - "hosted-git-info": "^2.7.1", - "osenv": "^0.1.5", - "semver": "^5.6.0", + "hosted-git-info": "^4.0.1", + "semver": "^7.3.4", "validate-npm-package-name": "^3.0.0" - } - }, - "node_modules/npm-package-arg/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" + }, + "engines": { + "node": ">=10" } }, "node_modules/npm-packlist": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", - "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-3.0.0.tgz", + "integrity": "sha512-L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ==", "dev": true, "license": "ISC", "dependencies": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1", + "glob": "^7.1.6", + "ignore-walk": "^4.0.1", + "npm-bundled": "^1.1.1", "npm-normalize-package-bin": "^1.0.1" + }, + "bin": { + "npm-packlist": "bin/index.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/npm-pick-manifest": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz", - "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz", + "integrity": "sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==", "dev": true, "license": "ISC", "dependencies": { - "figgy-pudding": "^3.5.1", - "npm-package-arg": "^6.0.0", - "semver": "^5.4.1" + "npm-install-checks": "^4.0.0", + "npm-normalize-package-bin": "^1.0.1", + "npm-package-arg": "^8.1.2", + "semver": "^7.3.4" } }, - "node_modules/npm-pick-manifest/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "node_modules/npm-registry-fetch": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz", + "integrity": "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==", "dev": true, "license": "ISC", - "bin": { - "semver": "bin/semver" + "dependencies": { + "make-fetch-happen": "^9.0.1", + "minipass": "^3.1.3", + "minipass-fetch": "^1.3.0", + "minipass-json-stream": "^1.0.1", + "minizlib": "^2.0.0", + "npm-package-arg": "^8.0.0" + }, + "engines": { + "node": ">=10" } }, "node_modules/npm-run-path": { @@ -6597,17 +6774,20 @@ } }, "node_modules/npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", + "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", "deprecated": "This package is no longer supported.", "dev": true, "license": "ISC", "dependencies": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "^3.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^4.0.3", + "set-blocking": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, "node_modules/num2fraction": { @@ -6617,16 +6797,6 @@ "dev": true, "license": "MIT" }, - "node_modules/number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/nwsapi": { "version": "2.2.23", "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.23.tgz", @@ -6731,6 +6901,47 @@ "node": ">= 0.8.0" } }, + "node_modules/ora": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", @@ -6738,16 +6949,6 @@ "dev": true, "license": "MIT" }, - "node_modules/os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", @@ -6758,18 +6959,6 @@ "node": ">=0.10.0" } }, - "node_modules/osenv": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "deprecated": "This package is no longer supported.", - "dev": true, - "license": "ISC", - "dependencies": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -6802,6 +6991,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", @@ -6813,69 +7018,54 @@ } }, "node_modules/pacote": { - "version": "7.6.1", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-7.6.1.tgz", - "integrity": "sha512-2kRIsHxjuYC1KRUIK80AFIXKWy0IgtFj76nKcaunozKAOSlfT+DFh3EfeaaKvNHCWixgi0G0rLg11lJeyEnp/Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "bluebird": "^3.5.1", - "cacache": "^10.0.4", - "get-stream": "^3.0.0", - "glob": "^7.1.2", - "lru-cache": "^4.1.1", - "make-fetch-happen": "^2.6.0", - "minimatch": "^3.0.4", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "normalize-package-data": "^2.4.0", - "npm-package-arg": "^6.0.0", - "npm-packlist": "^1.1.10", - "npm-pick-manifest": "^2.1.0", - "osenv": "^0.1.5", - "promise-inflight": "^1.0.1", - "promise-retry": "^1.1.1", - "protoduck": "^5.0.0", - "rimraf": "^2.6.2", - "safe-buffer": "^5.1.1", - "semver": "^5.5.0", - "ssri": "^5.2.4", - "tar": "^4.4.0", - "unique-filename": "^1.1.0", - "which": "^1.3.0" - } - }, - "node_modules/pacote/node_modules/get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/pacote/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/pacote/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-12.0.2.tgz", + "integrity": "sha512-Ar3mhjcxhMzk+OVZ8pbnXdb0l8+pimvlsqBGRNkble2NVgyqOGE3yrCGi/lAYq7E7NRDMz89R1Wx5HIMCGgeYg==", "dev": true, "license": "ISC", "dependencies": { - "isexe": "^2.0.0" + "@npmcli/git": "^2.1.0", + "@npmcli/installed-package-contents": "^1.0.6", + "@npmcli/promise-spawn": "^1.2.0", + "@npmcli/run-script": "^2.0.0", + "cacache": "^15.0.5", + "chownr": "^2.0.0", + "fs-minipass": "^2.1.0", + "infer-owner": "^1.0.4", + "minipass": "^3.1.3", + "mkdirp": "^1.0.3", + "npm-package-arg": "^8.0.1", + "npm-packlist": "^3.0.0", + "npm-pick-manifest": "^6.0.0", + "npm-registry-fetch": "^11.0.0", + "promise-retry": "^2.0.1", + "read-package-json-fast": "^2.0.1", + "rimraf": "^3.0.2", + "ssri": "^8.0.1", + "tar": "^6.1.0" }, "bin": { - "which": "bin/which" + "pacote": "lib/bin.js" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16" + } + }, + "node_modules/pacote/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/pako": { @@ -6885,18 +7075,6 @@ "dev": true, "license": "(MIT AND Zlib)" }, - "node_modules/parallel-transform": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz", - "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "cyclist": "^1.0.1", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" - } - }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -7073,6 +7251,18 @@ "node": ">= 0.10" } }, + "node_modules/peek-stream": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz", + "integrity": "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "duplexify": "^3.5.0", + "through2": "^2.0.3" + } + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -7081,9 +7271,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", "dev": true, "license": "MIT", "engines": { @@ -7310,36 +7500,19 @@ "license": "ISC" }, "node_modules/promise-retry": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz", - "integrity": "sha512-StEy2osPr28o17bIW776GtwO6+Q+M9zPiZkYfosciUUMYqjhU/ffwRAH0zN2+uvGyUsn8/YICIHRzLbPacpZGw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", "dev": true, "license": "MIT", "dependencies": { - "err-code": "^1.0.0", - "retry": "^0.10.0" + "err-code": "^2.0.2", + "retry": "^0.12.0" }, "engines": { - "node": ">=0.12" + "node": ">=10" } }, - "node_modules/protoduck": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz", - "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==", - "dev": true, - "license": "MIT", - "dependencies": { - "genfun": "^5.0.0" - } - }, - "node_modules/pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", - "dev": true, - "license": "ISC" - }, "node_modules/psl": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz", @@ -7377,20 +7550,20 @@ } }, "node_modules/public-encrypt/node_modules/bn.js": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz", - "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==", + "version": "4.12.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", + "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", "dev": true, "license": "MIT" }, "node_modules/pug": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.3.tgz", - "integrity": "sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.4.tgz", + "integrity": "sha512-kFfq5mMzrS7+wrl5pLJzZEzemx34OQ0w4SARfhy/3yxTlhbstsudDwJzhf1hP02yHzbjoVMSXUj/Sz6RNfMyXg==", "dev": true, "license": "MIT", "dependencies": { - "pug-code-gen": "^3.0.3", + "pug-code-gen": "^3.0.4", "pug-filters": "^4.0.0", "pug-lexer": "^5.0.1", "pug-linker": "^4.0.0", @@ -7413,9 +7586,9 @@ } }, "node_modules/pug-code-gen": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.3.tgz", - "integrity": "sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.4.tgz", + "integrity": "sha512-6okWYIKdasTyXICyEtvobmTZAVX57JkzgzIi4iRJlin8kmhG+Xry2dsus+Mun/nGCn6F2U49haHI5mkELXB14g==", "dev": true, "license": "MIT", "dependencies": { @@ -7520,9 +7693,9 @@ "license": "MIT" }, "node_modules/pump": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz", - "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz", + "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==", "dev": true, "license": "MIT", "dependencies": { @@ -7561,9 +7734,9 @@ "license": "MIT" }, "node_modules/qs": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", - "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz", + "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -7653,6 +7826,20 @@ "readable-stream": "^2.0.2" } }, + "node_modules/read-package-json-fast": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz", + "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "json-parse-even-better-errors": "^2.3.0", + "npm-normalize-package-bin": "^1.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -7988,13 +8175,13 @@ } }, "node_modules/retry": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz", - "integrity": "sha512-ZXUSQYTHdl3uS7IuCehYfMzKyIDBNoAuUblvy5oGO5UJSUTmStUUVPXbA9Qxd173Bgre53yCQczQuHgRWAdvJQ==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", "dev": true, "license": "MIT", "engines": { - "node": "*" + "node": ">= 4" } }, "node_modules/reusify": { @@ -8086,16 +8273,6 @@ "queue-microtask": "^1.2.2" } }, - "node_modules/run-queue": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", - "integrity": "sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==", - "dev": true, - "license": "ISC", - "dependencies": { - "aproba": "^1.1.1" - } - }, "node_modules/rw": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", @@ -8292,99 +8469,43 @@ } }, "node_modules/shrinkpack": { - "version": "1.0.0-alpha", - "resolved": "https://registry.npmjs.org/shrinkpack/-/shrinkpack-1.0.0-alpha.tgz", - "integrity": "sha512-TrVN8iWydKT69kM9/8MQDv10qWYlPk+y+svpsenAwkg4J7GHE+YQLerR+g/LJ0DV3w7fNiE+lZletaMQWpMfDA==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/shrinkpack/-/shrinkpack-0.20.0.tgz", + "integrity": "sha512-uu0AEwFYUIcADh07DEGKOJj9T0vLozB1WDhB/dXwTBQhwwr9jZ+dw+IY2JXAsxGr6pS0W/+QBw83kjYuWCTtAA==", "dev": true, "license": "MIT", "dependencies": { - "chalk": "2.4.1", - "commander": "2.15.1", - "libprecious": "1.9.0", - "npmlog": "4.1.2" + "commander": "8.3.0", + "gunzip-maybe": "1.4.2", + "pacote": "12.0.2", + "picocolors": "1.0.0", + "ssri": "8.0.1" }, "bin": { - "shrinkpack": "cli.js" + "shrinkpack": "dist/bin.js" }, "engines": { - "node": ">=4.0", - "npm": "<=5.8.0" + "node": ">=12.0.0", + "npm": ">=7.0.0", + "yarn": "use-npm" } }, - "node_modules/shrinkpack/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/shrinkpack/node_modules/chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/shrinkpack/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/shrinkpack/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true, - "license": "MIT" - }, "node_modules/shrinkpack/node_modules/commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", - "dev": true, - "license": "MIT" - }, - "node_modules/shrinkpack/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", "dev": true, "license": "MIT", "engines": { - "node": ">=4" + "node": ">= 12" } }, - "node_modules/shrinkpack/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "node_modules/shrinkpack/node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } + "license": "ISC" }, "node_modules/side-channel": { "version": "1.1.0", @@ -8556,14 +8677,14 @@ } }, "node_modules/smart-buffer": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz", - "integrity": "sha512-1+8bxygjTsNfvQe0/0pNBesTOlSHtOeG6b6LYbvsZCCHDKYZ40zcQo6YTnZBWrBSLWOCbrHljLdEmGMYebu7aQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", "dev": true, "license": "MIT", "engines": { - "node": ">= 0.10.15", - "npm": ">= 1.3.5" + "node": ">= 6.0.0", + "npm": ">= 3.0.0" } }, "node_modules/smartmenus": { @@ -8576,43 +8697,33 @@ } }, "node_modules/socks": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz", - "integrity": "sha512-ArX4vGPULWjKDKgUnW8YzfI2uXW7kzgkJuB0GnFBA/PfT3exrrOk+7Wk2oeb894Qf20u1PWv9LEgrO0Z82qAzA==", - "deprecated": "If using 2.x branch, please upgrade to at least 2.1.6 to avoid a serious bug with socket data flow and an import issue introduced in 2.1.0", + "version": "2.8.7", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", + "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==", "dev": true, "license": "MIT", "dependencies": { - "ip": "^1.1.4", - "smart-buffer": "^1.0.13" + "ip-address": "^10.0.1", + "smart-buffer": "^4.2.0" }, "engines": { - "node": ">= 0.10.0", - "npm": ">= 1.3.5" + "node": ">= 10.0.0", + "npm": ">= 3.0.0" } }, "node_modules/socks-proxy-agent": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz", - "integrity": "sha512-ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", + "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==", "dev": true, "license": "MIT", "dependencies": { - "agent-base": "^4.1.0", - "socks": "^1.1.10" - } - }, - "node_modules/socks-proxy-agent/node_modules/agent-base": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", - "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", - "dev": true, - "license": "MIT", - "dependencies": { - "es6-promisify": "^5.0.0" + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" }, "engines": { - "node": ">= 4.0.0" + "node": ">= 10" } }, "node_modules/source-map": { @@ -8696,9 +8807,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.22", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz", - "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==", + "version": "3.0.23", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz", + "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==", "dev": true, "license": "CC0-1.0" }, @@ -8720,13 +8831,16 @@ "license": "BSD-3-Clause" }, "node_modules/ssri": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", - "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", + "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", "dev": true, "license": "ISC", "dependencies": { - "safe-buffer": "^5.1.1" + "minipass": "^3.1.1" + }, + "engines": { + "node": ">= 8" } }, "node_modules/stream-browserify": { @@ -8751,17 +8865,6 @@ "readable-stream": "^2.0.2" } }, - "node_modules/stream-each": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", - "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", - "dev": true, - "license": "MIT", - "dependencies": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" - } - }, "node_modules/stream-http": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", @@ -8970,9 +9073,9 @@ } }, "node_modules/stylelint/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "dev": true, "license": "MIT", "dependencies": { @@ -9229,31 +9332,33 @@ } }, "node_modules/tar": { - "version": "4.4.19", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz", - "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", "dev": true, "license": "ISC", "dependencies": { - "chownr": "^1.1.4", - "fs-minipass": "^1.2.7", - "minipass": "^2.9.0", - "minizlib": "^1.3.3", - "mkdirp": "^0.5.5", - "safe-buffer": "^5.2.1", - "yallist": "^3.1.1" + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" }, "engines": { - "node": ">=4.5" + "node": ">=10" } }, - "node_modules/tar/node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, - "license": "ISC" + "license": "ISC", + "engines": { + "node": ">=8" + } }, "node_modules/terser": { "version": "3.17.0", @@ -9311,9 +9416,9 @@ } }, "node_modules/tmp": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", - "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz", + "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==", "dev": true, "license": "MIT", "engines": { @@ -9537,6 +9642,133 @@ "node": ">=4.2.0" } }, + "node_modules/typescript-strict-plugin": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/typescript-strict-plugin/-/typescript-strict-plugin-2.4.4.tgz", + "integrity": "sha512-OXcWHQk+pW9gqEL/Mb1eTgj/Yiqk1oHBERr9v4VInPOYN++p+cXejmQK/h/VlUPGD++FXQ8pgiqVMyEtxU4T6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^3.0.0", + "execa": "^4.0.0", + "minimatch": "^9.0.3", + "ora": "^5.4.1", + "yargs": "^16.2.0" + }, + "bin": { + "tsc-strict": "dist/cli/tsc-strict/index.js", + "update-strict-comments": "dist/cli/update-strict-comments/index.js" + } + }, + "node_modules/typescript-strict-plugin/node_modules/brace-expansion": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz", + "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/typescript-strict-plugin/node_modules/chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/typescript-strict-plugin/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/typescript-strict-plugin/node_modules/minimatch": { + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.2" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/typescript-strict-plugin/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/typescript-strict-plugin/node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/typescript-strict-plugin/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/typescript-strict-plugin/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/uglify-js": { "version": "3.17.4", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", @@ -9956,6 +10188,16 @@ "node": ">=10" } }, + "node_modules/wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "dev": true, + "license": "MIT", + "dependencies": { + "defaults": "^1.0.3" + } + }, "node_modules/webidl-conversions": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", @@ -10263,6 +10505,19 @@ "typedarray-to-buffer": "^3.1.5" } }, + "node_modules/write/node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, "node_modules/ws": { "version": "7.5.10", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", @@ -10314,16 +10569,16 @@ "license": "ISC" }, "node_modules/yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true, "license": "ISC" }, "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz", + "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==", "dev": true, "license": "ISC", "engines": { diff --git a/pkgs/by-name/co/collabora-online/package.nix b/pkgs/by-name/co/collabora-online/package.nix index c1fc8bc09100..2a68b03e0e71 100644 --- a/pkgs/by-name/co/collabora-online/package.nix +++ b/pkgs/by-name/co/collabora-online/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "collabora-online"; - version = "24.04.17-3"; + version = "25.04.9-4"; src = fetchFromGitHub { owner = "CollaboraOnline"; repo = "online"; tag = "cp-${finalAttrs.version}"; - hash = "sha256-KJ5E5jvV0MrWdpU4pU+9Y4ngRJ/kk3lcBntbWdQZFqY="; + hash = "sha256-+9dGNNduWq4+jxlVd49PDllIyI7vfYmFlly/t70eNtg="; }; nativeBuildInputs = [ @@ -68,12 +68,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-file-server-regex.patch - # https://github.com/CollaboraOnline/online/pull/11464/ - (fetchpatch { - name = "fix-testPreProcessedFileSubstitution"; - url = "https://github.com/CollaboraOnline/online/commit/76a4b64297d721d66603dc63f525324475036917.patch"; - hash = "sha256-PGys1dpHLFsUKKA1YyxkJpbBbc2prySdGH/CZni90kI="; - }) ]; postPatch = '' @@ -81,7 +75,6 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs browser/util/*.py coolwsd-systemplate-setup scripts/* substituteInPlace configure.ac --replace-fail '/usr/bin/env python3' python3 - substituteInPlace coolwsd-systemplate-setup --replace-fail /bin/pwd pwd ''; # Copy dummy self-signed certificates provided for testing. @@ -96,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' cp ${./package-lock.json} package-lock.json ''; - hash = "sha256-LzXU1WdayfXhkDOlKEtZ/pgYfFPNPml5TNXS9sJp2yI="; + hash = "sha256-c78C5yt/RH4jmjZpaBskV+1u4wTTVJoWjFqq6eNUVOA="; }; npmRoot = "browser"; diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index 3d54692518a1..c8fa25f3da41 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "comrak"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = "comrak"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Klux0l0onlkpRIeQPHKZZhLhYB5On2R8CivpByGSgEA="; + sha256 = "sha256-MMCA6PfVt9kUvdOKlIBFUxTXEJwNETyxgdPhdXcM/os="; }; - cargoHash = "sha256-AB4XcGERw9PmYpwMVV1mTjpEJmL4pV7iyZUhn5GWflc="; + cargoHash = "sha256-uHJvkFcKnX3gduTSQokhWwz9ABY94KxIQg7Q7fvyMhk="; meta = { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/by-name/co/connectome-workbench/gcc15-cstdint.patch b/pkgs/by-name/co/connectome-workbench/gcc15-cstdint.patch new file mode 100644 index 000000000000..9b7e9fed0324 --- /dev/null +++ b/pkgs/by-name/co/connectome-workbench/gcc15-cstdint.patch @@ -0,0 +1,10 @@ +--- a/Common/CaretRgb.h ++++ b/Common/CaretRgb.h +@@ -23,6 +23,7 @@ + + + #include ++#include + #include + + namespace caret { diff --git a/pkgs/by-name/co/connectome-workbench/package.nix b/pkgs/by-name/co/connectome-workbench/package.nix index ecd7044c3d67..01e021edc0f7 100644 --- a/pkgs/by-name/co/connectome-workbench/package.nix +++ b/pkgs/by-name/co/connectome-workbench/package.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/src"; + patches = [ + # GCC 15 compatibility: add missing #include + ./gcc15-cstdint.patch + ]; + postPatch = '' substituteInPlace kloewe/{cpuinfo,dot}/CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" '' diff --git a/pkgs/by-name/cp/cpeditor/package.nix b/pkgs/by-name/cp/cpeditor/package.nix index d8465995cb24..2cd870c271ad 100644 --- a/pkgs/by-name/cp/cpeditor/package.nix +++ b/pkgs/by-name/cp/cpeditor/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpeditor"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "cpeditor"; repo = "cpeditor"; tag = finalAttrs.version; - hash = "sha256-t7nn3sO45dOQq5OMWhaseO9XHicQ/1fjukXal5yPMgY"; + hash = "sha256-rdGdbMJ3j01RAS/xPZ9zimL0mv8ZW3vYXht6jNFyheI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix index af945b48a3ae..0dae81d299c6 100644 --- a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix +++ b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "cpp-ipfs-http-client"; - version = "unstable-2022-01-30"; + version = "0-unstable-2023-06-04"; src = fetchFromGitHub { owner = "vasild"; repo = "cpp-ipfs-http-client"; - rev = "3cdfa7fc6326e49fc81b3c7ca43ce83bdccef6d9"; - sha256 = "sha256-/oyafnk4SbrvoCh90wkZXNBjknMKA6EEUoEGo/amLUo="; + rev = "29a103af79ad62ef42180f54f6cd2128b4128836"; + hash = "sha256-B57W4OqNU0M4yYxbHIZb2TyHfMaihCOD1KdvPrm6xLE="; }; patches = [ ./unvendor-nlohmann-json.patch ]; diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 57a945d7e064..16dda53bbc41 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -1,7 +1,9 @@ { lib, + stdenv, buildGo126Module, fetchFromGitHub, + installShellFiles, nix-update-script, writableTmpDirAsHomeHook, versionCheckHook, @@ -25,6 +27,10 @@ buildGo126Module (finalAttrs: { "-X=github.com/charmbracelet/crush/internal/version.Version=${finalAttrs.version}" ]; + nativeBuildInputs = [ + installShellFiles + ]; + checkFlags = let # these tests fail in the sandbox @@ -44,6 +50,13 @@ buildGo126Module (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd crush \ + --bash <($out/bin/crush completion bash) \ + --fish <($out/bin/crush completion fish) \ + --zsh <($out/bin/crush completion zsh) + ''; + updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/cu/curl-impersonate/package.nix b/pkgs/by-name/cu/curl-impersonate/package.nix index f5282fbcb896..e97ae1a40940 100644 --- a/pkgs/by-name/cu/curl-impersonate/package.nix +++ b/pkgs/by-name/cu/curl-impersonate/package.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { curl mit ]; - maintainers = with lib.maintainers; [ ggg ]; + maintainers = [ ]; platforms = lib.platforms.unix; mainProgram = "curl-impersonate"; }; diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index 247eabb8b612..2c47b1f643b5 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -24,16 +24,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "dash-mpd-cli"; - version = "0.2.31"; + version = "0.2.32"; src = fetchFromGitHub { owner = "emarsden"; repo = "dash-mpd-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-4Jh1AAYOrOqaJV4d5laTtN9AQ061rTeEcCt+8QFtcmM="; + hash = "sha256-kqOzJZR2eoua8ruGcwNHdQHXg58xIkH8wlx1sEwzqtA="; }; - cargoHash = "sha256-GiGrWjwEshktAVTTXJ4lBRSUpywNlIMocd6EfL8ferY="; + cargoHash = "sha256-NHsEfqnJOyy5F3ALFKVB0by7xe4N/sVEBH0k8fO+cjI="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix index 39546f2cb7a7..189f5cf6fb9e 100644 --- a/pkgs/by-name/da/datafusion-cli/package.nix +++ b/pkgs/by-name/da/datafusion-cli/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -11,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { name = "datafusion-cli-source"; owner = "apache"; - repo = "arrow-datafusion"; + repo = "datafusion"; tag = finalAttrs.version; hash = "sha256-DYNKYE8+rh/hkHpWnBl9C7licTst7WxNOV812vPXiQs="; }; @@ -37,11 +39,18 @@ rustPlatform.buildRustPackage (finalAttrs: { # timeout doCheck = false; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + meta = { description = "CLI for Apache Arrow DataFusion"; mainProgram = "datafusion-cli"; homepage = "https://arrow.apache.org/datafusion"; - changelog = "https://github.com/apache/arrow-datafusion/blob/${finalAttrs.version}/datafusion/CHANGELOG.md"; + changelog = "https://github.com/apache/datafusion/blob/${finalAttrs.src.tag}/datafusion/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; }; diff --git a/pkgs/by-name/dh/dhtbsign/package.nix b/pkgs/by-name/dh/dhtbsign/package.nix new file mode 100644 index 000000000000..484937ba095c --- /dev/null +++ b/pkgs/by-name/dh/dhtbsign/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: +stdenv.mkDerivation { + pname = "dhtbsign"; + version = "0-unstable-2022-11-10"; + + src = fetchFromGitHub { + owner = "osm0sis"; + repo = "dhtbsign"; + rev = "2b2711dff153485c549240423d9c908a2912f4b2"; + hash = "sha256-51zmuQ817Mqx8Hwnx/t4fC9G5huiLGIv+99nRP16mSg="; + }; + + strictDeps = true; + + env.NIX_CFLAGS_COMPILE = toString ( + lib.optional stdenv.cc.isGNU [ + # Required with newer GCC + "-Wno-error=stringop-overflow" + ] + ); + + # Unstream has an install target, but installs dhtbsign as `$out/bin` + # instead of `$out/bin/dhtbsign` + installPhase = '' + runHook preInstall + install -Dm555 dhtbsign -t $out/bin + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/osm0sis/dhtbsign"; + description = "Tool to write the DHTB header for Samsung Spreadtrum devices"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ungeskriptet ]; + teams = [ lib.teams.android ]; + mainProgram = "dhtbsign"; + }; +} diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index 6a402051f161..b2a90f6a34be 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -108,12 +108,12 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "315"; + version = "316"; pyproject = true; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-Zw2goFgD47vZ/AQ1TEXqdlWxkY9p6digduAp78EHtnc="; + hash = "sha256-6YLeNNWVMbvL2xymsdsxUPnknOScqGc1egl8VKtWXz4="; }; outputs = [ diff --git a/pkgs/by-name/dn/dns-collector/package.nix b/pkgs/by-name/dn/dns-collector/package.nix index 49b52af19d61..62c3a728b09a 100644 --- a/pkgs/by-name/dn/dns-collector/package.nix +++ b/pkgs/by-name/dn/dns-collector/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "dns-collector"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "dmachard"; repo = "dns-collector"; tag = "v${finalAttrs.version}"; - hash = "sha256-497qilu1/76XbAO3fKIRpDWjQaCmdDgdxswkE5y8pNU="; + hash = "sha256-UMzL+use4T0WfcbJAW7XKi3ZuSh9ZFRjYcEr+BV9mkc="; }; subPackages = [ "." ]; @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-4gvGqNPRdB/t498WBF9vTqyuTl2rkAo7nRvNEpTMPqY="; + vendorHash = "sha256-xEtMe9xrdeYDHNLbcVa9INMprF6mEHyyrAt84nUAsUI="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index 24497e4e9b53..6e0ba140cff9 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.57.4"; + version = "1.59.1"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; tag = "v${version}"; - hash = "sha256-IagswzHoChAHUJKrtN9UDLhp4ZJSwUf9bX0+JN/DCmA="; + hash = "sha256-P1k1cd6DfxGom2VKPKkNqhfs0h89QHQW19ZtePlutJk="; }; - npmDepsHash = "sha256-QrQck7HG0jWohZ8hPIdrfvAX7Wk4r4url6zAtbSriWA="; + npmDepsHash = "sha256-OUggLKCzvgH158HSavEJBKtVs2EsddHDs/1q7H/5pPY="; dontNpmBuild = true; diff --git a/pkgs/by-name/ds/dsearch/package.nix b/pkgs/by-name/ds/dsearch/package.nix index a811f5a49f9e..813cd8b52868 100644 --- a/pkgs/by-name/ds/dsearch/package.nix +++ b/pkgs/by-name/ds/dsearch/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "dsearch"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "AvengeMedia"; repo = "danksearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-2o4oJgATtrhHUihmQlFhZBhx8qXFnxsgiXzfGairHhQ="; + hash = "sha256-8Ka2sH6l7lnkXV832o0tMK3i9A4zSYFtaYZL6LNgWvc="; }; - vendorHash = "sha256-cBBfIil7IYAXlQN8OyoJwsNxyYC0pruloaJrZZGovU4="; + vendorHash = "sha256-nvAgDX8dS3ZwAGTdPvNK1/XzlY28/QjRSW8cmqhp9io="; ldflags = [ "-w" diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix index cdc445321b4d..e5ae525aeb0c 100644 --- a/pkgs/by-name/ei/eigenwallet/package.nix +++ b/pkgs/by-name/ei/eigenwallet/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenwallet"; - version = "4.1.0"; + version = "4.2.4"; src = fetchurl { url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb"; - hash = "sha256-zUVsw4tEzM1xIKzwn/moaRKpwqFAvcl1jHb8EpfNLuQ="; + hash = "sha256-2AZJ8YSRxnlWtEkG8X9Zxt+xC/2YkTGg3kDorDjQYxY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/elftool/package.nix b/pkgs/by-name/el/elftool/package.nix new file mode 100644 index 000000000000..50808853d60f --- /dev/null +++ b/pkgs/by-name/el/elftool/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: +stdenv.mkDerivation { + pname = "elftool"; + version = "0-unstable-2022-11-10"; + + src = fetchFromGitHub { + owner = "osm0sis"; + repo = "elftool"; + rev = "363653ee89d7b4e1cd5e1f2c878d71acd75fc072"; + hash = "sha256-nMJhMzzvXtrezZbKdsBq24/El2n7ubiBd5XEYFg3C00="; + }; + + strictDeps = true; + + # Needed to fix `collect2: error: ld returned 1 exit status` + env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; + + makeFlags = [ "CC=c++" ]; + + installPhase = '' + runHook preInstall + install -Dm555 elftool -t $out/bin + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/osm0sis/elftool"; + description = "Program for packing and unpacking boot images from Sony mobile devices"; + # No license specified in the repository + license = lib.licenses.free; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + maintainers = with lib.maintainers; [ ungeskriptet ]; + teams = [ lib.teams.android ]; + mainProgram = "elftool"; + }; +} diff --git a/pkgs/by-name/em/emptty/package.nix b/pkgs/by-name/em/emptty/package.nix index 79057d2b82b9..5f63898830a3 100644 --- a/pkgs/by-name/em/emptty/package.nix +++ b/pkgs/by-name/em/emptty/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "emptty"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "tvrzna"; repo = "emptty"; rev = "v${finalAttrs.version}"; - hash = "sha256-JP9PElmwSHk8rcP7NF1PsZETul978UZR+MUulT3BtYs="; + hash = "sha256-EwXGaTwdL2jOLk+DR35mffhkPa1UVvfZ1Gx1KefbeGc="; }; buildInputs = [ diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix index e023bd9e4a11..9b593ac11364 100644 --- a/pkgs/by-name/et/etcd_3_6/package.nix +++ b/pkgs/by-name/et/etcd_3_6/package.nix @@ -11,11 +11,11 @@ }: let - version = "3.6.9"; - etcdSrcHash = "sha256-6rNCfjfs/lwiF3rnq5IM8ohW8Gz9r6gFHhIu9kvJ8VA="; - etcdCtlVendorHash = "sha256-yUA28nP5ueJz/b7spbg1mFRs2doBIyVNuZMCMlf//AE="; - etcdUtlVendorHash = "sha256-E3AVaUVulVKWGRbj/v2owbqkIfvxo/5naN1sNd96z+s="; - etcdServerVendorHash = "sha256-HtAsmsdjBbqls0S80E08PZcZYFlfpKUYrgJunRFP8Gc="; + version = "3.6.10"; + etcdSrcHash = "sha256-BGPOSML9Jd8D3eeksTykjM+lNvUxWw20jnXtxqg72Hc="; + etcdCtlVendorHash = "sha256-uluiQqq6X7xswG5qh9odd8ylsVexTrwmKR3id8GEHj0="; + etcdUtlVendorHash = "sha256-GVih32FEUV7FiDe/5+V5cDUhUM3D9kSA+5jpHu1fwFs="; + etcdServerVendorHash = "sha256-silFeLWbqqSJ8WMmlE4dDH98cCFUKLQDvs8Vhx5LnDY="; src = applyPatches { src = fetchFromGitHub { diff --git a/pkgs/by-name/fe/ferrum/package.nix b/pkgs/by-name/fe/ferrum/package.nix index 6aee48872d55..0d23d6b41240 100644 --- a/pkgs/by-name/fe/ferrum/package.nix +++ b/pkgs/by-name/fe/ferrum/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: let @@ -18,13 +19,7 @@ stdenvNoCC.mkDerivation { stripRoot = false; }; - installPhase = '' - runHook preInstall - - install -D -m444 -t $out/share/fonts/opentype $src/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://dotcolon.net/font/ferrum/"; diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix index 496adbf26209..c90a011ff6ac 100644 --- a/pkgs/by-name/fi/filebrowser/package.nix +++ b/pkgs/by-name/fi/filebrowser/package.nix @@ -12,13 +12,13 @@ }: let - version = "2.61.2"; + version = "2.62.2"; src = fetchFromGitHub { owner = "filebrowser"; repo = "filebrowser"; rev = "v${version}"; - hash = "sha256-/8bBYRzWJ00FpcLMB8M6hkyMUEM/0PM8jsvR+m7jfpc="; + hash = "sha256-yjy3RMgC38oktxMpvw78w5VVCUE/1+Lv37G/RJaQte0="; }; frontend = buildNpmPackage rec { @@ -41,7 +41,7 @@ let ; fetcherVersion = 3; pnpm = pnpm_10; - hash = "sha256-2e3Gr5/pdOsT3cSTdOz5mAjZaWB1C3qGDikpoa5BoII="; + hash = "sha256-0n2HxluqIcCzo1QA5D/YRCk5+mbTntLA8PFxZAC3YA8="; }; installPhase = '' @@ -59,7 +59,7 @@ buildGoModule { pname = "filebrowser"; inherit version src; - vendorHash = "sha256-aY3OIr0Kbno38Y/PZ03JK5wCCD4HRdnznJ3OaaH/WVA="; + vendorHash = "sha256-YM/aIx1gDhFAKNNZmXvG3AVd4xSNC8AHIya4Gyeq9/Y="; excludedPackages = [ "tools" ]; @@ -72,7 +72,12 @@ buildGoModule { ]; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "frontend" + ]; + }; inherit frontend; tests = { inherit (nixosTests) filebrowser; diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index afde25644661..f99dffe5e6c0 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "files-cli"; - version = "2.15.241"; + version = "2.15.257"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${finalAttrs.version}"; - hash = "sha256-bhRsRZFfbBs6RLmh5FWVNv3UdD60Bd6xEOcCgpS+GMk="; + hash = "sha256-Ym9rmgs5TO24+rgtNyCD+r7Spxo5y0WK+ly3AVLwj2g="; }; - vendorHash = "sha256-PTEE+qtNf6ZFTW4CY7zGT5D2G+kXIk4aWNSR37F5TE0="; + vendorHash = "sha256-iOAyeIA0eyE9sPoR2EM7477WcIH5GkPdCKs14oL52uE="; ldflags = [ "-s" diff --git a/pkgs/by-name/fl/flatcc/package.nix b/pkgs/by-name/fl/flatcc/package.nix index 9629f3e14bf5..23300be4a0e1 100644 --- a/pkgs/by-name/fl/flatcc/package.nix +++ b/pkgs/by-name/fl/flatcc/package.nix @@ -4,17 +4,21 @@ fetchFromGitHub, fetchpatch, cmake, + versionCheckHook, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "flatcc"; version = "0.6.1"; + strictDeps = true; + src = fetchFromGitHub { owner = "dvidelabs"; repo = "flatcc"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-0/IZ7eX6b4PTnlSSdoOH0FsORGK9hrLr1zlr/IHsJFQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-0/IZ7eX6b4PTnlSSdoOH0FsORGK9hrLr1zlr/IHsJFQ="; }; patches = [ @@ -42,18 +46,51 @@ stdenv.mkDerivation (finalAttrs: { "test/monster_test_cpp/CMakeLists.txt" ]; }) + ] + ++ lib.optionals stdenv.cc.isClang [ + # Fix clang compilation + # https://github.com/dvidelabs/flatcc/pull/273 + (fetchpatch { + name = "fix-c23-fallthrough.patch"; + url = "https://github.com/dvidelabs/flatcc/commit/7c199e3b191a6f714694035f1eba40112e71675c.patch"; + hash = "sha256-kGupiMVa2r+hsQnknatRK+EfscNjJD0T75NY1ELkJ5U="; + }) + + # Fix implicit int conversion on negation for int8/int16 + # https://github.com/dvidelabs/flatcc/commit/5df663837c93eb7516890c27574dcc4b042890cb + (fetchpatch { + name = "fix-pprintint-implicit-int-conversion.patch"; + url = "https://github.com/dvidelabs/flatcc/commit/5df663837c93eb7516890c27574dcc4b042890cb.patch"; + hash = "sha256-pntpatUDkZbj5pEViA8jDvXP+9KNdfhUDQCUd598Lxg="; + excludes = [ "CHANGELOG.md" ]; + }) ]; + postPatch = '' + substituteInPlace include/flatcc/portable/grisu3_print.h \ + --replace-fail \ + 'static char hexdigits[16] = "0123456789ABCDEF";' \ + "static char hexdigits[16] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};" + ''; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DFLATCC_INSTALL=on" + (lib.cmakeBool "FLATCC_INSTALL" true) ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + meta = { description = "FlatBuffers Compiler and Library in C for C"; mainProgram = "flatcc"; homepage = "https://github.com/dvidelabs/flatcc"; + changelog = "https://github.com/dvidelabs/flatcc/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = [ lib.licenses.asl20 ]; maintainers = with lib.maintainers; [ onny ]; }; diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 1735bd3751d4..325ada0394b8 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { pname = "flyctl"; - version = "0.4.27"; + version = "0.4.29"; src = fetchFromGitHub { owner = "superfly"; @@ -22,7 +22,7 @@ buildGoModule rec { cd "$out" git rev-parse HEAD > COMMIT ''; - hash = "sha256-C0MlKxkd3fftaBoVsmpnBP+tLw1dTCckKS0BrZGt8/c="; + hash = "sha256-mpyxl8Bjk6d0nCmnl+yzp0GtKiugjLykCFlfnf53+K4="; }; proxyVendor = true; diff --git a/pkgs/by-name/fr/freeorion/package.nix b/pkgs/by-name/fr/freeorion/package.nix index c7f068f1023e..8e022a6aaf60 100644 --- a/pkgs/by-name/fr/freeorion/package.nix +++ b/pkgs/by-name/fr/freeorion/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "freeorion"; - version = "0.5.1.1"; + version = "0.5.1.2"; src = fetchFromGitHub { owner = "freeorion"; repo = "freeorion"; tag = "v${finalAttrs.version}"; - hash = "sha256-0z3EPiSlViWQzpUu6+4IZ3ih0pbwdkZWAiVPsVcJr8o="; + hash = "sha256-/pLNOkxjuh/vdQQZQ9BzPCMygYPMDJDJuSXxn5lJt2o="; }; buildInputs = [ diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix index a547afc47e55..0049fd656899 100644 --- a/pkgs/by-name/fr/fresh-editor/package.nix +++ b/pkgs/by-name/fr/fresh-editor/package.nix @@ -12,16 +12,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "fresh"; - version = "0.2.18"; + version = "0.2.21"; src = fetchFromGitHub { owner = "sinelaw"; repo = "fresh"; tag = "v${finalAttrs.version}"; - hash = "sha256-LSMbG6ROFJv5Mc9TQ4ocZUXjqVlK9mvK3EtxEgEXKyk="; + hash = "sha256-du5YCDPqrGsbajT676Zs2oPvJPPAFseTkd3bXNNg64M="; }; - cargoHash = "sha256-XMl/1IVtZ15ukmouk7Ktz9W4N1lBuXJA++VzOrr/F2U="; + cargoHash = "sha256-UDbW8R8XNbif+beReQsCrCqtpUw8DhDMIAlZBKqUWaQ="; nativeBuildInputs = [ gzip diff --git a/pkgs/by-name/fu/funnelweb/package.nix b/pkgs/by-name/fu/funnelweb/package.nix index 9ee05416aef4..b39a11edd8a2 100644 --- a/pkgs/by-name/fu/funnelweb/package.nix +++ b/pkgs/by-name/fu/funnelweb/package.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation { sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg"; }; + postPatch = '' + substituteInPlace source/style.h \ + --replace-fail "typedef unsigned bool ; /* Unsigned, [0,1]. */" "" + ''; + buildPhase = '' cd source ${stdenv.cc}/bin/cc -D__linux__ -o fw *.c diff --git a/pkgs/by-name/fu/futility/package.nix b/pkgs/by-name/fu/futility/package.nix new file mode 100644 index 000000000000..0736278838a2 --- /dev/null +++ b/pkgs/by-name/fu/futility/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchgit, + openssl, + pkg-config, + nss, +}: +let + url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference"; + branch = "release-R145-16552.B"; +in +stdenv.mkDerivation { + pname = "futility"; + version = "0-${branch}"; + + src = fetchgit { + inherit url; + rev = "refs/heads/${branch}"; + hash = "sha256-LctTKkf8nTVcrErMiAkvSCYkZnBoTYjqxWj0xADi0Q4="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + nss + ]; + + postPatch = '' + patchShebangs ./scripts + substituteInPlace ./scripts/getversion.sh \ + --replace-fail "unknown" "${branch}" + ''; + + makeFlags = [ + "UB_DIR=$(out)/bin" + "USE_FLASHROM=0" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "HAVE_MACOS=1" ]; + + buildFlags = "futil"; + + installTargets = "futil_install"; + + meta = { + homepage = url; + description = "ChromeOS firmware utility"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ungeskriptet ]; + teams = [ lib.teams.android ]; + mainProgram = "futility"; + badPlatforms = lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 05777b2ee945..71dd19cf8a91 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fzf-make"; - version = "0.67.0"; + version = "0.68.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; tag = "v${finalAttrs.version}"; - hash = "sha256-ciUixT+ELBL90rPe1wUyp41ZL2a6YhEDY+n66cOB1xk="; + hash = "sha256-6lnu+wIRfd2DwCjPe5nng/6qZx/H9YBj3jItSREY+fI="; }; - cargoHash = "sha256-pVkoxMYcPUjzpN3nbyECtLS8wXo78P1ybOdl3P05Zkc="; + cargoHash = "sha256-geAaKOD1FbRasb648fBmrkxMMwd1OnNzjg23lgjpY+0="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/gb/gbdfed/package.nix b/pkgs/by-name/gb/gbdfed/package.nix index 7f3a0c30622c..ef988794e367 100644 --- a/pkgs/by-name/gb/gbdfed/package.nix +++ b/pkgs/by-name/gb/gbdfed/package.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; + postPatch = '' + # gcc15 + substituteInPlace bdfgrab.c --replace-fail 'int (*old_error_handler)();' 'XErrorHandler old_error_handler;' + substituteInPlace hbf.c --replace-fail 'typedef int bool;' '// typedef int bool;' + ''; + meta = { description = "Bitmap Font Editor"; longDescription = '' diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index a2ed4317e742..12339dc95457 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -15,18 +15,18 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.35.3"; + version = "0.36.0"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-tAv34dHEf9uK6A/d+zkYYB7FVPviRnjYrP5E23b9OXw="; + hash = "sha256-eSGznx64xN/2/TPkLTx57Ar56FogYSzUkINBduhMn/8="; }; nodejs = nodejs_22; - npmDepsHash = "sha256-gJJ2UD6m5vwUwYoYU8L4bjefrTX9CMWRYz4YTHi6Q/M="; + npmDepsHash = "sha256-ztpKe7kgQAgfCBiIBlzPDa5muOI+9kESwrzBLqwz3V0="; dontPatchElf = stdenv.isDarwin; @@ -117,6 +117,7 @@ buildNpmPackage (finalAttrs: { xiaoxiangmoe FlameFlag taranarmo + caverav ]; platforms = lib.platforms.all; mainProgram = "gemini"; diff --git a/pkgs/by-name/gh/ghgrab/package.nix b/pkgs/by-name/gh/ghgrab/package.nix index cbc2b6fc5b4f..1ed827e79dbd 100644 --- a/pkgs/by-name/gh/ghgrab/package.nix +++ b/pkgs/by-name/gh/ghgrab/package.nix @@ -2,35 +2,33 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, + versionCheckHook, }: # note: upstream has a flake rustPlatform.buildRustPackage (finalAttrs: { pname = "ghgrab"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "abhixdd"; repo = "ghgrab"; tag = "v${finalAttrs.version}"; - hash = "sha256-eXyLIrXsMV1p6xicKA5QNRPc4pkBdVM+fovOSaJT9/8="; + hash = "sha256-Ea5JdOKu4LBD77Nlj9gmISb6GPDhOZc3XCrRj2X/cB0="; }; - cargoHash = "sha256-mYOl2yI6D6c7Xs8ABFnRazyQZYQJCElXqvqQUET0zEc="; + cargoHash = "sha256-S1wkdPYVvH+4rfCQ/IohrqvHsiVWlb9OW5Dva3jNeis="; - # fails on darwin - # https://github.com/abhixdd/ghgrab/issues/31 - checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - "--skip=agent_tree_invalid_url_returns_json_error" - ]; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + nativeInstallCheckInputs = [ versionCheckHook ]; meta = { changelog = "https://github.com/abhixdd/ghgrab/releases/tag/v${finalAttrs.version}"; description = "Simple, pretty terminal tool that lets you search and download files from GitHub without leaving your CLI"; homepage = "https://github.com/abhixdd/ghgrab"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ phanirithvij ]; mainProgram = "ghgrab"; + maintainers = with lib.maintainers; [ phanirithvij ]; }; }) diff --git a/pkgs/by-name/gr/gradia/0001-fix-image_stack-action-target-type.patch b/pkgs/by-name/gr/gradia/0001-fix-image_stack-action-target-type.patch new file mode 100644 index 000000000000..8f5158ae756b --- /dev/null +++ b/pkgs/by-name/gr/gradia/0001-fix-image_stack-action-target-type.patch @@ -0,0 +1,13 @@ +diff --git a/data/ui/image_stack.blp b/data/ui/image_stack.blp +index 478bc8c..021388b 100644 +--- a/data/ui/image_stack.blp ++++ b/data/ui/image_stack.blp +@@ -94,7 +94,7 @@ template $GradiaImageStack: Adw.Bin { + icon-name: "sidebar-show-symbolic"; + tooltip-text: _("Open Sidebar"); + action-name: "win.sidebar-shown"; +- action-target: true; ++ action-target: "true"; + visible: false; + + styles [ diff --git a/pkgs/by-name/gr/gradia/package.nix b/pkgs/by-name/gr/gradia/package.nix index 0ac800e48813..6085a4fcd847 100644 --- a/pkgs/by-name/gr/gradia/package.nix +++ b/pkgs/by-name/gr/gradia/package.nix @@ -55,6 +55,10 @@ python3Packages.buildPythonApplication (finalAttrs: { tesseract ]; + patches = [ + ./0001-fix-image_stack-action-target-type.patch + ]; + postPatch = '' substituteInPlace meson.build \ --replace "/app/bin/tesseract" "${lib.getExe tesseract}" diff --git a/pkgs/by-name/gr/greed/package.nix b/pkgs/by-name/gr/greed/package.nix index 1b55c221fabf..43a21e05a0ed 100644 --- a/pkgs/by-name/gr/greed/package.nix +++ b/pkgs/by-name/gr/greed/package.nix @@ -9,23 +9,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "greed"; - version = "4.3"; + version = "4.5"; src = fetchFromGitLab { owner = "esr"; repo = "greed"; tag = finalAttrs.version; - hash = "sha256-NmX0hYHODe55N0edhdfdm0a/Yqm/UwkU/RREjYl3ePc="; + hash = "sha256-S2K6nn4WS1gOvhlYK/UH1hfA0pzij4w5SeP004WVZik="; }; postPatch = '' substituteInPlace Makefile \ --replace-fail "-lcurses" "-lncurses" \ - --replace-fail "BIN=/usr/games" "BIN=$out/bin" \ - --replace-fail "/usr/share" "$out/share" \ --replace-fail "/usr/games/lib/greed.hs" "/var/lib/greed/greed.hs" ''; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ ncurses ]; @@ -34,11 +35,6 @@ stdenv.mkDerivation (finalAttrs: { asciidoctor ]; - preInstall = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man6 - ''; - passthru = { updateScript = gitUpdater { }; }; diff --git a/pkgs/by-name/ha/harmonoid/package.nix b/pkgs/by-name/ha/harmonoid/package.nix index 99e6a02ca5bf..be44011022dd 100644 --- a/pkgs/by-name/ha/harmonoid/package.nix +++ b/pkgs/by-name/ha/harmonoid/package.nix @@ -16,7 +16,7 @@ mpv-unwrapped, }: let - version = "0.3.21"; + version = "0.3.22"; url_base = "https://github.com/alexmercerind2/harmonoid-releases/releases/download/v${version}"; url = rec { @@ -29,9 +29,9 @@ let or (throw "${stdenv.hostPlatform.system} is an unsupported platform"); hash = rec { - x86_64-linux = "sha256-RZDRb/afXbalNbLBGaQgx5Qd4UEbNrvIsa3h+e6osJE="; - aarch64-linux = "sha256-1ys7uyCjXe4IBeXRk8mFjqmP9OottNefQrrtTkxq/qU="; - x86_64-darwin = "sha256-mo7Rj6c89KZrsL29i99x4E7b6soWlGUsC6KpSB7y5iY="; + x86_64-linux = "sha256-+fEx30uu0rZiORrtE00xG2piJzpFbfxSZw3OjrhLJyg="; + aarch64-linux = "sha256-jXN5i+LudsODNZUzb5SXClqgQxYzanrbZCqB8X0pJRQ="; + x86_64-darwin = "sha256-YYMKrb7ZilfEztL2JTxSdeoDd8xQMrHFtN9N9fmsm3w="; aarch64-darwin = x86_64-darwin; } .${stdenv.hostPlatform.system}; @@ -44,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: { inherit url hash; }; + passthru.updateScript = ./update.sh; + nativeBuildInputs = [ makeWrapper ] diff --git a/pkgs/by-name/ha/harmonoid/update.sh b/pkgs/by-name/ha/harmonoid/update.sh new file mode 100755 index 000000000000..3b60cd92159c --- /dev/null +++ b/pkgs/by-name/ha/harmonoid/update.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl pcre2 jq common-updater-scripts + +set -eu -o pipefail + +release_data=$(curl https://api.github.com/repos/alexmercerind2/harmonoid-releases/releases/latest) +version=$(jq -r '.tag_name[1:]' <<< "$release_data") + +linux64_hash=$(jq '.assets[] as $item | if $item.name == "harmonoid-linux-x86_64.tar.gz" then $item.digest[7:] else empty end' -r <<< "$release_data") +linux64_hash=$(nix-hash --to-sri --type sha256 "$linux64_hash") + +linux_aarch_hash=$(jq '.assets[] as $item | if $item.name == "harmonoid-linux-aarch64.tar.gz" then $item.digest[7:] else empty end' -r <<< "$release_data") +linux_aarch_hash=$(nix-hash --to-sri --type sha256 "$linux_aarch_hash") + +macos_hash=$(jq '.assets[] as $item | if $item.name == "harmonoid-macos-universal.dmg" then $item.digest[7:] else empty end' -r <<< "$release_data") +macos_hash=$(nix-hash --to-sri --type sha256 "$macos_hash") + +update-source-version harmonoid "$version" "$linux64_hash" --system=x86_64-linux --ignore-same-version +update-source-version harmonoid "$version" "$linux_aarch_hash" --system=aarch64-linux --ignore-same-version +update-source-version harmonoid "$version" "$macos_hash" --system=x86_64-darwin --ignore-same-version diff --git a/pkgs/by-name/he/helix-db/package.nix b/pkgs/by-name/he/helix-db/package.nix index cf9d09237d13..f6337675fa88 100644 --- a/pkgs/by-name/he/helix-db/package.nix +++ b/pkgs/by-name/he/helix-db/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "helix-db"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { repo = "helix-db"; owner = "HelixDB"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qr6rrZx9wXQm4l7HqmGz3PXRJHuV3lUZMcGMH+sOPDY="; + hash = "sha256-2dhCTMCgB7vbGa3URbPGJTPJQXcAUQjlTshemZqWH8E="; }; - cargoHash = "sha256-nx4jq+2EChhtUEwCgZeqPIDidfRFZ0i0DZhkLVKapDo="; + cargoHash = "sha256-Nx30s7530W7JDizLKAHxf1aoe78QApNBJL97vO0FDZA="; patches = [ #There are no feature yet diff --git a/pkgs/by-name/he/hey-mail/package.nix b/pkgs/by-name/he/hey-mail/package.nix index c9864f6a7dad..eca024314d9d 100644 --- a/pkgs/by-name/he/hey-mail/package.nix +++ b/pkgs/by-name/he/hey-mail/package.nix @@ -94,12 +94,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hey-mail"; - version = "1.2.17"; - rev = "28"; + version = "1.3.1"; + rev = "29"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/lfWUNpR7PrPGsDfuxIhVxbj0wZHoH7bK_${finalAttrs.rev}.snap"; - hash = "sha512-X4iJ8r0VFHD+dtFkyABUEFeoI3CSpmT70JjgJGsW7nqzCLriF4eekdHKJgySusnLW250RlEVtEO5wKMW+2bqCQ=="; + hash = "sha512-mDMFD5G+TWpcCDNphvHegwlVGebw4aauShq7wJRF7F+iXX7E65+S00JpYWHu8PhUQeoVK4DkA4JkLfMq0D2lHA=="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index cc0645df5232..603fb82a1110 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -2,8 +2,8 @@ lib, appimageTools, fetchurl, - version ? "0.9.15.9", - hash ? "sha256-aJaygIDn3LxP5KhIpyLpof3OaNJrdWh0InBlb90p/uk=", + version ? "0.9.16.0", + hash ? "sha256-2DV+glvSDw6ZY1gJ0BKs0SLpIwx1bgPlloc7RQWTVKs=", }: let diff --git a/pkgs/by-name/hp/hpp2plantuml/package.nix b/pkgs/by-name/hp/hpp2plantuml/package.nix index e6052cf9b3b2..4903841db37f 100644 --- a/pkgs/by-name/hp/hpp2plantuml/package.nix +++ b/pkgs/by-name/hp/hpp2plantuml/package.nix @@ -1,28 +1,58 @@ { + fetchFromGitHub, lib, python3Packages, - fetchPypi, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "hpp2plantuml"; version = "0.8.6"; - format = "wheel"; + pyproject = true; - src = fetchPypi { - inherit (finalAttrs) pname version; - format = "wheel"; - hash = "sha256-9FggDDOxWr4z1DBbvYLyvgs3CCguFjq3I4E9ULwL0+Q="; + src = fetchFromGitHub { + owner = "thibaultmarin"; + repo = "hpp2plantuml"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8OmZfXPkRO8lgxTH6eedaiYLn0HGf+T7L+AxoA2amkQ="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ jinja2 cppheaderparser ]; + buildInputs = with python3Packages; [ + sphinx + numpydoc + ]; + + # argparse is part of the Python standard library since Python 3.2; + # the PyPI package is only a backport for older Python versions. + # robotpy-cppheaderparser is deprecated and not packaged in nixpkgs; + # we use the original cppheaderparser instead which provides the same + # CppHeaderParser Python module but has known incompatibilities (nested classes, template formatting) + # causing some functionality to break — see disabledTests below. + pythonRemoveDeps = [ + "argparse" + "robotpy-cppheaderparser" + ]; + pythonImportsCheck = [ "hpp2plantuml" ]; - nativeCheckInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + + # These tests fail because upstream expects robotpy-cppheaderparser (a fork) + # but we use the original cppheaderparser which has slightly different + # behaviour (template formatting and parent field type differences). + disabledTests = [ + "test_list_entries" + "test_full_files" + "test_main_function" + ]; meta = { description = "Convert C++ header files to PlantUML"; diff --git a/pkgs/by-name/ht/ht/package.nix b/pkgs/by-name/ht/ht/package.nix index 6e1e3023128a..822c66253825 100644 --- a/pkgs/by-name/ht/ht/package.nix +++ b/pkgs/by-name/ht/ht/package.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString [ "-Wno-narrowing" ]; + configureFlags = [ + # Fails to build on -std=gnu23. + "CFLAGS=-std=gnu17" + ]; + meta = { description = "File editor/viewer/analyzer for executables"; homepage = "https://hte.sourceforge.net"; diff --git a/pkgs/by-name/hu/hubot-sans/package.nix b/pkgs/by-name/hu/hubot-sans/package.nix index 2f184a09e5cb..8364556015b9 100644 --- a/pkgs/by-name/hu/hubot-sans/package.nix +++ b/pkgs/by-name/hu/hubot-sans/package.nix @@ -2,6 +2,7 @@ lib, fetchzip, stdenvNoCC, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -14,14 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { stripRoot = false; }; - installPhase = '' - runHook preInstall - - install -Dm644 Hubot\ Sans/TTF/*.ttf -t $out/share/fonts/truetype/ - install -Dm644 Hubot\ Sans/OTF/*.otf -t $out/share/fonts/opentype/ - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Variable font from GitHub"; @@ -37,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { of a typeface to be incorporated into one single file, and are supported by all major browsers. ''; - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index b4ec5ca4105e..5be928e2a333 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.9.4"; + version = "3.9.5"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-CTy7kMRSaMYRtOctbgizA2i4VGSLGS5/kI2lAnTuDC4="; + hash = "sha256-FFF5k+eGKg066zYYc9GvRMCsXdu092h9SQGvO6S8rBA="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/hy/hyprmon/package.nix b/pkgs/by-name/hy/hyprmon/package.nix index c9f256e75f40..aa5c70be3f99 100644 --- a/pkgs/by-name/hy/hyprmon/package.nix +++ b/pkgs/by-name/hy/hyprmon/package.nix @@ -1,21 +1,21 @@ { lib, - buildGoModule, + buildGo126Module, fetchFromGitHub, }: -buildGoModule (finalAttrs: { +buildGo126Module (finalAttrs: { pname = "hyprmon"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "erans"; repo = "hyprmon"; rev = "v${finalAttrs.version}"; - hash = "sha256-jZUtdOMmpd75CyjaXdrqXcYxcQ9q7G2YGBHoUUvycX8="; + hash = "sha256-fITGGP01RB8h8loClSZ+vuohViJQC8mpSt4iNZVK9yk="; }; - vendorHash = "sha256-THfdsr8jSvbcV1C2C2IJNvjeeonSZDfmCo6Ws2WreBA="; + vendorHash = "sha256-JahEeFmPYfJVXjbKdfUePI/xF3Ob/c2czFXKCy92ouQ="; meta = { description = "TUI monitor configuration tool for Hyprland with visual layout, drag-and-drop, and profile management"; diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix index f5d9ea0bafe5..5e04d15af550 100644 --- a/pkgs/by-name/in/inspircd/package.nix +++ b/pkgs/by-name/in/inspircd/package.nix @@ -151,13 +151,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "inspircd"; - version = "4.9.0"; + version = "4.10.0"; src = fetchFromGitHub { owner = "inspircd"; repo = "inspircd"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-DoXf0F7tjfQZRFMrVECrlRlJLt7PymjwHSg9+4RLH00="; + sha256 = "sha256-VmMfGpX6TcCuXuJmTptE51TL8cwavceDcOBeW0ipC4o="; }; outputs = [ diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index e5de6fd62eea..96c24cc06aef 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "intune-portal"; - version = "1.2511.7-noble"; + version = "1.2603.31-noble"; src = fetchurl { url = "https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb"; - hash = "sha256-MHvAmkemx28ZNcVloFNxJ03YbxrgVPvB7OOMYR6Oyo8="; + hash = "sha256-0braaXnRa04CUQdJx0ZFwe5qfjsJNzTtGqaKQV5Z6Yw="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/by-name/is/isolate/package.nix b/pkgs/by-name/is/isolate/package.nix index 86e7f5a6ebfd..69891ad0a845 100644 --- a/pkgs/by-name/is/isolate/package.nix +++ b/pkgs/by-name/is/isolate/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "isolate"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "ioi"; repo = "isolate"; rev = "v${finalAttrs.version}"; - hash = "sha256-AacKIRS/Ah1KoE+bz+lK2GPbS3F3ifBGXvvCFWMd7hs="; + hash = "sha256-z/23k6F9XHbJDFld9tjIafUZzbUDEWAnbLvAoaEAilQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ji/jigmo/package.nix b/pkgs/by-name/ji/jigmo/package.nix index b69a71312c68..8a5659869f83 100644 --- a/pkgs/by-name/ji/jigmo/package.nix +++ b/pkgs/by-name/ji/jigmo/package.nix @@ -2,31 +2,26 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "jigmo"; version = "20250912"; src = fetchzip { - url = "https://kamichikoichi.github.io/jigmo/Jigmo-${version}.zip"; + url = "https://kamichikoichi.github.io/jigmo/Jigmo-${finalAttrs.version}.zip"; hash = "sha256-Z9WYPqNjHqnYjRndxtHsQ9XhFshMR50hVkQsXgUMKE8="; stripRoot = false; }; - installPhase = '' - runHook preInstall - - install -Dm644 *.ttf -t $out/share/fonts/truetype/ - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Japanese Kanji font set which is the official successor to Hanazono Mincho"; homepage = "https://kamichikoichi.github.io/jigmo/"; license = lib.licenses.cc0; - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/jo/jost/package.nix b/pkgs/by-name/jo/jost/package.nix index 911edf4fe51e..79db69c1ba6a 100644 --- a/pkgs/by-name/jo/jost/package.nix +++ b/pkgs/by-name/jo/jost/package.nix @@ -2,24 +2,19 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "jost"; version = "3.5"; src = fetchzip { - url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip"; + url = "https://github.com/indestructible-type/Jost/releases/download/${finalAttrs.version}/Jost.zip"; hash = "sha256-ne81bMhmTzNZ/GGIzb7nCYh19vNLK+hJ3cP/zDxtiGM="; }; - installPhase = '' - runHook preInstall - - install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://github.com/indestructible-type/Jost"; @@ -27,4 +22,4 @@ stdenvNoCC.mkDerivation rec { license = lib.licenses.ofl; maintainers = [ lib.maintainers.ar1a ]; }; -} +}) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index d5755209e26e..e6089f6751ab 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -17,7 +17,7 @@ withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: let - version = "1.48.1"; + version = "1.49.0"; in rustPlatform.buildRustPackage { inherit version; @@ -34,10 +34,10 @@ rustPlatform.buildRustPackage { owner = "casey"; repo = "just"; tag = version; - hash = "sha256-w4u9grbK+L1q497qr04oARNonVuoiUs2d9eTC115T+s="; + hash = "sha256-4vUcKHoQto4TQce4y4/MwdES0+PPlSjNvzLW77FodWs="; }; - cargoHash = "sha256-bcepiMLdo8YNpkYGLoLUCcZ0f3l5tpMaRDUPhO86FEY="; + cargoHash = "sha256-5hhwzkNgF+i5aCUoVh1VNfkNJFttyy5cLhBwu8uHmAQ="; nativeBuildInputs = lib.optionals (installShellCompletions || installManPages) [ installShellFiles ] @@ -49,6 +49,7 @@ rustPlatform.buildRustPackage { export USER=just-user export USERNAME=just-user export JUST_CHOOSER="${coreutils}/bin/cat" + export XDG_RUNTIME_DIR=$(mktemp -d) # Prevent string.rs from being changed cp tests/string.rs $TMPDIR/string.rs diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix index ccf2a7f25ce8..7edd07e1606b 100644 --- a/pkgs/by-name/k6/k6/package.nix +++ b/pkgs/by-name/k6/k6/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "k6"; - version = "1.6.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "grafana"; repo = "k6"; rev = "v${finalAttrs.version}"; - hash = "sha256-pKkLrvqOz5d6iRCv3Ln31vhTBi0XWG1nSkIQ8xrK468="; + hash = "sha256-vULff8EVWns2N7QRK/dt90Jq10W3UFGXcIe3IXqJ+yA="; }; subPackages = [ "./" ]; diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix index d9af630cc840..7158edd10086 100644 --- a/pkgs/by-name/ki/kiro-cli/package.nix +++ b/pkgs/by-name/ki/kiro-cli/package.nix @@ -14,23 +14,23 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kiro-cli"; - version = "1.28.1"; + version = "1.29.3"; src = let darwinDmg = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg"; - hash = "sha256-kqt+iOQeXJZKMTGMOWgad2GzBEy5nEFAyZ6Lvwlo5uA="; + hash = "sha256-JjdZfkcWZhnGaVvTwgm1GdenM3OLhfVRYpuZ9Y/t/+E="; }; in { x86_64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz"; - hash = "sha256-WxSzjaHyZp7fbFdDcEwMmJWyjZ8iDJwp4O8aQudjhLY="; + hash = "sha256-DD3eQ9lpV+M0d40AxnLP6dOw/fvdeuAcPWwpUMonuNk="; }; aarch64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz"; - hash = "sha256-XEVO9sOu4ctFYV53Ntp1J/19Pi2iIAGXqzx909ANzpw="; + hash = "sha256-3c3zSSZNwY13Vr2k4raKaTp05XX4gh5LrAAvMU22UMM="; }; x86_64-darwin = darwinDmg; aarch64-darwin = darwinDmg; diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix index 1a6b71952219..16f4ea8afc28 100644 --- a/pkgs/by-name/ko/komga/package.nix +++ b/pkgs/by-name/ko/komga/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.24.2"; + version = "1.24.3"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-6qVWoEo/s8GEq7vOF0qyDGAQztRVFp/Ygx0hXRP895M="; + sha256 = "sha256-+MZ2Rr/QYJuKBZdQtuQaq1crRRqBPo3LGRHjkl1Gupo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock index 44c692f78eeb..5ab47a96be64 100644 --- a/pkgs/by-name/la/laravel/composer.lock +++ b/pkgs/by-name/la/laravel/composer.lock @@ -167,16 +167,16 @@ }, { "name": "illuminate/collections", - "version": "v13.2.0", + "version": "v13.3.0", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "adf06b38984b02ce29297b1489f0c757c56bff15" + "reference": "389c5008087f8c48d35b85585b4315107b5a0f9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/adf06b38984b02ce29297b1489f0c757c56bff15", - "reference": "adf06b38984b02ce29297b1489f0c757c56bff15", + "url": "https://api.github.com/repos/illuminate/collections/zipball/389c5008087f8c48d35b85585b4315107b5a0f9e", + "reference": "389c5008087f8c48d35b85585b4315107b5a0f9e", "shasum": "" }, "require": { @@ -222,11 +222,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2026-03-23T14:32:36+00:00" + "time": "2026-03-30T19:06:46+00:00" }, { "name": "illuminate/conditionable", - "version": "v13.2.0", + "version": "v13.3.0", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", @@ -272,16 +272,16 @@ }, { "name": "illuminate/contracts", - "version": "v13.2.0", + "version": "v13.3.0", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "6728b11fd8748dea0206e0b21c993cb8ae7ce426" + "reference": "8796cc5f30124b81210ae2f3b2ae0f69ad4fc7f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/6728b11fd8748dea0206e0b21c993cb8ae7ce426", - "reference": "6728b11fd8748dea0206e0b21c993cb8ae7ce426", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/8796cc5f30124b81210ae2f3b2ae0f69ad4fc7f8", + "reference": "8796cc5f30124b81210ae2f3b2ae0f69ad4fc7f8", "shasum": "" }, "require": { @@ -316,11 +316,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2026-03-20T15:16:26+00:00" + "time": "2026-03-26T17:13:01+00:00" }, { "name": "illuminate/filesystem", - "version": "v13.2.0", + "version": "v13.3.0", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", @@ -387,16 +387,16 @@ }, { "name": "illuminate/macroable", - "version": "v13.2.0", + "version": "v13.3.0", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", - "reference": "fca71b5b0b1291a69a0383b886b9835410f45358" + "reference": "f108cb3a8680f26e23c6ce7367c64525412d85b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/macroable/zipball/fca71b5b0b1291a69a0383b886b9835410f45358", - "reference": "fca71b5b0b1291a69a0383b886b9835410f45358", + "url": "https://api.github.com/repos/illuminate/macroable/zipball/f108cb3a8680f26e23c6ce7367c64525412d85b0", + "reference": "f108cb3a8680f26e23c6ce7367c64525412d85b0", "shasum": "" }, "require": { @@ -429,11 +429,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2026-02-25T16:07:55+00:00" + "time": "2026-03-28T19:16:13+00:00" }, { "name": "illuminate/reflection", - "version": "v13.2.0", + "version": "v13.3.0", "source": { "type": "git", "url": "https://github.com/illuminate/reflection.git", @@ -484,16 +484,16 @@ }, { "name": "illuminate/support", - "version": "v13.2.0", + "version": "v13.3.0", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "4ae94d59ea40bc6293ef3c087fc53a1f35619576" + "reference": "f31e168e236a90d96d7894cd1f107b1ba095de69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/4ae94d59ea40bc6293ef3c087fc53a1f35619576", - "reference": "4ae94d59ea40bc6293ef3c087fc53a1f35619576", + "url": "https://api.github.com/repos/illuminate/support/zipball/f31e168e236a90d96d7894cd1f107b1ba095de69", + "reference": "f31e168e236a90d96d7894cd1f107b1ba095de69", "shasum": "" }, "require": { @@ -559,7 +559,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2026-03-21T01:01:22+00:00" + "time": "2026-03-30T13:32:27+00:00" }, { "name": "laravel/prompts", @@ -879,16 +879,16 @@ }, { "name": "symfony/clock", - "version": "v8.0.0", + "version": "v8.0.8", "source": { "type": "git", "url": "https://github.com/symfony/clock.git", - "reference": "832119f9b8dbc6c8e6f65f30c5969eca1e88764f" + "reference": "b55a638b189a6faa875e0ccdb00908fb87af95b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/clock/zipball/832119f9b8dbc6c8e6f65f30c5969eca1e88764f", - "reference": "832119f9b8dbc6c8e6f65f30c5969eca1e88764f", + "url": "https://api.github.com/repos/symfony/clock/zipball/b55a638b189a6faa875e0ccdb00908fb87af95b3", + "reference": "b55a638b189a6faa875e0ccdb00908fb87af95b3", "shasum": "" }, "require": { @@ -932,7 +932,7 @@ "time" ], "support": { - "source": "https://github.com/symfony/clock/tree/v8.0.0" + "source": "https://github.com/symfony/clock/tree/v8.0.8" }, "funding": [ { @@ -952,20 +952,20 @@ "type": "tidelift" } ], - "time": "2025-11-12T15:46:48+00:00" + "time": "2026-03-30T15:14:47+00:00" }, { "name": "symfony/console", - "version": "v7.4.7", + "version": "v7.4.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "e1e6770440fb9c9b0cf725f81d1361ad1835329d" + "reference": "1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/e1e6770440fb9c9b0cf725f81d1361ad1835329d", - "reference": "e1e6770440fb9c9b0cf725f81d1361ad1835329d", + "url": "https://api.github.com/repos/symfony/console/zipball/1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707", + "reference": "1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707", "shasum": "" }, "require": { @@ -1030,7 +1030,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.4.7" + "source": "https://github.com/symfony/console/tree/v7.4.8" }, "funding": [ { @@ -1050,7 +1050,7 @@ "type": "tidelift" } ], - "time": "2026-03-06T14:06:20+00:00" + "time": "2026-03-30T13:54:39+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1121,16 +1121,16 @@ }, { "name": "symfony/finder", - "version": "v8.0.6", + "version": "v8.0.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "441404f09a54de6d1bd6ad219e088cdf4c91f97c" + "reference": "8da41214757b87d97f181e3d14a4179286151007" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/441404f09a54de6d1bd6ad219e088cdf4c91f97c", - "reference": "441404f09a54de6d1bd6ad219e088cdf4c91f97c", + "url": "https://api.github.com/repos/symfony/finder/zipball/8da41214757b87d97f181e3d14a4179286151007", + "reference": "8da41214757b87d97f181e3d14a4179286151007", "shasum": "" }, "require": { @@ -1165,7 +1165,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v8.0.6" + "source": "https://github.com/symfony/finder/tree/v8.0.8" }, "funding": [ { @@ -1185,7 +1185,7 @@ "type": "tidelift" } ], - "time": "2026-01-29T09:41:02+00:00" + "time": "2026-03-30T15:14:47+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1684,16 +1684,16 @@ }, { "name": "symfony/process", - "version": "v7.4.5", + "version": "v7.4.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "608476f4604102976d687c483ac63a79ba18cc97" + "reference": "60f19cd3badc8de688421e21e4305eba50f8089a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/608476f4604102976d687c483ac63a79ba18cc97", - "reference": "608476f4604102976d687c483ac63a79ba18cc97", + "url": "https://api.github.com/repos/symfony/process/zipball/60f19cd3badc8de688421e21e4305eba50f8089a", + "reference": "60f19cd3badc8de688421e21e4305eba50f8089a", "shasum": "" }, "require": { @@ -1725,7 +1725,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.4.5" + "source": "https://github.com/symfony/process/tree/v7.4.8" }, "funding": [ { @@ -1745,7 +1745,7 @@ "type": "tidelift" } ], - "time": "2026-01-26T15:07:59+00:00" + "time": "2026-03-24T13:12:05+00:00" }, { "name": "symfony/service-contracts", @@ -1836,16 +1836,16 @@ }, { "name": "symfony/string", - "version": "v8.0.6", + "version": "v8.0.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "6c9e1108041b5dce21a9a4984b531c4923aa9ec4" + "reference": "ae9488f874d7603f9d2dfbf120203882b645d963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/6c9e1108041b5dce21a9a4984b531c4923aa9ec4", - "reference": "6c9e1108041b5dce21a9a4984b531c4923aa9ec4", + "url": "https://api.github.com/repos/symfony/string/zipball/ae9488f874d7603f9d2dfbf120203882b645d963", + "reference": "ae9488f874d7603f9d2dfbf120203882b645d963", "shasum": "" }, "require": { @@ -1902,7 +1902,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v8.0.6" + "source": "https://github.com/symfony/string/tree/v8.0.8" }, "funding": [ { @@ -1922,20 +1922,20 @@ "type": "tidelift" } ], - "time": "2026-02-09T10:14:57+00:00" + "time": "2026-03-30T15:14:47+00:00" }, { "name": "symfony/translation", - "version": "v8.0.6", + "version": "v8.0.8", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "13ff19bcf2bea492d3c2fbeaa194dd6f4599ce1b" + "reference": "27c03ae3940de24ba2f71cfdbac824f2aa1fdf2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/13ff19bcf2bea492d3c2fbeaa194dd6f4599ce1b", - "reference": "13ff19bcf2bea492d3c2fbeaa194dd6f4599ce1b", + "url": "https://api.github.com/repos/symfony/translation/zipball/27c03ae3940de24ba2f71cfdbac824f2aa1fdf2f", + "reference": "27c03ae3940de24ba2f71cfdbac824f2aa1fdf2f", "shasum": "" }, "require": { @@ -1995,7 +1995,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v8.0.6" + "source": "https://github.com/symfony/translation/tree/v8.0.8" }, "funding": [ { @@ -2015,7 +2015,7 @@ "type": "tidelift" } ], - "time": "2026-02-17T13:07:04+00:00" + "time": "2026-03-30T15:14:47+00:00" }, { "name": "symfony/translation-contracts", @@ -2413,11 +2413,11 @@ }, { "name": "phpstan/phpstan", - "version": "2.1.44", + "version": "2.1.46", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4a88c083c668b2c364a425c9b3171b2d9ea5d218", - "reference": "4a88c083c668b2c364a425c9b3171b2d9ea5d218", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a193923fc2d6325ef4e741cf3af8c3e8f54dbf25", + "reference": "a193923fc2d6325ef4e741cf3af8c3e8f54dbf25", "shasum": "" }, "require": { @@ -2462,7 +2462,7 @@ "type": "github" } ], - "time": "2026-03-25T17:34:21+00:00" + "time": "2026-04-01T09:25:14+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix index a4280f5f1de4..76749b7f24ed 100644 --- a/pkgs/by-name/la/laravel/package.nix +++ b/pkgs/by-name/la/laravel/package.nix @@ -7,19 +7,19 @@ }: php.buildComposerProject2 (finalAttrs: { pname = "laravel"; - version = "5.24.10"; + version = "5.25.2"; src = fetchFromGitHub { owner = "laravel"; repo = "installer"; tag = "v${finalAttrs.version}"; - hash = "sha256-JPfsj20kLsefav6NiKA7QRADIzvKCCkFxNIeym7MYIY="; + hash = "sha256-tQBJ156KYcCVwf+xNzCL+4rh/ru1imTiD4Uu8vD16sw="; }; nativeBuildInputs = [ makeWrapper ]; composerLock = ./composer.lock; - vendorHash = "sha256-UefQzIwq6w9CL6zMHsco/Yyei9hqxNqdb6XMdCU+MXo="; + vendorHash = "sha256-nasF4IHxGvOQHVJ6S6+a8DA5iSvDvyH3Oxw8Zw4MdAY="; # Adding npm (nodejs) and php composer to path postInstall = '' diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix index 49c51be8dfab..42ea6adf1cea 100644 --- a/pkgs/by-name/le/leetgo/package.nix +++ b/pkgs/by-name/le/leetgo/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "leetgo"; - version = "1.4.16"; + version = "1.4.17"; src = fetchFromGitHub { owner = "j178"; repo = "leetgo"; rev = "v${finalAttrs.version}"; - hash = "sha256-rhMEeVkH9Z0pvtOtxooZKaiIQYyc067vqdSB9SIvqxg="; + hash = "sha256-FxXU1A9pnVMzD0fTo2QgZvZYC40UwHlJja69WCCXD0k="; }; - vendorHash = "sha256-nKGLjpxtjcoR1mO1/ZhDoLubzfkws2nE5qvk2jqYGf4="; + vendorHash = "sha256-ODSzzEj7r8itbsEeXutLyXxGZ/7q7BZbGQ1kRN4RSfc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/le/lexbor/package.nix b/pkgs/by-name/le/lexbor/package.nix index 1cff25b4c181..71df48fb8a5a 100644 --- a/pkgs/by-name/le/lexbor/package.nix +++ b/pkgs/by-name/le/lexbor/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lexbor"; - version = "2.7.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "lexbor"; repo = "lexbor"; tag = "v${finalAttrs.version}"; - hash = "sha256-MFwsXMiqKnkHRQkNrl34UDFfRQq1Q5gOYfsE56ZgWwY="; + hash = "sha256-P5ng/9lkjaWlZmyFzd3MpN39qBqhe8Rlkb/vv3cZ1MI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libetonyek/package.nix b/pkgs/by-name/li/libetonyek/package.nix index d128897c2140..cd105d0fac01 100644 --- a/pkgs/by-name/li/libetonyek/package.nix +++ b/pkgs/by-name/li/libetonyek/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchFromGitLab, autoreconfHook, pkg-config, boost, @@ -14,16 +15,26 @@ mdds, zlib, }: - +let + mdds_2_1 = mdds.overrideAttrs { + version = "2.1.1"; + src = fetchFromGitLab { + owner = "mdds"; + repo = "mdds"; + rev = "2.1.1"; + hash = "sha256-a412LpgDiYM8TMToaUrTlHtblYS1HehzrDOwvIAAxiA="; + }; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "libetonyek"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "LibreOffice"; repo = "libetonyek"; rev = "libetonyek-${finalAttrs.version}"; - hash = "sha256-dvYbV+7IakgOkGsZ+zaW+qgn/QoD6Jwq/juaE+7iYug="; + hash = "sha256-Dr4QhzZQzLNHf7OMMjUaR6WbnIQbu18LIiAjPD0sCsY="; }; nativeBuildInputs = [ @@ -39,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { liblangtag librevenge libxml2 - mdds + mdds_2_1 zlib ]; diff --git a/pkgs/by-name/li/libiscsi/package.nix b/pkgs/by-name/li/libiscsi/package.nix index b6d93ee53bb2..d76723def948 100644 --- a/pkgs/by-name/li/libiscsi/package.nix +++ b/pkgs/by-name/li/libiscsi/package.nix @@ -23,16 +23,19 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ]; - env = lib.optionalAttrs (stdenv.hostPlatform.is32bit || stdenv.hostPlatform.isDarwin) { - NIX_CFLAGS_COMPILE = toString [ - # iscsi-discard.c:223:57: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] - "-Wno-error=format" - # multithreading.c:257:16: error: 'sem_init' is deprecated [-Werror,-Wdeprecated-declarations] - "-Wno-error=deprecated-declarations" - # scsi-lowlevel.c:1244:11: error: cast from 'uint8_t *' (aka 'unsigned char *') to 'uint16_t *' (aka 'unsigned short *') increases required alignment from 1 to 2 [-Werror,-Wcast-align] - "-Wno-error=cast-align" - ]; - }; + env = + lib.optionalAttrs + (stdenv.hostPlatform.is32bit || stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isRiscV) + { + NIX_CFLAGS_COMPILE = toString [ + # iscsi-discard.c:223:57: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] + "-Wno-error=format" + # multithreading.c:257:16: error: 'sem_init' is deprecated [-Werror,-Wdeprecated-declarations] + "-Wno-error=deprecated-declarations" + # scsi-lowlevel.c:1244:11: error: cast from 'uint8_t *' (aka 'unsigned char *') to 'uint16_t *' (aka 'unsigned short *') increases required alignment from 1 to 2 [-Werror,-Wcast-align] + "-Wno-error=cast-align" + ]; + }; meta = { description = "iSCSI client library and utilities"; diff --git a/pkgs/by-name/li/libixion/package.nix b/pkgs/by-name/li/libixion/package.nix index 3a525d8400b5..0e39b8de19d2 100644 --- a/pkgs/by-name/li/libixion/package.nix +++ b/pkgs/by-name/li/libixion/package.nix @@ -4,20 +4,22 @@ fetchFromGitLab, autoreconfHook, pkg-config, - boost, + boost188, mdds, python3, }: - +let + boost = boost188; +in stdenv.mkDerivation (finalAttrs: { pname = "libixion"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitLab { owner = "ixion"; repo = "ixion"; rev = finalAttrs.version; - hash = "sha256-BrexWRaxrLTWuoU62kqws3tlSqVOHecSV5MXc4ZezFs="; + hash = "sha256-v72ihA/V21zM2xHe8t5MKYag1RUC9bWGpq7Sr7x+YIw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/liborcus/package.nix b/pkgs/by-name/li/liborcus/package.nix index a91620301b8a..acb3f9636eb6 100644 --- a/pkgs/by-name/li/liborcus/package.nix +++ b/pkgs/by-name/li/liborcus/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liborcus"; - version = "0.19.2"; + version = "0.21.0"; src = fetchFromGitLab { owner = "orcus"; repo = "orcus"; rev = finalAttrs.version; - hash = "sha256-+9C52H99c/kL5DEIoXV+WcLnTftRbicRLQN/FdIXBw8="; + hash = "sha256-vR/TtfUOa2Fmc4APfqG+Xu+mTAILGV+/JJnnmNHNJdQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index f32167cebd08..9453974c0f48 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "11.1.0"; + version = "11.2.1"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-70WFRCtc3h/Asy5ZZooW3Sg/lngPF4Nk4oPm/q/phGA="; + hash = "sha256-HQq4hrjuITQY9ia1z4pKid81+WfX9CGUUSQUfvBPPgE="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/lisette/package.nix b/pkgs/by-name/li/lisette/package.nix new file mode 100644 index 000000000000..7f88c219c2d8 --- /dev/null +++ b/pkgs/by-name/li/lisette/package.nix @@ -0,0 +1,44 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + go, + writableTmpDirAsHomeHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "lisette"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "ivov"; + repo = "lisette"; + tag = "lisette-v${finalAttrs.version}"; + hash = "sha256-wUd4LjwbsW5hS2VAbzzq9oDDPLbdXie6JmkuOEBsjmA="; + }; + + cargoHash = "sha256-E+8eFfftyrIGNfddQqDmmfPpv1FyYg2u00+KKru+B0Y="; + + preCheck = '' + export NO_COLOR=true + ''; + + nativeCheckInputs = [ + go + writableTmpDirAsHomeHook + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + meta = { + description = "Little language inspired by Rust that compiles to Go"; + homepage = "https://github.com/ivov/lisette"; + changelog = "https://github.com/ivov/lisette/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "lis"; + }; +}) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index f0a8a26cb4a7..7e9feed798ad 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -78,7 +78,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "8664"; + version = "8667"; outputs = [ "out" @@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-JTQg8A+8S7O/GSnRTDmvQuwDSuss+ydv6JDrNxWNeK8="; + hash = "sha256-bDI7a7OMCbuZyaJX4o22fmQIyrGdzYkoIeVvxBYlnRI="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index ba444c1cc7e3..71bc707b3d60 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,12 +7,12 @@ let pname = "lmstudio"; - version_aarch64-linux = "0.4.8-1"; - hash_aarch64-linux = "sha256-3Hk67hRlGdL3ODqgL9CaG+WZpKmGW7fLoxxvB3J/gc0="; - version_aarch64-darwin = "0.4.8-1"; - hash_aarch64-darwin = "sha256-14yQI67dv3R1EqyCzoHfprD2+Vuj5YHRn36tb3U/htw="; - version_x86_64-linux = "0.4.8-1"; - hash_x86_64-linux = "sha256-gbLq6nY3Jdo2nZYWbh0XEVojrqkO5noZLV/lw4TaEs8="; + version_aarch64-linux = "0.4.9-1"; + hash_aarch64-linux = "sha256-fQgXmhkbqTjbW/pyPvyZsIxtkQanpgh1DkzyrbFH6t8="; + version_aarch64-darwin = "0.4.9-1"; + hash_aarch64-darwin = "sha256-MuvYJ5mVC6Usz37DF/TG4M8gOHsKG2uN9qzq+dXNa7M="; + version_x86_64-linux = "0.4.9-1"; + hash_x86_64-linux = "sha256-+vn8gExfdfbYUBVzc59kCDlw7nEbFIyGR0fF9sFFodo="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; diff --git a/pkgs/by-name/lo/loki-tool/package.nix b/pkgs/by-name/lo/loki-tool/package.nix new file mode 100644 index 000000000000..2d66138e1d2d --- /dev/null +++ b/pkgs/by-name/lo/loki-tool/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: +stdenv.mkDerivation { + pname = "loki-tool"; + version = "0-unstable-2016-06-27"; + + src = fetchFromGitHub { + owner = "djrbliss"; + repo = "loki"; + rev = "784e86f981b7b1c30bd0d6b401f071e47e738eb8"; + hash = "sha256-yeLTQP8TYDkaMmynRxmATPi2/5VxkUZsYd44UQwz4PY="; + }; + + strictDeps = true; + + # Static build does not work on darwin due to linker issues + postPatch = '' + substituteInPlace Makefile --replace-fail \ + "CFLAGS += -g -static -Wall" "CFLAGS += -g -Wall" + ''; + + # Default build target tries to compile binary for Android + buildPhase = '' + runHook preBuild + make CC=cc loki_tool + runHook postBuild + ''; + + # Upstream has no install target + installPhase = '' + runHook preInstall + install -Dm555 loki_tool -t $out/bin + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/djrbliss/loki"; + description = "Tool for custom firmware on AT&T/Verizon Samsung and LG devices"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ ungeskriptet ]; + teams = [ lib.teams.android ]; + mainProgram = "loki_tool"; + }; +} diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix index d8666f5b6a28..7e1a849c5080 100644 --- a/pkgs/by-name/lo/lora/package.nix +++ b/pkgs/by-name/lo/lora/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchFromGitHub, nix-update-script, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -21,13 +22,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; + nativeBuildInputs = [ installFonts ]; + + # installFonts adds a hook to `postInstall` that installs fonts + # into the correct directories installPhase = '' runHook preInstall - - install -Dm444 -t $out/share/fonts/truetype $src/fonts/ttf/*.ttf - install -Dm444 -t $out/share/fonts/opentype $src/fonts/otf/*.otf - install -Dm444 -t $out/share/fonts/variable $src/fonts/variable/*.ttf - runHook postInstall ''; diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix index 1898f881b12e..a3503ca50753 100644 --- a/pkgs/by-name/lu/ludtwig/package.nix +++ b/pkgs/by-name/lu/ludtwig/package.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ludtwig"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "MalteJanz"; repo = "ludtwig"; rev = "v${finalAttrs.version}"; - hash = "sha256-zRroSPI41PU1sPwvKALWkydGWYJrz5uDJ94uimsCNys="; + hash = "sha256-czxfze7irABr5+iGwsJ7wR2kqRwDC6wOFGGxj1SUijw="; }; checkType = "debug"; - cargoHash = "sha256-cGxstBXNwyzQRNfedTbbO8Qf9C7VlMf2asz7VgQfZaA="; + cargoHash = "sha256-gSTWma7zZ4K425Tx8VSyEG5IBQnsoK+B2Rmt895b580="; meta = { description = "Linter / Formatter for Twig template files which respects HTML and your time"; diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix index 7a3eeb487c45..31a1c9317077 100644 --- a/pkgs/by-name/lu/ludusavi/package.nix +++ b/pkgs/by-name/lu/ludusavi/package.nix @@ -33,16 +33,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ludusavi"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "mtkennerly"; repo = "ludusavi"; tag = "v${finalAttrs.version}"; - hash = "sha256-tN0z9kSiSnbto8SyZE3y3pGBJObBksoRxAIKC5OBAxc="; + hash = "sha256-S2yN0WLG2tUxkqR9xe466VE+QgDQcSNgyNjvjTjTY7Q="; }; - cargoHash = "sha256-1zoG0UymnEMHMnVaboSDqYMZsObuuzxtwsjCfjeZaa0="; + cargoHash = "sha256-nRqyzRl10xRMLR5hxSaaMxBArgScoV2/iCvMkN9zH/4="; dontWrapGApps = true; diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index 97cf36319596..0795a1cf780f 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; - version = "1.13.3"; + version = "1.18.1"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = finalAttrs.version; - hash = "sha256-t1KowYGQgrsVroPUpUq8dZYPwVhGVImnzmbnUOlzPAY="; + hash = "sha256-Y18ab4Xh/R54H91sWVqKVDxc1OmVrQh/LB2eMmIjs04="; forceFetchGit = true; # Does not download all files otherwise }; - cargoHash = "sha256-UIz+q9u8gKXP+ewp8uXew5/cAMWOr3VGWWLjV/fip9M="; + cargoHash = "sha256-Jq/11J3diOe/z0W6smnmmbdeFdX1vOO3sn+KZ/Z/6M8="; env = { # Get openssl-sys to use pkg-config diff --git a/pkgs/by-name/mb/mboot/package.nix b/pkgs/by-name/mb/mboot/package.nix new file mode 100644 index 000000000000..76bde901a8e5 --- /dev/null +++ b/pkgs/by-name/mb/mboot/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: +stdenv.mkDerivation { + pname = "mboot"; + version = "0-unstable-2022-11-10"; + + src = fetchFromGitHub { + owner = "osm0sis"; + repo = "mboot"; + rev = "39f59a4f1b6a754c8953172fb80cb2ea1221ed20"; + hash = "sha256-xpVokOb4cenrrlORNIl58NuOSnaVyCIxRbyunRpix1U="; + }; + + strictDeps = true; + + # Unstream has an install target, but installs mboot as `$out/bin` + # instead of `$out/bin/mboot` + installPhase = '' + runHook preInstall + install -Dm555 mboot -t $out/bin + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/osm0sis/mboot"; + description = "Tool to pack and unpack Intel Android boot files"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ungeskriptet ]; + teams = [ lib.teams.android ]; + mainProgram = "mboot"; + }; +} diff --git a/pkgs/by-name/mc/mcp-gateway/package.nix b/pkgs/by-name/mc/mcp-gateway/package.nix new file mode 100644 index 000000000000..dd91c1b45f13 --- /dev/null +++ b/pkgs/by-name/mc/mcp-gateway/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "mcp-gateway"; + version = "2.9.1"; + + src = fetchFromGitHub { + owner = "MikkoParkkola"; + repo = "mcp-gateway"; + tag = "v${finalAttrs.version}"; + hash = "sha256-jPggWHX/Qz3sMh3P791D9WRMsppy3xRfUXd3jAcef5M="; + }; + + cargoHash = "sha256-TLjiI6mgWRkxZEifbyLzZpHj+486RYoGY2GOXsh/1Bs="; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + + # Most of the tests are failing. + doCheck = false; + + meta = { + description = "Universal MCP Gateway - Single-port multiplexing with Meta-MCP for ~95% context token savings"; + homepage = "https://github.com/MikkoParkkola/mcp-gateway"; + changelog = "https://github.com/MikkoParkkola/mcp-gateway/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "mcp-gateway"; + }; +}) diff --git a/pkgs/by-name/md/mdds/package.nix b/pkgs/by-name/md/mdds/package.nix index abf16d3c86db..d9326e631753 100644 --- a/pkgs/by-name/md/mdds/package.nix +++ b/pkgs/by-name/md/mdds/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mdds"; - version = "2.1.1"; + version = "3.1.0"; src = fetchFromGitLab { owner = "mdds"; repo = "mdds"; rev = finalAttrs.version; - hash = "sha256-a412LpgDiYM8TMToaUrTlHtblYS1HehzrDOwvIAAxiA="; + hash = "sha256-8xI0RmxMDvXp2rPWEd6Yu2i7q3ba8nSLBMF8SKjdIBs="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/me/medio/package.nix b/pkgs/by-name/me/medio/package.nix index 1009530b6b9a..2008f6ffc2c4 100644 --- a/pkgs/by-name/me/medio/package.nix +++ b/pkgs/by-name/me/medio/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: let @@ -18,13 +19,7 @@ stdenvNoCC.mkDerivation { stripRoot = false; }; - installPhase = '' - runHook preInstall - - install -D -m444 -t $out/share/fonts/opentype $src/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://dotcolon.net/font/medio/"; diff --git a/pkgs/by-name/me/melete/package.nix b/pkgs/by-name/me/melete/package.nix index a1d91013d4d3..dcfefdb0da42 100644 --- a/pkgs/by-name/me/melete/package.nix +++ b/pkgs/by-name/me/melete/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: let @@ -18,13 +19,7 @@ stdenvNoCC.mkDerivation { stripRoot = false; }; - installPhase = '' - runHook preInstall - - install -D -m444 -t $out/share/fonts/opentype $src/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://dotcolon.net/font/melete/"; diff --git a/pkgs/by-name/me/merriweather-sans/package.nix b/pkgs/by-name/me/merriweather-sans/package.nix index e3b44a16d2c7..59122a570a72 100644 --- a/pkgs/by-name/me/merriweather-sans/package.nix +++ b/pkgs/by-name/me/merriweather-sans/package.nix @@ -2,9 +2,10 @@ stdenvNoCC, lib, fetchFromGitHub, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "merriweather-sans"; version = "1.008"; @@ -18,12 +19,13 @@ stdenvNoCC.mkDerivation rec { # TODO: it would be nice to build this from scratch, but lots of # Python dependencies to package (fontmake, gftools) - installPhase = '' - install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf - install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff - install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2 - # TODO: install variable version? - ''; + # TODO: packaging with python allow update and usage of variable/otf fonts + nativeBuildInputs = [ installFonts ]; + + outputs = [ + "out" + "webfont" + ]; meta = { homepage = "https://github.com/SorkinType/Merriweather-Sans"; diff --git a/pkgs/by-name/me/merriweather/package.nix b/pkgs/by-name/me/merriweather/package.nix index 87f38e6b14d2..68c739de686a 100644 --- a/pkgs/by-name/me/merriweather/package.nix +++ b/pkgs/by-name/me/merriweather/package.nix @@ -2,29 +2,29 @@ stdenvNoCC, lib, fetchFromGitHub, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "merriweather"; - version = "2.005"; + version = "2.200"; src = fetchFromGitHub { owner = "SorkinType"; repo = "Merriweather"; - rev = "4fd88c9299009d1c1d201e7da3ff75cf1de5153a"; - sha256 = "1ndycja2jzhcfbqbm0p6ka2zl1i1pdbkf0crw2lp3pi4k89wlm29"; + rev = "6e3263d6241aeb747ebfcdd4af3ff8bd1013bb49"; + sha256 = "sha256-mpVJpxI98VxHpZMFFyTHjxTPcUTB1kK8XCGa32znMcQ="; }; # TODO: it would be nice to build this from scratch, but lots of # Python dependencies to package (fontmake, gftools) - installPhase = '' - install -m444 -Dt $out/share/fonts/opentype/${pname} fonts/otf/*.otf - install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf - install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff - install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2 - # TODO: install variable version? - ''; + nativeBuildInputs = [ installFonts ]; + + outputs = [ + "out" + "webfont" + ]; meta = { homepage = "https://github.com/SorkinType/Merriweather"; @@ -33,4 +33,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ emily ]; }; -} +}) diff --git a/pkgs/by-name/me/meslo-lgs-nf/package.nix b/pkgs/by-name/me/meslo-lgs-nf/package.nix index 9faeb5164cb3..7fa29d4f4146 100644 --- a/pkgs/by-name/me/meslo-lgs-nf/package.nix +++ b/pkgs/by-name/me/meslo-lgs-nf/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + installFonts, }: stdenv.mkDerivation { @@ -15,10 +16,7 @@ stdenv.mkDerivation { sha256 = "sha256-8xwVOlOP1SresbReNh1ce2Eu12KdIwdJSg6LKM+k2ng="; }; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp $src/*.ttf $out/share/fonts/truetype - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Meslo Nerd Font patched for Powerlevel10k"; diff --git a/pkgs/by-name/mi/microsoft-identity-broker/package.nix b/pkgs/by-name/mi/microsoft-identity-broker/package.nix index 8d18feca9dac..4c9193dd9224 100644 --- a/pkgs/by-name/mi/microsoft-identity-broker/package.nix +++ b/pkgs/by-name/mi/microsoft-identity-broker/package.nix @@ -25,11 +25,11 @@ }: stdenv.mkDerivation rec { pname = "microsoft-identity-broker"; - version = "2.5.0"; + version = "3.0.1"; src = fetchurl { url = "https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/m/microsoft-identity-broker/microsoft-identity-broker_${version}-noble_amd64.deb"; - hash = "sha256-zid9kjjz3mBfJFfiYUoqlIyQSsR041JN3Ib+JFSSEbE="; + hash = "sha256-cbG+HJ1nuOyxR/sd1P69QTEUaklywbJOP7o6K7l6SEs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/mimalloc/package.nix b/pkgs/by-name/mi/mimalloc/package.nix index a808fd8e12ac..34cea94853a2 100644 --- a/pkgs/by-name/mi/mimalloc/package.nix +++ b/pkgs/by-name/mi/mimalloc/package.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mimalloc"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "microsoft"; repo = "mimalloc"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-fk6nfyBFS1G0sJwUJVgTC1+aKd0We/JjsIYTO+IOfyg="; + hash = "sha256-7zG0Sqloanz/b+fkJ4wzO86uBmtf9fdYNAT9ixLouyY="; }; doCheck = !stdenv.hostPlatform.isStatic; diff --git a/pkgs/by-name/mi/minder/package.nix b/pkgs/by-name/mi/minder/package.nix index ef1b5513999f..80ac2d76452a 100644 --- a/pkgs/by-name/mi/minder/package.nix +++ b/pkgs/by-name/mi/minder/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minder"; - version = "2.0.5"; + version = "2.0.8"; src = fetchFromGitHub { owner = "phase1geo"; repo = "minder"; tag = finalAttrs.version; - hash = "sha256-g1rz7yihbMtSvL3B9XTqtOEjjLP+DczOTCp47Cp9GHs="; + hash = "sha256-5W2ff0TJPQnuUAqw4oRjUv/h1x1goVfUsYPyrqDwc9Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix index 83a8b819e5f5..298264a8d686 100644 --- a/pkgs/by-name/mi/miniflux/package.nix +++ b/pkgs/by-name/mi/miniflux/package.nix @@ -9,16 +9,16 @@ buildGo126Module (finalAttrs: { pname = "miniflux"; - version = "2.2.18"; + version = "2.2.19"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; tag = finalAttrs.version; - hash = "sha256-r5MFYdWV17u2ogxN01w9FpP/ErgqQmTEl5Nizg9FzCY="; + hash = "sha256-/zAO6LgT4BKGaLJNgfm2c0VCtpc/9jQmM6zmfnpJtYo="; }; - vendorHash = "sha256-F1FbenWzokNnF6xiZeqpu5HWs1PZo0WtlZX/ePTvBTE="; + vendorHash = "sha256-zQURNCImYB66agRnorqLzvQKNNZb1o9ZVOVuETjQ0RE="; nativeBuildInputs = [ installShellFiles ]; @@ -31,6 +31,8 @@ buildGo126Module (finalAttrs: { "-X miniflux.app/v2/internal/version.Version=${finalAttrs.version}" ]; + __darwinAllowLocalNetworking = true; + postInstall = '' mv $out/bin/miniflux.app $out/bin/miniflux installManPage miniflux.1 diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index a0a02995a897..0a2526fa0b65 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.194.0", + "version": "3.198.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.194.0/mirrord_linux_x86_64", - "hash": "sha256-6coP0EiDrTv0HNk+55C37d+eKhsOm25rQy42mRkoTy0=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.198.0/mirrord_linux_x86_64", + "hash": "sha256-JrfS4KGARmNGAWDLzmCkafjyPgk3NHIALEWMpoBmbWc=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.194.0/mirrord_linux_aarch64", - "hash": "sha256-k8/kkhYYk+eHdekIwi2wFmn6mX7WiKuKtaOC3soBT6U=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.198.0/mirrord_linux_aarch64", + "hash": "sha256-As0ybf+UQ4+q0lCkpM+6VkvTWMt8mtfMKmrPm3eZIcY=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.194.0/mirrord_mac_universal", - "hash": "sha256-VwcqBf3Jq9H3wgNz5o/7oJ5Pz0nXBRkzDA7D51hIWe0=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.198.0/mirrord_mac_universal", + "hash": "sha256-uvAvNF1KKIfvjzgwmwVacXA/bEwHolCCqFoou5L8pXw=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.194.0/mirrord_mac_universal", - "hash": "sha256-VwcqBf3Jq9H3wgNz5o/7oJ5Pz0nXBRkzDA7D51hIWe0=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.198.0/mirrord_mac_universal", + "hash": "sha256-uvAvNF1KKIfvjzgwmwVacXA/bEwHolCCqFoou5L8pXw=" } } } diff --git a/pkgs/by-name/mi/mistral-rs/no-native-cpu.patch b/pkgs/by-name/mi/mistral-rs/no-native-cpu.patch index bb2e37542d12..ed65366cce2d 100644 --- a/pkgs/by-name/mi/mistral-rs/no-native-cpu.patch +++ b/pkgs/by-name/mi/mistral-rs/no-native-cpu.patch @@ -1,5 +1,5 @@ diff --git a/.cargo/config.toml b/.cargo/config.toml -index dde3bc53f..693808c6e 100644 +index 0ab50ad46..3f5fe0788 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,15 +1,10 @@ @@ -9,7 +9,7 @@ index dde3bc53f..693808c6e 100644 [target.aarch64-apple-darwin] rustflags = [ - "-C", "target-cpu=native", - "-C", "target-feature=+aes,+sha2,+fp16", + "-C", "target-feature=+aes,+sha2,+fp16,+i8mm", ] [target.x86_64-apple-darwin] diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index fb562cfe9ac5..79b3ae825d7c 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -74,13 +74,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "mistral-rs"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "EricLBuehler"; repo = "mistral.rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-2gE3LRm2oy6H+y6dRNnwYIjlaG67it16bfhfTk4CUTc="; + hash = "sha256-WuDvD2ifk0AtB4fpgLqQSiXVfb/50M9oIuz738pdsis="; }; patches = [ @@ -96,7 +96,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "lto = false" ''; - cargoHash = "sha256-nktoMh07PfGJ156XrKa1N/icB634cr9ybsHq/y9zHKo="; + cargoHash = "sha256-MzGU62v6ZvVzTN7Ra+zz1uNlk4ul09YG5Hbj2A7hZbY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mk/mkbootimg-osm0sis/package.nix b/pkgs/by-name/mk/mkbootimg-osm0sis/package.nix new file mode 100644 index 000000000000..f6ed4bc7824c --- /dev/null +++ b/pkgs/by-name/mk/mkbootimg-osm0sis/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: +stdenv.mkDerivation { + pname = "mkbootimg-osm0sis"; + version = "2022.11.09-unstable-2025-03-10"; + + src = fetchFromGitHub { + owner = "osm0sis"; + repo = "mkbootimg"; + rev = "17cea80bd5af64e45cdf9e263cad7555030e0e86"; + hash = "sha256-5ilpgQS5ctMpxTJRa8Wty1B0mNN+77/fS2FThNfAKZk="; + }; + + strictDeps = true; + + env.NIX_CFLAGS_COMPILE = toString ( + lib.optional stdenv.cc.isGNU [ + # Required with newer GCC + "-Wstringop-overflow=0" + ] + ); + + installPhase = '' + runHook preInstall + install -Dm555 {mk,unpack}bootimg -t $out/bin + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/osm0sis/mkbootimg"; + description = "C rewrite of Android's boot image tools"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ungeskriptet ]; + teams = [ lib.teams.android ]; + mainProgram = "mkbootimg"; + }; +} diff --git a/pkgs/by-name/mk/mkmtkhdr/package.nix b/pkgs/by-name/mk/mkmtkhdr/package.nix new file mode 100644 index 000000000000..cc1207dddcc2 --- /dev/null +++ b/pkgs/by-name/mk/mkmtkhdr/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: +stdenv.mkDerivation { + pname = "mkmtkhdr"; + version = "0-unstable-2022-11-10"; + + src = fetchFromGitHub { + owner = "osm0sis"; + repo = "mkmtkhdr"; + rev = "be292c5295feb8158603c8575850208ea6218a78"; + hash = "sha256-eXC4OpjDCziahhhH73cOUkTsm1VFJE6wTtSk6RD5tqA="; + }; + + strictDeps = true; + + # Unstream has an install target, but installs mkmtkhdr as `$out/bin` + # instead of `$out/bin/mkmtkhdr` + installPhase = '' + runHook preInstall + install -Dm555 mkmtkhdr -t $out/bin + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/osm0sis/mkmtkhdr"; + description = "Tool to write MTK headers for split zImages and ramdisks"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ungeskriptet ]; + teams = [ lib.teams.android ]; + mainProgram = "mkmtkhdr"; + }; +} diff --git a/pkgs/by-name/mo/mona-sans/package.nix b/pkgs/by-name/mo/mona-sans/package.nix index 567b02b8487e..83c1d310224b 100644 --- a/pkgs/by-name/mo/mona-sans/package.nix +++ b/pkgs/by-name/mo/mona-sans/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -15,10 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { sha256 = "sha256-L1KlduItf1jBrw08NwbJvZFemLY8JHRXq2UDl9Wlq70="; }; - installPhase = '' - install -D -m444 -t $out/share/fonts/opentype fonts/static/otf/*.otf - install -D -m444 -t $out/share/fonts/truetype fonts/static/ttf/*.ttf fonts/variable/*.ttf - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Variable font from GitHub"; diff --git a/pkgs/by-name/mo/monkeys-audio/package.nix b/pkgs/by-name/mo/monkeys-audio/package.nix index 857bc634479a..7a5fc29b0080 100644 --- a/pkgs/by-name/mo/monkeys-audio/package.nix +++ b/pkgs/by-name/mo/monkeys-audio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "12.60"; + version = "12.62"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-vlxXAyo0dMwkyr7SE/JWgUr0ANDhWCm4zg2i/p+GlSc="; + hash = "sha256-YUY/VATJ+2bCKEdNfdvf+TQXHD7UWjd++CSZ5ut6Bs4="; stripRoot = false; }; diff --git a/pkgs/by-name/mp/mph_2b_damase/package.nix b/pkgs/by-name/mp/mph_2b_damase/package.nix index a06c04533ff4..07601746979a 100644 --- a/pkgs/by-name/mp/mph_2b_damase/package.nix +++ b/pkgs/by-name/mp/mph_2b_damase/package.nix @@ -1,4 +1,8 @@ -{ stdenvNoCC, fetchzip }: +{ + stdenvNoCC, + fetchzip, + installFonts, +}: stdenvNoCC.mkDerivation { pname = "mph-2b-damase"; @@ -9,13 +13,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-4x78D+c3ZBxfhTQQ4+gyxvrsuztHF2ItXLh4uA0PxvU="; }; - installPhase = '' - runHook preInstall - - install -Dm644 *.ttf -t $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { }; } diff --git a/pkgs/by-name/mp/mprisence/package.nix b/pkgs/by-name/mp/mprisence/package.nix index 135fcce9c0d3..8fa22f2fd4fb 100644 --- a/pkgs/by-name/mp/mprisence/package.nix +++ b/pkgs/by-name/mp/mprisence/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mprisence"; - version = "1.4.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "lazykern"; repo = "mprisence"; tag = "v${finalAttrs.version}"; - hash = "sha256-xQA9wxEweoxguVhuTfG6RVODKUuaTWEsrQh5Me05eCw="; + hash = "sha256-0DJfYU71VFA5+jEz5Wq0HEyk5KFXv7tOgxpfTWMWemc="; }; - cargoHash = "sha256-KF/PYocZDgryXyhFj2eD5o0Tlxmgxd27SqqW54e/qdw="; + cargoHash = "sha256-OoZq7vm4tnxysur69Yv+jvudab2gh8r5WnO2taF9U8A="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/mt/mtkclient/package.nix b/pkgs/by-name/mt/mtkclient/package.nix index 1fcd05b68974..e6e67a53a8eb 100644 --- a/pkgs/by-name/mt/mtkclient/package.nix +++ b/pkgs/by-name/mt/mtkclient/package.nix @@ -1,19 +1,23 @@ { lib, + copyDesktopItems, fetchFromGitHub, + gcc-arm-embedded, + makeDesktopItem, python3Packages, + udevCheckHook, }: python3Packages.buildPythonApplication rec { pname = "mtkclient"; - version = "2.1.2"; + version = "2.1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "bkerler"; repo = "mtkclient"; rev = "v${version}"; - hash = "sha256-mbfuOYJvwHfDvjTtAgMBLi7REIRRcJ9bhkY5oVjxCAM="; + hash = "sha256-8Y9tyw+dmhhc4tFo3slr4wQIPXIrmIk/wuCK4aM6oLY="; }; build-system = [ python3Packages.hatchling ]; @@ -29,10 +33,38 @@ python3Packages.buildPythonApplication rec { shiboken6 ]; + nativeBuildInputs = [ + udevCheckHook + copyDesktopItems + + # Dependencies for stage1 kamakiri payloads + gcc-arm-embedded + ]; + pythonImportsCheck = [ "mtkclient" ]; - # Note: No need to install mtkclient udev rules, 50-android.rules is covered by + # Build on-device payloads from source before assembling into a python package. + preBuild = '' + make -C src/stage1 + ''; + + # Note: No need to install other mtkclient udev rules, 50-android.rules is covered by # systemd 258 or newer and 51-edl.rules only applies to Qualcomm (i.e. not MTK). + postInstall = '' + install -Dm444 Setup/Linux/52-mtk.rules -t $out/lib/udev/rules.d + ''; + + desktopItems = [ + (makeDesktopItem { + name = "mtkclient"; + desktopName = "MTKClient"; + comment = "Mediatek Flash and Repair Utility"; + exec = "mtk_gui"; + categories = [ + "Development" + ]; + }) + ]; meta = { description = "MTK reverse engineering and flash tool"; diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index c4d76774bdb4..fb1edc169d41 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -10,17 +10,17 @@ buildGoModule (finalAttrs: { pname = "museum"; - version = "1.3.24"; + version = "1.3.28"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; tag = "photos-v${finalAttrs.version}"; - hash = "sha256-ltWY/T4QSN9Si8s4XRvvcL9yB1+lLx+zM5Ahb9DAzQE="; + hash = "sha256-No4raRi4QVpoQUVcZE2RMQsCGPHikagHyx6mvsxsV8k="; }; - vendorHash = "sha256-r/zAAWyLe6VYztsZuYlwg0jozGf8cScUKIcIdtZ0LvQ="; + vendorHash = "sha256-KGwrXQdGbA5+Nn20s7a7U45t3D7i8Ti9en+nR16vzDs="; sourceRoot = "${finalAttrs.src.name}/server"; diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix index 7dfc1c0be312..b3f9e005a037 100644 --- a/pkgs/by-name/my/mympd/package.nix +++ b/pkgs/by-name/my/mympd/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "23.0.1"; + version = "25.0.1"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-X5Pyh5QqVbH+4z1hf+u/JmN4lVKcW1RYu+rtDd5ec3w="; + sha256 = "sha256-qi+VzDe91yEQzNEcUSuhcuxF76FmBsVkmb5LCB+yjP0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index ff1927bf1be0..9d2a0d80d4cd 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -30,16 +30,16 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: { pname = "neovide"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; tag = finalAttrs.version; - hash = "sha256-i3HEdYZ1fTK8kHRMhGVY80kE6Sp/HhNV4vG2cVroDWo="; + hash = "sha256-yiIJEVEjXvFkTm4PIPOVX8gDAI6aA5PzBMlu51POCZU="; }; - cargoHash = "sha256-ybPKRgUZ2MRbzSFyevxSDtsNyU4iQwL4b7JIqBpbwk4="; + cargoHash = "sha256-bWkK8tmKJrBKmdzJzHDht7BYVBMgpapzG79o8RM+Wuc="; env = { SKIA_SOURCE_DIR = @@ -136,6 +136,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ ck3d + caverav ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ne/netbox_4_5/package.nix b/pkgs/by-name/ne/netbox_4_5/package.nix index f080e6294209..48015feff904 100644 --- a/pkgs/by-name/ne/netbox_4_5/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/package.nix @@ -16,14 +16,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "4.5.5"; + version = "4.5.7"; pyproject = false; src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox"; tag = "v${version}"; - hash = "sha256-he+WNbzIZSc2q97YjnAKHeFR0MDZCkDuAF/mfgAZuU4="; + hash = "sha256-8oOlDtTVeKDlaWt3JDy9wc1oUTTJPSoHd5O3YxbE50g="; }; patches = [ diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix index 4084631627de..bce95847cc2b 100644 --- a/pkgs/by-name/ne/nextpnr/package.nix +++ b/pkgs/by-name/ne/nextpnr/package.nix @@ -22,11 +22,6 @@ let enablePython = true; }; - pname = "nextpnr"; - - # Version 0.9 was patched (c7cfb) for Boost 1.87+ compatibility (boost system) - version = "0.9-unstable-2026-02-08"; - prjbeyond_src = fetchFromGitHub { owner = "YosysHQ-GmbH"; repo = "prjbeyond-db"; @@ -35,65 +30,67 @@ let }; in -stdenv.mkDerivation rec { - inherit pname version; +stdenv.mkDerivation (finalAttrs: { + pname = "nextpnr"; + version = "0.10"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "35f14336c042a9aa86cc66221434262fbb02034e"; - hash = "sha256-5Fn/Y+pjhnGFcZsCN7XZN0nPB9u/BIr+lxgrCC5pnpE="; + tag = "nextpnr-${finalAttrs.version}"; fetchSubmodules = true; + hash = "sha256-goHHEvkBw+9s3RHGfQtRaueXRBnoI14TmfGmb+1WPAY="; }; + # Don't use #embed macro for chipdb binary embeddings - otherwise getting spurious type narrowing errors. + # Maybe related to: https://github.com/llvm/llvm-project/issues/119256 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "check_cxx_compiler_hash_embed(HAS_HASH_EMBED CXX_FLAGS_HASH_EMBED)" "" + ''; + nativeBuildInputs = [ cmake python3 ] - ++ (lib.optional enableGui wrapQtAppsHook); + ++ lib.optionals enableGui [ + wrapQtAppsHook + ]; buildInputs = [ boostPython eigen python3Packages.apycula ] - ++ (lib.optional enableGui qtbase) - ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); + ++ lib.optionals enableGui [ + qtbase + ] + ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + ]; - cmakeFlags = - let - # Use the commit hash for the internal versioning - rev = src.rev; - versionStr = if (lib.hasPrefix "nextpnr-" rev) then rev else "nextpnr-${lib.substring 0 7 rev}"; - in - [ - "-DCURRENT_GIT_VERSION=${versionStr}" - "-DARCH=generic;ice40;ecp5;himbaechel" - "-DBUILD_TESTS=ON" - "-DICESTORM_INSTALL_PREFIX=${icestorm}" - "-DTRELLIS_INSTALL_PREFIX=${trellis}" - "-DTRELLIS_LIBDIR=${trellis}/lib/trellis" - "-DGOWIN_BBA_EXECUTABLE=${python3Packages.apycula}/bin/gowin_bba" - "-DUSE_OPENMP=ON" + cmakeFlags = [ + (lib.cmakeFeature "CURRENT_GIT_VERSION" finalAttrs.src.tag) + (lib.cmakeFeature "ARCH" "generic;ice40;ecp5;himbaechel") + (lib.cmakeBool "BUILD_TESTS" true) + (lib.cmakeFeature "ICESTORM_INSTALL_PREFIX" icestorm.outPath) + (lib.cmakeFeature "TRELLIS_INSTALL_PREFIX" trellis.outPath) + (lib.cmakeFeature "TRELLIS_LIBDIR" "${lib.getLib trellis}/lib/trellis") + (lib.cmakeFeature "GOWIN_BBA_EXECUTABLE" (lib.getExe' python3Packages.apycula "gowin_bba")) + (lib.cmakeBool "USE_OPENMP" true) - # gatemate excluded due to non-reproducible build https://github.com/YosysHQ/prjpeppercorn/issues/9 - # xilinx excluded due to needing vivado https://github.com/f4pga/prjxray?tab=readme-ov-file#step-1 - "-DHIMBAECHEL_UARCH=example;gowin;ng-ultra" + # gatemate excluded due to non-reproducible build https://github.com/YosysHQ/prjpeppercorn/issues/9 + # xilinx excluded due to needing vivado https://github.com/f4pga/prjxray?tab=readme-ov-file#step-1 + (lib.cmakeFeature "HIMBAECHEL_UARCH" "example;gowin;ng-ultra") - "-DHIMBAECHEL_GOWIN_DEVICES=all" - "-DHIMBAECHEL_PRJBEYOND_DB=${prjbeyond_src}" - # https://github.com/YosysHQ/nextpnr/issues/1578 - # `Compatibility with CMake < 3.5 has been removed from CMake.` - "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" - ] - ++ (lib.optional enableGui "-DBUILD_GUI=ON"); + (lib.cmakeFeature "HIMBAECHEL_GOWIN_DEVICES" "all") + (lib.cmakeFeature "HIMBAECHEL_PRJBEYOND_DB" prjbeyond_src.outPath) + # https://github.com/YosysHQ/nextpnr/issues/1578 + # `Compatibility with CMake < 3.5 has been removed from CMake.` + # "CMAKE_POLICY_VERSION_MINIMUM=3.5" - postPatch = '' - # Don't use #embed macro for chipdb binary embeddings - otherwise getting spurious type narrowing errors. - # Maybe related to: https://github.com/llvm/llvm-project/issues/119256 - substituteInPlace CMakeLists.txt \ - --replace-fail "check_cxx_compiler_hash_embed(HAS_HASH_EMBED CXX_FLAGS_HASH_EMBED)" "" - ''; + (lib.cmakeBool "BUILD_GUI" enableGui) + ]; doCheck = true; @@ -109,8 +106,9 @@ stdenv.mkDerivation rec { meta = { description = "Place and route tool for FPGAs"; homepage = "https://github.com/yosyshq/nextpnr"; + changelog = "https://github.com/YosysHQ/nextpnr/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.isc; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/ni/nixpkgs-vet/package.nix b/pkgs/by-name/ni/nixpkgs-vet/package.nix index a982f30d2fe0..290ce53852e9 100644 --- a/pkgs/by-name/ni/nixpkgs-vet/package.nix +++ b/pkgs/by-name/ni/nixpkgs-vet/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "nixpkgs-vet"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "NixOS"; repo = "nixpkgs-vet"; tag = finalAttrs.version; - hash = "sha256-TxQkD9jPoONec87qGXOIQNh+lZ7kyFM6q1RtlgxEqy4="; + hash = "sha256-Rk1p6qAqAtl5bwg9dNZ0yc4m1yOOxybWvTwfuNcOkFQ="; }; - cargoHash = "sha256-Wx8AwgUENVbxv9GgB/DTH5aGIRznAslABjxRu/X0l2s="; + cargoHash = "sha256-GaQ2ldsGabsDMx1bHuZwnSvtPp1LgPkj2C07cnEBdDY="; doCheck = false; diff --git a/pkgs/by-name/no/nominatim/nominatim-api.nix b/pkgs/by-name/no/nominatim/nominatim-api.nix index 57fad6142d1b..0280d402f82b 100644 --- a/pkgs/by-name/no/nominatim/nominatim-api.nix +++ b/pkgs/by-name/no/nominatim/nominatim-api.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "nominatim"; - version = "5.2.0"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "osm-search"; repo = "Nominatim"; tag = "v${version}"; - hash = "sha256-ao4oEPz5rtRQtPC2UcIHH1M+o914JraASf+hcB2SDKA="; + hash = "sha256-cICDzsEJ2yRi8PaQpjfVC9ZI3KeQPiqGu4U1nTxxBvk="; }; postPatch = '' diff --git a/pkgs/by-name/ol/olsrd/package.nix b/pkgs/by-name/ol/olsrd/package.nix index 8ba2a5e9ea70..8d46263b6814 100644 --- a/pkgs/by-name/ol/olsrd/package.nix +++ b/pkgs/by-name/ol/olsrd/package.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # boolean type guards in olsr_types.h are incompatible with C23 + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + buildInputs = [ bison flex diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index 5bccd1c423b7..ec506f9f55b8 100644 --- a/pkgs/by-name/op/open-policy-agent/package.nix +++ b/pkgs/by-name/op/open-policy-agent/package.nix @@ -14,13 +14,13 @@ assert buildGoModule (finalAttrs: { pname = "open-policy-agent"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; tag = "v${finalAttrs.version}"; - hash = "sha256-IzgqQ52nTkcQLg1w9yn3op5Q2P/7rVMNh3IgVYb5sFI="; + hash = "sha256-TUFVyrRX0eqXCY+wOYA9yAFTzsupBO4d7bHmQXRRGDE="; }; vendorHash = "sha256-l2HrTap6qZeKOvvCY6d+issQT2pL6TPU0pIdDN8vfVc="; diff --git a/pkgs/by-name/op/openclaw/package.nix b/pkgs/by-name/op/openclaw/package.nix index be4bdb77df9a..0f86c4ec9fb5 100644 --- a/pkgs/by-name/op/openclaw/package.nix +++ b/pkgs/by-name/op/openclaw/package.nix @@ -11,7 +11,7 @@ versionCheckHook, rolldown, installShellFiles, - version ? "2026.3.12", + version ? "2026.4.2", }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "openclaw"; @@ -21,10 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "openclaw"; repo = "openclaw"; tag = "v${finalAttrs.version}"; - hash = "sha256-dGKfXkC7vHflGbg+SkgSMfM5LW8w1YQIWicgp3BKDQ8="; + hash = "sha256-wVS2OuBNrF1yWjmINxde0kC5mvY2QUUtwYpYrZcARkI="; }; - pnpmDepsHash = "sha256-GHTkpwOj2Y29YUcS/kbZlCdo9DL8C3WW3WHe0PMIN/M="; + pnpmDepsHash = "sha256-aHepSWiQ4+UyjPHBF+4+M9/nFrgfCw422q671saJM+U="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; @@ -43,18 +43,25 @@ stdenvNoCC.mkDerivation (finalAttrs: { installShellFiles ]; - preBuild = '' - rm -rf node_modules/rolldown node_modules/@rolldown/pluginutils - mkdir -p node_modules/@rolldown - cp -r ${rolldown}/lib/node_modules/rolldown node_modules/rolldown - cp -r ${rolldown}/lib/node_modules/@rolldown/pluginutils node_modules/@rolldown/pluginutils - chmod -R u+w node_modules/rolldown node_modules/@rolldown/pluginutils - ''; - buildPhase = '' runHook preBuild pnpm install --frozen-lockfile + + # Replace pnpm-installed rolldown with the Nix-built version + rm -rf node_modules/rolldown node_modules/@rolldown/pluginutils + mkdir -p node_modules/@rolldown node_modules/.pnpm/node_modules/@rolldown + cp -r ${rolldown}/lib/node_modules/rolldown node_modules/rolldown + cp -r ${rolldown}/lib/node_modules/@rolldown/pluginutils node_modules/@rolldown/pluginutils + cp -r ${rolldown}/lib/node_modules/rolldown node_modules/.pnpm/node_modules/rolldown + cp -r ${rolldown}/lib/node_modules/@rolldown/pluginutils node_modules/.pnpm/node_modules/@rolldown/pluginutils + chmod -R u+w node_modules/rolldown node_modules/@rolldown/pluginutils \ + node_modules/.pnpm/node_modules/rolldown node_modules/.pnpm/node_modules/@rolldown/pluginutils + + # In Nix sandbox, npm install has no network access. Patch the staging + # script to accept version-mismatched deps from root node_modules + # instead of falling back to npm install. + sed -i 's/if (installedVersion === null || !dependencyVersionSatisfied(spec, installedVersion)) {/if (installedVersion === null) {/' scripts/stage-bundled-plugin-runtime-deps.mjs pnpm build pnpm ui:build @@ -69,12 +76,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp --reflink=auto -r package.json dist node_modules $libdir/ - cp --reflink=auto -r assets docs skills patches extensions $libdir/ 2>/dev/null || true + cp --reflink=auto -r assets docs skills patches extensions $libdir/ rm -f $libdir/node_modules/.pnpm/node_modules/clawdbot \ $libdir/node_modules/.pnpm/node_modules/moltbot \ $libdir/node_modules/.pnpm/node_modules/openclaw-control-ui + # Remove broken symlinks created by pnpm workspace linking in extensions + find $libdir/extensions -xtype l -delete + makeWrapper ${lib.getExe nodejs_22} $out/bin/openclaw \ --add-flags "$libdir/dist/index.js" \ --set NODE_PATH "$libdir/node_modules" @@ -118,7 +128,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { changelog = "https://github.com/openclaw/openclaw/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; mainProgram = "openclaw"; - maintainers = with lib.maintainers; [ chrisportela ]; + maintainers = with lib.maintainers; [ + chrisportela + mkg20001 + ]; platforms = with lib.platforms; linux ++ darwin; knownVulnerabilities = [ "Project uses LLMs to parse untrusted content, making it vulnerable to prompt injection, while having full access to system by default." diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index 523ef84ebbff..45dcc40332d5 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpm = pnpm_9; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}"; fetcherVersion = 3; - hash = "sha256-AAAzo//YG5X2531C3vEhsLHRYJilRcomT5uTBSmzNmQ="; + hash = "sha256-b7GGb9+7gpaTAjUmnvBoVFNgE6a1EhpEdNBHOfMMJa4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix index 63bd38b4a70c..2c2a275f56ac 100644 --- a/pkgs/by-name/op/opencloud/package.nix +++ b/pkgs/by-name/op/opencloud/package.nix @@ -28,13 +28,13 @@ let in buildGoModule (finalAttrs: { pname = "opencloud"; - version = "5.2.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "opencloud"; tag = "v${finalAttrs.version}"; - hash = "sha256-lycqekiYAkNABl8144W8ZdUjAruc5OKp6c3FUSrLvOw="; + hash = "sha256-PWXO4lrNWHr9Yqexv4lTzAvLwnabRv4oP/CAjpdTezg="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index c9e47597e9a7..d533f9e68fec 100644 --- a/pkgs/by-name/op/opencloud/web.nix +++ b/pkgs/by-name/op/opencloud/web.nix @@ -10,20 +10,20 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-web"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-eHu12DcP2LFJaRBX6WEieucS0HkSi231ZtUSZlunCuo="; + hash = "sha256-vUDkE1rF30r6guuQIb2XLnaq+1NsyjS5L319AfCzJvA="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-YOu0a/mR4PiRQx03BkPQbZgGQzgqXHy9DDihm8aD3wc="; + hash = "sha256-uaQTWytTHsQP19IHUIXccGkx8StIjMZ3MgepRydeims="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 601bf5c6897b..40fb53890f5d 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -112,7 +112,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { cd ./packages/opencode bun --bun ./script/build.ts --single --skip-install - bun --bun ./script/schema.ts schema.json + bun --bun ./script/schema.ts config.json tui.json runHook postBuild ''; @@ -133,7 +133,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { ) } - install -Dm644 schema.json $out/share/opencode/schema.json + install -Dm644 config.json $out/share/opencode/config.json + install -Dm644 tui.json $out/share/opencode/tui.json runHook postInstall ''; @@ -153,7 +154,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { versionCheckProgramArg = "--version"; passthru = { - jsonschema = "${placeholder "out"}/share/opencode/schema.json"; + jsonschema = { + config = "${placeholder "out"}/share/opencode/config.json"; + tui = "${placeholder "out"}/share/opencode/tui.json"; + }; updateScript = nix-update-script { extraArgs = [ "--subpackage" diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix index 4a9a829b2acb..cbfb202275cb 100644 --- a/pkgs/by-name/op/openimageio/package.nix +++ b/pkgs/by-name/op/openimageio/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openimageio"; - version = "3.1.11.0"; + version = "3.1.12.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenImageIO"; tag = "v${finalAttrs.version}"; - hash = "sha256-7VP/XSYti8YbFQwofAXAolsHc0rEHw14oqN0359LYJg="; + hash = "sha256-+5X2gR2WE6rO1OkhlTe0ptfCEKRxJVjw8v73lMTzURc="; }; outputs = [ diff --git a/pkgs/by-name/ov/overturemaps/package.nix b/pkgs/by-name/ov/overturemaps/package.nix index 2b84d362553b..d5ab35d1c6a0 100644 --- a/pkgs/by-name/ov/overturemaps/package.nix +++ b/pkgs/by-name/ov/overturemaps/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonPackage rec { pname = "overturemaps"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-y91x+S6YKBldy7OWIXCJQ5HuR3KrFRdfBkfMmkaeXy8="; + hash = "sha256-rvc1MpqCdRGuMWS5CSDev9SFgyVX8VczopXU/lWAyxg="; }; nativeBuildInputs = with python3Packages; [ @@ -22,6 +22,7 @@ python3Packages.buildPythonPackage rec { click geopandas numpy + orjson pyarrow shapely ]; diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 7e58138b2ce5..29949da00c57 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -1,7 +1,15 @@ { lib, - rustPlatform, + stdenv, fetchFromGitHub, + fetchPnpmDeps, + pnpmConfigHook, + pnpm_10, + nodejs_24, + nodejs-slim, + rustPlatform, + cargo, + rustc, cmake, makeBinaryWrapper, nix-update-script, @@ -10,7 +18,10 @@ versionCheckHook, }: -rustPlatform.buildRustPackage (finalAttrs: { +# Build with pnpm instead of buildRustPackage because the upstream npm CLI is the +# JS-plugin-capable runtime. The standalone Rust `oxlint` binary intentionally +# runs without an external linter, which leaves `jsPlugins` configs inert. +stdenv.mkDerivation (finalAttrs: { pname = "oxlint"; version = "1.58.0"; @@ -21,31 +32,145 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-FqKqLO31ej9NgBdcCjzVkgjlfMHV6RZMcHbdBVVwhHs="; }; - cargoHash = "sha256-OpMGS5+pTPZvfY2EMxQMTWrCHhnxUQb9kQC/pLvrZSY="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-OpMGS5+pTPZvfY2EMxQMTWrCHhnxUQb9kQC/pLvrZSY="; + }; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + pnpm = pnpm_10; + fetcherVersion = 3; + hash = "sha256-cYlY8UHd9yWWJkktycfhbvg/7N2rY9h/jYA+QQ20rK0="; + }; + + dontUseCmakeConfigure = true; nativeBuildInputs = [ + cargo cmake makeBinaryWrapper + nodejs_24 + pnpmConfigHook + pnpm_10 + rustPlatform.cargoSetupHook + rustc ]; - buildInputs = [ - rust-jemalloc-sys - ]; + + buildInputs = [ rust-jemalloc-sys ]; env.OXC_VERSION = finalAttrs.version; - cargoBuildFlags = [ - "--bin=oxlint" - ]; - cargoTestFlags = finalAttrs.cargoBuildFlags; + buildPhase = '' + runHook preBuild - postFixup = '' - wrapProgram $out/bin/oxlint \ + pnpm --workspace-concurrency=1 --filter oxlint-app run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + local -r packageRoot="$out/lib/oxlint" + mkdir -p "$packageRoot/bin" + + cp npm/oxlint/configuration_schema.json "$packageRoot/" + cp npm/oxlint/bin/oxlint "$packageRoot/bin/oxlint" + cp -r apps/oxlint/dist "$packageRoot/dist" + + chmod +x "$packageRoot/bin/oxlint" + + makeBinaryWrapper "${lib.getExe nodejs-slim}" "$out/bin/oxlint" \ + --add-flags "$packageRoot/bin/oxlint" \ --prefix PATH : "${lib.makeBinPath [ tsgolint ]}" + + runHook postInstall ''; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + pluginTestDir="$(mktemp -d)" + cat > "$pluginTestDir/plugin.mjs" <<'EOF' + const plugin = { + meta: { name: "smoke-plugin" }, + rules: { + "always-error": { + create(context) { + return { + Program(node) { + context.report({ node, message: "plugin-smoke-ok" }); + }, + }; + }, + }, + }, + }; + export default plugin; + EOF + cat > "$pluginTestDir/.oxlintrc.jsonc" <<'EOF' + { + "jsPlugins": ["./plugin.mjs"], + "rules": { + "smoke-plugin/always-error": "error" + } + } + EOF + printf 'const value = 1;\n' > "$pluginTestDir/input.js" + + ( + cd "$pluginTestDir" + set +e + pluginOutput="$($out/bin/oxlint input.js 2>&1)" + pluginStatus=$? + set -e + test "$pluginStatus" -ne 0 + printf '%s\n' "$pluginOutput" | grep -F "plugin-smoke-ok" > /dev/null + ) + + typeAwareTestDir="$(mktemp -d)" + cat > "$typeAwareTestDir/.oxlintrc.jsonc" <<'EOF' + { + "rules": { + "typescript/no-unnecessary-type-assertion": "error" + } + } + EOF + cat > "$typeAwareTestDir/tsconfig.json" <<'EOF' + { + "compilerOptions": { + "target": "es2024", + "lib": ["ES2024", "DOM"], + "module": "es2022", + "strict": true, + "skipLibCheck": true + } + } + EOF + cat > "$typeAwareTestDir/input.ts" <<'EOF' + const str: string = "hello"; + const redundant = str as string; + + export {}; + EOF + + ( + cd "$typeAwareTestDir" + set +e + typeAwareOutput="$($out/bin/oxlint --type-aware input.ts 2>&1)" + typeAwareStatus=$? + set -e + test "$typeAwareStatus" -ne 0 + printf '%s\n' "$typeAwareOutput" | grep -F "no-unnecessary-type-assertion" > /dev/null + ) + + runHook postInstallCheck + ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^oxlint_v([0-9.]+)$" ]; }; @@ -57,5 +182,6 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "oxlint"; + inherit (nodejs-slim.meta) platforms; }; }) diff --git a/pkgs/by-name/pe/penna/package.nix b/pkgs/by-name/pe/penna/package.nix index dd5094dc2518..34b69774d8c2 100644 --- a/pkgs/by-name/pe/penna/package.nix +++ b/pkgs/by-name/pe/penna/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: let @@ -18,13 +19,7 @@ stdenvNoCC.mkDerivation { stripRoot = false; }; - installPhase = '' - runHook preInstall - - install -D -m444 -t $out/share/fonts/opentype $src/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://dotcolon.net/font/penna/"; diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix index 1b630f142b59..ba992546caa6 100644 --- a/pkgs/by-name/pi/pi-coding-agent/package.nix +++ b/pkgs/by-name/pi/pi-coding-agent/package.nix @@ -11,16 +11,16 @@ }: buildNpmPackage (finalAttrs: { pname = "pi-coding-agent"; - version = "0.62.0"; + version = "0.64.0"; src = fetchFromGitHub { owner = "badlogic"; repo = "pi-mono"; tag = "v${finalAttrs.version}"; - hash = "sha256-nUK7R9kPkULg8eP9lwyqUpzPGRJeSRv3mDgBkHacf8I="; + hash = "sha256-knCfmoTjq5RADkGRcX7AAxTBhW+2GL4pDtgvMH8pMoY="; }; - npmDepsHash = "sha256-mzFtHU3xGFZxIaQ1XTkYLmQ4UCcn9HhPVfNJ0DHi7Ps="; + npmDepsHash = "sha256-dzBmtAhm0X4TsKW9nwKVyhvYlMLphzNtKkDvubWQFPk="; npmWorkspace = "packages/coding-agent"; diff --git a/pkgs/by-name/pi/pinecone/package.nix b/pkgs/by-name/pi/pinecone/package.nix deleted file mode 100644 index 58cf9c40b5a2..000000000000 --- a/pkgs/by-name/pi/pinecone/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule { - pname = "pinecone"; - version = "0.11.0-unstable-2025-03-04"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "pinecone"; - rev = "b35aec69f59eb9bb8bd5a8c6be30fc276d3cce96"; - hash = "sha256-0jqvWdFjN4Kzhkv4Oe1obsKGW0i/MGEMX3ZhcxpsdxA="; - }; - - vendorHash = "sha256-+P10K7G0UwkbCGEi6sYTQSqO7LzIf/xmaHIr7v110Ao="; - - meta = { - description = "Peer-to-peer overlay routing for the Matrix ecosystem"; - homepage = "https://matrix-org.github.io/pinecone/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ networkexception ]; - mainProgram = "pinecone"; - broken = true; - }; -} diff --git a/pkgs/by-name/pi/piper-tts/package.nix b/pkgs/by-name/pi/piper-tts/package.nix index c1bfc60b43ec..ce1ab826fc62 100644 --- a/pkgs/by-name/pi/piper-tts/package.nix +++ b/pkgs/by-name/pi/piper-tts/package.nix @@ -29,14 +29,14 @@ in python3Packages.buildPythonApplication rec { pname = "piper-tts"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchFromGitHub { owner = "OHF-Voice"; repo = "piper1-gpl"; tag = "v${version}"; - hash = "sha256-V/ESZMUT1PXxHNN7H2ckTBVOQRRf4c/L2GNtnkXvNpA="; + hash = "sha256-FHO+1d1iJimc6KweY/O6lEvWqGCyUwnDrslEfkxYR7A="; }; patches = [ diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix index 0e0c25adb379..7067c8e219de 100644 --- a/pkgs/by-name/pi/pixi-pack/package.nix +++ b/pkgs/by-name/pi/pixi-pack/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi-pack"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "Quantco"; repo = "pixi-pack"; tag = "v${finalAttrs.version}"; - hash = "sha256-zMrr/47oTej6uyiRpPRVlfUIFtl0wesCm+qN6Y7iUkE="; + hash = "sha256-j9b+wpVUvEU/0R3inMO12TUs65Avtn3NU11gEE4hxLM="; }; - cargoHash = "sha256-FnKmUNCmLcTTYqagOYhJFp7d/qbc0OBCb8nT7ZKx3n0="; + cargoHash = "sha256-22fE8XFTt10mUGl1jYb8UgoxD/rBlX4dNkjKEgtgAR8="; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index cd00f4579f3a..b56f6007947d 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -68,6 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://pixi.sh/latest/CHANGELOG"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ + esteve xiaoxiangmoe ]; mainProgram = "pixi"; diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 2febac4b5ce4..bd89a0e4015f 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2026-03-26"; + version = "0-unstable-2026-04-02"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "95295059bea6702b583a9530f8335fa353fbf601"; - hash = "sha256-OF6dWNs23PsRgwke7ydElTPrsBXRBwI3zMuBvCaWIk4="; + rev = "2d0d60d0e456af02dfc52d79053d5a3a20fb11ff"; + hash = "sha256-mHTARhEwD7li9xJQdnjDesgZ4DE34N35oBJIqvo4aUY="; }; vendorHash = "sha256-Dzizb692xTyCmaGpIoXU9OJ0//K+0QQ04vc4Dsnh34Q="; diff --git a/pkgs/by-name/pl/plezy/git-hashes.json b/pkgs/by-name/pl/plezy/git-hashes.json index 3d8d2ebb5da4..e263d0dab5fb 100644 --- a/pkgs/by-name/pl/plezy/git-hashes.json +++ b/pkgs/by-name/pl/plezy/git-hashes.json @@ -1,4 +1,9 @@ { - "os_media_controls": "sha256-6aM7C9KuF7we//yMUQ0SZ8o+5KQ9EP5sjkzwdghM4EQ=", + "auto_updater": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", + "auto_updater_macos": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", + "auto_updater_platform_interface": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", + "auto_updater_windows": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", + "material_symbols_icons": "sha256-XRB6AZ4Q33sQKVZFA8lgdXCW/bx55h/RpmuItmFYVJM=", + "os_media_controls": "sha256-kSJov92pvzFQGIKnQb6XlwRXTY0Xs4iOZmc/390yf0c=", "wakelock_plus": "sha256-OOTRP8v5mUma3j+G+koWoAufxrynWFMMhCLecvd1MhE=" } diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix index 32200def5b56..f7cd8f1b1736 100644 --- a/pkgs/by-name/pl/plezy/package.nix +++ b/pkgs/by-name/pl/plezy/package.nix @@ -1,8 +1,10 @@ { lib, + stdenv, + stdenvNoCC, flutter338, fetchFromGitHub, - yq-go, + fetchurl, pkg-config, libsecret, jsoncpp, @@ -10,108 +12,39 @@ libass, keybinder3, ffmpeg, - sdl3, + zlib, + libevdev, + jdk, makeDesktopItem, copyDesktopItems, imagemagick, - _experimental-update-script-combinators, - nix-update-script, + _7zz, + makeBinaryWrapper, runCommand, - dart, }: -flutter338.buildFlutterApplication rec { +let pname = "plezy"; - version = "1.17.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "edde746"; repo = "plezy"; tag = version; - hash = "sha256-bJ/Qho6hkjbGOFUJj3J4XKk4Eq+3PU1VFGxik5ht16c="; + hash = "sha256-9bB9L9f2s0i2xF4JIe4vlEpt/bmF1gf3gxcoHdCrYqc="; }; - pubspecLock = lib.importJSON ./pubspec.lock.json; - - gitHashes = lib.importJSON ./git-hashes.json; - - nativeBuildInputs = [ - pkg-config - copyDesktopItems - imagemagick - ]; - - buildInputs = [ - libsecret - jsoncpp - mpv-unwrapped - libass - keybinder3 - ffmpeg - sdl3 - ]; - - postPatch = '' - # Avoid FetchContent download of SDL3 during build. - substituteInPlace linux/CMakeLists.txt \ - --replace-fail "set(BUNDLE_SDL3 ON CACHE BOOL \"\" FORCE)" \ - "set(BUNDLE_SDL3 OFF CACHE BOOL \"\" FORCE)" - ''; - - desktopItems = [ - (makeDesktopItem { - name = "plezy"; - exec = "plezy"; - icon = "plezy"; - desktopName = "Plezy"; - comment = "Modern cross-platform Plex client built with Flutter"; - categories = [ - "AudioVideo" - "Video" - "Player" - ]; - }) - ]; - - postInstall = '' - install -Dm644 assets/plezy.png $out/share/icons/hicolor/128x128/apps/plezy.png - for size in 16 24 32 48 64 256 512; do - mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps - convert assets/plezy.png -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/plezy.png - done - ''; - - passthru = { - pubspecSource = - runCommand "pubspec.lock.json" - { - inherit src; - nativeBuildInputs = [ yq-go ]; - } - '' - yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out" - ''; - updateScript = _experimental-update-script-combinators.sequence [ - (nix-update-script { }) - ( - (_experimental-update-script-combinators.copyAttrOutputToFile "plezy.pubspecSource" ./pubspec.lock.json) - // { - supportedFeatures = [ ]; - } - ) - { - command = [ - dart.fetchGitHashesScript - "--input" - ./pubspec.lock.json - "--output" - ./git-hashes.json - ]; - supportedFeatures = [ ]; - } - ]; + simdutf = fetchurl { + url = "https://github.com/simdutf/simdutf/releases/download/v6.4.2/singleheader.zip"; + hash = "sha256-n+TW9RVySlXI3oj+5EY+CJChq+ImfNoTxLXSRdWAOeY="; }; + zlib-root = runCommand "zlib-root" { } '' + mkdir $out + ln -s ${zlib.dev}/include $out/include + ln -s ${zlib}/lib $out/lib + ''; + meta = { description = "Modern cross-platform Plex client built with Flutter"; homepage = "https://github.com/edde746/plezy"; @@ -121,6 +54,107 @@ flutter338.buildFlutterApplication rec { mio miniharinn ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ [ + "x86_64-darwin" + "aarch64-darwin" + ]; + sourceProvenance = lib.optionals stdenv.hostPlatform.isDarwin ( + with lib.sourceTypes; [ binaryNativeCode ] + ); }; -} + + linux = flutter338.buildFlutterApplication rec { + inherit pname version src; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + gitHashes = lib.importJSON ./git-hashes.json; + + nativeBuildInputs = [ + pkg-config + copyDesktopItems + imagemagick + ]; + + buildInputs = [ + libsecret + jsoncpp + mpv-unwrapped + libass + keybinder3 + ffmpeg + zlib + libevdev + jdk + ]; + + env = { + ZLIB_ROOT = zlib-root; + JAVA_HOME = "${jdk}/lib/openjdk"; + }; + + postPatch = '' + substituteInPlace linux/CMakeLists.txt \ + --replace-fail "URL https://github.com/simdutf/simdutf/releases/download/v6.4.2/singleheader.zip" \ + "URL file://${simdutf}" + ''; + + desktopItems = [ + (makeDesktopItem { + name = "plezy"; + exec = "plezy"; + icon = "plezy"; + desktopName = "Plezy"; + comment = meta.description; + categories = [ + "AudioVideo" + "Video" + "Player" + ]; + }) + ]; + + postInstall = '' + install -Dm644 assets/plezy.png $out/share/icons/hicolor/128x128/apps/plezy.png + for size in 16 24 32 48 64 256 512; do + mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps + convert assets/plezy.png -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/plezy.png + done + ''; + + passthru.updateScript = ./update.sh; + + inherit meta; + }; + + darwin = stdenvNoCC.mkDerivation { + inherit pname version; + + passthru.updateScript = ./update.sh; + + src = fetchurl { + url = "https://github.com/edde746/plezy/releases/download/${version}/plezy-macos.dmg"; + hash = "sha256-a3LvwWZvLPD7yKKbC+oYXSgoHXUS+mOojzfDyW7/QOE="; + }; + + nativeBuildInputs = [ + _7zz + makeBinaryWrapper + ]; + + sourceRoot = "Plezy.app"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications/Plezy.app + cp -r . $out/Applications/Plezy.app + makeBinaryWrapper $out/Applications/Plezy.app/Contents/MacOS/Plezy $out/bin/plezy + + runHook postInstall + ''; + + inherit meta; + }; +in +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/pl/plezy/pubspec.lock.json b/pkgs/by-name/pl/plezy/pubspec.lock.json index f379f6d5469b..6121af2bbdf4 100644 --- a/pkgs/by-name/pl/plezy/pubspec.lock.json +++ b/pkgs/by-name/pl/plezy/pubspec.lock.json @@ -30,16 +30,6 @@ "source": "hosted", "version": "0.13.6" }, - "android_intent_plus": { - "dependency": "direct main", - "description": { - "name": "android_intent_plus", - "sha256": "2329378af63f49b985cb2e110ac784d08374f1e2b1984be77ba9325b1c8cce11", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.3.1" - }, "ansicolor": { "dependency": "transitive", "description": { @@ -50,16 +40,6 @@ "source": "hosted", "version": "2.0.3" }, - "archive": { - "dependency": "transitive", - "description": { - "name": "archive", - "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.7" - }, "args": { "dependency": "transitive", "description": { @@ -80,15 +60,59 @@ "source": "hosted", "version": "2.13.0" }, + "auto_updater": { + "dependency": "direct main", + "description": { + "path": "packages/auto_updater", + "ref": "9e150f7", + "resolved-ref": "9e150f71e17495b7361aedbe6df22e89ad52c254", + "url": "https://github.com/edde746/auto_updater" + }, + "source": "git", + "version": "1.0.0" + }, + "auto_updater_macos": { + "dependency": "direct overridden", + "description": { + "path": "packages/auto_updater_macos", + "ref": "9e150f7", + "resolved-ref": "9e150f71e17495b7361aedbe6df22e89ad52c254", + "url": "https://github.com/edde746/auto_updater" + }, + "source": "git", + "version": "1.0.0" + }, + "auto_updater_platform_interface": { + "dependency": "direct overridden", + "description": { + "path": "packages/auto_updater_platform_interface", + "ref": "9e150f7", + "resolved-ref": "9e150f71e17495b7361aedbe6df22e89ad52c254", + "url": "https://github.com/edde746/auto_updater" + }, + "source": "git", + "version": "1.0.0" + }, + "auto_updater_windows": { + "dependency": "direct overridden", + "description": { + "path": "packages/auto_updater_windows", + "ref": "9e150f7", + "resolved-ref": "9e150f71e17495b7361aedbe6df22e89ad52c254", + "url": "https://github.com/edde746/auto_updater" + }, + "source": "git", + "version": "1.0.0" + }, "background_downloader": { "dependency": "direct main", "description": { "name": "background_downloader", - "sha256": "2ea5322fe836c0aaf96aefd29ef1936771c71927f687cf18168dcc119666a45f", + "sha256": "4cb23d9ad4f5060944f38164e7b90d4bf99b57b2472a3bd4676e59b2db4afd06", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.5.2" + "version": "9.5.4" }, "boolean_selector": { "dependency": "transitive", @@ -104,21 +128,21 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "7174c5d84b0fed00a1f5e7543597b35d67560465ae3d909f0889b8b20419d5e3", + "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "4.0.4" }, "build_config": { "dependency": "transitive", "description": { "name": "build_config", - "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.3.0" }, "build_daemon": { "dependency": "transitive", @@ -130,35 +154,15 @@ "source": "hosted", "version": "4.1.1" }, - "build_resolvers": { - "dependency": "transitive", - "description": { - "name": "build_resolvers", - "sha256": "82730bf3d9043366ba8c02e4add05842a10739899520a6a22ddbd22d333bd5bb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.1" - }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "32c6b3d172f1f46b7c4df6bc4a47b8d88afb9e505dd4ace4af80b3c37e89832b", + "sha256": "3552e5c2874ed47cf9ed9d6813ac71b2276ee07622f48530468b8013f1767e3f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" - }, - "build_runner_core": { - "dependency": "transitive", - "description": { - "name": "build_runner_core", - "sha256": "4b188774b369104ad96c0e4ca2471e5162f0566ce277771b179bed5eabf2d048", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "9.2.1" + "version": "2.13.0" }, "built_collection": { "dependency": "transitive", @@ -174,11 +178,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d", + "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.12.0" + "version": "8.12.4" }, "cached_network_image": { "dependency": "direct main", @@ -210,25 +214,15 @@ "source": "hosted", "version": "1.3.1" }, - "chalkdart": { - "dependency": "transitive", - "description": { - "name": "chalkdart", - "sha256": "7ffc6bd39c81453fb9ba8dbce042a9c960219b75ea1c07196a7fa41c2fab9e86", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.5" - }, "characters": { "dependency": "transitive", "description": { "name": "characters", - "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.4.1" }, "charcode": { "dependency": "transitive", @@ -270,15 +264,25 @@ "source": "hosted", "version": "1.1.2" }, + "code_assets": { + "dependency": "transitive", + "description": { + "name": "code_assets", + "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, "code_builder": { "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243", + "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.11.0" + "version": "4.11.1" }, "collection": { "dependency": "transitive", @@ -324,11 +328,11 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608", + "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.5+1" + "version": "0.3.5+2" }, "crypto": { "dependency": "direct main", @@ -340,6 +344,16 @@ "source": "hosted", "version": "3.0.7" }, + "cryptography": { + "dependency": "transitive", + "description": { + "name": "cryptography", + "sha256": "3eda3029d34ec9095a27a198ac9785630fe525c0eb6a49f3d575272f8e792ef0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.9.0" + }, "csslib": { "dependency": "transitive", "description": { @@ -350,16 +364,6 @@ "source": "hosted", "version": "1.0.2" }, - "csv": { - "dependency": "transitive", - "description": { - "name": "csv", - "sha256": "c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.0" - }, "dart_code_linter": { "dependency": "direct dev", "description": { @@ -374,11 +378,11 @@ "dependency": "direct main", "description": { "name": "dart_discord_presence", - "sha256": "4679b197eb37af3676766bbfba9f1f766ba27131588237f13ea7085e9dfe068a", + "sha256": "6860826f809517d354e2af14e504e46809afde11c43ff3685c7438073d226211", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.2.0" }, "dart_style": { "dependency": "transitive", @@ -394,11 +398,11 @@ "dependency": "transitive", "description": { "name": "dbus", - "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", + "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.11" + "version": "0.7.12" }, "device_info_plus": { "dependency": "direct main", @@ -424,41 +428,41 @@ "dependency": "direct main", "description": { "name": "dio", - "sha256": "d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9", + "sha256": "aff32c08f92787a557dd5c0145ac91536481831a01b4648136373cddb0e64f8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.9.0" + "version": "5.9.2" }, "dio_web_adapter": { "dependency": "transitive", "description": { "name": "dio_web_adapter", - "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", + "sha256": "2f9e64323a7c3c7ef69567d5c800424a11f8337b8b228bad02524c9fb3c1f340", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "drift": { "dependency": "direct main", "description": { "name": "drift", - "sha256": "540cf382a3bfa99b76e51514db5b0ebcd81ce3679b7c1c9cb9478ff3735e47a1", + "sha256": "970cd188fddb111b26ea6a9b07a62bf5c2432d74147b8122c67044ae3b97e99e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.28.2" + "version": "2.31.0" }, "drift_dev": { "dependency": "direct dev", "description": { "name": "drift_dev", - "sha256": "4db0eeedc7e8bed117a9f22d867ab7a3a294300fed5c269aac90d0b3545967ca", + "sha256": "917184b2fb867b70a548a83bf0d36268423b38d39968c06cce4905683da49587", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.28.3" + "version": "2.31.0" }, "duration": { "dependency": "direct main", @@ -484,11 +488,11 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.2.0" }, "file": { "dependency": "transitive", @@ -524,21 +528,21 @@ "dependency": "direct main", "description": { "name": "flex_color_picker", - "sha256": "f5b0b53d4ae0d59b1e28dfc21d5398e5028cf8e764518e491a52fd050aa23881", + "sha256": "a0979dd61f21b634717b98eb4ceaed2bfe009fe020ce8597aaf164b9eeb57aaa", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.7.2" + "version": "3.8.0" }, "flex_seed_scheme": { "dependency": "transitive", "description": { "name": "flex_seed_scheme", - "sha256": "828291a5a4d4283590541519d8b57821946660ac61d2e07d955f81cfcab22e5d", + "sha256": "a3183753bbcfc3af106224bff3ab3e1844b73f58062136b7499919f49f3667e7", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.1" }, "flutter": { "dependency": "direct main", @@ -547,7 +551,7 @@ "version": "0.0.0" }, "flutter_cache_manager": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "flutter_cache_manager", "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386", @@ -556,16 +560,6 @@ "source": "hosted", "version": "3.4.1" }, - "flutter_launcher_icons": { - "dependency": "direct dev", - "description": { - "name": "flutter_launcher_icons", - "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.14.4" - }, "flutter_lints": { "dependency": "direct dev", "description": { @@ -596,11 +590,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95", + "sha256": "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.3" + "version": "2.2.4" }, "flutter_test": { "dependency": "direct dev", @@ -614,16 +608,6 @@ "source": "sdk", "version": "0.0.0" }, - "frontend_server_client": { - "dependency": "transitive", - "description": { - "name": "frontend_server_client", - "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.0" - }, "glob": { "dependency": "transitive", "description": { @@ -644,6 +628,16 @@ "source": "hosted", "version": "2.3.2" }, + "hooks": { + "dependency": "transitive", + "description": { + "name": "hooks", + "sha256": "e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, "html": { "dependency": "transitive", "description": { @@ -655,7 +649,7 @@ "version": "0.15.6" }, "http": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "http", "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", @@ -684,16 +678,6 @@ "source": "hosted", "version": "4.1.2" }, - "image": { - "dependency": "transitive", - "description": { - "name": "image", - "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.5.4" - }, "in_app_review": { "dependency": "direct main", "description": { @@ -734,6 +718,16 @@ "source": "hosted", "version": "1.0.5" }, + "jni": { + "dependency": "transitive", + "description": { + "name": "jni", + "sha256": "d2c361082d554d4593c3012e26f6b188f902acd291330f13d6427641a92b3da1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.2" + }, "json_annotation": { "dependency": "direct main", "description": { @@ -798,11 +792,11 @@ "dependency": "direct main", "description": { "name": "logger", - "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3", + "sha256": "25aee487596a6257655a1e091ec2ae66bc30e7af663592cc3a27e6591e05035c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.2" + "version": "2.7.0" }, "logging": { "dependency": "transitive", @@ -818,31 +812,32 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.17" + "version": "0.12.18" }, "material_color_utilities": { "dependency": "transitive", "description": { "name": "material_color_utilities", - "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.11.1" + "version": "0.13.0" }, "material_symbols_icons": { "dependency": "direct main", "description": { - "name": "material_symbols_icons", - "sha256": "02555a48e1ec02b16e532dfd4ef13c4f6bf7ec7c20230e58e56641a393433dc3", - "url": "https://pub.dev" + "path": ".", + "ref": "1d8cd83", + "resolved-ref": "1d8cd8325db29691a01738a25f220dd3515bd1e2", + "url": "https://github.com/edde746/material_symbols_icons" }, - "source": "hosted", - "version": "4.2892.0" + "source": "git", + "version": "4.2906.0" }, "meta": { "dependency": "transitive", @@ -868,11 +863,21 @@ "dependency": "direct main", "description": { "name": "mobile_scanner", - "sha256": "0b466a0a8a211b366c2e87f3345715faef9b6011c7147556ad22f37de6ba3173", + "sha256": "c92c26bf2231695b6d3477c8dcf435f51e28f87b1745966b1fe4c47a286171ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.11" + "version": "7.2.0" + }, + "native_toolchain_c": { + "dependency": "transitive", + "description": { + "name": "native_toolchain_c", + "sha256": "6ba77bb18063eebe9de401f5e6437e95e1438af0a87a3a39084fbd37c90df572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.17.6" }, "nested": { "dependency": "transitive", @@ -894,6 +899,16 @@ "source": "hosted", "version": "0.5.0" }, + "objective_c": { + "dependency": "transitive", + "description": { + "name": "objective_c", + "sha256": "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.3.0" + }, "octo_image": { "dependency": "transitive", "description": { @@ -908,8 +923,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "6463fd18875ead347e739189b9687307f629f090", - "resolved-ref": "6463fd18875ead347e739189b9687307f629f090", + "ref": "467251821f76bba37ed4c6d5ee1c9de27c285e34", + "resolved-ref": "467251821f76bba37ed4c6d5ee1c9de27c285e34", "url": "https://github.com/edde746/os-media-controls" }, "source": "git", @@ -979,21 +994,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "e122c5ea805bb6773bb12ce667611265980940145be920cd09a4b0ec0285cb16", + "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.20" + "version": "2.2.22" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "efaec349ddfc181528345c56f8eda9d6cccd71c177511b132c6a0ddaefaa2738", + "sha256": "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.3" + "version": "2.6.0" }, "path_provider_linux": { "dependency": "transitive", @@ -1029,11 +1044,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", + "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.1" + "version": "7.0.2" }, "platform": { "dependency": "transitive", @@ -1065,16 +1080,6 @@ "source": "hosted", "version": "1.5.2" }, - "posix": { - "dependency": "transitive", - "description": { - "name": "posix", - "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.3" - }, "process": { "dependency": "transitive", "description": { @@ -1169,31 +1174,31 @@ "dependency": "transitive", "description": { "name": "rxdart", - "sha256": "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.27.7" + "version": "0.28.0" }, "saf_stream": { "dependency": "direct main", "description": { "name": "saf_stream", - "sha256": "c05449997698c481a03e428162a999f93b1ee1bcc0349d651899a59f7b10230a", + "sha256": "6fa5179bf5c8f5f99b183286df6236b23de33c1e874d69ce1fe565a63f95f62b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.3" + "version": "2.0.0" }, "saf_util": { "dependency": "direct main", "description": { "name": "saf_util", - "sha256": "219f983e5f17b28998335158cdc97add9d52af9884e38b5a43f10dcc070510ec", + "sha256": "0cf5fc462fc7e466e1d5608dd5a331d88d6dd6c7b01f62a305aaf469bf3309ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.11.0" + "version": "2.0.0" }, "screen_retriever": { "dependency": "transitive", @@ -1245,35 +1250,65 @@ "source": "hosted", "version": "0.2.0" }, + "sentry": { + "dependency": "transitive", + "description": { + "name": "sentry", + "sha256": "a49b4fb1cba576fe216347dc2a0e6d76076fb998e6012857db96f991c23b7b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.15.0" + }, + "sentry_flutter": { + "dependency": "direct main", + "description": { + "name": "sentry_flutter", + "sha256": "25150030c93bd1d4b727ab61cfb09e99121c69ce90fa820bb9ca16dab433e43a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.15.0" + }, + "serial_csv": { + "dependency": "transitive", + "description": { + "name": "serial_csv", + "sha256": "2d62bb70cb3ce7251383fc86ea9aae1298ab1e57af6ef4e93b6a9751c5c268dd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.2" + }, "shared_preferences": { "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", + "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.3" + "version": "2.5.4" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713", + "sha256": "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.15" + "version": "2.4.21" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "1c33a907142607c40a7542768ec9badfd16293bac51da3a4482623d15845f88b", + "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.5" + "version": "2.5.6" }, "shared_preferences_linux": { "dependency": "transitive", @@ -1345,61 +1380,61 @@ "dependency": "direct main", "description": { "name": "slang", - "sha256": "13e3b6f07adc51ab751e7889647774d294cbce7a3382f81d9e5029acfe9c37b2", + "sha256": "ea6702ed6b1c82065fb2de906fe34ac9298117342e3c2ea2567132efdc81bd17", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.12.0" + "version": "4.14.0" }, "slang_build_runner": { "dependency": "direct dev", "description": { "name": "slang_build_runner", - "sha256": "453d74b5430153a3c4150d5ba8f6380e0785f3939f7511f10ac5b6cf9bb7d2a7", + "sha256": "1db59254041026aec97df5aca30a602e09e9d1546c3d16b55c3c7cf4c16cdb6c", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.12.0" + "version": "4.14.0" }, "slang_flutter": { "dependency": "direct main", "description": { "name": "slang_flutter", - "sha256": "0a4545cca5404d6b7487cf61cf1fe56c52daeb08de56a7574ee8381fbad035a0", + "sha256": "dcc4e77527c91b12348fc8bdd43d3eb92d8cea37c12a23a1f9719cdc12c804c6", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.12.0" + "version": "4.14.0" }, "source_gen": { "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3", + "sha256": "adc962c96fffb2de1728ef396a995aaedcafbe635abdca13d2a987ce17e57751", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "4.2.1" }, "source_helper": { "dependency": "transitive", "description": { "name": "source_helper", - "sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca", + "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.7" + "version": "1.3.8" }, "source_span": { "dependency": "transitive", "description": { "name": "source_span", - "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.1" + "version": "1.10.2" }, "sqflite": { "dependency": "transitive", @@ -1415,11 +1450,11 @@ "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88", + "sha256": "881e28efdcc9950fd8e9bb42713dcf1103e62a2e7168f23c9338d82db13dec40", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2+2" + "version": "2.4.2+3" }, "sqflite_common": { "dependency": "transitive", @@ -1465,21 +1500,21 @@ "dependency": "direct main", "description": { "name": "sqlite3_flutter_libs", - "sha256": "1e800ebe7f85a80a66adacaa6febe4d5f4d8b75f244e9838a27cb2ffc7aec08d", + "sha256": "eeb9e3a45207649076b808f8a5a74d68770d0b7f26ccef6d5f43106eee5375ad", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.41" + "version": "0.5.42" }, "sqlparser": { "dependency": "transitive", "description": { "name": "sqlparser", - "sha256": "57090342af1ce32bb499aa641f4ecdd2d6231b9403cea537ac059e803cc20d67", + "sha256": "337e9997f7141ffdd054259128553c348635fa318f7ca492f07a4ab76f850d19", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.41.2" + "version": "0.43.1" }, "stack_trace": { "dependency": "transitive", @@ -1545,21 +1580,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", + "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.7" - }, - "timing": { - "dependency": "transitive", - "description": { - "name": "timing", - "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.2" + "version": "0.7.9" }, "typed_data": { "dependency": "transitive", @@ -1575,11 +1600,11 @@ "dependency": "direct main", "description": { "name": "universal_gamepad", - "sha256": "fff36a78ac91986ec4ef6281e16df644f14b690a0c4978792e86055e0cc809ad", + "sha256": "6177944707639a20dd4f89e7f8d78bf66b40ba03d70a1962754d3bba45e14ccd", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.5.4" }, "url_launcher": { "dependency": "direct main", @@ -1595,41 +1620,41 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9", + "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.24" + "version": "6.3.28" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "6b63f1441e4f653ae799166a72b50b1767321ecc263a57aadf825a7a2a5477d9", + "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.5" + "version": "6.4.1" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "8262208506252a3ed4ff5c0dc1e973d2c0e0ef337d0a074d35634da5d44397c9", + "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.4" + "version": "3.2.5" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -1645,41 +1670,41 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", + "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.4" + "version": "3.1.5" }, "uuid": { "dependency": "direct main", "description": { "name": "uuid", - "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", + "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.2" + "version": "4.5.3" }, "vector_graphics": { "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6", + "sha256": "7076216a10d5c390315fbe536a30f1254c341e7543e6c4c8a815e591307772b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.19" + "version": "1.1.20" }, "vector_graphics_codec": { "dependency": "transitive", @@ -1695,11 +1720,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b", + "sha256": "5a88dd14c0954a5398af544651c7fb51b457a2a556949bfb25369b210ef73a74", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.20" + "version": "1.2.0" }, "vector_math": { "dependency": "transitive", @@ -1736,21 +1761,21 @@ "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2", + "sha256": "24b84143787220a403491c2e5de0877fbbb87baf3f0b18a2a988973863db4b03", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" + "version": "1.2.1" }, "web": { "dependency": "transitive", @@ -1812,46 +1837,6 @@ "source": "hosted", "version": "0.5.1" }, - "workmanager": { - "dependency": "direct main", - "description": { - "name": "workmanager", - "sha256": "065673b2a465865183093806925419d311a9a5e0995aa74ccf8920fd695e2d10", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.0+3" - }, - "workmanager_android": { - "dependency": "transitive", - "description": { - "name": "workmanager_android", - "sha256": "9ae744db4ef891f5fcd2fb8671fccc712f4f96489a487a1411e0c8675e5e8cb7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.0+2" - }, - "workmanager_apple": { - "dependency": "transitive", - "description": { - "name": "workmanager_apple", - "sha256": "1cc12ae3cbf5535e72f7ba4fde0c12dd11b757caf493a28e22d684052701f2ca", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.1+2" - }, - "workmanager_platform_interface": { - "dependency": "transitive", - "description": { - "name": "workmanager_platform_interface", - "sha256": "f40422f10b970c67abb84230b44da22b075147637532ac501729256fcea10a47", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.1+1" - }, "xdg_directories": { "dependency": "transitive", "description": { @@ -1885,6 +1870,6 @@ }, "sdks": { "dart": ">=3.10.7 <4.0.0", - "flutter": ">=3.35.0" + "flutter": ">=3.38.4" } } diff --git a/pkgs/by-name/pl/plezy/update.sh b/pkgs/by-name/pl/plezy/update.sh new file mode 100755 index 000000000000..6befc9c04271 --- /dev/null +++ b/pkgs/by-name/pl/plezy/update.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go + +set -eou pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" + +latestVersion=$(curl --fail --silent https://api.github.com/repos/edde746/plezy/releases/latest | jq --raw-output .tag_name) + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; plezy.version" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "plezy is up-to-date: $currentVersion" + exit 0 +fi + +echo "updating plezy: $currentVersion -> $latestVersion" + +sed -i "s/version = \".*\"/version = \"${latestVersion}\"/" "$ROOT/package.nix" + +GIT_SRC_URL="https://github.com/edde746/plezy/archive/refs/tags/${latestVersion}.tar.gz" +GIT_SRC_SHA=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$(nix-prefetch-url --unpack "$GIT_SRC_URL")") +sed -i "/fetchFromGitHub/,/hash/{s|hash = \".*\"|hash = \"${GIT_SRC_SHA}\"|}" "$ROOT/package.nix" + +DMG_URL="https://github.com/edde746/plezy/releases/download/${latestVersion}/plezy-macos.dmg" +DMG_SHA=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$(nix-prefetch-url "$DMG_URL")") +sed -i "/plezy-macos.dmg/,/hash/{s|hash = \".*\"|hash = \"${DMG_SHA}\"|}" "$ROOT/package.nix" + +curl --fail --silent "https://raw.githubusercontent.com/edde746/plezy/${latestVersion}/pubspec.lock" \ + | yq eval --output-format=json --prettyPrint > "$ROOT/pubspec.lock.json" + +python3 "$(dirname "$(readlink -f "$0")")/../../../development/compilers/dart/fetch-git-hashes.py" \ + --input "$ROOT/pubspec.lock.json" \ + --output "$ROOT/git-hashes.json" diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index aedaafac1f74..66ad9039cf0d 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -13,18 +13,18 @@ }: buildGo126Module (finalAttrs: { pname = "pocket-id"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; tag = "v${finalAttrs.version}"; - hash = "sha256-lH8OYBJn1tsHs2wZCbqMqevjqK+tgAqG+Z+fsWP/fV4="; + hash = "sha256-5y4XIwBnag+vWoNH3RBYn5QbmpM2S08mkY7GiLFchag="; }; sourceRoot = "${finalAttrs.src.name}/backend"; - vendorHash = "sha256-a/h8Ptvs4UTgfX9jweo1IyDbwTFafgYrzUSE5pRUjRI="; + vendorHash = "sha256-ZrwnM3X8PbR89xQrM2VeYUTRR2/HupoAb5k9sH26vb8="; env.CGO_ENABLED = 0; ldflags = [ @@ -65,7 +65,7 @@ buildGo126Module (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-vVCRfQWck9SR1hkJhUnoZ+0QDT8XmOiWeontgzv1e0s="; + hash = "sha256-4rMVdZnPMAIX/F3CGNJQJtH9OcJ663UlF+arvuwgS80="; }; env.BUILD_OUTPUT_PATH = "dist"; diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index 4363fb5fff28..b8eb6e18c1dd 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "polarity"; - version = "latest-unstable-2026-03-23"; + version = "latest-unstable-2026-03-27"; src = fetchFromGitHub { owner = "polarity-lang"; repo = "polarity"; - rev = "134d730457e0e874308d0f0abab4600eb89bf084"; - hash = "sha256-EzPNv9GmHqIcSkADEVDBLzlWD/kubQIWBfYeCWowAhw="; + rev = "5d253a2701288573a32b58fbf592c66254b825ee"; + hash = "sha256-jOIuBqJd5dKxEwHoaMMV4Jh9tOhQLkrIuuKsszPkpnE="; }; cargoHash = "sha256-eat5XK8GZlbdPdkcrvOF99ln0a2SHZexAnqH55i8Vec="; diff --git a/pkgs/by-name/po/pony-corral/package.nix b/pkgs/by-name/po/pony-corral/package.nix index 32647363b155..20693eae01a2 100644 --- a/pkgs/by-name/po/pony-corral/package.nix +++ b/pkgs/by-name/po/pony-corral/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { if stdenv.hostPlatform.isx86_64 then "x86-64" else if stdenv.hostPlatform.isAarch64 then - "armv8-a" + "generic" else lib.warn '' architecture '${stdenv.hostPlatform.system}' compiles with native optimizations, diff --git a/pkgs/by-name/pr/premid/package.nix b/pkgs/by-name/pr/premid/package.nix deleted file mode 100644 index 5f4bff2fcb04..000000000000 --- a/pkgs/by-name/pr/premid/package.nix +++ /dev/null @@ -1,167 +0,0 @@ -{ - autoPatchelfHook, - makeDesktopItem, - lib, - stdenv, - wrapGAppsHook3, - fetchurl, - copyDesktopItems, - alsa-lib, - at-spi2-atk, - at-spi2-core, - atk, - cairo, - cups, - dbus, - expat, - fontconfig, - freetype, - gdk-pixbuf, - glib, - gtk3, - libcxx, - libdrm, - libnotify, - libpulseaudio, - libuuid, - libx11, - libxscrnsaver, - libxcomposite, - libxcursor, - libxdamage, - libxext, - libxfixes, - libxi, - libxrandr, - libxrender, - libxtst, - libxcb, - libxshmfence, - libgbm, - nspr, - nss, - pango, - systemd, - libappindicator-gtk3, - libdbusmenu, -}: - -stdenv.mkDerivation rec { - pname = "premid"; - version = "2.3.4"; - - src = fetchurl { - url = "https://github.com/premid/Linux/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-ime6SCxm+fhMR2wagv1RItqwLjPxvJnVziW3DZafP50="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook3 - copyDesktopItems - ]; - - buildInputs = [ - alsa-lib - cups - libdrm - libuuid - libxdamage - libx11 - libxscrnsaver - libxtst - libxcb - libxshmfence - libgbm - nss - ]; - - dontWrapGApps = true; - dontBuild = true; - dontConfigure = true; - - libPath = lib.makeLibraryPath [ - libcxx - systemd - libpulseaudio - libdrm - libgbm - stdenv.cc.cc - alsa-lib - atk - at-spi2-atk - at-spi2-core - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libnotify - libx11 - libxcomposite - libuuid - libxcursor - libxdamage - libxext - libxfixes - libxi - libxrandr - libxrender - libxtst - nspr - nss - libxcb - pango - systemd - libxscrnsaver - libappindicator-gtk3 - libdbusmenu - ]; - - installPhase = '' - mkdir -p $out/{bin,opt/PreMiD,share/pixmaps} - mv * $out/opt/PreMiD - - chmod +x $out/opt/PreMiD/${pname} - patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ - $out/opt/PreMiD/${pname} - - wrapProgram $out/opt/PreMiD/${pname} \ - "''${gappsWrapperArgs[@]}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${pname} - - ln -s $out/opt/PreMiD/${pname} $out/bin/ - ''; - - # This is the icon used by the desktop file - postInstall = '' - ln -s $out/opt/PreMiD/assets/appIcon.png $out/share/pixmaps/${pname}.png - ''; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = "PreMiD"; - icon = pname; - desktopName = "PreMiD"; - genericName = meta.description; - mimeTypes = [ "x-scheme-handler/premid" ]; - }) - ]; - - meta = { - description = "Simple, configurable utility to show your web activity as playing status on Discord"; - homepage = "https://premid.app"; - downloadPage = "https://premid.app/downloads"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ natto1784 ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "premid"; - }; -} diff --git a/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix b/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix index 2f6862ac6dcd..97d8506cc77c 100644 --- a/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix @@ -30,5 +30,6 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/Tinkoff/libvirt-exporter"; license = lib.licenses.asl20; maintainers = [ ]; + mainProgram = "libvirt-exporter"; }; }) diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index ac5e4bc80de4..da4dde42567d 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "node_exporter"; - version = "1.10.2"; + version = "1.11.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "node_exporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-UaybbRmcvifXNwTNXg7mIYN9JnonSxwG62KfvU5auIE="; + hash = "sha256-cZ7MGh80LIPTrTzgR6W+gl6BUc7ss60mjocwm1BMXC0="; }; - vendorHash = "sha256-zQn3Hn40zZT3ZLiYQc/68i9t791eisBSiB6Re24/Ncg="; + vendorHash = "sha256-qTuzF4xeF0riOedwaUR4x/U6Jb0j+GIwUfUfstp2Cao="; # FIXME: tests fail due to read-only nix store doCheck = false; diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix index 56aa3c8c6657..cbd430e0e3dc 100644 --- a/pkgs/by-name/pr/proton-pass-cli/package.nix +++ b/pkgs/by-name/pr/proton-pass-cli/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "proton-pass-cli"; - version = "1.8.0"; + version = "1.9.0"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; @@ -46,19 +46,19 @@ stdenv.mkDerivation (finalAttrs: { sources = { "aarch64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64"; - hash = "sha256-6kFY7cLN/xCez4aeprV4HllPxxTECiV2jI475izsrI8="; + hash = "sha256-mLYtw8ON2B+RUXVkD10VyI03d3yrdwFFz8giDb/PiNg="; }; "aarch64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64"; - hash = "sha256-t3AyOLF0mXh9eCxBOh3e8WPBPowv9pWZ2WQTCTl+StA="; + hash = "sha256-dg7jNFrzuIeXKN3wV3nj92acwP1lqE3QHsuiosjrvLw="; }; "x86_64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64"; - hash = "sha256-f8P0Pv4DUJPlcF4qPmqlLEHFfRYkLrxmPIgakUFYZlk="; + hash = "sha256-C9nWUikfaCfroVwz4C9K9dNMUpP6kbpHuuHMRTch5aU="; }; "x86_64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64"; - hash = "sha256-M7zWxVYHHjM86/l3K+0AR8QceiydP0n0sXj9rSctaeI="; + hash = "sha256-m3HllX9YAmavVbkAyJ5h69QCcH2i4Ux+p17e0/VGovQ="; }; }; updateScript = writeShellScript "update-proton-pass-cli" '' diff --git a/pkgs/by-name/pr/protonmail-export/package.nix b/pkgs/by-name/pr/protonmail-export/package.nix index 403f6f41f789..918c17a023d1 100644 --- a/pkgs/by-name/pr/protonmail-export/package.nix +++ b/pkgs/by-name/pr/protonmail-export/package.nix @@ -18,22 +18,21 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "protonmail-export"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-mail-export"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-rpfTI3vcZlEK1TrxRMMHFKutwC/YqAZrZCFiUsfMafc="; + hash = "sha256-ZYUqbxT9Aq3iaXdaCag4xstbrm9z9X435zm/Qz8OOyM="; }; goModules = (buildGoModule { - pname = "protonmail-export-go-modules"; - inherit (finalAttrs) src version; + inherit (finalAttrs) pname src version; sourceRoot = "${finalAttrs.src.name}/go-lib"; - vendorHash = "sha256-rKi3PNsYsZA+MLcLTVrVI3T2SUBZCiq9Zxtf+1SGArk="; + vendorHash = "sha256-jtrfxKPFTiowllHDR7fo8GaeyhcPxAAXehBTk4bXKn8="; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/by-name/py/pyxel/Cargo.lock b/pkgs/by-name/py/pyxel/Cargo.lock index ceb33dd96ddb..dba923e7a5d6 100644 --- a/pkgs/by-name/py/pyxel/Cargo.lock +++ b/pkgs/by-name/py/pyxel/Cargo.lock @@ -4,30 +4,42 @@ version = 4 [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] [[package]] -name = "aligned-vec" -version = "0.5.0" +name = "aligned" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" +checksum = "ee4508988c62edf04abd8d92897fca0c2995d907ce1dfeaf369dac3716a40685" +dependencies = [ + "as-slice", +] [[package]] -name = "android-tzdata" -version = "0.1.1" +name = "aligned-vec" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b" +dependencies = [ + "equator", +] + +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android_system_properties" @@ -40,18 +52,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "arbitrary" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" -dependencies = [ - "derive_arbitrary", -] +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" [[package]] name = "arg_enum_proc_macro" @@ -71,41 +80,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] -name = "autocfg" -version = "1.4.0" +name = "as-slice" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "av-scenechange" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f321d77c20e19b92c39e7471cf986812cbb46659d2af674adc4331ef3f18394" +dependencies = [ + "aligned", + "anyhow", + "arg_enum_proc_macro", + "arrayvec", + "log", + "num-rational", + "num-traits", + "pastey", + "rayon", + "thiserror", + "v_frame", + "y4m", +] [[package]] name = "av1-grain" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +checksum = "8cfddb07216410377231960af4fcab838eaa12e013417781b78bd95ee22077f8" dependencies = [ "anyhow", "arrayvec", "log", - "nom", + "nom 8.0.0", "num-rational", "v_frame", ] [[package]] name = "avif-serialize" -version = "0.8.3" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98922d6a4cfbcb08820c69d8eeccc05bb1f29bfa06b4f5b1dbfe9a868bd7608e" +checksum = "375082f007bd67184fb9c0374614b29f9aaa604ec301635f72338bb65386a53d" dependencies = [ "arrayvec", ] [[package]] name = "bindgen" -version = "0.71.1" +version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.11.0", "cexpr", "clang-sys", "itertools 0.13.0", @@ -121,9 +159,9 @@ dependencies = [ [[package]] name = "bit_field" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" +checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6" [[package]] name = "bitflags" @@ -133,33 +171,42 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" [[package]] name = "bitstream-io" -version = "2.6.0" +version = "4.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6099cdc01846bc367c4e7dd630dc5966dccf36b652fae7a74e17b640411a91b2" +checksum = "60d4bd9d1db2c6bdf285e223a7fa369d5ce98ec767dec949c6ca62863ce61757" +dependencies = [ + "core2", +] + +[[package]] +name = "blip_buf" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d01761ce5061c5345c211c47958ee76989241021a9e3c16d3c0a35a309462fb5" [[package]] name = "built" -version = "0.7.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ed6191a7e78c36abdb16ab65341eefd73d64d303fffccdbb00d51e4205967b" +checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64" [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "bytemuck" -version = "1.22.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" +checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" [[package]] name = "byteorder-lite" @@ -169,10 +216,11 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "cc" -version = "1.2.19" +version = "1.2.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" +checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -184,32 +232,32 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "nom", -] - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon 0.12.16", + "nom 7.1.3", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" + +[[package]] +name = "chacha20" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +dependencies = [ + "cfg-if", + "cpufeatures", + "rand_core 0.10.0", +] [[package]] name = "chrono" -version = "0.4.40" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", "num-traits", @@ -230,9 +278,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.54" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d" dependencies = [ "cc", ] @@ -250,10 +298,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] -name = "crc32fast" -version = "1.4.2" +name = "core2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -285,20 +351,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" - -[[package]] -name = "derive_arbitrary" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "directories" @@ -327,6 +382,35 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equator" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc" +dependencies = [ + "equator-macro", +] + +[[package]] +name = "equator-macro" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "equivalent" version = "1.0.2" @@ -335,9 +419,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.11" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", "windows-sys", @@ -345,9 +429,9 @@ dependencies = [ [[package]] name = "exr" -version = "1.73.0" +version = "1.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0" +checksum = "4300e043a56aa2cb633c01af81ca8f699a321879a7854d3896a0ba89056363be" dependencies = [ "bit_field", "half", @@ -358,6 +442,32 @@ dependencies = [ "zune-inflate", ] +[[package]] +name = "extended" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365" + +[[package]] +name = "fax" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" +dependencies = [ + "fax_derive", +] + +[[package]] +name = "fax_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "fdeflate" version = "0.3.7" @@ -369,54 +479,90 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.25" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db" dependencies = [ "cfg-if", "libc", "libredox", - "windows-sys", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" + [[package]] name = "flate2" -version = "1.1.1" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", "miniz_oxide", + "zlib-rs", +] + +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +name = "fontdue" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e57e16b3fe8ff4364c0661fdaac543fb38b29ea9bc9c2f45612d90adf931d2b" +dependencies = [ + "hashbrown 0.15.5", + "ttf-parser", ] [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "getrandom" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", - "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "r-efi 5.3.0", + "wasip2", +] + +[[package]] +name = "getrandom" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", + "rand_core 0.10.0", + "wasip2", + "wasip3", ] [[package]] name = "gif" -version = "0.13.1" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +checksum = "f5df2ba84018d80c213569363bdcd0c64e6933c67fe4c1d60ecf822971a3c35e" dependencies = [ "color_quant", "weezl", @@ -424,15 +570,15 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "glow" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08" +checksum = "29038e1c483364cc6bb3cf78feee1816002e127c331a1eec55a4d202b9e1adb5" dependencies = [ "js-sys", "slotmap", @@ -442,19 +588,31 @@ dependencies = [ [[package]] name = "half" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" +checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ "cfg-if", "crunchy", + "zerocopy", ] [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "heck" @@ -470,9 +628,9 @@ checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f" [[package]] name = "iana-time-zone" -version = "0.1.63" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -480,7 +638,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.61.0", + "windows-core", ] [[package]] @@ -493,10 +651,16 @@ dependencies = [ ] [[package]] -name = "image" -version = "0.25.6" +name = "id-arena" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + +[[package]] +name = "image" +version = "0.25.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104" dependencies = [ "bytemuck", "byteorder-lite", @@ -504,6 +668,7 @@ dependencies = [ "exr", "gif", "image-webp", + "moxcms", "num-traits", "png", "qoi", @@ -517,9 +682,9 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f" +checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3" dependencies = [ "byteorder-lite", "quick-error", @@ -527,26 +692,22 @@ dependencies = [ [[package]] name = "imgref" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408" +checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8" [[package]] name = "indexmap" -version = "2.9.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.16.1", + "serde", + "serde_core", ] -[[package]] -name = "indoc" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" - [[package]] name = "interpolate_name" version = "0.2.4" @@ -559,12 +720,12 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.12.1" +name = "inventory" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "009ae045c87e7082cb72dab0ccd01ae075dd00141ddc108f43a0ea150a9e7227" dependencies = [ - "either", + "rustversion", ] [[package]] @@ -577,48 +738,69 @@ dependencies = [ ] [[package]] -name = "jobserver" -version = "0.1.33" +name = "itertools" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ - "getrandom 0.3.2", + "either", +] + +[[package]] +name = "itoa" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" + +[[package]] +name = "jobserver" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +dependencies = [ + "getrandom 0.3.4", "libc", ] -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c" dependencies = [ "once_cell", "wasm-bindgen", ] [[package]] -name = "lebe" -version = "0.5.2" +name = "lazy_static" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + +[[package]] +name = "lebe" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" [[package]] name = "libc" -version = "0.2.172" +version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "libfuzzer-sys" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf78f52d400cf2d84a3a973a78a592b4adc535739e0a5597a0da6f0c357adc75" +checksum = "f12a681b7dd8ce12bff52488013ba614b869148d54dd79836ab85aafdd53f08d" dependencies = [ "arbitrary", "cc", @@ -626,46 +808,37 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.6" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-targets", + "windows-link", ] [[package]] name = "libredox" -version = "0.1.3" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.11.0", "libc", + "plain", "redox_syscall", ] [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "log" -version = "0.4.27" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "loop9" @@ -688,18 +861,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.4" +version = "2.8.0" 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", -] +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "minimal-lexical" @@ -709,14 +873,24 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", "simd-adler32", ] +[[package]] +name = "moxcms" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b" +dependencies = [ + "num-traits", + "pxfm", +] + [[package]] name = "new_debug_unreachable" version = "1.0.6" @@ -744,6 +918,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nom" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" +dependencies = [ + "memchr", +] + [[package]] name = "noop_proc_macro" version = "0.3.0" @@ -752,9 +935,9 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "ntapi" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae" dependencies = [ "winapi", ] @@ -811,18 +994,28 @@ dependencies = [ [[package]] name = "objc2-core-foundation" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166" +checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.11.0", +] + +[[package]] +name = "objc2-io-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15" +dependencies = [ + "libc", + "objc2-core-foundation", ] [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "option-ext" @@ -830,29 +1023,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - [[package]] name = "paste" version = "1.0.15" @@ -860,18 +1030,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] -name = "pkg-config" -version = "0.3.32" +name = "pastey" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "png" -version = "0.17.16" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" +checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.11.0", "crc32fast", "fdeflate", "flate2", @@ -880,9 +1056,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "ppv-lite86" @@ -895,9 +1071,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.32" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", "syn", @@ -905,65 +1081,67 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] name = "profiling" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d" +checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773" dependencies = [ "profiling-procmacros", ] [[package]] name = "profiling-procmacros" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30" +checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" dependencies = [ "quote", "syn", ] [[package]] -name = "pyo3" -version = "0.24.2" +name = "pxfm" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" +checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d" + +[[package]] +name = "pyo3" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf85e27e86080aafd5a22eae58a162e133a589551542b3e5cee4beb27e54f8e1" dependencies = [ - "cfg-if", - "indoc", + "inventory", "libc", - "memoffset", "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", - "unindent", ] [[package]] name = "pyo3-build-config" -version = "0.24.2" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" +checksum = "8bf94ee265674bf76c09fa430b0e99c26e319c945d96ca0d5a8215f31bf81cf7" dependencies = [ - "once_cell", - "target-lexicon 0.13.2", + "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.24.2" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" +checksum = "491aa5fc66d8059dd44a75f4580a2962c1862a1c2945359db36f6c2818b748dc" dependencies = [ "libc", "pyo3-build-config", @@ -971,9 +1149,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.24.2" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" +checksum = "f5d671734e9d7a43449f8480f8b38115df67bef8d21f76837fa75ee7aaa5e52e" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -983,9 +1161,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.24.2" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" +checksum = "22faaa1ce6c430a1f71658760497291065e6450d7b5dc2bcf254d49f66ee700a" dependencies = [ "heck", "proc-macro2", @@ -995,52 +1173,44 @@ dependencies = [ ] [[package]] -name = "pyxel-engine" -version = "2.3.18" +name = "pyxel-binding" +version = "2.8.8" dependencies = [ - "cfg-if", + "pyo3", + "pyxel-core", + "sysinfo", +] + +[[package]] +name = "pyxel-core" +version = "2.8.8" +dependencies = [ + "bindgen", + "blip_buf", "chrono", + "cmake", "directories", + "flate2", + "fontdue", "gif", "glow", "hound", "image", "indexmap", + "libc", "noise", - "parking_lot", - "pyxel-platform", - "rand 0.9.1", + "paste", + "rand 0.10.0", "rand_xoshiro", "semver", "serde", "serde-xml-rs", + "symphonia", + "tar", "toml", "zip", ] -[[package]] -name = "pyxel-platform" -version = "2.3.18" -dependencies = [ - "bindgen", - "cfg-if", - "cmake", - "flate2", - "glow", - "parking_lot", - "paste", - "tar", -] - -[[package]] -name = "pyxel-wrapper" -version = "2.3.18" -dependencies = [ - "pyo3", - "pyxel-engine", - "sysinfo", -] - [[package]] name = "qoi" version = "0.4.1" @@ -1058,18 +1228,24 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.40" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] [[package]] name = "r-efi" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" @@ -1077,29 +1253,28 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc", - "rand_chacha 0.3.1", "rand_core 0.6.4", ] [[package]] name = "rand" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "rand_chacha 0.9.0", - "rand_core 0.9.3", + "rand_chacha", + "rand_core 0.9.5", ] [[package]] -name = "rand_chacha" -version = "0.3.1" +name = "rand" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", + "chacha20", + "getrandom 0.4.2", + "rand_core 0.10.0", ] [[package]] @@ -1109,7 +1284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -1117,18 +1292,21 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + +[[package]] +name = "rand_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.3.4", ] [[package]] name = "rand_core" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" -dependencies = [ - "getrandom 0.3.2", -] +checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" [[package]] name = "rand_xorshift" @@ -1141,28 +1319,30 @@ dependencies = [ [[package]] name = "rand_xoshiro" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41" +checksum = "1f0b2cc7bfeef8f0320ca45f88b00157a03c67137022d59393614352d6bf4312" dependencies = [ - "rand_core 0.9.3", + "rand_core 0.10.0", ] [[package]] name = "rav1e" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +checksum = "43b6dd56e85d9483277cde964fd1bdb0428de4fec5ebba7540995639a21cb32b" dependencies = [ + "aligned-vec", "arbitrary", "arg_enum_proc_macro", "arrayvec", + "av-scenechange", "av1-grain", "bitstream-io", "built", "cfg-if", "interpolate_name", - "itertools 0.12.1", + "itertools 0.14.0", "libc", "libfuzzer-sys", "log", @@ -1171,23 +1351,21 @@ dependencies = [ "noop_proc_macro", "num-derive", "num-traits", - "once_cell", "paste", "profiling", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand 0.9.2", + "rand_chacha", "simd_helpers", - "system-deps", - "thiserror 1.0.69", + "thiserror", "v_frame", "wasm-bindgen", ] [[package]] name = "ravif" -version = "0.11.12" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6a5f31fcf7500f9401fea858ea4ab5525c99f2322cfcee732c0e6c74208c0c6" +checksum = "e52310197d971b0f5be7fe6b57530dcd27beb35c1b013f29d66c1ad73fbbcc45" dependencies = [ "avif-serialize", "imgref", @@ -1200,9 +1378,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -1210,9 +1388,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -1220,29 +1398,29 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.11" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" +checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.11.0", ] [[package]] name = "redox_users" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", "libredox", - "thiserror 2.0.12", + "thiserror", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -1252,9 +1430,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -1263,15 +1441,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "rgb" -version = "0.8.50" +version = "0.8.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" +checksum = "47b34b781b31e5d73e9fbc8689c70551fd1ade9a19e3e28cfec8580a79290cc4" [[package]] name = "rustc-hash" @@ -1281,11 +1459,11 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustix" -version = "1.0.5" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.11.0", "errno", "libc", "linux-raw-sys", @@ -1294,48 +1472,52 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "semver" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] [[package]] name = "serde-xml-rs" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" +checksum = "cc2215ce3e6a77550b80a1c37251b7d294febaf42e36e21b7b411e0bf54d540d" dependencies = [ "log", "serde", - "thiserror 1.0.69", - "xml-rs", + "thiserror", + "xml", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1343,12 +1525,25 @@ dependencies = [ ] [[package]] -name = "serde_spanned" -version = "0.6.8" +name = "serde_json" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ + "itoa", + "memchr", "serde", + "serde_core", + "zmij", +] + +[[package]] +name = "serde_spanned" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876ac351060d4f882bb1032b6369eb0aef79ad9df1ea8bc404874d8cc3d0cd98" +dependencies = [ + "serde_core", ] [[package]] @@ -1359,9 +1554,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "simd-adler32" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" [[package]] name = "simd_helpers" @@ -1374,24 +1569,199 @@ dependencies = [ [[package]] name = "slotmap" -version = "1.0.7" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038" dependencies = [ "version_check", ] [[package]] name = "smallvec" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + +[[package]] +name = "symphonia" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5773a4c030a19d9bfaa090f49746ff35c75dfddfa700df7a5939d5e076a57039" +dependencies = [ + "lazy_static", + "symphonia-bundle-flac", + "symphonia-bundle-mp3", + "symphonia-codec-aac", + "symphonia-codec-adpcm", + "symphonia-codec-alac", + "symphonia-codec-pcm", + "symphonia-codec-vorbis", + "symphonia-core", + "symphonia-format-mkv", + "symphonia-format-ogg", + "symphonia-format-riff", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-bundle-flac" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c91565e180aea25d9b80a910c546802526ffd0072d0b8974e3ebe59b686c9976" +dependencies = [ + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-bundle-mp3" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4872dd6bb56bf5eac799e3e957aa1981086c3e613b27e0ac23b176054f7c57ed" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-codec-aac" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c263845aa86881416849c1729a54c7f55164f8b96111dba59de46849e73a790" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-adpcm" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dddc50e2bbea4cfe027441eece77c46b9f319748605ab8f3443350129ddd07f" +dependencies = [ + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-alac" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8413fa754942ac16a73634c9dfd1500ed5c61430956b33728567f667fdd393ab" +dependencies = [ + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-pcm" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e89d716c01541ad3ebe7c91ce4c8d38a7cf266a3f7b2f090b108fb0cb031d95" +dependencies = [ + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-vorbis" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f025837c309cd69ffef572750b4a2257b59552c5399a5e49707cc5b1b85d1c73" +dependencies = [ + "log", + "symphonia-core", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-core" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea00cc4f79b7f6bb7ff87eddc065a1066f3a43fe1875979056672c9ef948c2af" +dependencies = [ + "arrayvec", + "bitflags 1.3.2", + "bytemuck", + "lazy_static", + "log", +] + +[[package]] +name = "symphonia-format-mkv" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "122d786d2c43a49beb6f397551b4a050d8229eaa54c7ddf9ee4b98899b8742d0" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-format-ogg" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b4955c67c1ed3aa8ae8428d04ca8397fbef6a19b2b051e73b5da8b1435639cb" +dependencies = [ + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-format-riff" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2d7c3df0e7d94efb68401d81906eae73c02b40d5ec1a141962c592d0f11a96f" +dependencies = [ + "extended", + "log", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-metadata" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36306ff42b9ffe6e5afc99d49e121e0bd62fe79b9db7b9681d48e29fa19e6b16" +dependencies = [ + "encoding_rs", + "lazy_static", + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-utils-xiph" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27c85ab799a338446b68eec77abf42e1a6f1bb490656e121c6e27bfbab9f16" +dependencies = [ + "symphonia-core", + "symphonia-metadata", +] [[package]] name = "syn" -version = "2.0.100" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -1400,35 +1770,23 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.34.2" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b93974b3d3aeaa036504b8eefd4c039dced109171c1ae973f1dc63b2c7e4b2" +checksum = "92ab6a2f8bfe508deb3c6406578252e491d299cbbf3bc0529ecc3313aee4a52f" dependencies = [ "libc", "memchr", "ntapi", "objc2-core-foundation", + "objc2-io-kit", "windows", ] -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - [[package]] name = "tar" -version = "0.4.44" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a" +checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973" dependencies = [ "filetime", "libc", @@ -1437,50 +1795,24 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "target-lexicon" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" +checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "thiserror" -version = "1.0.69" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" -dependencies = [ - "thiserror-impl 2.0.12", + "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.69" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", @@ -1489,78 +1821,92 @@ dependencies = [ [[package]] name = "tiff" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +checksum = "b63feaf3343d35b6ca4d50483f94843803b0f51634937cc2ec519fc32232bc52" dependencies = [ + "fax", "flate2", - "jpeg-decoder", + "half", + "quick-error", "weezl", + "zune-jpeg", ] [[package]] name = "toml" -version = "0.8.20" +version = "1.1.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +checksum = "f8195ca05e4eb728f4ba94f3e3291661320af739c4e43779cbdfae82ab239fcc" dependencies = [ "indexmap", - "serde", + "serde_core", "serde_spanned", "toml_datetime", + "toml_parser", + "toml_writer", "winnow", ] [[package]] -name = "unicode-ident" -version = "1.0.18" +name = "toml_datetime" +version = "1.1.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "97251a7c317e03ad83774a8752a7e81fb6067740609f75ea2b585b569a59198f" +dependencies = [ + "serde_core", +] [[package]] -name = "unindent" -version = "0.2.4" +name = "toml_parser" +version = "1.1.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" +checksum = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011" +dependencies = [ + "winnow", +] + +[[package]] +name = "toml_writer" +version = "1.1.0+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d282ade6016312faf3e41e57ebbba0c073e4056dab1232ab1cb624199648f8ed" + +[[package]] +name = "ttf-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + +[[package]] +name = "typed-path" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e28f89b80c87b8fb0cf04ab448d5dd0dd0ade2f8891bae878de66a75a28600e" + +[[package]] +name = "unicode-ident" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "v_frame" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +checksum = "666b7727c8875d6ab5db9533418d7c764233ac9c0cff1d469aec8fa127597be2" dependencies = [ "aligned-vec", "num-traits", "wasm-bindgen", ] -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - [[package]] name = "version_check" version = "0.9.5" @@ -1569,50 +1915,46 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" +name = "wasip2" +version = "1.0.2+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen", +] + +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" +dependencies = [ + "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1620,31 +1962,65 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3" dependencies = [ + "bumpalo", "proc-macro2", "quote", "syn", - "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16" dependencies = [ "unicode-ident", ] [[package]] -name = "web-sys" -version = "0.3.77" +name = "wasm-encoder" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags 2.11.0", + "hashbrown 0.15.5", + "indexmap", + "semver", +] + +[[package]] +name = "web-sys" +version = "0.3.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9" dependencies = [ "js-sys", "wasm-bindgen", @@ -1652,9 +2028,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.8" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" +checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] name = "winapi" @@ -1680,55 +2056,54 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.57.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ - "windows-core 0.57.0", - "windows-targets", + "windows-collections", + "windows-core", + "windows-future", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" +dependencies = [ + "windows-core", ] [[package]] name = "windows-core" -version = "0.57.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement 0.57.0", - "windows-interface 0.57.0", - "windows-result 0.1.2", - "windows-targets", -] - -[[package]] -name = "windows-core" -version = "0.61.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" -dependencies = [ - "windows-implement 0.60.0", - "windows-interface 0.59.1", + "windows-implement", + "windows-interface", "windows-link", - "windows-result 0.3.2", + "windows-result", "windows-strings", ] [[package]] -name = "windows-implement" -version = "0.57.0" +name = "windows-future" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" dependencies = [ - "proc-macro2", - "quote", - "syn", + "windows-core", + "windows-link", + "windows-threading", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -1737,20 +2112,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.57.0" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-interface" -version = "0.59.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -1759,158 +2123,186 @@ dependencies = [ [[package]] name = "windows-link" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] -name = "windows-result" -version = "0.1.2" +name = "windows-numerics" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" dependencies = [ - "windows-targets", + "windows-core", + "windows-link", ] [[package]] name = "windows-result" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ "windows-link", ] [[package]] name = "windows-strings" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ "windows-link", ] [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-targets", + "windows-link", ] [[package]] -name = "windows-targets" -version = "0.52.6" +name = "windows-threading" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows-link", ] -[[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.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[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.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[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.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - [[package]] name = "winnow" -version = "0.7.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" +checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" + +[[package]] +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" dependencies = [ - "memchr", + "wit-bindgen-rust-macro", ] [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "wit-bindgen-core" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" dependencies = [ - "bitflags 2.9.0", + "anyhow", + "heck", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck", + "indexmap", + "prettyplease", + "syn", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags 2.11.0", + "indexmap", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", ] [[package]] name = "xattr" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", "rustix", ] [[package]] -name = "xml-rs" -version = "0.8.26" +name = "xml" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda" +checksum = "b8aa498d22c9bbaf482329839bc5620c46be275a19a812e9a22a2b07529a642a" + +[[package]] +name = "y4m" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448" [[package]] name = "zerocopy" -version = "0.8.24" +version = "0.8.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" +checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.24" +version = "0.8.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" +checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89" dependencies = [ "proc-macro2", "quote", @@ -1919,24 +2311,35 @@ dependencies = [ [[package]] name = "zip" -version = "2.6.1" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dcb24d0152526ae49b9b96c1dcf71850ca1e0b882e4e28ed898a93c41334744" +checksum = "7756d0206d058333667493c4014f545f4b9603c4330ccd6d9b3f86dcab59f7d9" dependencies = [ - "arbitrary", "crc32fast", - "crossbeam-utils", "flate2", "indexmap", "memchr", + "typed-path", "zopfli", ] [[package]] -name = "zopfli" -version = "0.8.2" +name = "zlib-rs" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7" +checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513" + +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" + +[[package]] +name = "zopfli" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249" dependencies = [ "bumpalo", "crc32fast", @@ -1946,9 +2349,9 @@ dependencies = [ [[package]] name = "zune-core" -version = "0.4.12" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" +checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9" [[package]] name = "zune-inflate" @@ -1961,9 +2364,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.14" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028" +checksum = "0b7a1c0af6e5d8d1363f4994b7a091ccf963d8b694f7da5b0b9cceb82da2c0a6" dependencies = [ "zune-core", ] diff --git a/pkgs/by-name/py/pyxel/never-bundle-sdl2.patch b/pkgs/by-name/py/pyxel/never-bundle-sdl2.patch deleted file mode 100644 index dc53e63bc6ca..000000000000 --- a/pkgs/by-name/py/pyxel/never-bundle-sdl2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/rust/pyxel-platform/build.rs b/rust/pyxel-platform/build.rs -index 45eecae..f385eb9 100644 ---- a/rust/pyxel-platform/build.rs -+++ b/rust/pyxel-platform/build.rs -@@ -31,7 +31,7 @@ impl SDL2BindingsBuilder { - } - - fn should_bundle_sdl2(&self) -> bool { -- self.target_os.contains("windows") || self.target_os == "darwin" -+ false - } - - fn download_sdl2(&self) { diff --git a/pkgs/by-name/py/pyxel/package.nix b/pkgs/by-name/py/pyxel/package.nix index 3770dd9aea92..63f6270e6af0 100644 --- a/pkgs/by-name/py/pyxel/package.nix +++ b/pkgs/by-name/py/pyxel/package.nix @@ -1,42 +1,58 @@ { lib, - python3, + python3Packages, + cargo, fetchFromGitHub, rustPlatform, + rustc, SDL2, }: -python3.pkgs.buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "pyxel"; - version = "2.3.18"; + version = "2.8.10"; pyproject = true; src = fetchFromGitHub { owner = "kitao"; repo = "pyxel"; tag = "v${finalAttrs.version}"; - hash = "sha256-pw1ZDmQ7zGwfM98jjym34RbLmUbjuuUnCoPGczxdai8="; + hash = "sha256-+SitYe2HFA6rwqk5lipcKFdBy69zdAhw3Q+Nb0iBx6s="; }; - patches = [ ./never-bundle-sdl2.patch ]; - postPatch = '' - cp ${./Cargo.lock} rust/Cargo.lock + cp ${./Cargo.lock} crates/Cargo.lock + chmod u+w crates/Cargo.lock ''; - cargoRoot = "rust"; + cargoRoot = "crates"; - cargoDeps = rustPlatform.importCargoLock { - # generated by running `cargo generate-lockfile` in the `rust` directory - lockFile = ./Cargo.lock; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) + src + pname + version + cargoRoot + ; + postPatch = '' + cp ${./Cargo.lock} crates/Cargo.lock + ''; + hash = "sha256-UEN66yygcyOJt8fROClfBi1V5F7/I7P4j4vkPzKJ7jY="; }; buildAndTestSubdir = "python"; - nativeBuildInputs = with rustPlatform; [ - cargoSetupHook - maturinBuildHook - bindgenHook + maturinBuildFlags = [ + "--features" + "sdl2_dynamic" + ]; + + nativeBuildInputs = [ + cargo + rustc + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustPlatform.bindgenHook ]; buildInputs = [ SDL2 ]; @@ -48,7 +64,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pythonImportsCheck = [ "pyxel" - "pyxel.pyxel_wrapper" + "pyxel.pyxel_binding" ]; meta = { @@ -57,7 +73,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: { homepage = "https://github.com/kitao/pyxel"; license = lib.licenses.mit; mainProgram = "pyxel"; - maintainers = with lib.maintainers; [ tomasajt ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ + tomasajt + miniharinn + ]; + platforms = with lib.platforms; linux ++ darwin; }; }) diff --git a/pkgs/by-name/qm/qmmp/package.nix b/pkgs/by-name/qm/qmmp/package.nix index 2afa9c6258c8..482fb81c18b0 100644 --- a/pkgs/by-name/qm/qmmp/package.nix +++ b/pkgs/by-name/qm/qmmp/package.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qmmp"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "https://qmmp.ylsoftware.com/files/qmmp/2.3/qmmp-${finalAttrs.version}.tar.bz2"; - hash = "sha256-ph0cH6qcQRx1KSpXEJmRgrkYgxuPDyAMhxSeP/NTvqk="; + hash = "sha256-TYu65hnpnP1mXZbDaI0tMG9f/DAUTgezfKcBqZ4yY2U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index bd5cebc0d7b1..dc97f0714e35 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "26.3.22"; + version = "26.4.4"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-80JfKVdugyE43FZiqYAb2xEiuoYhkPvqo+OHshrTawg="; + hash = "sha256-Sp1ICvsmTlq8cqF3mrkfyAx/tZwLLZIqmQqMQ1gt8uo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix index e6359a874a72..7dbe642a22ff 100644 --- a/pkgs/by-name/qu/qutebrowser/package.nix +++ b/pkgs/by-name/qu/qutebrowser/package.nix @@ -26,15 +26,15 @@ let pdfjs = let - version = "5.4.394"; + version = "5.6.205"; in fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; - hash = "sha256-KMpSwF5MmoWdNoIUd4ZOwbJZZmjkid8wUoFKw7XjQFA="; + hash = "sha256-JMmxoT68PNJ/MmlMwVNYcHerorklLv5YY6C55xjn73w="; stripRoot = false; }; - version = "3.6.3"; + version = "3.7.0"; in python3.pkgs.buildPythonApplication { @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-bb4oieYevWMAOuQLMZ4egfMG6SToMWxnla5IhAIcL68="; + hash = "sha256-x/lYhOpeZnXlhAJb6lXP+VDEfXSa/39BX2jaA/zOD5I="; }; # Needs tox diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index 14e2c7e764df..0944c3eff3e8 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "25.3.11"; + version = "26.1.2"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-Nl+lz5tF9/N5B0jgM4tS3psrg7qDIGZh77HgggFoXHQ="; + sha256 = "sha256-dY6orYo5t+l0xKEqnCrXiaQ/57rqJnn9RAP67EgDi98="; }; in buildGoModule rec { @@ -20,7 +20,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-ozhu/4DGhpRj8vK4rzyhyV9/ZXg3LtoFYcubHVwjMbQ="; + vendorHash = "sha256-0lxwIemmAdsnGjyF6dNc9YVPrc4VENxSYpcWRiF4KpI="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index b59fa4432d8f..f4a0c0ec0394 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -14,13 +14,13 @@ let in renode.overrideAttrs (old: rec { pname = "renode-unstable"; - version = "1.16.1-unstable-2026-03-31"; + version = "1.16.1-unstable-2026-04-03"; src = fetchFromGitHub { owner = "renode"; repo = "renode"; - rev = "9a65fb18c4ebdf32795150b44daa949977c6c124"; - hash = "sha256-Acx3kyk0vzB1df+8yvpj0fKgePtaolJ1c4nCicAD0Gs="; + rev = "a5e76fbb6f3b2a15e6b1e3bfe021fdc2619f773a"; + hash = "sha256-FCeZ/6Dp/IgFgaKu589rMAOk0NIisR4uJyCKcuSsM90="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index ea99724ea891..7f65d118d985 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -35,7 +35,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rerun"; - version = "0.30.2"; + version = "0.31.1"; outputs = [ "out" @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "rerun-io"; repo = "rerun"; tag = finalAttrs.version; - hash = "sha256-KDtDX7qt+wOJDUVkqjJQPFp2umH7vYja8WyYven5emM="; + hash = "sha256-NnjX7vtVPz1rquTFL7qgAcoZ96RnOy5r+nI/bA6p1Es="; }; # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"' ''; - cargoHash = "sha256-/VAPPz1KYy8kbNRyPq198x3uyX2/vbEqWJxY18+b7BI="; + cargoHash = "sha256-LoR/pTL1ZsBgVT4DBApiUtvbHIhsWhVg62T0hkSbCNo="; cargoBuildFlags = [ "--package" diff --git a/pkgs/by-name/ro/rolldown/package.nix b/pkgs/by-name/ro/rolldown/package.nix index 7c23504a0a48..18a7aa5fe41a 100644 --- a/pkgs/by-name/ro/rolldown/package.nix +++ b/pkgs/by-name/ro/rolldown/package.nix @@ -10,7 +10,7 @@ cargo, rustc, cmake, - version ? "1.0.0-rc.5", + version ? "1.0.0-rc.12", }: stdenv.mkDerivation (finalAttrs: { pname = "rolldown"; @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "rolldown"; repo = "rolldown"; tag = "v${finalAttrs.version}"; - hash = "sha256-uqgJN7jn70z3cQlEEyk+0TeiHDn1AkvMmCaEOksHxhM="; + hash = "sha256-G26fPJElnIob1b94KqM5b2A64qs+x/d8FNrAsaN8BOI="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "rolldown"; version = finalAttrs.version; src = finalAttrs.src; - hash = "sha256-tyayOAwdqP1euzicJrstwHiHxoFRWq+IGSiN/uFNZz8="; + hash = "sha256-btGnMU+t8zij/gRfFp5p6h2/781IZM5AWvZNqC2dfNs="; }; pnpmDeps = fetchPnpmDeps { pname = "rolldown"; @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { src = finalAttrs.src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-16NBCf4dP8a8dbgnmtFawMHKD7geIkLXt4F4w18FSUM="; + hash = "sha256-lQVbYV8S3P1+AQwF9PBDxJqbKf9jBAtwymKcxQ55FeQ="; }; # cmake is only needed for Rust build (mimalloc-sys), not for a top-level configure diff --git a/pkgs/by-name/ru/runc/package.nix b/pkgs/by-name/ru/runc/package.nix index 80661c71986f..6776d0da64dc 100644 --- a/pkgs/by-name/ru/runc/package.nix +++ b/pkgs/by-name/ru/runc/package.nix @@ -16,13 +16,13 @@ buildGoModule (finalAttrs: { pname = "runc"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; tag = "v${finalAttrs.version}"; - hash = "sha256-YqzRHItk8gRDBQN+lUTGdbXUf+vuDIjmErDR57Ec/54="; + hash = "sha256-bBZEcFr/w8r0pKb0ijONUogCKRMgbMQt3o2NR+zhXrU="; }; vendorHash = null; diff --git a/pkgs/by-name/rx/rx/package.nix b/pkgs/by-name/rx/rx/package.nix deleted file mode 100644 index 1b6404b512a9..000000000000 --- a/pkgs/by-name/rx/rx/package.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromGitHub, - makeWrapper, - cmake, - pkg-config, - libxrandr, - libxi, - libxinerama, - libxext, - libxcursor, - libx11, - libGL ? null, -}: - -rustPlatform.buildRustPackage (finalAttrs: { - pname = "rx"; - version = "0.5.2"; - - src = fetchFromGitHub { - owner = "cloudhead"; - repo = "rx"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM="; - }; - - cargoHash = "sha256-gRhjqQNL1Cu6/RpF2AeIGwbuDkFvyOf3gnpYt5Hlhfc="; - - nativeBuildInputs = [ - cmake - pkg-config - makeWrapper - ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - # glfw-sys dependencies: - libx11 - libxrandr - libxinerama - libxcursor - libxi - libxext - ]; - - # FIXME: GLFW (X11) requires DISPLAY env variable for all tests - doCheck = false; - - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - mkdir -p $out/share/applications - cp $src/rx.desktop $out/share/applications - wrapProgram $out/bin/rx --prefix LD_LIBRARY_PATH : ${libGL}/lib - ''; - - meta = { - description = "Modern and extensible pixel editor implemented in Rust"; - mainProgram = "rx"; - homepage = "https://rx.cloudhead.io/"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ - minijackson - ]; - platforms = [ "x86_64-linux" ]; - }; -}) diff --git a/pkgs/by-name/sa/sampo/package.nix b/pkgs/by-name/sa/sampo/package.nix index 6f064c372e0f..969ced16a98f 100644 --- a/pkgs/by-name/sa/sampo/package.nix +++ b/pkgs/by-name/sa/sampo/package.nix @@ -9,20 +9,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sampo"; - version = "0.17.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "bruits"; repo = "sampo"; tag = "sampo-v${finalAttrs.version}"; - hash = "sha256-NY73wGLS5r7C5GoF6p9Yf1d9nhbis/QZWAgnIVjytjA="; + hash = "sha256-lCF38mDdoBqm9F9enEhYx3fdrTgLG+ItL37Kxzqhqcw="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-9Z0Jdx220+GrdNZPcJnjxqSOp6GHFXomtME0qczHbvs="; + cargoHash = "sha256-roYUqxY+zkRoHZbC52Psk7/T1lRYjgnQ0cAFlUCZPn4="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/sc/scientifica/package.nix b/pkgs/by-name/sc/scientifica/package.nix index 4bdc4a029c57..0ca632ba97c9 100644 --- a/pkgs/by-name/sc/scientifica/package.nix +++ b/pkgs/by-name/sc/scientifica/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchurl, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -13,17 +14,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-8IV4aaDoRsbxddy4U90fEZ6henUhjmO38HNtWo4ein8="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/fonts/misc - install ttf/*.ttf $out/share/fonts/truetype - install otb/*.otb $out/share/fonts/misc - install bdf/*.bdf $out/share/fonts/misc - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Tall and condensed bitmap font for geeks"; diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix index 9110ec50d236..a40b4b9f392e 100644 --- a/pkgs/by-name/sd/SDL_image/package.nix +++ b/pkgs/by-name/sd/SDL_image/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL_image"; - version = "1.2.12-unstable-2025-11-06"; + version = "1.2.12-unstable-2026-04-03"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL_image"; - rev = "7c6ea40bb75262740cd07f7658bc543f13c65b3c"; - hash = "sha256-V8d9En6fJArslFLIaeCdfVD5YoHPbKjOpR79Va8w8js="; + rev = "678ac6a4c6021853485050926f45db08ba6aec48"; + hash = "sha256-kK8EPDW8jkdOiDrOxK9MmrtA5varUzbj1/arLwjkUIs="; }; configureFlags = [ diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index e4aac4235040..f42b91b6f137 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -1,76 +1,126 @@ { - lib, - stdenv, buildGoModule, fetchFromGitHub, - libredirect, iana-etc, - testers, - seaweedfs, + installShellFiles, + lib, + libredirect, + nix-update-script, + stdenv, + versionCheckHook, }: - buildGoModule (finalAttrs: { pname = "seaweedfs"; - version = "4.17"; + version = "4.18"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; tag = finalAttrs.version; - hash = "sha256-xy3gXw3cbFO3OkzgEmIecvxPJT15tn58FI4ppibckzE="; + leaveDotGit = true; + postFetch = '' + pushd "$out" + git rev-parse --short HEAD 2>/dev/null >$out/COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + popd + ''; + hash = "sha256-X0/BCdLpM7Cs2Q7goW9JHw8tA+ztlm+qxusn+OIQ/qg="; }; - vendorHash = "sha256-XbfKYftKfbJDkbp9DwVAs56w5lMvqdlW5cwhhivniBM="; + postPatch = '' + # Remove unmaintained code that's not used and generates various issues. + rm -rf unmaintained + ''; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ]; + vendorHash = "sha256-W5fRmE89IBP5h11+Op3mkCQw9WkUgAtXduEHBdHiQVI="; + + nativeBuildInputs = [ + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libredirect.hook + ]; subPackages = [ "weed" ]; - ldflags = [ - "-s" - "-X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=N/A" - ]; - tags = [ "elastic" "gocdk" + "rclone" "sqlite" - "ydb" + "tarantool" "tikv" + "ydb" ]; + ldflags = [ + "-s" + "-extldflags=-static" + ]; + + env = { + CGO_ENABLED = 0; + GODEBUG = "http2client=0"; + }; + preBuild = '' - export GODEBUG=http2client=0 + ldflags+=" -X \"github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=$( + # * + # + # We work around this by replacing it with the Noto Color Emoji + # set, which is available under a FOSS licence and more likely to + # be used on a NixOS machine anyway. The Apple emoji are removed + # before `fetchPnpmDeps` to ensure that the build doesn’t cache the + # unlicensed emoji files. replaceVars ./replace-apple-emoji-with-noto-emoji.patch { noto-emoji-pngs = "${noto-fonts-color-emoji-png}/share/noto-fonts-color-emoji-png"; } @@ -137,9 +151,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace app/updateDefaultSession.main.ts \ --replace-fail "\''${process.versions.electron}" "`jq -r '.devDependencies.electron' < package.json`" - # https://github.com/signalapp/Signal-Desktop/issues/7667 - substituteInPlace ts/util/version.std.ts \ - --replace-fail 'isAdhoc(version)' 'true' + # Disable auto-updater https://github.com/signalapp/Signal-Desktop/issues/7667 + substituteInPlace config/production.json \ + --replace-fail '"updatesEnabled": true' '"updatesEnabled": false' # Nix builds do not need upstream release hooks (notarization and # language-pack postprocessing), and they expect a different macOS @@ -274,7 +288,6 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \ --add-flags "$out/share/signal-desktop/app.asar" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} '' + '' diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 884314d38dcf..6ef16071d7a8 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -8,7 +8,7 @@ let pname = "simplex-chat-desktop"; - version = "6.4.10"; + version = "6.4.11"; sources = { "aarch64-linux" = fetchurl { @@ -17,7 +17,7 @@ let }; "x86_64-linux" = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-HueMU1cCOspIsDg4hC9ebMbIvkOtZGiSktB1VSMGgT8="; + hash = "sha256-0b88H6eMYO+EgRnWzd9x/MUCr7CE/AHDZnKILQJS1DQ="; }; }; diff --git a/pkgs/by-name/sm/smiley-sans/package.nix b/pkgs/by-name/sm/smiley-sans/package.nix index e792dd2d2ef8..2a56f55f9e44 100644 --- a/pkgs/by-name/sm/smiley-sans/package.nix +++ b/pkgs/by-name/sm/smiley-sans/package.nix @@ -3,25 +3,25 @@ stdenvNoCC, fetchzip, nix-update-script, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "smiley-sans"; version = "2.0.1"; src = fetchzip { - url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${version}/smiley-sans-v${version}.zip"; + url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${finalAttrs.version}/smiley-sans-v${finalAttrs.version}.zip"; sha256 = "sha256-p6DwX5MBPemAfV99L9ayLkEWro31ip4tf+wBQr8mkbs="; stripRoot = false; }; - installPhase = '' - runHook preInstall - install -Dm644 -t $out/share/fonts/opentype *.otf - install -Dm644 -t $out/share/fonts/truetype *.ttf - install -Dm644 -t $out/share/fonts/woff2 *.woff2 - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; + + outputs = [ + "out" + "webfont" + ]; passthru.updateScript = nix-update-script { }; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://atelier-anchor.com/typefaces/smiley-sans/"; changelog = "https://github.com/atelier-anchor/smiley-sans/blob/main/CHANGELOG.md"; license = lib.licenses.ofl; - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sn/snid/package.nix b/pkgs/by-name/sn/snid/package.nix new file mode 100644 index 000000000000..1ae9e9a66300 --- /dev/null +++ b/pkgs/by-name/sn/snid/package.nix @@ -0,0 +1,27 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "snid"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "AGWA"; + repo = "snid"; + tag = "v${finalAttrs.version}"; + hash = "sha256-syKEtG/B1Yy0BAQqlR6o4uIRSwCnFOBsPpV4arqO/I4="; + }; + + vendorHash = "sha256-cVarG6Tx4yWpZE5BLZsMtLV9LF1lsiFfIXxhYiNjQlY="; + + meta = { + description = "Zero config TLS proxy server that uses SNI"; + homepage = "https://github.com/AGWA/snid"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomfitzhenry ]; + mainProgram = "snid"; + }; +}) diff --git a/pkgs/by-name/sn/sniglet/package.nix b/pkgs/by-name/sn/sniglet/package.nix index 5f12432be069..39c98288447a 100644 --- a/pkgs/by-name/sn/sniglet/package.nix +++ b/pkgs/by-name/sn/sniglet/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, stdenvNoCC, + installFonts, }: stdenvNoCC.mkDerivation { @@ -15,14 +16,14 @@ stdenvNoCC.mkDerivation { hash = "sha256-fLT2hZT9o1Ka30EB/6oWwmalhVJ+swXLRFG99yRWd2c="; }; - installPhase = '' - runHook preInstall + preInstall = "rm webfonts/Sniglet-webfont.ttf"; - install -D -m444 -t $out/share/fonts/truetype $src/*.ttf - install -D -m444 -t $out/share/fonts/opentype $src/*.otf + nativeBuildInputs = [ installFonts ]; - runHook postInstall - ''; + outputs = [ + "out" + "webfont" + ]; meta = { description = "Fun rounded display face that’s great for headlines"; diff --git a/pkgs/by-name/so/soapysdrplay/cmake.patch b/pkgs/by-name/so/soapysdrplay/cmake.patch new file mode 100644 index 000000000000..eebd4d7ec1ee --- /dev/null +++ b/pkgs/by-name/so/soapysdrplay/cmake.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ca2171..2928008 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + ######################################################################## + # Build Soapy SDR support module for SDRplay (API version 3) + ######################################################################## +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.10) + project(SoapySDRPlay CXX) + + find_package(SoapySDR "0.4.0" NO_MODULE REQUIRED) \ No newline at end of file diff --git a/pkgs/by-name/so/soapysdrplay/package.nix b/pkgs/by-name/so/soapysdrplay/package.nix index 26613cb26d42..e30f18451336 100644 --- a/pkgs/by-name/so/soapysdrplay/package.nix +++ b/pkgs/by-name/so/soapysdrplay/package.nix @@ -8,17 +8,19 @@ sdrplay, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "soapysdr-sdrplay3"; - version = "0.4.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapySDRPlay3"; - rev = "soapy-sdrplay3-${version}"; - sha256 = "sha256-WMcAw0uR2o2SrQR4mBtdVEZlJ/ZXRqwo6zMJNsB/5U4="; + rev = "soapy-sdrplay3-${finalAttrs.version}"; + hash = "sha256-5XBOUhI/37sMfdVEb19zWU00/j+Nb30wsP5CXjJ+sJY="; }; + patches = [ ./cmake.patch ]; + nativeBuildInputs = [ cmake pkg-config @@ -38,6 +40,11 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pothosware/SoapySDRPlay3"; license = lib.licenses.mit; maintainers = [ lib.maintainers.pmenke ]; - platforms = lib.platforms.linux; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; -} +}) diff --git a/pkgs/by-name/so/sony-dump/0001-Fix-makefile.patch b/pkgs/by-name/so/sony-dump/0001-Fix-makefile.patch new file mode 100644 index 000000000000..062563318cf9 --- /dev/null +++ b/pkgs/by-name/so/sony-dump/0001-Fix-makefile.patch @@ -0,0 +1,143 @@ +From 1f7c72d18298d1bdbd25fb51754bdcc54f700a1d Mon Sep 17 00:00:00 2001 +From: David Wronek +Date: Wed, 8 Oct 2025 20:25:19 +0200 +Subject: [PATCH] Fix makefile + +Signed-off-by: David Wronek +--- + makefile | 116 ++++++++++--------------------------------------------- + 1 file changed, 20 insertions(+), 96 deletions(-) + +diff --git a/makefile b/makefile +index 9cbf7c9..00e756f 100644 +--- a/makefile ++++ b/makefile +@@ -1,105 +1,29 @@ +-CFLAGS= -Wall -O2 -Iinclude -Izlib-1.2.11 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE=1 ++CFLAGS= -Wall -O2 -Iinclude -Izlib -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE=1 + +-CC=gcc ++CC=cc + STRIP=strip + +-CCWIN=i686-w64-mingw32-gcc +-CCWINSTRIP=i686-w64-mingw32-strip +- +-CCARM=/home/savan/Desktop/gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc +-CCARMSTRIP=/home/savan/Desktop/gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabi/bin/arm-linux-gnueabi-strip +- +-CCARM64=/home/savan/Desktop/gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc +-CCARM64STRIP=/home/savan/Desktop/gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-strip +- +-CCAPPLE64=/home/savan/Desktop/osxtoolchain/osxcross/target/bin/x86_64-apple-darwin11-cc +-CCAPPLESTRIP64=/home/savan/Desktop/osxtoolchain/osxcross/target/bin/x86_64-apple-darwin11-strip +- +-CCAPPLE=/home/savan/Desktop/osxtoolchain/osxcross/target/bin/i386-apple-darwin11-cc +-CCAPPLESTRIP=/home/savan/Desktop/osxtoolchain/osxcross/target/bin/i386-apple-darwin11-strip +- +-CCMIPS64=/home/savan/Desktop/buildroot-2017.02.8/output/host/usr/bin/mips64-buildroot-linux-uclibc-gcc +-CCMIPS64STRIP=/home/savan/Desktop/buildroot-2017.02.8/output/host/usr/bin/mips64-buildroot-linux-uclibc-strip +- +-CCMIPS=/home/savan/Desktop/buildroot-2018.02.2/output/host/usr/bin/mips-buildroot-linux-uclibc-gcc +-CCMIPSSTRIP=/home/savan/Desktop/buildroot-2018.02.2/output/host/usr/bin/mips-buildroot-linux-uclibc-strip +- + SOURCE= \ +- zlib-1.2.11/adler32.c \ +- zlib-1.2.11/crc32.c \ +- zlib-1.2.11/deflate.c \ +- zlib-1.2.11/infback.c \ +- zlib-1.2.11/inffast.c \ +- zlib-1.2.11/inflate.c \ +- zlib-1.2.11/inftrees.c \ +- zlib-1.2.11/trees.c \ +- zlib-1.2.11/zutil.c \ +- zlib-1.2.11/compress.c \ +- zlib-1.2.11/uncompr.c \ +- zlib-1.2.11/gzclose.c \ +- zlib-1.2.11/gzlib.c \ +- zlib-1.2.11/gzread.c \ +- zlib-1.2.11/gzwrite.c \ ++ zlib/adler32.c \ ++ zlib/crc32.c \ ++ zlib/deflate.c \ ++ zlib/infback.c \ ++ zlib/inffast.c \ ++ zlib/inflate.c \ ++ zlib/inftrees.c \ ++ zlib/trees.c \ ++ zlib/zutil.c \ ++ zlib/compress.c \ ++ zlib/uncompr.c \ ++ zlib/gzclose.c \ ++ zlib/gzlib.c \ ++ zlib/gzread.c \ ++ zlib/gzwrite.c \ + lz4.c \ + unpackbootimg.c \ + untar.c \ + sony_dump.c + +-default:download sony_dump.exe sony_dump.i386 sony_dump.x86_64 sony_dump.arm32 sony_dump.arm32_pie sony_dump.arm64 sony_dump.arm64_pie sony_dump.x86_64-apple-darwin11 sony_dump.i386-apple-darwin11 sony_dump.mips64 sony_dump.mips32 archive +- +-download: +- @if [ ! -d "zlib-1.2.11" ]; then wget https://zlib.net/zlib-1.2.11.tar.gz ; tar xzf zlib-1.2.11.tar.gz ; rm -rf zlib-1.2.11.tar.gz ; fi +- +-sony_dump.exe: +- ${CCWIN} ${CFLAGS} -static ${SOURCE} -o sony_dump.exe +- ${CCWINSTRIP} sony_dump.exe +- +-sony_dump.i386: +- ${CC} -m32 ${CFLAGS} -static ${SOURCE} -o sony_dump.i386 +- ${STRIP} sony_dump.i386 +- +-sony_dump.x86_64: +- ${CC} ${CFLAGS} -static ${SOURCE} -o sony_dump.x86_64 +- ${STRIP} sony_dump.x86_64 +- +-sony_dump.arm32: +- ${CCARM} ${CFLAGS} -static ${SOURCE} -o sony_dump.arm32 +- ${CCARMSTRIP} sony_dump.arm32 +- +-sony_dump.arm32_pie: +- @cp -fr sony_dump.arm32 sony_dump.arm32_pie +- @dd if=pie of=sony_dump.arm32_pie bs=1 count=1 seek=16 conv=notrunc +- +-sony_dump.arm64: +- ${CCARM64} ${CFLAGS} -static ${SOURCE} -o sony_dump.arm64 +- ${CCARM64STRIP} sony_dump.arm64 +- +-sony_dump.arm64_pie: +- @cp -fr sony_dump.arm64 sony_dump.arm64_pie +- @dd if=pie of=sony_dump.arm64_pie bs=1 count=1 seek=16 conv=notrunc +- +-sony_dump.i386-apple-darwin11: +- ${CCAPPLE} ${CFLAGS} ${SOURCE} -o sony_dump.i386-apple-darwin11 +- ${CCAPPLESTRIP} sony_dump.i386-apple-darwin11 +- +-sony_dump.x86_64-apple-darwin11: +- ${CCAPPLE64} ${CFLAGS} ${SOURCE} -o sony_dump.x86_64-apple-darwin11 +- ${CCAPPLESTRIP64} sony_dump.x86_64-apple-darwin11 +- +-sony_dump.mips64: +- ${CCMIPS64} ${CFLAGS} -static ${SOURCE} -o sony_dump.mips64 +- ${CCMIPS64STRIP} sony_dump.mips64 +- +-sony_dump.mips32: +- ${CCMIPS} ${CFLAGS} -static ${SOURCE} -o sony_dump.mips32 +- ${CCMIPSSTRIP} sony_dump.mips32 +- +-archive: +- @zip -9 sony_dump_tool.zip sony_dump.arm32_pie sony_dump.arm64_pie sony_dump.exe sony_dump.i386-apple-darwin11 sony_dump.mips64 sony_dump.x86_64-apple-darwin11 sony_dump.arm32 sony_dump.arm64 sony_dump.i386 sony_dump.mips32 sony_dump.x86_64 +- +-clean: +- rm -rf sony_dump_tool.zip sony_dump.exe sony_dump.i386 sony_dump.x86_64 sony_dump.arm32 sony_dump.arm32_pie sony_dump.arm64 sony_dump.arm64_pie sony_dump.x86_64-apple-darwin11 sony_dump.i386-apple-darwin11 sony_dump.mips64 sony_dump.mips32 +- +-distclean: +- rm -rf sony_dump_tool.zip zlib-1.2.11 sony_dump.exe sony_dump.i386 sony_dump.x86_64 sony_dump.arm32 sony_dump.arm32_pie sony_dump.arm64 sony_dump.arm64_pie sony_dump.x86_64-apple-darwin11 sony_dump.i386-apple-darwin11 sony_dump.mips64 sony_dump.mips32 +- ++default: ++ ${CC} ${CFLAGS} ${SOURCE} -o sony_dump ++ ${STRIP} sony_dump +-- +2.52.0 + diff --git a/pkgs/by-name/so/sony-dump/package.nix b/pkgs/by-name/so/sony-dump/package.nix new file mode 100644 index 000000000000..d4ae1391dff2 --- /dev/null +++ b/pkgs/by-name/so/sony-dump/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + zlib, +}: +stdenv.mkDerivation { + pname = "sony-dump"; + version = "0-unstable-2019-11-3"; + + src = fetchFromGitHub { + owner = "munjeni"; + repo = "anyxperia_dumper"; + rev = "2171258c9df50aba139b4bd1aa93295cd14d2262"; + hash = "sha256-kdHMDIX+ryx63A5TJMsqEZ4W36edC+dQrJKTeh5RFHA="; + }; + + strictDeps = true; + + prePatch = '' + tar -xzf ${zlib.src} + mv ${zlib.name} zlib + ''; + + patches = [ + ./0001-Fix-makefile.patch + ]; + + installPhase = '' + runHook preInstall + install -Dm555 sony_dump -t $out/bin + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/munjeni/anyxperia_dumper"; + description = "Tool to dump Sony Xperia boot images"; + # No license specified in the repository + license = lib.licenses.free; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + maintainers = with lib.maintainers; [ ungeskriptet ]; + teams = [ lib.teams.android ]; + mainProgram = "sony_dump"; + }; +} diff --git a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix index e54ee54ffbbe..2511fea120e1 100644 --- a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix +++ b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix @@ -5,21 +5,21 @@ lib, makeBinaryWrapper, stdenv, - unstableGitUpdater, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "spectre-meltdown-checker"; - version = "0.46-unstable-2024-08-04"; + version = "26.21.0401891"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; - rev = "34c6095912d115551f69435a55d6e0445932fdf9"; - hash = "sha256-m0f0+AFPrB2fPNd1SkSj6y9PElTdefOdI51Jgfi816w="; + tag = "v${finalAttrs.version}"; + hash = "sha256-cIPM4SFP5NS2eE37fQNb+l6W7mTcmsE1viUEUF+E8SM="; }; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = gitUpdater { }; prePatch = '' substituteInPlace spectre-meltdown-checker.sh \ @@ -39,10 +39,11 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { + changelog = "https://github.com/speed47/spectre-meltdown-checker/releases/tag/${finalAttrs.src.tag}"; description = "Spectre & Meltdown vulnerability/mitigation checker for Linux"; mainProgram = "spectre-meltdown-checker"; homepage = "https://github.com/speed47/spectre-meltdown-checker"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.dotlambda ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index ee443579f80b..b92f127c1214 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule (finalAttrs: { pname = "stackit-cli"; - version = "0.57.0"; + version = "0.59.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-rkgDMS2Blc5RSRP/Itx4yOOfzYO9n092dWbPPC6gGmI="; + hash = "sha256-OOvcdkvNur+pLEHsoGROCOuD/oydZqbhMPUDUSDnLes="; }; - vendorHash = "sha256-WnGLi2C6Vk26I/Uzh/bvcnLVRPxUJFt19MUqasov/iU="; + vendorHash = "sha256-HZ5k1AIuSsAdVIHMzo3awguw+AlctLMicLRzzGgM7xA="; subPackages = [ "." ]; diff --git a/pkgs/by-name/su/sudo-font/package.nix b/pkgs/by-name/su/sudo-font/package.nix index 01368d72012d..1e9a37a05894 100644 --- a/pkgs/by-name/su/sudo-font/package.nix +++ b/pkgs/by-name/su/sudo-font/package.nix @@ -2,31 +2,26 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "sudo-font"; version = "3.4"; src = fetchzip { - url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; + url = "https://github.com/jenskutilek/sudo-font/releases/download/v${finalAttrs.version}/sudo.zip"; hash = "sha256-sSLY94wY9+AYAqWDq+Xy+KctUfJVS0jeS3baF8mLO9I="; }; - installPhase = '' - runHook preInstall - - install -Dm644 *.ttf -t $out/share/fonts/truetype/ - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Font for programmers and command line users"; homepage = "https://www.kutilek.de/sudo-font/"; - changelog = "https://github.com/jenskutilek/sudo-font/raw/v${version}/sudo/FONTLOG.txt"; + changelog = "https://github.com/jenskutilek/sudo-font/raw/v${finalAttrs.version}/sudo/FONTLOG.txt"; license = lib.licenses.ofl; - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index e1880be3dbac..fc1e90e768a8 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "supabase-cli"; - version = "2.75.0"; + version = "2.84.2"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-AroDni0IQ6jMn5mOXt4+8j5tTwEk1upIUo2qvbWY9Jo="; + hash = "sha256-0S+FV1aty/RzkLA6WK4Me/eKEr4LduDfIVdruQO9ZrM="; }; - vendorHash = "sha256-+qFZHCBcZ8tfSrDoYzw7wrVhZM+cUU5okiii8eeDCek="; + vendorHash = "sha256-7BkSPFR5ciEVA/i1gy53SZu26MMkZNC+VwRHMoLJSxI="; ldflags = [ "-s" diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index e9734928b767..42d15192a6b7 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -24,16 +24,16 @@ buildGoModule (finalAttrs: { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; tag = "v${finalAttrs.version}"; - hash = "sha256-bVY9Q61shftUigCitRhE18GVi3RNULIifGdgwThXlaQ="; + hash = "sha256-jKmkj7Y3D2Af7XNOkLY3sknOelvId649NZXpu/fU7ko="; }; - vendorHash = "sha256-aSstxlxx22iF86lCMcR9E+Zn83wcS1oSfT2KflNt6Ks="; + vendorHash = "sha256-Qg5OWg+iFcGuD8E3/7YwmmciiRGdUFNSHLrEAaqRmnQ="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/sy/synthv1/package.nix b/pkgs/by-name/sy/synthv1/package.nix index 17592763ae2d..b8c26a5d5eb9 100644 --- a/pkgs/by-name/sy/synthv1/package.nix +++ b/pkgs/by-name/sy/synthv1/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "synthv1"; - version = "1.3.2"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/synthv1/synthv1-${finalAttrs.version}.tar.gz"; - hash = "sha256-tCxgJdl5PMNvnhPZOsNhlS3LqBksmXBojfnSLZUZKMY="; + hash = "sha256-z4jy6Zo7LaYLf3QoAXl0MvZ9rcZWThWwChGDJBY0HYg="; }; postPatch = '' diff --git a/pkgs/by-name/te/terraria-server/package.nix b/pkgs/by-name/te/terraria-server/package.nix index 5b8a92c0acec..4f05787e61c9 100644 --- a/pkgs/by-name/te/terraria-server/package.nix +++ b/pkgs/by-name/te/terraria-server/package.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "terraria-server"; - version = "1.4.5.5"; + version = "1.4.5.6"; urlVersion = lib.replaceStrings [ "." ] [ "" ] finalAttrs.version; src = fetchurl { url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${finalAttrs.urlVersion}.zip"; - hash = "sha256-BmLT5ATBviSfYuc3Cx/aMHUNTBs6S56GHJF8YIJXhtU="; + hash = "sha256-11xFWsIX/TQ0RIyPglHBNH8IdahcQ4WJ3HG1V3d+kVU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/th/there/package.nix b/pkgs/by-name/th/there/package.nix new file mode 100644 index 000000000000..b5e587fd310e --- /dev/null +++ b/pkgs/by-name/th/there/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenvNoCC, + fetchzip, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "there"; + version = "2.0.0"; + + src = fetchzip { + url = "https://github.com/dena-sohrabi/There/releases/download/v${finalAttrs.version}/There.zip"; + hash = "sha256-p7AK9FfeycUgDfVk8HlKkjLBdOoTWAK/oGxlWSFykOc="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -R There.app "$out/Applications/" + + runHook postInstall + ''; + + dontBuild = true; + dontFixup = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Track timezones"; + homepage = "https://there.pm"; + changelog = "https://github.com/dena-sohrabi/There/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ myzel394 ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index a43933eb4cc9..188e1f452d63 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.14.14"; + version = "0.14.16"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; tag = "v${finalAttrs.version}"; - hash = "sha256-AYOuJO9wVuOX6zC7GYXCccC7A8LJaEj+L2oADwJx29s="; + hash = "sha256-Lcv/yAH+4LlzaFhTk5GA3WHxm8gHWO+7560zolTCIIM="; }; - cargoHash = "sha256-4xIGW0WCd7RF6mGY753qK6Ncs72AJbs3kzOVBp9sGYY="; + cargoHash = "sha256-D9G08K2rp0uBFz+1LktdH8thGNpzaTD2QCCV2P3Hl9M="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix index ff31a75a9f20..da553c06ed89 100644 --- a/pkgs/by-name/tu/turso-cli/package.nix +++ b/pkgs/by-name/tu/turso-cli/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "turso-cli"; - version = "1.0.18"; + version = "1.0.19"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-mWX7cJK4TX2JXHYQ4d5WaS/ZwlEkXJaiNM7zx/w+n9c="; + hash = "sha256-A0stg1w3nlrybqRcMROlWF3PnvYEYqy8KskjIXXA7Rk="; }; vendorHash = "sha256-Cb4/KA9jfI/pNHbJqLWtm9oEXfMHGBS46J9o3lL4/Tk="; diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index f0522cd483cd..7fd4f4b2df47 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.28"; + version = "0.0.29"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-X4bCWl7fkCleQewoHXaJqFC6MLsiFrH8YgbZK9QeDSI="; + hash = "sha256-rOkh6HgZ5F/1wJr0iZwaqqYmcEONioz7jeebp19xxXs="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-DCTFjFl/fCbXwj7AGPNnrjvSTqxNW6PVWsUhbSGe/wI="; + cargoHash = "sha256-ajuhF+jpx+9U9swrd8HF3ZH7ovSwz0nDNRiQzcrttwg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index 09de04d2881a..e61989a48da8 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "typos-lsp"; # Please update the corresponding VSCode extension too. # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix - version = "0.1.50"; + version = "0.1.51"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-DInO8+VrphHZjlP7oegJKJG05dIFxsmcJKqU2hG4zT0="; + hash = "sha256-24HeIisU7jOTWB8i06WgMxyWaSnB6twcncMbUVx5P24="; }; - cargoHash = "sha256-zgbmPuvoAsvCdq49mT3YTNpeh91n0YLluwKEKJk9UaQ="; + cargoHash = "sha256-kwSEC7WEEF3MbjGO0/hSRty2LXbUayBgxAyFDQ450dw="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index d2d6f556e9dc..19f5d1b6c297 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "typos"; - version = "1.44.0"; + version = "1.45.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = "typos"; tag = "v${finalAttrs.version}"; - hash = "sha256-0cDkLeYMQH2rXUfIjUQm1XjvHTYqLWbqHCxFIvC+jKk="; + hash = "sha256-Sgu6zCWwdqZW+HW9i/rujViL/jvDTzdkEm257OMQarg="; }; - cargoHash = "sha256-H+nXNfnrJXXTZsXgLXrrdvYzN6k38imcmY17tvGM21s="; + cargoHash = "sha256-NTbmLAUSz3CjQtf0s5Hu3OFvGw6D8jw0gmIt4kaQbwM="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/um/umap/package.nix b/pkgs/by-name/um/umap/package.nix index a05f64d33149..c5e3ff1af1b3 100644 --- a/pkgs/by-name/um/umap/package.nix +++ b/pkgs/by-name/um/umap/package.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "umap"; - version = "3.6.3"; + version = "3.7.1"; pyproject = true; src = fetchFromGitHub { owner = "umap-project"; repo = "umap"; rev = version; - hash = "sha256-b+ie1fZxeE7W2YKEUrftkRnmUnCeWZF1VSaB+nDRCXU="; + hash = "sha256-Fuq2whUFwidLd2pk1c1+jumik3IO13CwGLJraGvHHIA="; }; build-system = [ diff --git a/pkgs/by-name/un/unpackelf/package.nix b/pkgs/by-name/un/unpackelf/package.nix new file mode 100644 index 000000000000..7876fb6e10c5 --- /dev/null +++ b/pkgs/by-name/un/unpackelf/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "unpackelf"; + version = "2022.11.09"; + + src = fetchFromGitHub { + owner = "osm0sis"; + repo = "unpackelf"; + tag = finalAttrs.version; + hash = "sha256-uAt4qpctQPGyXFLtRqTBiCXahoA+/b5rYZCjIh8N+QU="; + }; + + strictDeps = true; + + # Unstream has an install target, but installs unpackelf as `$out/bin` + # instead of `$out/bin/unpackelf` + installPhase = '' + runHook preInstall + install -Dm555 unpackelf -t $out/bin + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/osm0sis/unpackelf"; + description = "Tool to unpack Sony ELF kernel format image variants"; + # No license specified in the repository + license = lib.licenses.free; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + maintainers = with lib.maintainers; [ ungeskriptet ]; + teams = [ lib.teams.android ]; + mainProgram = "unpackelf"; + }; +}) diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix index 83452d135519..ceef595bd676 100644 --- a/pkgs/by-name/ve/veryl/package.nix +++ b/pkgs/by-name/ve/veryl/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "veryl"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "veryl-lang"; repo = "veryl"; rev = "v${finalAttrs.version}"; - hash = "sha256-uplW62XoWhMtsMt658BlnHm9bEHJUzZqtJRTUBCjOrs="; + hash = "sha256-X3DF1d2rYrdOc/M4Wwp0FnMK5GC33SlmHpjJ3hyeLso="; fetchSubmodules = true; }; - cargoHash = "sha256-h9ECFtIfFjIheRMFUyCUDYIp1RLQ9ZH4mIlaCH1g9Lo="; + cargoHash = "sha256-0t2809LWMDU+IKWdxjd4kc+qyI8f/rIbWQ1C3f5BBwY="; nativeBuildInputs = [ pkg-config @@ -50,8 +50,13 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=tests::publish" "--skip=tests::publish_with_commit" # "Permission Denied", while making its cache dir? + "--skip=native_test::test" + "--skip=native_test::test_ignored_attribute" + "--skip=native_test::test_wave_dump" "--skip=analyzer::test_25_dependency" + "--skip=analyzer::test_84_package_self_ref_2" "--skip=analyzer::test_68_std" + "--skip=emitter::test_84_package_self_ref_2" "--skip=emitter::test_25_dependency" "--skip=emitter::test_68_std" "--skip=filelist::test" diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index 58fe791753b6..0fd8c7674883 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.18.1"; + version = "8.18.2"; outputs = [ "bin" @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libvips"; repo = "libvips"; tag = "v${finalAttrs.version}"; - hash = "sha256-PIaoijkhMKbG8IgK11h8DLemjUR1WNSYB1yfqI4kwdQ="; + hash = "sha256-w42igzcvnCBoGHAvyb27Z6IciSuGeHctgSsZY30TtWo="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' diff --git a/pkgs/by-name/vo/volanta/package.nix b/pkgs/by-name/vo/volanta/package.nix index 49710588a6b8..ada4ec6a9c0d 100644 --- a/pkgs/by-name/vo/volanta/package.nix +++ b/pkgs/by-name/vo/volanta/package.nix @@ -9,11 +9,11 @@ }: let pname = "volanta"; - version = "1.16.3"; - build = "581a1e68"; + version = "1.16.4"; + build = "af311390"; src = fetchurl { url = "https://cdn.volanta.app/software/volanta-app/${version}-${build}/volanta-${version}.AppImage"; - hash = "sha256-5187tE37dRyqjBa8P0Jwio2lBd8qd+tEZgl/98nGQy8="; + hash = "sha256-KLbScB7yaFbSdoR1piQppK33Lsvlfamb+MVvESrFqAA="; }; appImageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/wo/wolfssl/package.nix b/pkgs/by-name/wo/wolfssl/package.nix index 8418be4e39d4..6df1a958ebcf 100644 --- a/pkgs/by-name/wo/wolfssl/package.nix +++ b/pkgs/by-name/wo/wolfssl/package.nix @@ -10,6 +10,7 @@ # requiring to build a special variant for that software. Example: 'haproxy' variant ? "all", extraConfigureFlags ? [ ], + enableJni ? false, enableARMCryptoExtensions ? stdenv.hostPlatform.isAarch64 && ((builtins.match "^.*\\+crypto.*$" stdenv.hostPlatform.gcc.arch) != null), @@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: { # ensure test detects musl-based systems too substituteInPlace scripts/ocsp-stapling2.test \ --replace '"linux-gnu"' '"linux-"' + '' + + lib.optionalString enableJni '' + # Some tests fail when JNI is enabled + sed -i '/TEST_DECL(test_wolfSSL_Tls13_ECH)/d; + /TEST_DECL(test_wolfSSL_Tls13_ECH_HRR)/d; + /TEST_DECL(test_TLSX_CA_NAMES_bad_extension)/d' tests/api.c + sed -i '/quic/d' tests/include.am + sed -i '/WOLFSSL_QUIC/,/#endif/d' tests/unit.c ''; configureFlags = [ @@ -65,6 +74,9 @@ stdenv.mkDerivation (finalAttrs: { # No runtime detection under ARM and no platform function checks like for X86. (if enableARMCryptoExtensions then "--enable-armasm=inline" else "--disable-armasm") ] + ++ lib.optionals enableJni [ + "--enable-jni" + ] ++ extraConfigureFlags; # Breaks tls13 tests on aarch64-darwin. diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix index 44635613f247..e1a4ad1f1978 100644 --- a/pkgs/by-name/wo/wox/package.nix +++ b/pkgs/by-name/wo/wox/package.nix @@ -25,13 +25,13 @@ }: let - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Wox-launcher"; repo = "Wox"; tag = "v${version}"; - hash = "sha256-6QJCv1geDff4noSaurVsO0Gz0g5+cdobG9DpKBcrMkA="; + hash = "sha256-1g38ry6+iWiRBLVbgLNaotc/jlsG5LLVYvzJbmEjIdA="; }; metaCommon = { diff --git a/pkgs/by-name/wq/wqy_microhei/package.nix b/pkgs/by-name/wq/wqy_microhei/package.nix index 5abd008355a9..5e4b18a16d5f 100644 --- a/pkgs/by-name/wq/wqy_microhei/package.nix +++ b/pkgs/by-name/wq/wqy_microhei/package.nix @@ -2,24 +2,19 @@ lib, stdenvNoCC, fetchurl, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "wqy-microhei"; version = "0.2.0"; src = fetchurl { - url = "mirror://sourceforge/wqy/wqy-microhei-${version}-beta.tar.gz"; + url = "mirror://sourceforge/wqy/wqy-microhei-${finalAttrs.version}-beta.tar.gz"; hash = "sha256-KAKsgCOqNqZupudEWFTjoHjTd///QhaTQb0jeHH3IT4="; }; - installPhase = '' - runHook preInstall - - install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Chinese Unicode font optimized for screen display"; @@ -28,4 +23,4 @@ stdenvNoCC.mkDerivation rec { maintainers = [ lib.maintainers.pkmx ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix index 3efd0356c230..e75598afe0a3 100644 --- a/pkgs/by-name/xi/xine-ui/package.nix +++ b/pkgs/by-name/xi/xine-ui/package.nix @@ -72,6 +72,11 @@ stdenv.mkDerivation (finalAttrs: { LIRC_LIBS = "-L ${lib.getLib lirc}/lib -llirc_client"; }; + postPatch = '' + substituteInPlace src/common/getopt.h \ + --replace-fail 'extern int getopt ();' 'extern int getopt (int ___argc, char *const *___argv, const char *__shortopts);' + ''; + strictDeps = true; meta = { diff --git a/pkgs/by-name/xi/xits-math/package.nix b/pkgs/by-name/xi/xits-math/package.nix index 37c0fad2656a..6573b4d6c624 100644 --- a/pkgs/by-name/xi/xits-math/package.nix +++ b/pkgs/by-name/xi/xits-math/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, python3Packages, + installFonts, }: stdenv.mkDerivation (finalAttrs: { @@ -16,21 +17,23 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "1x3r505dylz9rz8dj98h5n9d0zixyxmvvhnjnms9qxdrz9bxy9g1"; }; - nativeBuildInputs = ( - with python3Packages; - [ + nativeBuildInputs = + (with python3Packages; [ python fonttools fontforge - ] - ); + ]) + ++ [ installFonts ]; postPatch = '' rm *.otf ''; + # installFonts adds a hook to `postInstall` that installs fonts + # into the correct directories installPhase = '' - install -m444 -Dt $out/share/fonts/opentype *.otf + runHook preInstall + runHook postInstall ''; meta = { diff --git a/pkgs/by-name/xk/xkcd-font/package.nix b/pkgs/by-name/xk/xkcd-font/package.nix index a1cc647f0fe6..649cdbbb6794 100644 --- a/pkgs/by-name/xk/xkcd-font/package.nix +++ b/pkgs/by-name/xk/xkcd-font/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { @@ -15,20 +16,20 @@ stdenvNoCC.mkDerivation { hash = "sha256-1DgSx2L+OpXuPVSXbbl/hcZUyBK9ikPyGWuk6wNzlwc="; }; - installPhase = '' - runHook preInstall + preInstall = "rm xkcd/build/xkcd.otf"; - install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf - install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf + nativeBuildInputs = [ installFonts ]; - runHook postInstall - ''; + outputs = [ + "out" + "webfont" + ]; meta = { description = "Xkcd font"; homepage = "https://github.com/ipython/xkcd-font"; license = lib.licenses.cc-by-nc-30; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; }; } diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index f733ac779af2..5f85a5c10c3c 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2026.03"; + version = "2026.04"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-xIJHzWnkxTEFfbVoLqMxd+wC+jfK/0rPVuwGXhOBTrk="; + hash = "sha256-eNt1dm2TDnw+JtRP73RppKeCspxKLgS3mnYKRNQ3Srs="; }; meta = { diff --git a/pkgs/by-name/xo/xournalpp/package.nix b/pkgs/by-name/xo/xournalpp/package.nix index 37760fc9dff3..b7005cb3a63d 100644 --- a/pkgs/by-name/xo/xournalpp/package.nix +++ b/pkgs/by-name/xo/xournalpp/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xournalpp"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "xournalpp"; repo = "xournalpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-AHW3LfGAXoP9F3EJiRgVBQ9NuYdVJrh0cQKSEiG48rc="; + hash = "sha256-RNGVUgpn1Wefc48x5E88AGk4rtXyu0RovZxaS2bqQ+c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix index f9214e5c4231..8412e073e881 100644 --- a/pkgs/by-name/yu/yubihsm-shell/package.nix +++ b/pkgs/by-name/yu/yubihsm-shell/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yubihsm-shell"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubihsm-shell"; rev = finalAttrs.version; - hash = "sha256-/hmG7yVxCVTrpmm/S7oDKQQyXIEO+S5D9wMTc7oW9Io="; + hash = "sha256-qWz9fWhwNObvHERvJTWSN3DQsaPNnPEp4SEdYQvFAlY="; }; postPatch = '' diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix index 6378631ee7fc..3dd456d73086 100644 --- a/pkgs/by-name/z3/z3/package.nix +++ b/pkgs/by-name/z3/z3/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals pythonBindings [ (lib.cmakeFeature "CMAKE_INSTALL_PYTHON_PKG_DIR" "${placeholder "python"}/${python3Packages.python.sitePackages}") - (lib.cmakeFeature "Python3_EXECUTABLE" "${lib.getExe python3Packages.python}") + (lib.cmakeFeature "Python3_EXECUTABLE" python3Packages.python.pythonOnBuildForHost.interpreter) ] ++ lib.optionals javaBindings [ (lib.cmakeFeature "Z3_JAVA_JNI_LIB_INSTALLDIR" "${placeholder "java"}/lib") diff --git a/pkgs/by-name/ze/zeal/package.nix b/pkgs/by-name/ze/zeal/package.nix index fd4a94ab4185..d8138090e767 100644 --- a/pkgs/by-name/ze/zeal/package.nix +++ b/pkgs/by-name/ze/zeal/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "zeal"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; tag = "v${finalAttrs.version}"; - hash = "sha256-13BscKZU/wzjstEQ8ffTGFJaDXO+p8IxNqNsyoEjQUc="; + hash = "sha256-FGg89bluN2IJJtkjwPa6dC83CBLdOr+LW5ArUKp4awk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix index 7e5cbe2eccb5..29a55d63f6cc 100644 --- a/pkgs/desktops/enlightenment/evisum/default.nix +++ b/pkgs/desktops/enlightenment/evisum/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "evisum"; - version = "1.0.0"; + version = "1.2.1"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0tlND/ZvB/07Ze1rccF9T+HMpoL1TPDDDaFAb1Kvtag="; + sha256 = "XuND4zidLkkah3kYYBc7ZLG4r3QvnKpc34NFxA7NR9c="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index 4e5b38564e40..7826a4abb3a1 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -159,11 +159,12 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gitUpdater { }; + } + // lib.optionalAttrs withQt6 { tests = { # Test of morph-browser itself standalone = if withQt6 then nixosTests.morph-browser.qt6 else nixosTests.morph-browser.qt5; - } - // lib.optionalAttrs withQt6 { + # Interactions between the Lomiri ecosystem and this browser inherit (nixosTests.lomiri) desktop-basics desktop-appinteractions; }; diff --git a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix index 94357423aee2..9f177ec48fe0 100644 --- a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix +++ b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix @@ -2,21 +2,21 @@ stdenvNoCC, lib, fetchFromGitLab, + adwaita-icon-theme, gitUpdater, gtk3, hicolor-icon-theme, - ubuntu-themes, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "suru-icon-theme"; - version = "2025.05.0"; + version = "2026.03.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/suru-icon-theme"; rev = finalAttrs.version; - hash = "sha256-6MyZTRcfCpiCXzwrwNiBP6J4L4oFbFtoymhke13tLy0="; + hash = "sha256-cH3Ce2DKlfFZYpkYA7J4GFtYBYSoHoQICPWygI45/so="; }; # Commit 79763fa4ff701d1d89d7362c37c65b2a3cbdf543 introduced abunch of symlinks for Lomiri apps' icons to files from this theme. @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { hicolor-icon-theme # theme setup hook ]; - propagatedBuildInputs = [ ubuntu-themes ]; + propagatedBuildInputs = [ adwaita-icon-theme ]; dontConfigure = true; dontBuild = true; diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index a4872027f911..c4fc4757226e 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -16,12 +16,6 @@ let inherit (self) callPackage; in { - #### Core Apps - morph-browser = callPackage ./applications/morph-browser { - # get_target_property() called with non-existent target "Qt6::qdoc". - withDocumentation = !useQt6; - }; - #### Data lomiri-schemas = callPackage ./data/lomiri-schemas { }; lomiri-sounds = callPackage ./data/lomiri-sounds { }; @@ -56,6 +50,13 @@ let lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { }; lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { }; } + // lib.optionalAttrs useQt6 { + #### Core Apps + morph-browser = callPackage ./applications/morph-browser { + # get_target_property() called with non-existent target "Qt6::qdoc". + withDocumentation = !useQt6; + }; + } // lib.optionalAttrs (!useQt6) { #### Core Apps lomiri = callPackage ./applications/lomiri { }; @@ -105,5 +106,6 @@ lib.makeScope qtPackages.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 + morph-browser = throw "`lomiri.morph-browser` has been removed because it relied on the known-vulnerable `libsForQt5.qtwebengine`. Please use `lomiri-qt6.morph-browser` instead."; # Added on 2026-03-31 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/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index ec5447a751b4..a330d11e7855 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -24,8 +24,8 @@ let in { icu78 = make-icu { - version = "78.1"; - hash = "sha256-Yhf1jKObIxJ2Bc/Gx+DTR1/ksNYxVwETg9cWy0FheIY="; + version = "78.2"; + hash = "sha256-Pploe1xDXUsgljDi0uu3mQbJhGheeGNQeLZy4DyJ3zU="; }; icu77 = make-icu { version = "77.1"; diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/development/libraries/valhalla/default.nix index 16132a8d6d74..565477d03b26 100644 --- a/pkgs/development/libraries/valhalla/default.nix +++ b/pkgs/development/libraries/valhalla/default.nix @@ -24,21 +24,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "valhalla"; - version = "3.5.1"; + version = "3.6.3"; src = fetchFromGitHub { owner = "valhalla"; repo = "valhalla"; tag = finalAttrs.version; - hash = "sha256-v/EwoJA1j8PuF9jOsmxQL6i+MT0rXbyLUE4HvBHUWDo="; + hash = "sha256-Q+h1k26UPiZEVhtonjipUS6gGIUZHM16pYgCxq/Zav0="; fetchSubmodules = true; }; postPatch = '' substituteInPlace src/bindings/python/CMakeLists.txt \ --replace-fail "\''${Python_SITEARCH}" "${placeholder "out"}/${python3.sitePackages}" - substituteInPlace CMakeLists.txt \ - --replace-fail "rapidjson_include_dir rapidjson" "rapidjson_include_dir RapidJSON" ''; nativeBuildInputs = [ @@ -79,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - changelog = "https://github.com/valhalla/valhalla/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/valhalla/valhalla/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Open Source Routing Engine for OpenStreetMap"; homepage = "https://valhalla.readthedocs.io/"; license = lib.licenses.mit; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 1b6848105bc3..280dd6587c92 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1912,6 +1912,64 @@ final: prev: { } ) { }; + ltreesitter = callPackage ( + { + buildLuarocksPackage, + fetchFromGitHub, + fetchurl, + }: + buildLuarocksPackage { + pname = "ltreesitter"; + version = "0.2.0-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/ltreesitter-0.2.0-1.rockspec"; + sha256 = "0qhmx73hkskzmf5s3yv843234ri8n3gqj4dad79b018j5ilwiria"; + }).outPath; + src = fetchFromGitHub { + owner = "euclidianAce"; + repo = "ltreesitter"; + tag = "v0.2.0"; + hash = "sha256-PYM6UAwp8w0qZxua5G6RFXI78Q6L3Vlc3eolXlNrN8k="; + }; + + meta = { + homepage = "https://github.com/euclidianAce/ltreesitter"; + description = "Treesitter bindings to Lua"; + license.fullName = "MIT"; + }; + } + ) { }; + + ltreesitter-ts = callPackage ( + { + buildLuarocksPackage, + fetchFromGitHub, + fetchurl, + }: + buildLuarocksPackage { + pname = "ltreesitter-ts"; + version = "0.0.1-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/ltreesitter-ts-0.0.1-1.rockspec"; + sha256 = "064nn3h6wi8z5ply35ig78jjkpy527nc5qxisbkvv8s3s345h82r"; + }).outPath; + src = fetchFromGitHub { + owner = "FourierTransformer"; + repo = "ltreesitter-ts"; + tag = "0.0.1"; + hash = "sha256-HFBOYFadw+lwQYk39vrFtAn/HGjfXzCxjN1RLBp4yKA="; + }; + + meta = { + homepage = "https://github.com/FourierTransformer/ltreesitter-ts"; + description = "Treesitter parsing library bindings for Lua"; + license.fullName = "MIT"; + }; + } + ) { }; + lua-cjson = callPackage ( { buildLuarocksPackage, @@ -3221,7 +3279,7 @@ final: prev: { knownRockspec = (fetchurl { url = "mirror://luarocks/lualine.nvim-scm-1.rockspec"; - sha256 = "06cm86prf92fiqc30r0lsas70fzp7fli2p758gy5sd133ncqxliz"; + sha256 = "01cqa4nvpq0z4230szwbcwqb0kd8cz2dycrd764r0z5c6vivgfzs"; }).outPath; src = fetchFromGitHub { owner = "nvim-lualine"; @@ -3508,6 +3566,38 @@ final: prev: { } ) { }; + luarocks-build-tree-sitter-cli = callPackage ( + { + buildLuarocksPackage, + fetchFromGitHub, + fetchurl, + luaOlder, + }: + buildLuarocksPackage { + pname = "luarocks-build-tree-sitter-cli"; + version = "0.0.3-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/luarocks-build-tree-sitter-cli-0.0.3-1.rockspec"; + sha256 = "0yy04svrll85zn334mhhnzzdqymsbiqymnr6iaj23h436v3gcq38"; + }).outPath; + src = fetchFromGitHub { + owner = "FourierTransformer"; + repo = "luarocks-build-tree-sitter-cli"; + tag = "0.0.3"; + hash = "sha256-Chc0eKvKyL9JM6MNX5GcRes1YA2+W842NDrX1nNMQ+E="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/FourierTransformer/luarocks-build-tree-sitter-cli"; + description = "A LuaRocks build backend to install the tree-sitter CLI"; + license.fullName = "MIT"; + }; + } + ) { }; + luarocks-build-treesitter-parser = callPackage ( { buildLuarocksPackage, @@ -5682,38 +5772,46 @@ final: prev: { { argparse, buildLuarocksPackage, - dkjson, fetchFromGitHub, fetchurl, inspect, + ltreesitter-ts, + lua-cjson, luafilesystem, + luarocks-build-treesitter-parser, lusc_luv, luv, tl, + tree-sitter-cli, + tree-sitter-teal, }: buildLuarocksPackage { pname = "teal-language-server"; - version = "0.0.5-1"; + version = "0.1.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/teal-language-server-0.0.5-1.rockspec"; - sha256 = "11ps1hgkgli4sf9gcj7pin4kbc5w0yck0daig1ghqssn2q9m2x5l"; + url = "mirror://luarocks/teal-language-server-0.1.1-1.rockspec"; + sha256 = "1dhhqm2dwl1i27dni8yd6l7qjd1xhz16b772jp96aj66rizhkvcr"; }).outPath; src = fetchFromGitHub { owner = "teal-language"; repo = "teal-language-server"; - rev = "main"; - hash = "sha256-TbNvYG2aRt27+sfXvZOlq/F7Gy6sQtoDz6satC+Qqss="; + tag = "0.1.1"; + hash = "sha256-UgN3BOdsxUIsn1HAXEmAzHns1ZKylxUo7owI2uYsNlA="; }; + nativeBuildInputs = [ luarocks-build-treesitter-parser ]; propagatedBuildInputs = [ argparse - dkjson inspect + ltreesitter-ts + lua-cjson luafilesystem lusc_luv luv tl + tree-sitter-cli + tree-sitter-teal ]; meta = { @@ -5911,6 +6009,38 @@ final: prev: { } ) { }; + tree-sitter-cli = callPackage ( + { + buildLuarocksPackage, + fetchFromGitHub, + fetchurl, + luarocks-build-tree-sitter-cli, + }: + buildLuarocksPackage { + pname = "tree-sitter-cli"; + version = "0.26.5-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/tree-sitter-cli-0.26.5-1.rockspec"; + sha256 = "1bd9lz72gvi7djzcy0z6yja045ycm4byiyjpwa3m6zgh1h4mp30r"; + }).outPath; + src = fetchFromGitHub { + owner = "FourierTransformer"; + repo = "tree-sitter-cli"; + rev = "d8e1eb4ae406b75db0f50fae8be5dff636dbb4da"; + hash = "sha256-J73buMI+DzrQ4Qx7G6rW2xFxiOYJBy4rGVDsnfNEgzQ="; + }; + + nativeBuildInputs = [ luarocks-build-tree-sitter-cli ]; + + meta = { + homepage = "https://github.com/FourierTransformer/tree-sitter-cli"; + description = "Install tree-sitter CLI binaries"; + license.fullName = "MIT"; + }; + } + ) { }; + tree-sitter-http = callPackage ( { buildLuarocksPackage, @@ -6004,6 +6134,38 @@ final: prev: { } ) { }; + tree-sitter-teal = callPackage ( + { + buildLuarocksPackage, + fetchurl, + fetchzip, + luaOlder, + luarocks-build-treesitter-parser, + }: + buildLuarocksPackage { + pname = "tree-sitter-teal"; + version = "0.0.35-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/tree-sitter-teal-0.0.35-1.rockspec"; + sha256 = "06g2i3y3gmyz17v9gxwswa9db544nyhd5mx4zq3lihrshbbf6r10"; + }).outPath; + src = fetchzip { + url = "https://github.com/euclidianAce/tree-sitter-teal/archive/05d276e737055e6f77a21335b7573c9d3c091e2f.zip"; + sha256 = "1g1zk47a8jcwac0j60mlfv56mhlhbf6f77vjkx4vsfbrryprcfi4"; + }; + + disabled = luaOlder "5.1"; + nativeBuildInputs = [ luarocks-build-treesitter-parser ]; + + meta = { + homepage = "https://github.com/euclidianAce/tree-sitter-teal"; + description = "tree-sitter parser for teal"; + license.fullName = "UNKNOWN"; + }; + } + ) { }; + utf8 = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index af4acdffa2e0..42b5073f727c 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -23,6 +23,7 @@ gnulib, gnum4, gobject-introspection, + icu, imagemagick, installShellFiles, lib, @@ -434,6 +435,35 @@ in buildInputs = old.buildInputs ++ [ sqlite.dev ]; }); + ltreesitter = prev.ltreesitter.overrideAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ + tree-sitter + ]; + postConfigure = (old.postConfigure or "") + '' + substituteInPlace ''${rockspecFilename} \ + --replace-fail '"tree-sitter/lib/src/lib.c",' "" \ + --replace-fail '"tree-sitter/lib/include",' '"${tree-sitter}/include"' \ + --replace-fail '"tree-sitter/lib/src"' "" + ''; + NIX_CFLAGS_COMPILE = "-I${tree-sitter}/include"; + NIX_LDFLAGS = "-L${tree-sitter}/lib -ltree-sitter"; + }); + + ltreesitter-ts = prev.ltreesitter-ts.overrideAttrs (old: { + # Upstream package relies on git submodules (ltreesitter + tree-sitter), + # but the default source fetch misses those files. + src = fetchFromGitHub { + owner = "FourierTransformer"; + repo = "ltreesitter-ts"; + rev = "0.0.1"; + fetchSubmodules = true; + hash = "sha256-hKM5HQU7A08mA004ZMV7hIVq/2WR3KocMatnTplM8uU="; + }; + nativeBuildInputs = old.nativeBuildInputs ++ [ icu ]; + NIX_CFLAGS_COMPILE = "-I${lib.getDev icu}/include"; + NIX_LDFLAGS = "-L${lib.getLib icu}/lib -licuuc -licui18n -licudata"; + }); + lua-cmsgpack = prev.lua-cmsgpack.overrideAttrs { strictDeps = false; meta.broken = isLuaJIT; @@ -1099,6 +1129,48 @@ in ''; }; + teal-language-server = prev.teal-language-server.overrideAttrs (old: { + # TODO: Remove this prerelease override once upstream publishes a release + # or rockspec that the luarocks updater can consume directly. + version = "0.1.2-pre-1"; + knownRockspec = + (fetchurl { + url = "https://raw.githubusercontent.com/teal-language/teal-language-server/0.1.2-pre-1/teal-language-server-0.1.2-1.rockspec"; + sha256 = "1z7nbzhdqh2w7k635hbbfba2s37rxbcphaxq7dfsjfj3sgkj9snf"; + }).outPath; + src = fetchFromGitHub { + owner = "teal-language"; + repo = "teal-language-server"; + tag = "0.1.2-pre-1"; + hash = "sha256-1ssgt+/e28TJ+1G1TWAPbZe5DiUYOafsSbc9exttesk="; + }; + strictDeps = false; + # Relax lockfile-pinned deps (e.g. luafilesystem 1.8.0-1) so nixpkgs + # packaged versions can satisfy dependencies. + preConfigure = (old.preConfigure or "") + '' + rm -f luarocks.lock + ''; + postConfigure = (old.postConfigure or "") + '' + substituteInPlace ''${rockspecFilename} \ + --replace-fail 'tag = "0.1.2"' 'tag = "0.1.2-pre-1"' \ + --replace-fail '"ltreesitter == 0.1.0",' '"ltreesitter >= 0.2.0",' \ + --replace-fail '"luv == 1.51.0",' '"luv >= 1.51.0",' \ + --replace-fail '"tree-sitter-cli == 0.24.7",' "" \ + --replace-fail '"tl == 0.24.5",' '"tl >= 0.24.5",' \ + --replace-fail '"tree-sitter-teal == 0.0.34",' '"tree-sitter-teal >= 0.0.34",' + ''; + propagatedBuildInputs = + (lib.filter ( + drv: + !(lib.elem (lib.getName drv) [ + "ltreesitter-ts" + ]) + ) (old.propagatedBuildInputs or [ ])) + ++ [ + final.ltreesitter + ]; + }); + tiktoken_core = prev.tiktoken_core.overrideAttrs (old: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (old) src; @@ -1142,6 +1214,17 @@ in ]; }); + tree-sitter-cli = prev.tree-sitter-cli.overrideAttrs (_: { + # Keep this package hermetic: provide the already-packaged tree-sitter + # binary instead of using the LuaRocks backend that downloads from GitHub. + installPhase = '' + runHook preInstall + mkdir -p $out/bin + ln -s ${lib.getExe tree-sitter} $out/bin/tree-sitter + runHook postInstall + ''; + }); + tree-sitter-http = prev.tree-sitter-http.overrideAttrs (old: { nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ tree-sitter @@ -1163,6 +1246,13 @@ in meta.broken = lua.luaversion != "5.1"; }); + tree-sitter-teal = prev.tree-sitter-teal.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + tree-sitter + writableTmpDirAsHomeHook + ]; + }); + utf8 = prev.utf8.overrideAttrs { postPatch = '' sed -i '/#include /a\ diff --git a/pkgs/development/php-packages/opentelemetry/default.nix b/pkgs/development/php-packages/opentelemetry/default.nix index 396db92825df..45da887ebd6d 100644 --- a/pkgs/development/php-packages/opentelemetry/default.nix +++ b/pkgs/development/php-packages/opentelemetry/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.2.1"; + version = "1.3.1"; in buildPecl rec { inherit version; @@ -15,7 +15,7 @@ buildPecl rec { owner = "open-telemetry"; repo = "opentelemetry-php-instrumentation"; rev = version; - hash = "sha256-zUrcikGB3O44ihcw2zOAhInfgF+sXT+Xl2lF7XJphzY="; + hash = "sha256-L58QiuwCIaNPzeh+E7/16kgUNa7vfHCowU7eDKiiImc="; }; sourceRoot = "${src.name}/ext"; diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index ec1426755dc0..4f84accf0b55 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -15,36 +15,36 @@ }: let - version = "0.20.0"; + version = "0.21.0"; hashes = { "aarch64-darwin" = { platform = "darwin-arm64"; hash = { - "8.1" = "sha256-v+28oH/7Dp7mSsIgC/IQAn3Pp0gZ43vBMHb/1xBhiVY="; - "8.2" = "sha256-OXWMn71XCECh5q1kPxKyo7v/dzCT2it7S8NIKbjBli8="; - "8.3" = "7mlpqSPI34DTMJe6gw+77aJGOr12CXHHw+kBmy/nBI4="; - "8.4" = "sha256-FpkzCsak8RZBOgOT90VA5iLcfp5FOxpaOqWQJoV0HEY="; - "8.5" = "bMHjDJf5/prqUjVR6xOTsHl9iFGrBTL6b42KxyogWbQ="; + "8.1" = "sha256-BL4XH7oyZBmZThhfdaqwtArxjF+0CKYYIqxRBafhjCI="; + "8.2" = "sha256-CDNSwdU+/7STdSzZigzq0qc58s2Tz0GtKsXnXpQodic="; + "8.3" = "10cDKh5aXhUN8bONZAXKr8o7UMlngYCXmqD829Ht3oU="; + "8.4" = "sha256-t2cNqYl4U4qDmpK6+4iFKmAAd2D66EJqzt+5l1gB0wg="; + "8.5" = "JBitKlONDaXsDW1wf08JqDbado8Fy+uVzYU9Lvi8fFc="; }; }; "aarch64-linux" = { platform = "debian-aarch64+libssl3"; hash = { - "8.1" = "sha256-Bbm+KURBJbzdyuV2RvnxYnLXLS6VN1osME6ZYCJLBhs="; - "8.2" = "sha256-niNBiZYOQVBg8CA/HCHkXdVJKBbbb/64Z1tjVo0m/2M="; - "8.3" = "sha256-CcuZ36K6nEFVIrdqHMQ5zp1zDDRXP55VKfqT3vx2+NA="; - "8.4" = "rvySgiePXFOctBBJqamBgn2XYQSQzeZAU2i1yCa5/lI="; - "8.5" = "4nkaXp2ArpndcG4BlPU7IlBrVrOEb/Tn7hSZ+0Vsm7k="; + "8.1" = "sha256-I0gMRnN3y/57f0IBNDx5TaFtdFnFmotaqI8vnwGwxqg="; + "8.2" = "sha256-gsk/Kz/zJUXGFubfnQ7wia/5JEHgrIoTM396QpX5YaE="; + "8.3" = "sha256-6+ALZru+ee4lE41bKd06bnSqqTZ1FlcNVW4xOAWZP4g="; + "8.4" = "fYWndjBhKQQjFUwT0aP4A6EUkNCYsEvKtUcXR9l11Yg="; + "8.5" = "0UEvha64GSG/Mysc7oUJ6GMmY1uRZxN/gCkkNzWq/ng="; }; }; "x86_64-linux" = { platform = "debian-x86-64+libssl3"; hash = { - "8.1" = "sha256-1UJMs1lhXMVLbyxQIOIF8S+p9lMMx5WzMwdYUs3eN6U="; - "8.2" = "sha256-zg+LSZdm3qIJ6DoRPSGRSEmKkn5uNPErlC5kMUQhxmM="; - "8.3" = "sha256-kvE4MavRxqQgkWHjaSBwx87r336pmqEwsIpC9CYwPxI="; - "8.4" = "pvYJHfkKvdyIrSrvxezwX2QWQw3kj6nPe/sHlJKys+Q="; - "8.5" = "Aw3oQXYjVNaDHl/qffhTmNHLTWi5bTjF1r4SKyu8nC0="; + "8.1" = "sha256-g5H+3q0ehto/Ug87nb69quiWfR+AhZD5RdrYKl9fmU8="; + "8.2" = "sha256-pUAACcw24DuTDla0L375P+iPhZ/ttlMU2rnQKF6WU8k="; + "8.3" = "sha256-kKF7+zs0WXaMNh7rYUBrg+VixK+AEn3b65EtQiQpJUA="; + "8.4" = "FMYVQ2LDOWnmjkj5UdogwRB4q6NZqebUivbDmAjBONg="; + "8.5" = "T4RL15DJ/rkFLMCXiK7/2PD62LUkrlqFeLwDu1F7Ev0="; }; }; }; diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix index abc6c0746cec..f32e4b74b259 100644 --- a/pkgs/development/python-modules/afsapi/default.nix +++ b/pkgs/development/python-modules/afsapi/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "afsapi"; - version = "0.2.8"; + version = "0.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "wlcrs"; repo = "python-afsapi"; tag = version; - hash = "sha256-eE5BsXNtSU6YUhRn4/SKpMrqaYf8tyfLKdxxGOmNJ9I="; + hash = "sha256-WkkRsXRJ4i3lUn3X94YX7ZqfaKE2GgrBycbflnnlC74="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 965b92c7cd61..289f9a16c06d 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,14 +26,14 @@ buildPythonPackage (finalAttrs: { pname = "aioesphomeapi"; - version = "44.8.0"; + version = "44.9.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${finalAttrs.version}"; - hash = "sha256-8vc9efKFXTQ1or4uAIMo7ElHc7gaaxKheWGb2RcppbQ="; + hash = "sha256-k6yK0aBHA/BpM6uU93Z47kPvduwSlFTG7Upm0SFXcTg="; }; build-system = [ diff --git a/pkgs/development/python-modules/aioghost/default.nix b/pkgs/development/python-modules/aioghost/default.nix new file mode 100644 index 000000000000..0565d1ba2287 --- /dev/null +++ b/pkgs/development/python-modules/aioghost/default.nix @@ -0,0 +1,49 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + hatchling, + pyjwt, + pytest-aiohttp, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "aioghost"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "TryGhost"; + repo = "aioghost"; + tag = "v${finalAttrs.version}"; + hash = "sha256-VIMkAPUzIzSwXCbwqu+OOvUwd/l2zUJpnvjLlvIoDAk="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + aiohttp + pyjwt + ]; + + nativeCheckInputs = [ + aioresponses + pytest-aiohttp + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aioghost" ]; + + meta = { + description = "Async Python client for the Ghost Admin API"; + homepage = "https://github.com/TryGhost/aioghost"; + changelog = "https://github.com/TryGhost/aioghost/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/aioimmich/default.nix b/pkgs/development/python-modules/aioimmich/default.nix index 42eff42600d1..df85901cf930 100644 --- a/pkgs/development/python-modules/aioimmich/default.nix +++ b/pkgs/development/python-modules/aioimmich/default.nix @@ -14,19 +14,19 @@ buildPythonPackage rec { pname = "aioimmich"; - version = "0.12.1"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "mib1185"; repo = "aioimmich"; tag = "v${version}"; - hash = "sha256-bmBVIy96qEhLltz8weA1pwr27MlHoETe/YVfM7sLGWw="; + hash = "sha256-N7cn/kcyBmiaAhOIxGtLPGxQbPolhhhbSNUzHnpb7QM="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail setuptools==82.0.0 setuptools + --replace-fail setuptools==82.0.1 setuptools ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiolichess/default.nix b/pkgs/development/python-modules/aiolichess/default.nix new file mode 100644 index 000000000000..117589863d88 --- /dev/null +++ b/pkgs/development/python-modules/aiolichess/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + aiohttp, +}: + +buildPythonPackage (finalAttrs: { + pname = "aiolichess"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aryanhasgithub"; + repo = "aiolichess"; + tag = "v${finalAttrs.version}"; + hash = "sha256-WCrvDNlq0i2FBD6Ouiue3BQcTuIV80Z8MT/5mOjTr3w="; + }; + + build-system = [ hatchling ]; + + dependencies = [ aiohttp ]; + + # upstream tests are empty + doCheck = false; + + pythonImportsCheck = [ "aiolichess" ]; + + meta = { + description = "Async Python client for the Lichess REST API"; + homepage = "https://github.com/aryanhasgithub/aiolichess"; + changelog = "https://github.com/aryanhasgithub/aiolichess/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index e53bc2239dc4..7ec2359dd375 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -1,24 +1,35 @@ { lib, buildPythonPackage, - crc, fetchPypi, + + # build-system setuptools-scm, + + # dependencies + fastcrc, + msgspec, + numpy, }: buildPythonPackage (finalAttrs: { pname = "apycula"; - version = "0.29"; + version = "0.31"; pyproject = true; + # The Pypi archive contains necessary files generated with proprietary tools. src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-awhGSmGQDQ0Pi+4y9KoR1Yw6UZjM/CTxAV0jdfen6Qw="; + hash = "sha256-77pr4HbS2adFeEI3Q3KzcCfJMi4UomOtKnuGAxobxF0="; }; build-system = [ setuptools-scm ]; - dependencies = [ crc ]; + dependencies = [ + fastcrc + msgspec + numpy + ]; # Tests require a physical FPGA doCheck = false; diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index add1c66a51f5..4aba45a772b4 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -7,6 +7,7 @@ pygobject3, libblockdev, bytesize, + dasbus, pyudev, dbus-python, util-linux, @@ -61,6 +62,7 @@ buildPythonPackage rec { pygobject3 libblockdevPython bytesize + dasbus pyudev dbus-python util-linux @@ -84,7 +86,10 @@ buildPythonPackage rec { stratisd ]; - pythonImportsCheck = [ "blivet" ]; + pythonImportsCheck = [ + "blivet" + "blivet.devicelibs.lvm" + ]; # Even unit tests require a system D-Bus. # TODO: Write a NixOS VM test? diff --git a/pkgs/development/python-modules/ctranslate2/default.nix b/pkgs/development/python-modules/ctranslate2/default.nix index 26de059fba7b..5c84d2b1ca1c 100644 --- a/pkgs/development/python-modules/ctranslate2/default.nix +++ b/pkgs/development/python-modules/ctranslate2/default.nix @@ -67,10 +67,15 @@ buildPythonPackage rec { rm -rf ctranslate2 ''; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # Fatal Python error: Aborted - "test_invalid_model_path" - ]; + disabledTests = + lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ + # RuntimeError: Failed to initialize cpuinfo!" + "test_torch_variables" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Fatal Python error: Aborted + "test_invalid_model_path" + ]; disabledTestPaths = [ # TODO: ModuleNotFoundError: No module named 'opennmt' diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index a9ca4e859d89..6118e3d8589f 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -16,29 +16,31 @@ typing-extensions, # tests + arro3-core, + nanoarrow, numpy, pytest-asyncio, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datafusion"; - version = "50.1.0"; + version = "52.3.0"; pyproject = true; src = fetchFromGitHub { name = "datafusion-source"; owner = "apache"; - repo = "arrow-datafusion-python"; - tag = version; + repo = "datafusion-python"; + tag = finalAttrs.version; # Fetch arrow-testing and parquet-testing (tests assets) fetchSubmodules = true; - hash = "sha256-+r3msFc9yu3aJBDRI66A/AIctCbLxfZB3Ur/raDV3x8="; + hash = "sha256-kyJoG65XKSF+RElZlsdfVTZp/ufWiUw0YdCpQ8Qcg78="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname src version; - hash = "sha256-XJ2x/EtMZu/fdS6XB/IydMfHmlaxEWJ3XJPY73WoGqs="; + inherit (finalAttrs) pname src version; + hash = "sha256-7/YWJORUjhhZSLyyBT6NFD0RzARJ3SKd11gn4kJ7aYw="; }; nativeBuildInputs = with rustPlatform; [ @@ -57,6 +59,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + arro3-core + nanoarrow numpy pytest-asyncio pytestCheckHook @@ -87,8 +91,8 @@ buildPythonPackage rec { that uses Apache Arrow as its in-memory format. ''; homepage = "https://arrow.apache.org/datafusion/"; - changelog = "https://github.com/apache/arrow-datafusion-python/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/apache/datafusion-python/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ cpcloud ]; }; -} +}) diff --git a/pkgs/development/python-modules/dm-tree/default.nix b/pkgs/development/python-modules/dm-tree/default.nix index 3e9b803192fc..45792a3f70d5 100644 --- a/pkgs/development/python-modules/dm-tree/default.nix +++ b/pkgs/development/python-modules/dm-tree/default.nix @@ -19,16 +19,16 @@ numpy, wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dm-tree"; - version = "0.1.9"; + version = "0.1.10"; pyproject = true; src = fetchFromGitHub { owner = "deepmind"; repo = "tree"; - tag = version; - hash = "sha256-cHuaqA89r90TCPVHNP7B1cfK+WxqmfTXndJ/dRdmM24="; + tag = finalAttrs.version; + hash = "sha256-L1DOwgJriFoS0rf6g+f3qcw94Q/ia4N6kZ1ai6F/Qng="; }; # Allows to forward cmake args through the conventional `cmakeFlags` postPatch = '' @@ -36,10 +36,6 @@ buildPythonPackage rec { --replace-fail \ "cmake_args = [" \ 'cmake_args = [ *os.environ.get("cmakeFlags", "").split(),' - substituteInPlace tree/CMakeLists.txt \ - --replace-fail \ - "CMAKE_CXX_STANDARD 14" \ - "CMAKE_CXX_STANDARD 17" ''; cmakeFlags = [ (lib.cmakeBool "USE_SYSTEM_ABSEIL" true) @@ -71,13 +67,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "tree" ]; meta = { - description = "Tree is a library for working with nested data structures"; + description = "Python library for working with nested data structures"; homepage = "https://github.com/deepmind/tree"; - changelog = "https://github.com/google-deepmind/tree/releases/tag/${version}"; + changelog = "https://github.com/google-deepmind/tree/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ samuela ndl ]; }; -} +}) diff --git a/pkgs/development/python-modules/epaper-dithering/default.nix b/pkgs/development/python-modules/epaper-dithering/default.nix new file mode 100644 index 000000000000..be30e1abe96b --- /dev/null +++ b/pkgs/development/python-modules/epaper-dithering/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + numpy, + pillow, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "epaper-dithering"; + version = "0.6.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "OpenDisplay"; + repo = "epaper-dithering"; + tag = "python-v${finalAttrs.version}"; + hash = "sha256-h84AgWJR8zVuwoz02A3U82yTOw4MSK9DjaxkYi0nWkM="; + }; + + sourceRoot = "${finalAttrs.src.name}/packages/python"; + + build-system = [ hatchling ]; + + dependencies = [ + numpy + pillow + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "epaper_dithering" ]; + + meta = { + description = "Dithering algorithms for e-paper/e-ink displays"; + homepage = "https://github.com/OpenDisplay/epaper-dithering"; + changelog = "https://github.com/OpenDisplay/epaper-dithering/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 169db92f5ed6..e62703501685 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; src = fetchFromGitHub { owner = "slhck"; repo = "ffmpeg-progress-yield"; tag = "v${version}"; - hash = "sha256-Cy2ShWEwtfk/eDCXZL3qPrTRMJZtCtjOVHfmW0NbuN4="; + hash = "sha256-OEE23gzPYcjKjrar+aV2zZuZyhrvqkYPhnWC3GzefUI="; }; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/hass-client/default.nix b/pkgs/development/python-modules/hass-client/default.nix index d5e0f34fdef0..ba0fdc3aec80 100644 --- a/pkgs/development/python-modules/hass-client/default.nix +++ b/pkgs/development/python-modules/hass-client/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "hass-client"; - version = "1.2.0"; + version = "1.2.3"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "python-hass-client"; tag = version; - hash = "sha256-FA3acaXLWcBMDsabLPxVk6EArSxcTAnmFeO1ixTXB1Q="; + hash = "sha256-uCVwxa/KTiOmaexmdeynL2LSqBhDu8Zfre+Nh9Oauiw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hyperpyyaml/default.nix b/pkgs/development/python-modules/hyperpyyaml/default.nix index 0c9ebca66166..72b74de94d96 100644 --- a/pkgs/development/python-modules/hyperpyyaml/default.nix +++ b/pkgs/development/python-modules/hyperpyyaml/default.nix @@ -26,6 +26,19 @@ buildPythonPackage rec { hash = "sha256-/7OrIR61zQYl2+RjiOOlaqUGWBieon5fe8sgmEvKowo="; }; + postPatch = '' + # https://github.com/speechbrain/HyperPyYAML/pull/33 + substituteInPlace hyperpyyaml/core.py \ + --replace-fail \ + " hparams = yaml.load(yaml_stream, Loader=loader)" \ + " if not hasattr(loader, 'max_depth'): + loader.max_depth = 0 + hparams = yaml.load(yaml_stream, Loader=loader)" + ''; + + # https://github.com/speechbrain/HyperPyYAML/pull/33 + pythonRelaxDeps = [ "ruamel.yaml" ]; + build-system = [ setuptools ]; @@ -40,8 +53,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "hyperpyyaml" ]; meta = { - # https://github.com/speechbrain/HyperPyYAML/pull/32 - broken = lib.versionAtLeast ruamel-yaml.version "0.19"; description = "Extensions to YAML syntax for better python interaction"; homepage = "https://github.com/speechbrain/HyperPyYAML"; changelog = "https://github.com/speechbrain/HyperPyYAML/releases/tag/${src.tag}"; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 2ed3b6d2bc5b..bb4e5237c410 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.5.3"; + version = "0.5.4"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "ignite"; tag = "v${version}"; - hash = "sha256-0lQe5fWR4t3uAJVfGVebkxiWHx8TvgNQzJylKNmjjo0="; + hash = "sha256-taf1T5zSX436Bn2qLL8ba/fXyFtu51uOvYcWerpEQ1E="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix index e5a7c5f4a6b7..fc56722b9f16 100644 --- a/pkgs/development/python-modules/instructor/default.nix +++ b/pkgs/development/python-modules/instructor/default.nix @@ -33,14 +33,14 @@ buildPythonPackage (finalAttrs: { pname = "instructor"; - version = "1.14.5"; + version = "1.15.1"; pyproject = true; src = fetchFromGitHub { owner = "jxnl"; repo = "instructor"; tag = "v${finalAttrs.version}"; - hash = "sha256-MxFHCjtIUESuvDkNvEEcZdWXTLAxGFH9ZJ1wx8E4N14="; + hash = "sha256-+mYVg4IuoU/GEK/L3qXUfO224eWMrRtoXTTi8RhOJk4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index ded3466b2ea0..5fa068355a65 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -42,21 +42,21 @@ buildPythonPackage (finalAttrs: { pname = "lancedb"; - version = "0.30.1"; + version = "0.30.2"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lancedb"; tag = "python-v${finalAttrs.version}"; - hash = "sha256-LzuzVl6cTkn1Owd91bHi5JS43KZUhd/ZD9biS21MdVs="; + hash = "sha256-k7eVUOnriR91DqVRJP7N9VG75bHAzbDB8bHFLFi5h1w="; }; buildAndTestSubdir = "python"; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-U5wpWN6e26187DYeT85l6TxBnUu8rD+UzE98OIkretc="; + hash = "sha256-yux18lKMaNOmrmVOYNMo5MMNAO0at5g/0eEsjF97Pes="; }; build-system = [ rustPlatform.maturinBuildHook ]; diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix index 187fac569c01..6887f60a7673 100644 --- a/pkgs/development/python-modules/lerobot/default.nix +++ b/pkgs/development/python-modules/lerobot/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -20,6 +21,7 @@ huggingface-hub, imageio, jsonlines, + numpy, opencv-python-headless, packaging, pynput, @@ -39,14 +41,14 @@ buildPythonPackage (finalAttrs: { pname = "lerobot"; - version = "0.4.3"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "lerobot"; tag = "v${finalAttrs.version}"; - hash = "sha256-3z8gyK9bx5GpFXM/kLbxume/e8F2U84yUTUhmn57mLs="; + hash = "sha256-i4szKM8b766mAA0AxCHB4s1wEEZbGeBKGeGpLICVsrM="; }; build-system = [ @@ -57,18 +59,16 @@ buildPythonPackage (finalAttrs: { pythonRelaxDeps = [ "av" - "datasets" "diffusers" "draccus" - "gymnasium" - "huggingface-hub" - "opencv" + "numpy" + "opencv-python-headless" "rerun-sdk" "torch" + "torchcodec" "torchvision" "wandb" ]; - dependencies = [ accelerate av @@ -83,6 +83,7 @@ buildPythonPackage (finalAttrs: { huggingface-hub imageio jsonlines + numpy opencv-python-headless packaging pynput @@ -124,17 +125,25 @@ buildPythonPackage (finalAttrs: { # Require internet access "test_act_backbone_lr" + "test_all_items_have_subtask" "test_backward_compatibility" "test_convert_image_to_video_dataset" "test_convert_image_to_video_dataset_subset_episodes" "test_dataset_initialization" "test_factory" "test_from_pretrained_nonexistent_path" + "test_getitem_has_subtask_index" + "test_getitem_returns_subtask_string" "test_load_config_nonexistent_path_tries_hub" "test_make_env_from_hub_async" "test_make_env_from_hub_with_trust" "test_policy_defaults" "test_save_and_load_pretrained" + "test_subtask_dataset_loads" + "test_subtask_index_in_features" + "test_subtask_index_maps_to_valid_subtask" + "test_subtask_metadata_loaded" + "test_task_and_subtask_coexist" # TypeError: stack(): argument 'tensors' (position 1) must be tuple of Tensors, not Column "test_check_timestamps_sync_slightly_off" @@ -161,6 +170,12 @@ buildPythonPackage (finalAttrs: { # TypeError: 'NoneType' object is not subscriptable "test_pi0_rtc_inference_with_prev_chunk" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # RuntimeError: Failed to initialize cpuinfo! + "test_complementary_data_float_dtype_conversion" + "test_float_dtype_conversion" + "test_float_dtype_with_mixed_tensors" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix index 3363a64e862f..55801dc2819f 100644 --- a/pkgs/development/python-modules/logical-unification/default.nix +++ b/pkgs/development/python-modules/logical-unification/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, + fetchpatch, toolz, multipledispatch, py, @@ -13,7 +13,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "logical-unification"; version = "0.4.7"; pyproject = true; @@ -21,10 +21,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pythological"; repo = "unification"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-m1wB7WOGb/io4Z7Zfl/rckh08j6IKSiiwFKMvl5UzHg="; }; + patches = [ + (fetchpatch { + url = "https://github.com/pythological/unification/pull/49.patch"; + hash = "sha256-0y1DHxxjQ19upOlstf/zihP1b6iQ4A/WqyWNpirW/kg="; + }) + ]; + build-system = [ setuptools setuptools-scm @@ -42,11 +49,6 @@ buildPythonPackage rec { pytest-benchmark # Needed for the `--benchmark-skip` flag ]; - disabledTests = lib.optionals (pythonAtLeast "3.12") [ - # Failed: DID NOT RAISE - "test_reify_recursion_limit" - ]; - pytestFlags = [ "--benchmark-skip" "--html=testing-report.html" @@ -62,4 +64,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ Etjean ]; }; -} +}) diff --git a/pkgs/development/python-modules/mhcgnomes/default.nix b/pkgs/development/python-modules/mhcgnomes/default.nix index f963f94a3b56..7024be45ec02 100644 --- a/pkgs/development/python-modules/mhcgnomes/default.nix +++ b/pkgs/development/python-modules/mhcgnomes/default.nix @@ -17,14 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "mhcgnomes"; - version = "3.15.1"; + version = "3.19.0"; pyproject = true; src = fetchFromGitHub { owner = "pirl-unc"; repo = "mhcgnomes"; tag = "v${finalAttrs.version}"; - hash = "sha256-tcJfGIJsbCdN+U/+2zsYBhKEJNy55QMf7eu9Z4nuXlk="; + hash = "sha256-Z5Xmo3yXsFr2u2BUVc5YJZc7gjcBSkpfWy2VuXK8qEc="; }; build-system = [ diff --git a/pkgs/development/python-modules/modelscope/default.nix b/pkgs/development/python-modules/modelscope/default.nix index f30b7bdb2317..a00887cec342 100644 --- a/pkgs/development/python-modules/modelscope/default.nix +++ b/pkgs/development/python-modules/modelscope/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "modelscope"; - version = "1.35.1"; + version = "1.35.3"; pyproject = true; src = fetchFromGitHub { owner = "modelscope"; repo = "modelscope"; tag = "v${finalAttrs.version}"; - hash = "sha256-p8Pv58IpP165z4CHq+CO6160LyHd3BS3Y3I2JBGp4KE="; + hash = "sha256-3PG20FqNn8syngxmzxjIr1C8u128RPFj+FjU494QTYA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nanoarrow/default.nix b/pkgs/development/python-modules/nanoarrow/default.nix new file mode 100644 index 000000000000..7993c3e2668e --- /dev/null +++ b/pkgs/development/python-modules/nanoarrow/default.nix @@ -0,0 +1,89 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython, + meson, + meson-python, + + # nativeBuildInputs + pkg-config, + + # buildInputs + zlib, + zstd-c, + + pytestCheckHook, +}: + +let + # Nanoarrow requires a specific post-0.6.1 flatcc commit that adds `_with_size` API variants not + # present in the upstream 0.6.1 release. + flatcc-src = fetchFromGitHub { + owner = "dvidelabs"; + repo = "flatcc"; + rev = "fd3c4ae5cd39f0651eda6a3a1a374278070135d6"; + hash = "sha256-8MqazKuwfFWVJ/yjT5fNrRzexFQ2ky4YTcZqOYjk9Qc="; + }; +in +buildPythonPackage (finalAttrs: { + pname = "nanoarrow"; + version = "0.8.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "apache"; + repo = "arrow-nanoarrow"; + tag = "apache-arrow-nanoarrow-${finalAttrs.version}"; + hash = "sha256-1iLbT1eeyZaoB75uYTgg4qns+C7b4DErqMwJ9nQPRls="; + }; + + # Pre-populate the meson subproject with the flatcc source so meson doesn't try to download it. + # The wrap's patch_directory overlay (meson.build) must also be applied. + postPatch = + let + flatcc-src-dest = "subprojects/flatcc-${flatcc-src.rev}"; + in + '' + cp -r --no-preserve=mode ${flatcc-src} ${flatcc-src-dest} + cp subprojects/packagefiles/flatcc/meson.build ${flatcc-src-dest}/ + ''; + + sourceRoot = "${finalAttrs.src.name}/python"; + + build-system = [ + cython + meson + meson-python + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + zlib + zstd-c + ]; + + mesonFlags = [ + # Use system zstd instead of the meson wrap + (lib.mesonOption "force_fallback_for" "flatcc") + ]; + + pythonImportsCheck = [ "nanoarrow" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Python bindings to the nanoarrow C library"; + homepage = "https://github.com/apache/arrow-nanoarrow/tree/main/python"; + changelog = "https://github.com/apache/arrow-nanoarrow/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/onvif-parsers/default.nix b/pkgs/development/python-modules/onvif-parsers/default.nix new file mode 100644 index 000000000000..683fca6fcb33 --- /dev/null +++ b/pkgs/development/python-modules/onvif-parsers/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + lxml, + onvif-zeep-async, + zeep, + pytest-cov-stub, + pytestCheckHook, + pytest-asyncio, +}: + +buildPythonPackage (finalAttrs: { + pname = "onvif-parsers"; + version = "2.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "openvideolibs"; + repo = "onvif-parsers"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ukwcyycK3YFk0qHUPBD7Aoy3F3itXn0zUGq9I65b3Ns="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + lxml + onvif-zeep-async + zeep + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "onvif_parsers" ]; + + meta = { + description = "Parsers for ONVIF events"; + homepage = "https://github.com/openvideolibs/onvif-parsers"; + changelog = "https://github.com/openvideolibs/onvif-parsers/blob/main/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/pgmpy/default.nix b/pkgs/development/python-modules/pgmpy/default.nix index 3a473f07c388..295c936b3d5f 100644 --- a/pkgs/development/python-modules/pgmpy/default.nix +++ b/pkgs/development/python-modules/pgmpy/default.nix @@ -28,7 +28,7 @@ }: buildPythonPackage (finalAttrs: { pname = "pgmpy"; - version = "1.0.0-unstable-2025-12-20"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/py-opendisplay/default.nix b/pkgs/development/python-modules/py-opendisplay/default.nix new file mode 100644 index 000000000000..bd4e2f61fae7 --- /dev/null +++ b/pkgs/development/python-modules/py-opendisplay/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + bleak, + bleak-retry-connector, + epaper-dithering, + numpy, + pillow, + pytestCheckHook, + pytest-asyncio, +}: + +buildPythonPackage (finalAttrs: { + pname = "py-opendisplay"; + version = "5.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "OpenDisplay"; + repo = "py-opendisplay"; + tag = "v${finalAttrs.version}"; + hash = "sha256-pPV4Ir9GK++66qq5QGnwyjpBinK7EvI7C7HB14tFDXU="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + bleak + bleak-retry-connector + epaper-dithering + numpy + pillow + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ "opendisplay" ]; + + meta = { + description = "Python library for communicating with OpenDisplay BLE e-paper displays"; + homepage = "https://github.com/OpenDisplay/py-opendisplay"; + changelog = "https://github.com/OpenDisplay/py-opendisplay/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix index 5a3f34d650dc..a753d84b06fa 100644 --- a/pkgs/development/python-modules/py-opensonic/default.nix +++ b/pkgs/development/python-modules/py-opensonic/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "py-opensonic"; - version = "8.1.1"; + version = "8.1.2"; pyproject = true; src = fetchFromGitHub { owner = "khers"; repo = "py-opensonic"; tag = "v${version}"; - hash = "sha256-/P/7ytA0YHuJZEq7KQosPBQM2vo6VAss1G8pTIEswJA="; + hash = "sha256-lpPRkPLWHzsXhpZ1PVvgNWTQUuuU8N0g7ntqyOAbPlM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/py-unifi-access/default.nix b/pkgs/development/python-modules/py-unifi-access/default.nix new file mode 100644 index 000000000000..c06334edd5b0 --- /dev/null +++ b/pkgs/development/python-modules/py-unifi-access/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, + pydantic, + aioresponses, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "py-unifi-access"; + version = "1.1.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "imhotep"; + repo = "py-unifi-access"; + tag = finalAttrs.version; + hash = "sha256-FYhHTYQl+yGHcAu0APqdfca/YSMp3GSQmY7kSO4xkH8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + pydantic + ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "unifi_access_api" ]; + + meta = { + description = "Async Python client for the UniFi Access local API with WebSocket event support"; + homepage = "https://github.com/imhotep/py-unifi-access"; + changelog = "https://github.com/imhotep/py-unifi-access/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix index cd74ebb3583d..def0e82f09e4 100644 --- a/pkgs/development/python-modules/pyannote-audio/default.nix +++ b/pkgs/development/python-modules/pyannote-audio/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, # build-system hatchling, @@ -61,7 +62,9 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ + "torch" "torchaudio" + "torchcodec" ]; dependencies = [ asteroid-filterbanks @@ -121,13 +124,22 @@ buildPythonPackage rec { "test_audio_resample" ]; - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ - # Crashes the interpreter - # - On aarch64-darwin: Trace/BPT trap: 5 - # - On x86_64-darwin: Fatal Python error: Illegal instruction - "tests/inference_test.py" - "tests/test_train.py" - ]; + disabledTestPaths = + lib.optionals stdenv.hostPlatform.isDarwin [ + # Crashes the interpreter + # - On aarch64-darwin: Trace/BPT trap: 5 + # - On x86_64-darwin: Fatal Python error: Illegal instruction + "tests/inference_test.py" + "tests/test_train.py" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # RuntimeError: Please call `iter(combined_loader)` first. + # https://github.com/Lightning-AI/pytorch-lightning/issues/20641 + "tests/inference_test.py" + "tests/test_train.py" + # PicklingError: Can't pickle + "tests/tasks/test_reproducibility.py" + ]; meta = { description = "Neural building blocks for speaker diarization: speech activity detection, speaker change detection, overlapped speech detection, speaker embedding"; diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index 70be656ae915..9df2ae84c750 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -34,14 +34,14 @@ buildPythonPackage (finalAttrs: { pname = "pylance"; - version = "3.0.1"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; tag = "v${finalAttrs.version}"; - hash = "sha256-zlD6jHMpgk4gvMjBizZP2VV0zM6iKaatIq6PbBKWaJ8="; + hash = "sha256-Z7lgK7sIeZCL8VXfmwC8G1f7cBqG2nfFM3oyJZfmNQ4="; }; sourceRoot = "${finalAttrs.src.name}/python"; @@ -53,7 +53,7 @@ buildPythonPackage (finalAttrs: { src sourceRoot ; - hash = "sha256-+4UVY4JjQsVT+S5+j9PEXoFuiZhrrelSEfY8EvXp/Sk="; + hash = "sha256-hZEcTo4B3+viRwWExkaguq+c7DejjaouNf0+L96rms4="; }; nativeBuildInputs = [ @@ -151,6 +151,9 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # OSError: LanceError(IO): Resources exhausted: Failed to allocate additional 1245184 bytes for ExternalSorter[0]... "test_merge_insert_large" + + # RuntimeError: Failed to initialize cpuinfo! + "test_index_cast_centroids" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Build hangs after all the tests are run due to a torch subprocess not exiting diff --git a/pkgs/development/python-modules/pysilero-vad/default.nix b/pkgs/development/python-modules/pysilero-vad/default.nix index 392d72c8082c..fbd19cafdb50 100644 --- a/pkgs/development/python-modules/pysilero-vad/default.nix +++ b/pkgs/development/python-modules/pysilero-vad/default.nix @@ -48,6 +48,7 @@ buildPythonPackage (finalAttrs: { ''; meta = { + broken = stdenv.hostPlatform.isDarwin; # ld: unknown option: --disable-new-dtags description = "Pre-packaged voice activity detector using silero-vad"; homepage = "https://github.com/rhasspy/pysilero-vad"; changelog = "https://github.com/rhasspy/pysilero-vad/blob/${finalAttrs.src.tag}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix index 03f5ed36644e..7b2c7282b033 100644 --- a/pkgs/development/python-modules/pysnooper/default.nix +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, @@ -22,6 +23,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # timing-sensitive and often breaks on x86_64-darwin + "test_relative_time" + ]; + pythonImportsCheck = [ "pysnooper" ]; meta = { diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index f5875901b576..0bae3f20b92c 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -102,17 +102,20 @@ buildPythonPackage { "test_isolated_streams" "test_send_dataframe_roundtrip" "test_server_failed_table_creation_does_not_leak_entry" + "test_server_version_info" "test_server_with_dataset_files" "test_server_with_dataset_prefix" "test_server_with_multiple_datasets" # TypeError: 'Snapshot' object is not callable + "test_chunk_record_batch" "test_schema_recording" ]; disabledTestPaths = [ # "fixture 'benchmark' not found" "tests/python/log_benchmark/test_log_benchmark.py" + "tests/python/log_benchmark/test_micro_benchmark.py" # ValueError: Failed to start Rerun server: Error loading RRD: couldn't decode "/build/source/tests/assets/rrd/dataset/file4.rrd" "rerun_py/tests/e2e_redap_tests" diff --git a/pkgs/development/python-modules/sqlalchemy-utc/default.nix b/pkgs/development/python-modules/sqlalchemy-utc/default.nix index c1b5f9a41ff4..bea5ee19946b 100644 --- a/pkgs/development/python-modules/sqlalchemy-utc/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utc/default.nix @@ -22,6 +22,8 @@ buildPythonPackage (finalAttrs: { patches = [ # https://github.com/spoqa/sqlalchemy-utc/pull/20 ./sqlalchemy2-compat.patch + # https://github.com/spoqa/sqlalchemy-utc/pull/21\ + ./python314-compat.patch ]; build-system = [ diff --git a/pkgs/development/python-modules/sqlalchemy-utc/python314-compat.patch b/pkgs/development/python-modules/sqlalchemy-utc/python314-compat.patch new file mode 100644 index 000000000000..4d8e08137ddf --- /dev/null +++ b/pkgs/development/python-modules/sqlalchemy-utc/python314-compat.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 2da8f43..1927e60 100644 +--- a/setup.py ++++ b/setup.py +@@ -34,7 +34,7 @@ def get_version(): + continue + target, = node.targets + if isinstance(target, ast.Name) and target.id == '__version__': +- return node.value.s ++ return node.value.value + + + install_requires = ['setuptools', 'SQLAlchemy >= 0.9.0'] diff --git a/pkgs/development/python-modules/trmnl/default.nix b/pkgs/development/python-modules/trmnl/default.nix new file mode 100644 index 000000000000..8bc2662263b9 --- /dev/null +++ b/pkgs/development/python-modules/trmnl/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + aiohttp, + mashumaro, + orjson, + yarl, + aioresponses, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + syrupy, +}: + +buildPythonPackage (finalAttrs: { + pname = "trmnl"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "joostlek"; + repo = "python-trmnl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Gpyhp+d27/IxDOTFxcN9ltYbOJOg9scf17qVb/ArBw0="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + mashumaro + orjson + yarl + ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-cov-stub + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ "trmnl" ]; + + meta = { + description = "Asynchronous Python client for TRMNL"; + homepage = "https://github.com/joostlek/python-trmnl"; + changelog = "https://github.com/joostlek/python-trmnl/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/ts1-signatures/default.nix b/pkgs/development/python-modules/ts1-signatures/default.nix index d0c7b15fa94e..fca8f786323b 100644 --- a/pkgs/development/python-modules/ts1-signatures/default.nix +++ b/pkgs/development/python-modules/ts1-signatures/default.nix @@ -36,6 +36,6 @@ buildPythonPackage { description = "TLS and HTTP signature and fingerprint library"; homepage = "https://github.com/yifeikong/th1"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ggg ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix index c89f11ded901..8f53a89075d6 100644 --- a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix +++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "tuya-device-sharing-sdk"; - version = "0.2.8"; + version = "0.2.9"; pyproject = true; src = fetchFromGitHub { owner = "tuya"; repo = "tuya-device-sharing-sdk"; tag = finalAttrs.version; - hash = "sha256-uD2Lzs08i/01iEksXpYRGB2lU7I15sQrJLfJZ93+oeY="; + hash = "sha256-kNWg+AXISThwK14ByObUr+/4GMntrZgtEEMNpw/HjLw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix index 2f72aa889258..a508f25d1b33 100644 --- a/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/pkgs/development/python-modules/unifi-discovery/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "unifi-discovery"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "unifi-discovery"; tag = "v${version}"; - hash = "sha256-Ea+zxV2GUAaG/BxO103NhOLzzr/TNJaOsynDad2/2VA="; + hash = "sha256-/SsgBiCEfMYi3DccYKBZGoYX4egGW+bBIA/D73FaneE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 4053ad783d6b..a7f7a2eb87e9 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -27,14 +27,14 @@ buildPythonPackage (finalAttrs: { pname = "uproot"; - version = "5.7.2"; + version = "5.7.3"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot5"; tag = "v${finalAttrs.version}"; - hash = "sha256-5FTGUYn+wveNA10ccIVmDuAmAuCZ5DdMAhRXRIgExg8="; + hash = "sha256-16+AIHjGN/XbpyXLYATLzzBxl7kN9/XNyV5uz4LIZ2k="; }; build-system = [ @@ -94,6 +94,7 @@ buildPythonPackage (finalAttrs: { # Tests that try to download files "tests/test_0066_fix_http_fallback_freeze.py" "tests/test_0220_contiguous_byte_ranges_in_http.py" + "tests/test_1610_read_TMatrixTSym_from_ttree.py" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 6b6886c71367..777859cedb1f 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.28.0"; + version = "2.28.1"; src = fetchFromGitHub { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-b52UjilVc5BNATlzhxBmFohd9kK3OJQOKJWy+VSAlEE="; + sha256 = "sha256-p4fsQu46HX8Gc2W/RCvvjI1KZGcN2S/3ZOLty0MHmfg="; }; vendorHash = "sha256-6a4Xdp8lcPq+GPewQmEPzr9hXjSrqHR7kqw7pqHzjXE="; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix index b7502a19fcdb..7360c7a66d6b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix @@ -923,10 +923,30 @@ }; go-template = { - version = "0-unstable-2025-12-12"; + version = "0-unstable-2026-03-21"; url = "github:ngalaiko/tree-sitter-go-template"; - rev = "c59999dc449c29549f5735eaac31b938a13b6c14"; - hash = "sha256-YKqpNkCRLX+89Ottw4KVXxrEsIPRUsWs0UwIgucHwdo="; + rev = "aa71f63de226c5592dfbfc1f29949522d7c95fac"; + hash = "sha256-QSzUyRDGdBH9TaG3YCHnJp12WcR8kdbsZFIk8I+JW1Y="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + azahi + ]; + }; + }; + + go-template-helm = { + version = "0-unstable-2026-03-21"; + url = "github:ngalaiko/tree-sitter-go-template"; + rev = "aa71f63de226c5592dfbfc1f29949522d7c95fac"; + hash = "sha256-QSzUyRDGdBH9TaG3YCHnJp12WcR8kdbsZFIk8I+JW1Y="; + location = "dialects/helm"; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + azahi + ]; + }; }; godot-resource = { diff --git a/pkgs/misc/cups/drivers/brother/dcpj785dw/default.nix b/pkgs/misc/cups/drivers/brother/dcpj785dw/default.nix new file mode 100644 index 000000000000..ad7068ae6b18 --- /dev/null +++ b/pkgs/misc/cups/drivers/brother/dcpj785dw/default.nix @@ -0,0 +1,130 @@ +{ + lib, + stdenv, + fetchurl, + cups, + dpkg, + gnused, + makeWrapper, + ghostscript, + file, + a2ps, + coreutils, + gnugrep, + which, + gawk, + pkgsi686Linux, +}: + +let + version = "1.0.0_0"; + model = "dcpj785dw"; +in +{ + driver = stdenv.mkDerivation { + pname = "${model}-lpr"; + inherit version; + + src = fetchurl { + + url = "https://download.brother.com/welcome/dlf102774/${model}lpr-1.0.0-0.i386.deb"; + sha256 = "sha256-EXUN69YJEz1M0ADEF+0uZ+hdMgIiXChwtf+NzeFk7j0="; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + buildInputs = [ + cups + ghostscript + a2ps + gawk + ]; + unpackPhase = "dpkg-deb -x $src $out"; + + installPhase = '' + substituteInPlace $out/opt/brother/Printers/${model}/lpd/filter${model} \ + --replace /opt "$out/opt" + + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/${model}/lpd/br${model}filter + + mkdir -p $out/lib/cups/filter/ + ln -s $out/opt/brother/Printers/${model}/lpd/filter${model} $out/lib/cups/filter/brother_lpdwrapper_${model} + + wrapProgram $out/opt/brother/Printers/${model}/lpd/filter${model} \ + --prefix PATH ":" ${ + lib.makeBinPath [ + gawk + ghostscript + a2ps + file + gnused + gnugrep + coreutils + which + ] + } \ + --set LD_PRELOAD ${pkgsi686Linux.libredirect}/lib/libredirect.so \ + --set NIX_REDIRECTS /opt/=$out/opt/ + ''; + + meta = { + homepage = "http://www.brother.com/"; + description = "Brother ${model} printer driver"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=gb&lang=en&prod=${model}_all&os=128"; + maintainers = with lib.maintainers; [ marcovergueira ]; + }; + }; + + cupswrapper = stdenv.mkDerivation { + pname = "${model}-cupswrapper"; + inherit version; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf102775/${model}cupswrapper-1.0.0-0.i386.deb"; + sha256 = "sha256-JrYn9UlQr48HlETUmsNRq4oNPwtSiTFCsOuPMJ2kzSU="; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + buildInputs = [ + cups + ghostscript + a2ps + gawk + ]; + unpackPhase = "dpkg-deb -x $src $out"; + + installPhase = '' + for f in $out/opt/brother/Printers/${model}/cupswrapper/cupswrapper${model}; do + wrapProgram $f --prefix PATH : ${ + lib.makeBinPath [ + coreutils + ghostscript + gnugrep + gnused + ] + } + done + + mkdir -p $out/share/cups/model + ln -s $out/opt/brother/Printers/${model}/cupswrapper/brother_${model}_printer_en.ppd $out/share/cups/model/ + ''; + + meta = { + homepage = "http://www.brother.com/"; + description = "Brother ${model} printer CUPS wrapper driver"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=gb&lang=en&prod=${model}_all&os=128"; + maintainers = with lib.maintainers; [ lewo ]; + }; + }; +} diff --git a/pkgs/os-specific/linux/kernel/mptcp-config.nix b/pkgs/os-specific/linux/kernel/mptcp-config.nix deleted file mode 100644 index 1fb5c3fe0c4d..000000000000 --- a/pkgs/os-specific/linux/kernel/mptcp-config.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib }: -with lib.kernel; -{ - # DRM_AMDGPU = yes; - - IPV6 = yes; - MPTCP = yes; - IP_MULTIPLE_TABLES = yes; - - # Enable advanced path-managers... - MPTCP_PM_ADVANCED = yes; - MPTCP_FULLMESH = yes; - MPTCP_NDIFFPORTS = yes; - # ... but use none by default. - # The default is safer if source policy routing is not setup. - DEFAULT_DUMMY = yes; - DEFAULT_MPTCP_PM.freeform = "default"; - - # MPTCP scheduler selection. - MPTCP_SCHED_ADVANCED = yes; - DEFAULT_MPTCP_SCHED.freeform = "default"; - - # Smarter TCP congestion controllers - TCP_CONG_LIA = module; - TCP_CONG_OLIA = module; - TCP_CONG_WVEGAS = module; - TCP_CONG_BALIA = module; -} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index cd3a3632099c..1d60c341a6eb 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2139,7 +2139,8 @@ ]; "ghost" = ps: with ps; [ - ]; # missing inputs: aioghost + aioghost + ]; "gios" = ps: with ps; [ gios @@ -3476,7 +3477,8 @@ ]; "lichess" = ps: with ps; [ - ]; # missing inputs: aiolichess + aiolichess + ]; "lidarr" = ps: with ps; [ aiopyarr @@ -4483,9 +4485,10 @@ "onvif" = ps: with ps; [ ha-ffmpeg + onvif-parsers onvif-zeep-async wsdiscovery - ]; # missing inputs: onvif_parsers + ]; "open_meteo" = ps: with ps; [ open-meteo @@ -4535,11 +4538,12 @@ home-assistant-intents ifaddr mutagen + py-opendisplay pymicro-vad pyserial pyspeex-noise zeroconf - ]; # missing inputs: py-opendisplay + ]; "openerz" = ps: with ps; [ openerz-api @@ -6623,7 +6627,8 @@ ]; "trmnl" = ps: with ps; [ - ]; # missing inputs: trmnl + trmnl + ]; "tts" = ps: with ps; [ ha-ffmpeg @@ -6693,7 +6698,8 @@ ]; "unifi_access" = ps: with ps; [ - ]; # missing inputs: py-unifi-access + py-unifi-access + ]; "unifi_direct" = ps: with ps; [ unifi-ap @@ -7670,6 +7676,7 @@ "geofency" "geonetnz_quakes" "geonetnz_volcano" + "ghost" "gios" "github" "glances" @@ -7849,6 +7856,7 @@ "lg_soundbar" "lg_thinq" "libre_hardware_monitor" + "lichess" "lidarr" "liebherr" "life360" @@ -8012,10 +8020,12 @@ "onedrive_for_business" "onewire" "onkyo" + "onvif" "open_meteo" "open_router" "openai_conversation" "openalpr_cloud" + "opendisplay" "openerz" "openevse" "openexchangerates" @@ -8326,6 +8336,7 @@ "transport_nsw" "trend" "triggercmd" + "trmnl" "tts" "tuya" "twentemilieu" @@ -8336,6 +8347,7 @@ "uk_transport" "ukraine_alarm" "unifi" + "unifi_access" "unifiprotect" "universal" "upb" diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix index f7113a2eadb5..382b3ace4f86 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix @@ -26,6 +26,12 @@ buildHomeAssistantComponent rec { pytestCheckHook ]; + disabledTests = [ + # tests try to open sockets + "test_manual_flow_ac_device" + "test_manual_flow_cc_device" + ]; + meta = { changelog = "https://github.com/mill1000/midea-ac-py/releases/tag/${src.tag}"; description = "Home Assistant custom integration to control Midea (and associated brands) air conditioners via LAN"; diff --git a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix index b29bab484b8f..9777ef932b99 100644 --- a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix +++ b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix @@ -30,6 +30,13 @@ buildHomeAssistantComponent rec { pytest-homeassistant-custom-component ]; + disabledTests = [ + # tests try to open sockets + "test_form_success" + "test_form_already_configured" + "test_form_with_options" + ]; + meta = { description = "Home Assistant Mitsubishi Air Conditioner Integration"; changelog = "https://github.com/pymitsubishi/homeassistant-mitsubishi/releases/tag/v${version}"; diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix index bd9740aa5ef5..2c013f73fb99 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix @@ -34,6 +34,12 @@ buildHomeAssistantComponent rec { ] ++ home-assistant.getPackages "camera" home-assistant.python.pkgs; + disabledTests = [ + # tests try to open sockets + "test_thumbnail_camera_from_img_to_none" + "test_bad_connection_config_flow" + ]; + #skip phases with nothing to do dontConfigure = true; diff --git a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix index 5dcb54c919eb..31009c79d092 100644 --- a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix +++ b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix @@ -13,7 +13,7 @@ buildHomeAssistantComponent rec { owner = "samoswall"; repo = "polaris-mqtt"; tag = "v${version}"; - hash = "sha256-GKwc9EwPygA1ZJx7wcDOdV7FzhOdrNhQuKv3h35NgUU="; + hash = "sha256-H/SYO3suxtLnvAvk2gdgMT+gBlvymmgmvRCVk1zMtHo="; }; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix index 10af5e277c27..bc4e71f62c3e 100644 --- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix +++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix @@ -20,13 +20,13 @@ buildHomeAssistantComponent rec { owner = "mampfes"; domain = "waste_collection_schedule"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { inherit owner; repo = "hacs_waste_collection_schedule"; tag = version; - hash = "sha256-L7SHqBCBFmcegCUl88L8DrNXPGbY9CDKqlvLSOWCQ+g="; + hash = "sha256-2uOeKB3ivvfsxiwUoGMlT2BFqIdTRKtr84G4QAX0uD0="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/missing-hashes.json b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/missing-hashes.json new file mode 100644 index 000000000000..7707e4f6ed98 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/missing-hashes.json @@ -0,0 +1,38 @@ +{ + "@esbuild/aix-ppc64@npm:0.19.12": "0740fd9160dffa94e55cd58d2f9faf4624a2be68d2696376d5c60cfced508809275eac76315796a1aef8daf3b0975b0df0f2d94de10c14c3f40087b7c6eeb047", + "@esbuild/android-arm64@npm:0.19.12": "29d94e32a47af3ae1cc7c0364b00b3145db0b16539bd8d30356bb3a8769499867a7a3f1bc070f10a63cdb33c29752a43f3e4d4594a316e7d179e82bf12edf47c", + "@esbuild/android-arm@npm:0.19.12": "f6784506ff94332d1332536cfcabe54dacb6ddc0ce285cdc3d00bb30a71c5dc57b81e3552354c59fe992d6dbc0f66eb8040d18cba76d44ee9cd7b7ed2a3feece", + "@esbuild/android-x64@npm:0.19.12": "6253d60665402e38a080c101651c6e1617002b7aa53ed7a81f33d89fd5f99f37f11757bdd534faa3bf115dacf4723412a7cda532abdf0458bb478340772ba8d1", + "@esbuild/darwin-arm64@npm:0.19.12": "d934b758e8d6f7c69660f699a627963742a79dd5a917855c878700cc70eda3e629461e1fc69f8bb7242c15ec84f015e40f6877acd599604b784190514de4717f", + "@esbuild/darwin-x64@npm:0.19.12": "a436c4b3037a6a68c2b11fe487057c2cd4579363d94562d026a6d1a58eaf019c6ea94ba109e0b0a0597526fb6d2244d261fb7e6a18648f375ec90898b8bc14d6", + "@esbuild/freebsd-arm64@npm:0.19.12": "527060fd8bc2c9771d861a9a62935605e190dc17f454408fd87afc7d2fafe2a35cbca5cb171aaeab28cce187a21e5e2bfd607014e229360a8b4fa32438393203", + "@esbuild/freebsd-x64@npm:0.19.12": "b4d54892b0eec50f259fa6ab5527a5b4e48e1c68351d2c8febf60835bb5ac957564d2ab2ddf16ee66335b58a69ec367f48b125fb9646f8a39a11e1248c579501", + "@esbuild/linux-arm64@npm:0.19.12": "23dd17cd5b3f3d64726baa5632bd8079059ebf8419e3f9e82d900f8c781a7788980f6e6d1a604c1d84bd539f555227559f4916d52e2447a30f5886bbf1ed486c", + "@esbuild/linux-arm@npm:0.19.12": "76b9b411ba41320d57632347d1a09db7e745aec425db2cffe1c6467928c8d67bc122b544aa7fcbdca74a32262bfe0d48aa479931f6943bd84434389fada189a0", + "@esbuild/linux-ia32@npm:0.19.12": "be7a5294d9387fe09e154c5c771761291ce2278c2e04d36396f737736d185ab4a23d97830afaec67bb593549745ba9e240ac86b0ad4c0e0044e553c408105aed", + "@esbuild/linux-loong64@npm:0.19.12": "964386dd94bdd05383e6a8223a6af222a113bef78e4c8f7a77684c9c2e56c30d876c502ce4d28b4d91d21c402cdd491eb1e62bb72448c7077276c4714b299263", + "@esbuild/linux-mips64el@npm:0.19.12": "5608d554f1db3311315eb29780e312e66d106d41ad53fb3458e201fbbddda198836fc4ca04314f7ae4e61462214c92494928804abab0759a384adff773da40d0", + "@esbuild/linux-ppc64@npm:0.19.12": "7523a8c6b4b46324698b6aecfc661b369326099ebf72a36562ce69d8a6e2158cbe1d9af6d2588f130000c49875b719910df4b426885fcbac1065af590c1cd985", + "@esbuild/linux-riscv64@npm:0.19.12": "da7aedccce7377c1991a3bfce3767a41c2bd688a361ff5df9a16b56874d1bd198c4fa70ca15bd7234497ea5ff9a44ddbbece95733a1dbd9f43918b4bf27fb76c", + "@esbuild/linux-s390x@npm:0.19.12": "5f55ca2284c1cd1034a0bdf1ded7d38f43539f028fd58ec157f36fd89701f5fd0d0d45514b82c4199e3bd16049635a3a16c96a694f5a8d9c8a40429ad3e2172e", + "@esbuild/linux-x64@npm:0.19.12": "401ff8f1d6d5ae6ebdd0d8e24cef86ba1c3adc4fac2014033c8e690331495cb57922e31cdaa96619e2b190a5bfc88ae8b90b1cd3a59952969a29da418bda58b1", + "@esbuild/netbsd-x64@npm:0.19.12": "0e4b3ae706cb82356e20862ec0066e9eb61bc7f7bf3cc09da27a72fa5790a59f5256f4e2cd255aac6023a37036c8ad805d51498dbd56fe7d913711858d3c8ebc", + "@esbuild/openbsd-x64@npm:0.19.12": "f55049053a978c178bf1d7f4857af395afa9b7708410707eef8149f42adc3ed6d72088419cc17f75f1b7be4991ad28007fe298be84f95ca4e02d28bac1b518c7", + "@esbuild/sunos-x64@npm:0.19.12": "da944741c1d6c8d814633445f068b27cdff337f309513982125f633d7365154ba6073719ba4389e471479886841d0152f37426f5bd890b7a8c33b89b7f775c82", + "@esbuild/win32-arm64@npm:0.19.12": "c9e6922908588569a8cf396ab0c5230cd1634db77039cb635d83eb825eba64a4ac3e19f28917185495d9d7b043161bfbd4cd49eb7d3592b88cf4594d9d628d08", + "@esbuild/win32-ia32@npm:0.19.12": "71487cca9ac6cce6bf214be36e5c6aa1eaac49a2bcd538fafb6168fecbbe2624edf2a057be531b5393c4e2672b24bd316a872cc081df1d9c06e3a12704662675", + "@esbuild/win32-x64@npm:0.19.12": "33341d6ae7d0682fb679170c91efa3933fc58dfe3d2f95c19b9856db55af6c8af4785f3669f3de34907ab222b2a6a201a8557213bd37dcc8406593e9eddbaa3c", + "@rollup/rollup-android-arm-eabi@npm:4.12.0": "640cc66cd5a2183210340084ee32cf117e44b63f58ee50ca2717f240b2b6f83849f3c175c375e85950c7192ec6ab18e837804e86a83cc30bfc4d873c9acc8626", + "@rollup/rollup-android-arm64@npm:4.12.0": "ada400a44ac5f868528d5e9cbaf3e9aa1c9081edc329c025984a81974b4b60126bca6095a0a04c79017732276b56a21e77ebda6467978df2b947538ad153b7bc", + "@rollup/rollup-darwin-arm64@npm:4.12.0": "07b2bc6d30f1eaecf1e57671614860455034c9e36cd4b4ff0bbaf1f29fca53533853c377033d0571b6fb112221aae965c57dc5f956ba159289a94fcae092520c", + "@rollup/rollup-darwin-x64@npm:4.12.0": "6cd7429f62d198d5c340b1020acc6da116e724a2d8f320ea42a4ce46f705874e083c7941a149479ef42d6ca7d5f6ff1a4ac814b3526aa5c8816261ce2553ad71", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.12.0": "8230ef8bf5fe6fbc5becb3ca7f063bda37c6f2e06946888f25bbb8e7fcdb035982d584b858fd5ce17d8e2fa45b134ee9af10e50bd669a10a87abf65f7cb12505", + "@rollup/rollup-linux-arm64-gnu@npm:4.12.0": "8b7cef65fa45f60ab341832c1739aa8d2c928f6fdbdcceb9c815a6260ae5b00f736d3fe9ad435885cc3a13a429a3226d602e319eb6f3bdc9c32cdbf2a48d9649", + "@rollup/rollup-linux-arm64-musl@npm:4.12.0": "5dd334993ff942c864acd4a9e3fc4f9720b94c2dda2b3aba1f57078142de7787d278d6efb8f6d334e97a8abf2d691c642513672faa78a0861b3cdde435e7b705", + "@rollup/rollup-linux-riscv64-gnu@npm:4.12.0": "6fb56fc75f5df2c9dfde59a4e1aa5744f31b265af1c283bc7d17a61c30e6527ba91fd09d0e77de8247b8ef93a21f5021af2835ba37f13acfda7815ca216dad96", + "@rollup/rollup-linux-x64-gnu@npm:4.12.0": "53519406cf62f02b65d2b7783675d7797ef13a9f2b1a15c9fecaccf654ebca374a6ab82051952a9efed64c7a704d908c1e5e6eb045351fd20c2ff05281f3d126", + "@rollup/rollup-linux-x64-musl@npm:4.12.0": "a5b79ae17930fc37b875e869ee5dd4db20b318da177e51e32cb31d0f11a365e350750fa35997de84123de4d4a27a6fa3f3f95ee2021161762ade51b673c702c5", + "@rollup/rollup-win32-arm64-msvc@npm:4.12.0": "b9b0498a30a31e598b1342d5fa25d2540e695fb9b275bcdeef85add12b625166004afa575dfe8679f913e622d57f51f65b900159ce6eca5031adc2c25cbd625d", + "@rollup/rollup-win32-ia32-msvc@npm:4.12.0": "f8e3d0e5c24b0390509b900fd4a082f04cf97143398a81a69c8d8db5ad1db138b8cad6491fad2f095256f526153a0ac4320f8aad8aa988d73c4c6a85637f4f41", + "@rollup/rollup-win32-x64-msvc@npm:4.12.0": "c881e1441f3e76db0c1fc0172150155559a08714a3342c1bbee3db3aab12f081dfb3d2ae05490e45bf296069d0165c25bd121d032da57b6f588da6e8bb19a079" +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index d480e09d7bbb..3dfe4ff0e434 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -1,35 +1,57 @@ { lib, stdenv, - fetchzip, + fetchFromGitHub, + gitMinimal, + yarn-berry_4, + nodejs, + npmHooks, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "advanced-camera-card"; version = "7.27.4"; - src = fetchzip { - url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-lBdJBn/TLU3ezZnUJLt4eH87n1pOizS68RfLHYyRUq0="; + src = fetchFromGitHub { + owner = "dermotduffy"; + repo = "advanced-camera-card"; + tag = "v${finalAttrs.version}"; + hash = "sha256-GHSyDdKGgPPMbcPIqlQbRA0V8gPd1YsId8gqPF0VgTs="; + leaveDotGit = true; # gitInfo plugin }; - # TODO: build from source once yarn berry support lands in nixpkgs - dontBuild = true; + missingHashes = ./missing-hashes.json; + + offlineCache = yarn-berry_4.fetchYarnBerryDeps { + name = "${finalAttrs.pname}-yarn-deps"; + inherit (finalAttrs) src missingHashes; + hash = "sha256-N5GL9//CS33ntGu8v6i9+S38BDsXDD7HvOask1JflJ8="; + }; + + nativeBuildInputs = [ + gitMinimal + nodejs + npmHooks.npmBuildHook + yarn-berry_4 + yarn-berry_4.yarnBerryConfigHook + ]; + + npmBuildScript = "build"; installPhase = '' runHook preInstall - install -d $out - install -m0644 *.js $out/ + mkdir $out + cp -rv dist/* $out/ runHook postInstall ''; meta = { - changelog = "https://github.com/dermotduffy/advanced-camera-card/releases/tag/v${version}"; + changelog = "https://github.com/dermotduffy/advanced-camera-card/releases/tag/${finalAttrs.src.tag}"; description = "Comprehensive camera card for Home Assistant"; homepage = "https://github.com/dermotduffy/advanced-camera-card"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ hexa ]; }; -} +}) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix index 9acd176c229a..5f79d2b5decf 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "bubble-card"; - version = "3.1.1"; + version = "3.1.6"; src = fetchFromGitHub { owner = "Clooos"; repo = "Bubble-Card"; rev = "v${version}"; - hash = "sha256-8sSYqrcfWwnxJ0QGrPdjtAj2FG1TGINIgrvgqFncrIU="; + hash = "sha256-sQWpz1GMmX6RRGBI8uzdOrX5taUJUIbz+lE9ChXAvig="; }; - npmDepsHash = "sha256-zkZfyNeJgk0eQkMVptuH7iN5/J/EicGeYHTAF09gLM4="; + npmDepsHash = "sha256-jyw8U99R7M3JJwu30ADefAitm4lWWVHEwq108gWZpfg="; preBuild = '' rm -rf dist diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index ebcdbc0d96fe..92df2993e286 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -57,7 +57,7 @@ in }; jetty_12 = common { - version = "12.1.7"; - hash = "sha256-FjOoPqI3cibcND6gIkWltLERO+2bLIgGL5PyZl5zUg8="; + version = "12.1.8"; + hash = "sha256-H9faI1a/GlKJ74HYQc3znnxWEzatACI82QMyZe5Z6gQ="; }; } diff --git a/pkgs/shells/fish/plugins/plugin-git.nix b/pkgs/shells/fish/plugins/plugin-git.nix index ea5c8edbffd7..523d90582e29 100644 --- a/pkgs/shells/fish/plugins/plugin-git.nix +++ b/pkgs/shells/fish/plugins/plugin-git.nix @@ -6,13 +6,13 @@ buildFishPlugin rec { pname = "plugin-git"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "jhillyerd"; repo = "plugin-git"; tag = "v${version}"; - hash = "sha256-p7vvwisu3mvVOE1DcALbzuGJqWBcE1h71UjaopGdxE0="; + hash = "sha256-2+CX9ZGNkois7h3m30VG19Cf4ykRdoiPpEVxJMk75I4="; }; meta = { diff --git a/pkgs/test/check-by-name/pinned-version.txt b/pkgs/test/check-by-name/pinned-version.txt deleted file mode 100644 index d917d3e26adc..000000000000 --- a/pkgs/test/check-by-name/pinned-version.txt +++ /dev/null @@ -1 +0,0 @@ -0.1.2 diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 6c7b426fa8f0..0507bab15ca4 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "reproducible-build.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/hdf5/-/raw/main/hdf5-make-reproducible.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/hdf5/-/raw/721d33408db902ff738db18f1e977611d49b4ba8/hdf5-make-reproducible.patch"; hash = "sha256-Z31dCsLjYpqjoGXooOXI81EPjPwyTK8890xCENTh8aM="; }) ]; diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix index 7818d1c25219..57d1ed53f20f 100644 --- a/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix +++ b/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix @@ -5,15 +5,17 @@ }: buildGhidraExtension (finalAttrs: { pname = "Ghidra-GolangAnalyzerExtension"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "mooncat-greenpy"; repo = "Ghidra_GolangAnalyzerExtension"; rev = finalAttrs.version; - hash = "sha256-uxozIJ+BLcP1vBnLOCZD9ueY10hd37fON/Miii3zabo="; + hash = "sha256-zKN9SKprJIA5hQCvaQUdfBchN+2wPo47bkOchnQrr5A="; }; + sourceRoot = "${finalAttrs.src.name}/GolangAnalyzerExtension"; + meta = { description = "Facilitates the analysis of Golang binaries using Ghidra"; homepage = "https://github.com/mooncat-greenpy/Ghidra_GolangAnalyzerExtension"; diff --git a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix index f46c07cac596..33f00113c5f4 100644 --- a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix +++ b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix @@ -26,13 +26,13 @@ let self = buildGhidraExtension (finalAttrs: { pname = "kaiju"; - version = "260116"; + version = "260309"; src = fetchFromGitHub { owner = "CERTCC"; repo = "kaiju"; rev = finalAttrs.version; - hash = "sha256-cEGBBVuXUcacPzfc1cWGjDPWt8IfGNakDvfzoDCaBAI="; + hash = "sha256-DjuZJ20w/hhBlHa5ZprS33s5iMtOWboTHdgfCJ62Ttg="; }; buildInputs = [ diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 86b5b8415753..f9359ae08dc7 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -11,10 +11,10 @@ flex, perl, nixosTests, - ... -}@args: + enabledPlugins ? null, +}: let - plugins = callPackage ./plugins.nix args; + plugins = callPackage ./plugins.nix { inherit enabledPlugins; }; in stdenv.mkDerivation (finalAttrs: { pname = "collectd"; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 2f8ba6c56b42..b871112d14bf 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -45,7 +45,6 @@ # Defaults to `null` for all supported plugins (except xen, which is marked as # insecure), otherwise a list of plugin names for a custom build enabledPlugins ? null, - ... }: let diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c4a2c5e9bdc5..76007cb15d3c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -505,6 +505,7 @@ mapAliases { cloudlogoffline = throw "cloudlogoffline has been removed"; # Added 2025-05-18 clucene_core = warnAlias "'clucene_core' has been renamed to 'clucene-core'" clucene-core; # Added 2026-01-12 clucene_core_2 = warnAlias "'clucene_core_2' has been renamed to 'clucene-core_2'" clucene-core_2; # Added 2026-01-12 + cmtk = throw "'cmtk' has been dropped due to being broken since September 2025, with no complaints by any users of the package."; # Added 2026-04-05 coc-sumneko-lua = throw "'coc-sumneko-lua' has been removed due to unmaintained and broken package. 'lua_ls' can be used as a replacement"; # Added 2026-02-04 cockroachdb-bin = throw "'cockroachdb-bin' has been renamed to/replaced by 'cockroachdb'"; # Converted to throw 2025-10-27 code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22 @@ -827,6 +828,7 @@ mapAliases { glfw-wayland-minecraft = throw "'glfw-wayland-minecraft' has been renamed to/replaced by 'glfw3-minecraft'"; # Converted to throw 2025-10-27 glxinfo = throw "'glxinfo' has been renamed to/replaced by 'mesa-demos'"; # Converted to throw 2025-10-27 gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07 + gmu = throw "'gmu' has been removed as it was broken and unmaintained in Nixpkgs"; # Added 2026-04-04 gnat11 = throw "gnat11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 gnat12 = throw "gnat12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 gnat12Packages = throw "gnat12Packages has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 @@ -1605,6 +1607,7 @@ mapAliases { pidgin-window-merge = throw "'pidgin-window-merge' has been renamed to/replaced by 'pidginPackages.pidgin-window-merge'"; # Converted to throw 2025-10-27 pidgin-xmpp-receipts = throw "'pidgin-xmpp-receipts' has been renamed to/replaced by 'pidginPackages.pidgin-xmpp-receipts'"; # Converted to throw 2025-10-27 pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25 + pinecone = throw "'pinecone' has been removed, as it is unmaintained and obsolete"; # Added 2026-03-31 pinentry = throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'"; # Converted to throw 2025-10-26 pingvin-share = throw "'pingvin-share' has been removed as it was broken and archived upstream"; # Added 2025-11-08 piper-train = throw "piper-train is now part of the piper package using the `withTrain` override"; # Added 2025-09-03 @@ -1644,6 +1647,7 @@ mapAliases { powwow = throw "'powwow' has been removed, since it's unmaintained since 2021 and doesn't build with glibc 2.42"; # Added 2025-09-28 prboom-plus = throw "'prboom-plus' has been removed since it is unmaintained upstream."; # Added 2025-09-14 preload = throw "'preload' has been removed due to lack of usage and being broken since its introduction into nixpkgs"; # Added 2025-11-29 + premid = throw "'premid' has been removed, as it has been archived upstream since July 2024. Consider using the browser extension instead."; # Added 2026-04-04 presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2025-06-19 preserves-nim = throw "'preserves-nim' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 primusLib = warnAlias "'primusLib' has been renamed to 'primus-lib'" primus-lib; # Added 2026-02-12 @@ -1777,6 +1781,7 @@ mapAliases { rust-synapse-state-compress = throw "'rust-synapse-state-compress' has been renamed to/replaced by 'rust-synapse-compress-state'"; # Converted to throw 2025-10-27 rustc-wasm32 = throw "'rustc-wasm32' has been renamed to/replaced by 'rustc'"; # Converted to throw 2025-10-27 rustic-rs = throw "'rustic-rs' has been renamed to/replaced by 'rustic'"; # Converted to throw 2025-10-27 + rx = throw "'rx' has been dropped due to being broken since September 2025, with no complaints by any users of the package."; # Added 2026-04-05 ryujinx = throw "'ryujinx' has been replaced by 'ryubing' as the new upstream"; # Added 2025-07-30 ryujinx-greemdev = throw "'ryujinx-greemdev' has been renamed to/replaced by 'ryubing'"; # Converted to throw 2025-10-27 scantailor = throw "'scantailor' has been renamed to/replaced by 'scantailor-advanced'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b74acf1f8d7..6fee0170889a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11967,6 +11967,10 @@ with pkgs; dcp9020cdw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp9020cdw { }).cupswrapper; + dcpj785dw = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcpj785dw { }).driver; + + dcpj785dw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcpj785dw { }).cupswrapper; + cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; cups-brother-hl1210w = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1210w { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 145dd80ebfe5..9beb1b313a26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -292,6 +292,8 @@ self: super: with self; { aioftp = callPackage ../development/python-modules/aioftp { }; + aioghost = callPackage ../development/python-modules/aioghost { }; + aiogithubapi = callPackage ../development/python-modules/aiogithubapi { }; aiogram = callPackage ../development/python-modules/aiogram { }; @@ -380,6 +382,8 @@ self: super: with self; { aiokem = callPackage ../development/python-modules/aiokem { }; + aiolichess = callPackage ../development/python-modules/aiolichess { }; + aiolifx = callPackage ../development/python-modules/aiolifx { }; aiolifx-connection = callPackage ../development/python-modules/aiolifx-connection { }; @@ -5052,6 +5056,8 @@ self: super: with self; { enzyme = callPackage ../development/python-modules/enzyme { }; + epaper-dithering = callPackage ../development/python-modules/epaper-dithering { }; + epc = callPackage ../development/python-modules/epc { }; ephem = callPackage ../development/python-modules/ephem { }; @@ -10785,6 +10791,8 @@ self: super: with self; { nampa = callPackage ../development/python-modules/nampa { }; + nanoarrow = callPackage ../development/python-modules/nanoarrow { zstd-c = pkgs.zstd; }; + nanobind = callPackage ../development/python-modules/nanobind { }; nanoeigenpy = callPackage ../development/python-modules/nanoeigenpy { }; @@ -11462,6 +11470,8 @@ self: super: with self; { onnxslim = callPackage ../development/python-modules/onnxslim { }; + onvif-parsers = callPackage ../development/python-modules/onvif-parsers { }; + onvif-zeep = callPackage ../development/python-modules/onvif-zeep { }; onvif-zeep-async = callPackage ../development/python-modules/onvif-zeep-async { }; @@ -13143,6 +13153,8 @@ self: super: with self; { py-ocsf-models = callPackage ../development/python-modules/py-ocsf-models { }; + py-opendisplay = callPackage ../development/python-modules/py-opendisplay { }; + py-opensonic = callPackage ../development/python-modules/py-opensonic { }; py-partiql-parser = callPackage ../development/python-modules/py-partiql-parser { }; @@ -13175,6 +13187,8 @@ self: super: with self; { py-ubjson = callPackage ../development/python-modules/py-ubjson { }; + py-unifi-access = callPackage ../development/python-modules/py-unifi-access { }; + py-vapid = callPackage ../development/python-modules/py-vapid { }; py-zabbix = callPackage ../development/python-modules/py-zabbix { }; @@ -19708,6 +19722,8 @@ self: super: with self; { } ); + trmnl = callPackage ../development/python-modules/trmnl { }; + troi = callPackage ../development/python-modules/troi { }; troposphere = callPackage ../development/python-modules/troposphere { };