diff --git a/doc/languages-frameworks/java.section.md b/doc/languages-frameworks/java.section.md index 6d56ffcd4503..5208a6388a32 100644 --- a/doc/languages-frameworks/java.section.md +++ b/doc/languages-frameworks/java.section.md @@ -33,8 +33,7 @@ stdenv.mkDerivation { ``` Note that `jdk` is an alias for the OpenJDK (self-built where available, -or pre-built via Zulu). Platforms with OpenJDK not (yet) in Nixpkgs -(`Aarch32`, `Aarch64`) point to the (unfree) `oraclejdk`. +or pre-built via Zulu). Also note that not using `stripJavaArchivesHook` will likely cause the generated `.jar` files to be non-deterministic, which is not optimal. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6fd827cd72b9..86ba6402a342 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4368,6 +4368,12 @@ githubId = 18414241; name = "Andreas Erdes"; }; + computerdane = { + email = "danerieber@gmail.com"; + github = "computerdane"; + githubId = 6487079; + name = "Dane Rieber"; + }; confus = { email = "con-f-use@gmx.net"; github = "con-f-use"; @@ -4766,12 +4772,6 @@ githubId = 24708079; name = "Dan Eads"; }; - danerieber = { - email = "danerieber@gmail.com"; - github = "danerieber"; - githubId = 6487079; - name = "Dane Rieber"; - }; danid3v = { email = "sch220233@spengergasse.at"; github = "DaniD3v"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 1a88bef76409..5c4bd436d7bb 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -333,6 +333,11 @@ This change requires granting access to the repositories to this user or setting the appropriate one through `services.cgit.some-instance.user`. +- All Oracle JDKs and JREs (`oraclejdk`, `oraclejdk8`, `oraclejre`, `oraclejre8`, + `jrePlugin`, `jre8Plugin`, `jdkdistro`, `oraclejdk8distro`, and `oraclejdk11`) + were dropped due to being unmaintained and heavily insecure. OpenJDK provides + compatible replacements for JDKs and JREs. + - `gradle_6` was removed due to being [unsupported upstream as of 10 Feb 2023](https://endoflife.date/gradle). Additionally, it had numerous security vulnerabilities that were only patched in later versions, such as [CVE-2021-29429](https://nvd.nist.gov/vuln/detail/CVE-2021-32751), @@ -342,6 +347,9 @@ nvimpager settings: user commands in `-c` and `--cmd` now override the respective default settings because they are executed later. +- `javacard-devkit` was dropped due to having a dependency on the Oracle JDK, + as well as being several years out-of-date. + - Kubernetes `featureGates` have changed from a `listOf str` to `attrsOf bool`. This refactor makes it possible to also disable feature gates, without having to use `extraOpts` flags. @@ -388,6 +396,9 @@ - `services.pgbouncer` systemd service is configured with `Type=notify-reload` and allows reloading configuration without process restart. PgBouncer configuration options were moved to the free-form type option named [`services.pgbouncer.settings`](#opt-services.pgbouncer.settings) according to the NixOS RFC 0042. +- Docear was removed because it was unmaintained upstream. + JabRef, Zotero, or Mendeley are potential replacements. + - `nodePackages.coc-metals` was removed due to being deprecated upstream. `vimPlugins.nvim-metals` is its official replacement. @@ -492,6 +503,9 @@ - PPD files for Utax printers got renamed (spaces replaced by underscores) in newest `foomatic-db` package; users of Utax printers might need to adapt their `hardware.printers.ensurePrinters.*.model` value. +- `sqldeveloper` was dropped due to being severely out-of-date and having a dependency on + JavaFX for Java 8, which we do not support. + - The `kvdo` kernel module package was removed, because it was upstreamed in kernel version 6.9, where it is called `dm-vdo`. - `libe57format` has been updated to `>= 3.0.0`, which contains some backward-incompatible API changes. See the [release note](https://github.com/asmaloney/libE57Format/releases/tag/v3.0.0) for more details. @@ -663,6 +677,15 @@ lists by default. Backwards-compatible behavior can be enabled with `atomsCoercedToLists`. +- Atlassian Server products have been removed, as support for the Atlassian Server + products ended in February 2024 and there was insufficient interest in + maintaining the Atlassian Data Center replacements: + - The `atlassian-bamboo` package + - The `atlassian-confluence` package and its `services.confluence` NixOS module + - The `atlassian-crowd` package and its `services.crowd` NixOS module + - The `atlassian-jira` package and its `services.jira` NixOS module + + - `python3Packages.nose` has been removed, as it has been deprecated and unmaintained for almost a decade and does not work on Python 3.12. Please switch to `pytest` or another test runner/framework. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d05bafae4a23..7b753937e808 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1390,9 +1390,6 @@ ./services/web-apps/alps.nix ./services/web-apps/anuko-time-tracker.nix ./services/web-apps/artalk.nix - ./services/web-apps/atlassian/confluence.nix - ./services/web-apps/atlassian/crowd.nix - ./services/web-apps/atlassian/jira.nix ./services/web-apps/audiobookshelf.nix ./services/web-apps/bluemap.nix ./services/web-apps/bookstack.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 160ad91e42aa..18b7e9faaa72 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -62,7 +62,9 @@ in (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed") (mkRemovedOptionModule [ "services" "cgmanager" "enable"] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "confluence" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements") (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "crowd" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements") (mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.") (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") (mkRemovedOptionModule [ "services" "dnscrypt-wrapper" ] '' @@ -82,6 +84,7 @@ in (mkRemovedOptionModule [ "services" "homeassistant-satellite"] "The `services.homeassistant-satellite` module has been replaced by `services.wyoming-satellite`.") (mkRemovedOptionModule [ "services" "hydron" ] "The `services.hydron` module has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability.") (mkRemovedOptionModule [ "services" "ihatemoney" ] "The ihatemoney module has been removed for lack of downstream maintainer") + (mkRemovedOptionModule [ "services" "jira" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements") (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "lshd" ] "The corresponding package was removed from nixpkgs as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decades.") (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix deleted file mode 100644 index 683a1c7603ef..000000000000 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ /dev/null @@ -1,224 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.confluence; - - pkg = cfg.package.override (optionalAttrs cfg.sso.enable { - enableSSO = cfg.sso.enable; - }); - - crowdProperties = pkgs.writeText "crowd.properties" '' - application.name ${cfg.sso.applicationName} - application.password ${if cfg.sso.applicationPassword != null then cfg.sso.applicationPassword else "@NIXOS_CONFLUENCE_CROWD_SSO_PWD@"} - application.login.url ${cfg.sso.crowd}/console/ - - crowd.server.url ${cfg.sso.crowd}/services/ - crowd.base.url ${cfg.sso.crowd}/ - - session.isauthenticated session.isauthenticated - session.tokenkey session.tokenkey - session.validationinterval ${toString cfg.sso.validationInterval} - session.lastvalidation session.lastvalidation - ''; - -in - -{ - options = { - services.confluence = { - enable = mkEnableOption "Atlassian Confluence service"; - - user = mkOption { - type = types.str; - default = "confluence"; - description = "User which runs confluence."; - }; - - group = mkOption { - type = types.str; - default = "confluence"; - description = "Group which runs confluence."; - }; - - home = mkOption { - type = types.str; - default = "/var/lib/confluence"; - description = "Home directory of the confluence instance."; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Address to listen on."; - }; - - listenPort = mkOption { - type = types.port; - default = 8090; - description = "Port to listen on."; - }; - - catalinaOptions = mkOption { - type = types.listOf types.str; - default = []; - example = [ "-Xms1024m" "-Xmx2048m" "-Dconfluence.disable.peopledirectory.all=true" ]; - description = "Java options to pass to catalina/tomcat."; - }; - - proxy = { - enable = mkEnableOption "proxy support"; - - name = mkOption { - type = types.str; - example = "confluence.example.com"; - description = "Virtual hostname at the proxy"; - }; - - port = mkOption { - type = types.port; - default = 443; - example = 80; - description = "Port used at the proxy"; - }; - - scheme = mkOption { - type = types.str; - default = "https"; - example = "http"; - description = "Protocol used at the proxy."; - }; - }; - - sso = { - enable = mkEnableOption "SSO with Atlassian Crowd"; - - crowd = mkOption { - type = types.str; - example = "http://localhost:8095/crowd"; - description = "Crowd Base URL without trailing slash"; - }; - - applicationName = mkOption { - type = types.str; - example = "jira"; - description = "Exact name of this Confluence instance in Crowd"; - }; - - applicationPassword = mkOption { - type = types.nullOr types.str; - default = null; - description = "Application password of this Confluence instance in Crowd"; - }; - - applicationPasswordFile = mkOption { - type = types.nullOr types.str; - default = null; - description = "Path to the application password for Crowd of Confluence."; - }; - - validationInterval = mkOption { - type = types.int; - default = 2; - example = 0; - description = '' - Set to 0, if you want authentication checks to occur on each - request. Otherwise set to the number of minutes between request - to validate if the user is logged in or out of the Crowd SSO - server. Setting this value to 1 or higher will increase the - performance of Crowd's integration. - ''; - }; - }; - - package = mkPackageOption pkgs "atlassian-confluence" { }; - - jrePackage = mkPackageOption pkgs "oraclejre8" { - extraDescription = '' - ::: {.note } - Atlassian only supports the Oracle JRE (JRASERVER-46152). - ::: - ''; - }; - }; - }; - - config = mkIf cfg.enable { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - }; - - assertions = [ - { assertion = cfg.sso.enable -> ((cfg.sso.applicationPassword == null) != (cfg.sso.applicationPasswordFile)); - message = "Please set either applicationPassword or applicationPasswordFile"; - } - ]; - - warnings = mkIf (cfg.sso.enable && cfg.sso.applicationPassword != null) [ - "Using `services.confluence.sso.applicationPassword` is deprecated! Use `applicationPasswordFile` instead!" - ]; - - users.groups.${cfg.group} = {}; - - systemd.tmpfiles.rules = [ - "d '${cfg.home}' - ${cfg.user} - - -" - "d /run/confluence - - - - -" - - "L+ /run/confluence/home - - - - ${cfg.home}" - "L+ /run/confluence/logs - - - - ${cfg.home}/logs" - "L+ /run/confluence/temp - - - - ${cfg.home}/temp" - "L+ /run/confluence/work - - - - ${cfg.home}/work" - "L+ /run/confluence/server.xml - - - - ${cfg.home}/server.xml" - ]; - - systemd.services.confluence = { - description = "Atlassian Confluence"; - - wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - - path = [ cfg.jrePackage pkgs.bash ]; - - environment = { - CONF_USER = cfg.user; - JAVA_HOME = "${cfg.jrePackage}"; - CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; - JAVA_OPTS = mkIf cfg.sso.enable "-Dcrowd.properties=${cfg.home}/crowd.properties"; - }; - - preStart = '' - mkdir -p ${cfg.home}/{logs,work,temp,deploy} - - sed -e 's,port="8090",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ - '' + (lib.optionalString cfg.proxy.enable '' - -e 's,protocol="org.apache.coyote.http11.Http11NioProtocol",protocol="org.apache.coyote.http11.Http11NioProtocol" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}",' \ - '') + '' - ${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml - - ${optionalString cfg.sso.enable '' - install -m660 ${crowdProperties} ${cfg.home}/crowd.properties - ${optionalString (cfg.sso.applicationPasswordFile != null) '' - ${pkgs.replace-secret}/bin/replace-secret \ - '@NIXOS_CONFLUENCE_CROWD_SSO_PWD@' \ - ${cfg.sso.applicationPasswordFile} \ - ${cfg.home}/crowd.properties - ''} - ''} - ''; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - PrivateTmp = true; - Restart = "on-failure"; - RestartSec = "10"; - ExecStart = "${pkg}/bin/start-confluence.sh -fg"; - ExecStop = "${pkg}/bin/stop-confluence.sh"; - }; - }; - }; -} diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix deleted file mode 100644 index 527fa1743df2..000000000000 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ /dev/null @@ -1,193 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.crowd; - - pkg = cfg.package.override { - home = cfg.home; - port = cfg.listenPort; - openidPassword = cfg.openidPassword; - } // (optionalAttrs cfg.proxy.enable { - proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}"; - }); - - crowdPropertiesFile = pkgs.writeText "crowd.properties" '' - application.name crowd-openid-server - application.password @NIXOS_CROWD_OPENID_PW@ - application.base.url http://localhost:${toString cfg.listenPort}/openidserver - application.login.url http://localhost:${toString cfg.listenPort}/openidserver - application.login.url.template http://localhost:${toString cfg.listenPort}/openidserver?returnToUrl=''${RETURN_TO_URL} - - crowd.server.url http://localhost:${toString cfg.listenPort}/crowd/services/ - - session.isauthenticated session.isauthenticated - session.tokenkey session.tokenkey - session.validationinterval 0 - session.lastvalidation session.lastvalidation - ''; - -in - -{ - options = { - services.crowd = { - enable = mkEnableOption "Atlassian Crowd service"; - - user = mkOption { - type = types.str; - default = "crowd"; - description = "User which runs Crowd."; - }; - - group = mkOption { - type = types.str; - default = "crowd"; - description = "Group which runs Crowd."; - }; - - home = mkOption { - type = types.str; - default = "/var/lib/crowd"; - description = "Home directory of the Crowd instance."; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Address to listen on."; - }; - - listenPort = mkOption { - type = types.port; - default = 8092; - description = "Port to listen on."; - }; - - openidPassword = mkOption { - type = types.str; - default = "WILL_NEVER_BE_SET"; - description = "Application password for OpenID server."; - }; - - openidPasswordFile = mkOption { - type = types.nullOr types.str; - default = null; - description = "Path to the file containing the application password for OpenID server."; - }; - - catalinaOptions = mkOption { - type = types.listOf types.str; - default = []; - example = [ "-Xms1024m" "-Xmx2048m" ]; - description = "Java options to pass to catalina/tomcat."; - }; - - proxy = { - enable = mkEnableOption "reverse proxy support"; - - name = mkOption { - type = types.str; - example = "crowd.example.com"; - description = "Virtual hostname at the proxy"; - }; - - port = mkOption { - type = types.port; - default = 443; - example = 80; - description = "Port used at the proxy"; - }; - - scheme = mkOption { - type = types.str; - default = "https"; - example = "http"; - description = "Protocol used at the proxy."; - }; - - secure = mkOption { - type = types.bool; - default = true; - description = "Whether the connections to the proxy should be considered secure."; - }; - }; - - package = mkPackageOption pkgs "atlassian-crowd" { }; - - jrePackage = mkPackageOption pkgs "oraclejre8" { - extraDescription = '' - ::: {.note } - Atlassian only supports the Oracle JRE (JRASERVER-46152). - ::: - ''; - }; - }; - }; - - config = mkIf cfg.enable { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - }; - - users.groups.${cfg.group} = {}; - - systemd.tmpfiles.rules = [ - "d '${cfg.home}' - ${cfg.user} ${cfg.group} - -" - "d /run/atlassian-crowd - - - - -" - - "L+ /run/atlassian-crowd/database - - - - ${cfg.home}/database" - "L+ /run/atlassian-crowd/logs - - - - ${cfg.home}/logs" - "L+ /run/atlassian-crowd/work - - - - ${cfg.home}/work" - "L+ /run/atlassian-crowd/server.xml - - - - ${cfg.home}/server.xml" - ]; - - systemd.services.atlassian-crowd = { - description = "Atlassian Crowd"; - - wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - - path = [ cfg.jrePackage ]; - - environment = { - JAVA_HOME = "${cfg.jrePackage}"; - CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; - CATALINA_TMPDIR = "/tmp"; - JAVA_OPTS = mkIf (cfg.openidPasswordFile != null) "-Dcrowd.properties=${cfg.home}/crowd.properties"; - }; - - preStart = '' - rm -rf ${cfg.home}/work - mkdir -p ${cfg.home}/{logs,database,work} - - sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ - '' + (lib.optionalString cfg.proxy.enable '' - -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \ - '') + '' - ${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml - - ${optionalString (cfg.openidPasswordFile != null) '' - install -m660 ${crowdPropertiesFile} ${cfg.home}/crowd.properties - ${pkgs.replace-secret}/bin/replace-secret \ - '@NIXOS_CROWD_OPENID_PW@' \ - ${cfg.openidPasswordFile} \ - ${cfg.home}/crowd.properties - ''} - ''; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - PrivateTmp = true; - Restart = "on-failure"; - RestartSec = "10"; - ExecStart = "${pkg}/start_crowd.sh -fg"; - }; - }; - }; -} diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix deleted file mode 100644 index 40c5d95cae3a..000000000000 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ /dev/null @@ -1,219 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.jira; - - pkg = cfg.package.override (optionalAttrs cfg.sso.enable { - enableSSO = cfg.sso.enable; - }); - - crowdProperties = pkgs.writeText "crowd.properties" '' - application.name ${cfg.sso.applicationName} - application.password @NIXOS_JIRA_CROWD_SSO_PWD@ - application.login.url ${cfg.sso.crowd}/console/ - - crowd.server.url ${cfg.sso.crowd}/services/ - crowd.base.url ${cfg.sso.crowd}/ - - session.isauthenticated session.isauthenticated - session.tokenkey session.tokenkey - session.validationinterval ${toString cfg.sso.validationInterval} - session.lastvalidation session.lastvalidation - ''; - -in - -{ - options = { - services.jira = { - enable = mkEnableOption "Atlassian JIRA service"; - - user = mkOption { - type = types.str; - default = "jira"; - description = "User which runs JIRA."; - }; - - group = mkOption { - type = types.str; - default = "jira"; - description = "Group which runs JIRA."; - }; - - home = mkOption { - type = types.str; - default = "/var/lib/jira"; - description = "Home directory of the JIRA instance."; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Address to listen on."; - }; - - listenPort = mkOption { - type = types.port; - default = 8091; - description = "Port to listen on."; - }; - - catalinaOptions = mkOption { - type = types.listOf types.str; - default = []; - example = [ "-Xms1024m" "-Xmx2048m" ]; - description = "Java options to pass to catalina/tomcat."; - }; - - proxy = { - enable = mkEnableOption "reverse proxy support"; - - name = mkOption { - type = types.str; - example = "jira.example.com"; - description = "Virtual hostname at the proxy"; - }; - - port = mkOption { - type = types.port; - default = 443; - example = 80; - description = "Port used at the proxy"; - }; - - scheme = mkOption { - type = types.str; - default = "https"; - example = "http"; - description = "Protocol used at the proxy."; - }; - - secure = mkOption { - type = types.bool; - default = true; - description = "Whether the connections to the proxy should be considered secure."; - }; - }; - - sso = { - enable = mkEnableOption "SSO with Atlassian Crowd"; - - crowd = mkOption { - type = types.str; - example = "http://localhost:8095/crowd"; - description = "Crowd Base URL without trailing slash"; - }; - - applicationName = mkOption { - type = types.str; - example = "jira"; - description = "Exact name of this JIRA instance in Crowd"; - }; - - applicationPasswordFile = mkOption { - type = types.str; - description = "Path to the file containing the application password of this JIRA instance in Crowd"; - }; - - validationInterval = mkOption { - type = types.int; - default = 2; - example = 0; - description = '' - Set to 0, if you want authentication checks to occur on each - request. Otherwise set to the number of minutes between request - to validate if the user is logged in or out of the Crowd SSO - server. Setting this value to 1 or higher will increase the - performance of Crowd's integration. - ''; - }; - }; - - package = mkPackageOption pkgs "atlassian-jira" { }; - - jrePackage = mkPackageOption pkgs "oraclejre8" { - extraDescription = '' - ::: {.note } - Atlassian only supports the Oracle JRE (JRASERVER-46152). - ::: - ''; - }; - }; - }; - - config = mkIf cfg.enable { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - home = cfg.home; - }; - - users.groups.${cfg.group} = {}; - - systemd.tmpfiles.rules = [ - "d '${cfg.home}' - ${cfg.user} - - -" - "d /run/atlassian-jira - - - - -" - - "L+ /run/atlassian-jira/home - - - - ${cfg.home}" - "L+ /run/atlassian-jira/logs - - - - ${cfg.home}/logs" - "L+ /run/atlassian-jira/work - - - - ${cfg.home}/work" - "L+ /run/atlassian-jira/temp - - - - ${cfg.home}/temp" - "L+ /run/atlassian-jira/server.xml - - - - ${cfg.home}/server.xml" - ]; - - systemd.services.atlassian-jira = { - description = "Atlassian JIRA"; - - wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - - path = [ cfg.jrePackage pkgs.bash ]; - - environment = { - JIRA_USER = cfg.user; - JIRA_HOME = cfg.home; - JAVA_HOME = "${cfg.jrePackage}"; - CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; - JAVA_OPTS = mkIf cfg.sso.enable "-Dcrowd.properties=${cfg.home}/crowd.properties"; - }; - - preStart = '' - mkdir -p ${cfg.home}/{logs,work,temp,deploy} - - sed -e 's,port="8080",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ - '' + (lib.optionalString cfg.proxy.enable '' - -e 's,protocol="HTTP/1.1",protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \ - '') + '' - ${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml - - ${optionalString cfg.sso.enable '' - install -m660 ${crowdProperties} ${cfg.home}/crowd.properties - ${pkgs.replace-secret}/bin/replace-secret \ - '@NIXOS_JIRA_CROWD_SSO_PWD@' \ - ${cfg.sso.applicationPasswordFile} \ - ${cfg.home}/crowd.properties - ''} - ''; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - PrivateTmp = true; - Restart = "on-failure"; - RestartSec = "10"; - ExecStart = "${pkg}/bin/start-jira.sh -fg"; - ExecStop = "${pkg}/bin/stop-jira.sh"; - }; - }; - }; - - imports = [ - (mkRemovedOptionModule [ "services" "jira" "sso" "applicationPassword" ] '' - Use `applicationPasswordFile` instead! - '') - ]; -} diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index 6db465c0d5ae..251c343c17df 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "18.0.0"; + version = "18.1.2"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-h88wqKwkxY/5uOU0SQp8vb4ri3Ndi3ezHPTDFJGVE2Q="; + sha256 = "sha256-4BGW7jDeqwhbAi1LODeiFrmBIzv0qAMKT3IVRgYn87E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 202375b4867e..9e57f0d1c316 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-SZfl93TcaD9j59zGflPFmHgIP5NaS8bgDi3l3SRRFiI="; + hash_darwin = "sha256-4uE34f99fTiG5FJq0xnEodqQvNT2Aa8kesYOxY44xXA="; hash_darwin_aarch64 = - "sha256-wLX63aA8l+23ehdBHPcXtoZ2WEhrmYVKzqUDBbrhSRw="; - hash_linux = "sha256-kP6N7fM+7+S3JwT2JvqfWDRCfAQiNc/rQlHxjJ8DNuo="; - version = "130.0.6723.69"; + "sha256-gDrfR5EgBx3YRxf3/08gayOhmEqSw4G/QcuNtfHmRHk="; + hash_linux = "sha256-qMlM6ilsIqm8G5KLE4uGVb/s2bNyZSyQmxsq+EHKX/c="; + version = "130.0.6723.91"; }; deps = { gn = { @@ -15,8 +15,8 @@ version = "2024-09-09"; }; }; - hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8="; - version = "130.0.6723.69"; + hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M="; + version = "130.0.6723.91"; }; ungoogled-chromium = { deps = { @@ -27,11 +27,11 @@ version = "2024-09-09"; }; ungoogled-patches = { - hash = "sha256-usNlX/ol8Zn3lQTvp311DuyYbSHF/HN0r7k8qeUIJmU="; - rev = "130.0.6723.69-1"; + hash = "sha256-LhCrwOwPmEn5xlBLTgp2NMfQLxYbSg0pdZxshoqQAGw="; + rev = "130.0.6723.91-1"; }; }; - hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8="; - version = "130.0.6723.69"; + hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M="; + version = "130.0.6723.91"; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index f0c3b4e98721..ad1173be2ed1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,49 +1,34 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , callPackage -, pkg-config -, cmake -, ninja -, clang -, lld -, python3 -, wrapQtAppsHook -, removeReferencesTo -, qtbase -, qtimageformats -, qtsvg -, qtwayland -, kcoreaddons -, lz4 -, xxHash -, ffmpeg -, openalSoft -, minizip -, libopus -, alsa-lib -, libpulseaudio -, range-v3 -, tl-expected -, hunspell -, gobject-introspection -, jemalloc -, rnnoise -, microsoft-gsl -, boost -, libicns -, darwin +, libsForQt5 +, yasm }: -let - tg_owt = callPackage ./tg_owt.nix { +(libsForQt5.callPackage ../telegram-desktop/default.nix { + inherit stdenv; + + tg_owt = (callPackage ../telegram-desktop/tg_owt.nix { # tg_owt should use the same compiler inherit stdenv; - }; + }).overrideAttrs(oldAttrs: { + version = "0-unstable-2024-06-15"; - mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; -in -stdenv.mkDerivation rec { + src = fetchFromGitHub { + owner = "desktop-app"; + repo = "tg_owt"; + rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; + hash = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; + fetchSubmodules = true; + }; + + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ yasm ]; + }); + + withWebKitGTK = false; +}).overrideAttrs { pname = "kotatogram-desktop"; version = "1.4.9-unstable-2024-09-27"; @@ -59,128 +44,15 @@ stdenv.mkDerivation rec { ./macos.patch ./macos-opengl.patch ./macos-qt5.patch + (fetchpatch { + url = "https://gitlab.com/mnauw/cppgir/-/commit/c8bb1c6017a6f7f2e47bd10543aea6b3ec69a966.patch"; + stripLen = 1; + extraPrefix = "cmake/external/glib/cppgir/"; + hash = "sha256-8B4h3BTG8dIlt3+uVgBI569E9eCebcor9uohtsrZpnI="; + }) ]; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ - --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ - --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ - --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ - --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster - ''; - - # Wrapping the inside of the app bundles, avoiding double-wrapping - dontWrapQtApps = stdenv.hostPlatform.isDarwin; - - nativeBuildInputs = [ - pkg-config - cmake - ninja - python3 - wrapQtAppsHook - removeReferencesTo - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - # to build bundled libdispatch - clang - gobject-introspection - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - lld - ]; - - buildInputs = [ - qtbase - qtimageformats - qtsvg - lz4 - xxHash - ffmpeg - openalSoft - minizip - libopus - range-v3 - tl-expected - rnnoise - tg_owt - microsoft-gsl - boost - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland - kcoreaddons - alsa-lib - libpulseaudio - hunspell - jemalloc - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - Cocoa - CoreFoundation - CoreServices - CoreText - CoreGraphics - CoreMedia - OpenGL - AudioUnit - ApplicationServices - Foundation - AGL - Security - SystemConfiguration - Carbon - AudioToolbox - VideoToolbox - VideoDecodeAcceleration - AVFoundation - CoreAudio - CoreVideo - CoreMediaIO - QuartzCore - AppKit - CoreWLAN - WebKit - IOKit - GSS - MediaPlayer - IOSurface - Metal - NaturalLanguage - libicns - ]); - - enableParallelBuilding = true; - - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; - - cmakeFlags = [ - "-DTDESKTOP_API_TEST=ON" - ]; - - installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - cp -r ${mainProgram}.app $out/Applications - ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} - ''; - - preFixup = '' - remove-references-to -t ${stdenv.cc.cc} $out/bin/${mainProgram} - remove-references-to -t ${microsoft-gsl} $out/bin/${mainProgram} - remove-references-to -t ${tg_owt.dev} $out/bin/${mainProgram} - ''; - - postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} - ''; - - passthru = { - inherit tg_owt; - }; - meta = with lib; { - inherit mainProgram; description = "Kotatogram – experimental Telegram Desktop fork"; longDescription = '' Unofficial desktop client for the Telegram messenger, based on Telegram Desktop. @@ -192,5 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://kotatogram.github.io"; changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; maintainers = with maintainers; [ ilya-fedin ]; + mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix deleted file mode 100644 index 922efe2d7bf0..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch2 -, pkg-config -, cmake -, ninja -, yasm -, libjpeg -, openssl -, libopus -, ffmpeg -, protobuf -, openh264 -, crc32c -, libvpx -, libX11 -, libXtst -, libXcomposite -, libXdamage -, libXext -, libXrender -, libXrandr -, libXi -, glib -, abseil-cpp -, pipewire -, mesa -, libdrm -, libGL -, darwin -}: - -stdenv.mkDerivation { - pname = "tg_owt"; - version = "0-unstable-2024-06-15"; - - src = fetchFromGitHub { - owner = "desktop-app"; - repo = "tg_owt"; - rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; - sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; - fetchSubmodules = true; - }; - - patches = [ - # Remove usage of AVCodecContext::reordered_opaque - (fetchpatch2 { - name = "webrtc-ffmpeg-7.patch"; - url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; - decode = "base64 -d"; - stripLen = 1; - extraPrefix = "src/"; - hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU="; - }) - ]; - - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ - --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ - --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \ - --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \ - --replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"' - ''; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config cmake ninja yasm ]; - - propagatedBuildInputs = [ - libjpeg - openssl - libopus - ffmpeg - protobuf - openh264 - crc32c - libvpx - abseil-cpp - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXtst - libXcomposite - libXdamage - libXext - libXrender - libXrandr - libXi - glib - pipewire - mesa - libdrm - libGL - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Cocoa - AppKit - IOKit - IOSurface - Foundation - AVFoundation - CoreMedia - VideoToolbox - CoreGraphics - CoreVideo - OpenGL - Metal - MetalKit - CoreFoundation - ApplicationServices - ]); - - enableParallelBuilding = true; - - meta.license = lib.licenses.bsd3; -} diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index f41713389679..731042ac924a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_6_0, makeWrapper }: +{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_4_1, makeWrapper }: stdenv.mkDerivation { pname = "${kotatogram-desktop.pname}-with-webkit"; @@ -8,12 +8,13 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out cp -r ${kotatogram-desktop}/share $out + substituteInPlace $out/share/dbus-1/services/* --replace-fail ${kotatogram-desktop} $out ''; postFixup = '' mkdir -p $out/bin makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_6_0 ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_4_1 ]} ''; meta = kotatogram-desktop.meta // { platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 6f6246702894..c4de1b979195 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -1,48 +1,44 @@ { lib +, stdenv , fetchFromGitHub , callPackage , pkg-config , cmake , ninja +, clang +, lld , python3 -, gobject-introspection -, wrapGAppsHook3 , wrapQtAppsHook -, extra-cmake-modules +, tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; } , qtbase -, qtwayland -, qtsvg , qtimageformats -, gtk3 -, glib-networking -, boost -, fmt -, libdbusmenu +, qtsvg +, qtwayland +, kcoreaddons , lz4 , xxHash , ffmpeg +, protobuf , openalSoft , minizip , libopus , alsa-lib , libpulseaudio -, pipewire , range-v3 , tl-expected , hunspell -, webkitgtk_6_0 +, gobject-introspection , jemalloc , rnnoise -, protobuf -, abseil-cpp -, xdg-utils , microsoft-gsl -, rlottie +, boost , ada -, stdenv -, darwin -, lld +, withWebKitGTK ? true +, wrapGAppsHook3 +, glib-networking +, webkitgtk_4_1 , libicns +, darwin , nix-update-script }: @@ -53,14 +49,6 @@ # - https://git.alpinelinux.org/aports/tree/testing/telegram-desktop/APKBUILD # - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template -let - tg_owt = callPackage ./tg_owt.nix { - inherit stdenv; - abseil-cpp = abseil-cpp.override { - cxxStandard = "20"; - }; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; version = "5.6.3"; @@ -75,10 +63,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./macos.patch - # the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling - # and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary - # see https://github.com/NixOS/nixpkgs/issues/218370 - ./scheme.patch ]; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' @@ -88,16 +72,19 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && withWebKitGTK) '' substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \ - --replace-fail '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"' + --replace-fail '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"' '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster ''; - # We want to run wrapProgram manually (with additional parameters) + # Avoid double-wrapping dontWrapGApps = true; - dontWrapQtApps = true; + + # Wrapping the inside of the app bundles, avoiding double-wrapping + dontWrapQtApps = stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ pkg-config @@ -106,18 +93,19 @@ stdenv.mkDerivation (finalAttrs: { python3 wrapQtAppsHook ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + # to build bundled libdispatch + clang gobject-introspection + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [ wrapGAppsHook3 - extra-cmake-modules ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ]; buildInputs = [ qtbase - qtsvg qtimageformats - boost + qtsvg lz4 xxHash ffmpeg @@ -127,23 +115,21 @@ stdenv.mkDerivation (finalAttrs: { range-v3 tl-expected rnnoise - protobuf tg_owt microsoft-gsl - rlottie + boost ada ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + protobuf qtwayland - gtk3 - glib-networking - fmt - libdbusmenu + kcoreaddons alsa-lib libpulseaudio - pipewire hunspell - webkitgtk_6_0 jemalloc + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [ + glib-networking + webkitgtk_4_1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa CoreFoundation @@ -185,33 +171,22 @@ stdenv.mkDerivation (finalAttrs: { }; cmakeFlags = [ - (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true) # We're allowed to used the API ID of the Snap package: (lib.cmakeFeature "TDESKTOP_API_ID" "611335") (lib.cmakeFeature "TDESKTOP_API_HASH" "d524b414d21f4d37f08684c1df41ac9c") - # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649 - (lib.cmakeBool "DESKTOP_APP_USE_PACKAGED_FONTS" false) ]; - preBuild = '' - # for cppgir to locate gir files - export GI_GIR_PATH="$XDG_DATA_DIRS" - ''; - installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin} ''; - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - # This is necessary to run Telegram in a pure environment. - # We also use gappsWrapperArgs from wrapGAppsHook. - wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ - "''${gappsWrapperArgs[@]}" \ - "''${qtWrapperArgs[@]}" \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + preFixup = lib.optionalString (stdenv.hostPlatform.isLinux && withWebKitGTK) '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram} ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch deleted file mode 100644 index 58aaa8a7fcb5..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp -index e3e0de6c6..d5851bd6e 100644 ---- a/Telegram/SourceFiles/core/application.cpp -+++ b/Telegram/SourceFiles/core/application.cpp -@@ -421,7 +421,6 @@ void Application::run() { - - void Application::autoRegisterUrlScheme() { - if (!OptionSkipUrlSchemeRegister.value()) { -- InvokeQueued(this, [] { RegisterUrlScheme(); }); - } - } - diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 425b82f15d9b..a0847b98139e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -5,29 +5,31 @@ fetchpatch2, pkg-config, cmake, - crc32c, + ninja, python3, libjpeg, openssl, libopus, ffmpeg, openh264, + crc32c, libvpx, - libXi, - libXfixes, + libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, + libXi, glib, abseil-cpp, pipewire, mesa, + libdrm, libGL, - unstableGitUpdater, darwin, + unstableGitUpdater, }: stdenv.mkDerivation { @@ -38,7 +40,7 @@ stdenv.mkDerivation { owner = "desktop-app"; repo = "tg_owt"; rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8"; - sha256 = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o="; + hash = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o="; fetchSubmodules = true; }; @@ -54,36 +56,50 @@ stdenv.mkDerivation { }) ]; + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ + --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \ + --replace-fail '"libGL.so.1"' '"${lib.getLib libGL}/lib/libGL.so.1"' \ + --replace-fail '"libgbm.so.1"' '"${lib.getLib mesa}/lib/libgbm.so.1"' \ + --replace-fail '"libdrm.so.2"' '"${lib.getLib libdrm}/lib/libdrm.so.2"' + ''; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ - cmake pkg-config + cmake + ninja python3 ]; - buildInputs = + propagatedBuildInputs = [ - openssl libjpeg + openssl libopus ffmpeg + openh264 + crc32c + libvpx + abseil-cpp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - glib - libXi + libX11 + libXtst libXcomposite libXdamage libXext - libXfixes libXrender libXrandr - libXtst + libXi + glib pipewire mesa + libdrm libGL ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( @@ -99,6 +115,7 @@ stdenv.mkDerivation { VideoToolbox CoreGraphics CoreVideo + OpenGL Metal MetalKit CoreFoundation @@ -106,18 +123,6 @@ stdenv.mkDerivation { ] ); - propagatedBuildInputs = [ - abseil-cpp - crc32c - openh264 - libvpx - ]; - - cmakeFlags = [ - # Building as a shared library isn't officially supported and may break at any time. - (lib.cmakeBool "BUILD_SHARED_LIBS" false) - ]; - passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix deleted file mode 100644 index 3f0544d56f6e..000000000000 --- a/pkgs/applications/office/docear/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{lib, stdenv, fetchurl, runtimeShell, makeWrapper -, oraclejre -, antialiasFont ? true -}: - -stdenv.mkDerivation { - pname = "docear"; - version = "1.2"; - - src = fetchurl { - url = "http://docear.org/downloads/docear_linux.tar.gz"; - sha256 = "1g5n7r2x4gas6dl2fbyh7v9yxdcb6bzml8n3ldmpzv1rncgjcdp4"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ oraclejre ]; - - buildPhase = ""; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share - cp -R * $out/share - chmod 0755 $out/share/ -R - - # The wrapper ensures oraclejre is used - makeWrapper ${runtimeShell} $out/bin/docear \ - --set _JAVA_OPTIONS "${lib.optionalString antialiasFont "-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on"}" \ - --set JAVA_HOME ${oraclejre.home} \ - --add-flags "$out/share/docear.sh" - - chmod 0755 $out/bin/docear - ''; - - meta = with lib; { - description = "Unique solution to academic literature management"; - homepage = "http://www.docear.org/"; - # Licenses at: http://www.docear.org/software/download/ - license = with licenses; [ - gpl2 # for the main software and some dependencies - bsd3 # for one of its dependencies - ]; - maintainers = with maintainers; [ unode ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index f1c2c53638ad..c01337b8d969 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pkg-config, coin-utils, zlib, osi }: stdenv.mkDerivation rec { - version = "1.17.9"; + version = "1.17.10"; pname = "clp"; src = fetchFromGitHub { owner = "coin-or"; repo = "Clp"; rev = "releases/${version}"; - hash = "sha256-kHCDji+yIf5mCoxKB2b/HaATGmwwIAPEV74tthIMeMY="; + hash = "sha256-9IlBT6o1aHAaYw2/39XrUis72P9fesmG3B6i/e+v3mM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix deleted file mode 100644 index cade6f0c7484..000000000000 --- a/pkgs/applications/video/go-chromecast/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "go-chromecast"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "vishen"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Kzo8iWj4mtnX1Jxm2sLsnmEOmpzScxWHZ/sLYYm3vQI="; - }; - - vendorHash = "sha256-cEUlCR/xtPJJSWplV1COwV6UfzSmVArF4V0pJRk+/Og="; - - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; - - meta = with lib; { - homepage = "https://github.com/vishen/go-chromecast"; - description = "CLI for Google Chromecast, Home devices and Cast Groups"; - license = licenses.asl20; - maintainers = [ ]; - mainProgram = "go-chromecast"; - }; -} diff --git a/pkgs/applications/video/mlv-app/aarch64-flags.patch b/pkgs/applications/video/mlv-app/aarch64-flags.patch index affd85d2b732..4d26bfdd39d0 100644 --- a/pkgs/applications/video/mlv-app/aarch64-flags.patch +++ b/pkgs/applications/video/mlv-app/aarch64-flags.patch @@ -2,12 +2,12 @@ diff --git a/platform/qt/MLVApp.pro b/platform/qt/MLVApp.pro index ebdc552..3e37573 100644 --- a/platform/qt/MLVApp.pro +++ b/platform/qt/MLVApp.pro -@@ -84,7 +84,7 @@ win32{ +@@ -120,7 +120,7 @@ win32{ # Linux linux-g++*{ -- QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -+ QMAKE_CFLAGS += -O3 -fopenmp -std=c99 - QMAKE_CXXFLAGS += -fopenmp +- QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -ftree-vectorize ++ QMAKE_CFLAGS += -O3 -fopenmp -std=c99 -ftree-vectorize + QMAKE_CXXFLAGS += -fopenmp -std=c++11 -ftree-vectorize LIBS += -lgomp } diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix index da9f4d5807e1..c4f0f984518e 100644 --- a/pkgs/applications/video/mlv-app/default.nix +++ b/pkgs/applications/video/mlv-app/default.nix @@ -18,7 +18,10 @@ mkDerivation rec { sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU="; }; - patches = if stdenv.hostPlatform.isAarch64 then ./aarch64-flags.patch else null; + patches = lib.optionals stdenv.hostPlatform.isAarch64 [ + # remove optimization flags with x86 only instruction sets + ./aarch64-flags.patch + ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index 567a1b4db6eb..ce3c4e075a95 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "distrobox"; - version = "1.7.2.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "89luca89"; repo = "distrobox"; rev = finalAttrs.version; - hash = "sha256-H2jeKs0h4ZAcP33HB5jptlubq62cwnjPK2wSlEIfFWA="; + hash = "sha256-e9oSTk+UlkrkRSipqjjMqwtxEvEZffVBmlSTmsIT7cU="; }; dontConfigure = true; @@ -16,12 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper ]; + patches = [ + # https://github.com/89luca89/distrobox/issues/408 + ./relative-default-icon.patch + ]; + installPhase = '' runHook preInstall - # https://github.com/89luca89/distrobox/issues/408 - substituteInPlace ./distrobox-generate-entry \ - --replace-fail 'icon_default="''${HOME}/.local' "icon_default=\"$out" ./install -P $out runHook postInstall diff --git a/pkgs/applications/virtualization/distrobox/relative-default-icon.patch b/pkgs/applications/virtualization/distrobox/relative-default-icon.patch new file mode 100644 index 000000000000..069c2d40d618 --- /dev/null +++ b/pkgs/applications/virtualization/distrobox/relative-default-icon.patch @@ -0,0 +1,26 @@ +diff --git a/distrobox-generate-entry b/distrobox-generate-entry +index 65fcea0..8d57e4e 100755 +--- a/distrobox-generate-entry ++++ b/distrobox-generate-entry +@@ -51,7 +51,7 @@ container_manager="autodetect" + container_name_default="my-distrobox" + delete=0 + icon="auto" +-icon_default="${XDG_DATA_HOME:-${HOME}/.local/share}/icons/terminal-distrobox-icon.svg" ++icon_default="terminal-distrobox-icon" + verbose=0 + online=0 + version="1.8.0" +@@ -335,12 +335,6 @@ if [ "${icon}" = "auto" ]; then + + icon_url="$(echo "${DISTRO_ICON_MAP}" | grep "${container_distro}:" | cut -d':' -f2-)" + +- # Distro not found in our map, fallback to generic icon +- if [ -z "${icon_url}" ]; then +- icon_url="https://raw.githubusercontent.com/89luca89/distrobox/main/icons/terminal-distrobox-icon.svg" +- container_distro="terminal-distrobox-icon" +- fi +- + if [ -n "${icon_url}" ] && [ "${download}" != "null" ]; then + icon_extension="${icon_url##*.}" + diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index b0c9f93649c9..c5b27e85e5bb 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -82,6 +82,7 @@ rec { , destination ? "" , checkPhase ? "" , meta ? { } + , passthru ? { } , allowSubstitutes ? false , preferLocalBuild ? true , derivationArgs ? { } @@ -105,7 +106,8 @@ rec { { mainProgram = lib.head matches; } // meta // derivationArgs.meta or {}; - } // removeAttrs derivationArgs [ "passAsFile" "meta" ]) + passthru = passthru // derivationArgs.passthru or {}; + } // removeAttrs derivationArgs [ "passAsFile" "meta" "passthru" ]) '' target=$out${lib.escapeShellArg destination} mkdir -p "$(dirname "$target")" @@ -220,6 +222,12 @@ rec { Type: AttrSet */ meta ? { }, + /* + `stdenv.mkDerivation`'s `passthru` argument. + + Type: AttrSet + */ + passthru ? { }, /* The `checkPhase` to run. Defaults to `shellcheck` on supported platforms and `bash -n`. @@ -263,7 +271,7 @@ rec { derivationArgs ? { }, }: writeTextFile { - inherit name meta derivationArgs; + inherit name meta passthru derivationArgs; executable = true; destination = "/bin/${name}"; allowSubstitutes = true; @@ -366,9 +374,10 @@ rec { , destination ? "" # relative path appended to $out eg "/bin/foo" , checkPhase ? "" # syntax checks, e.g. for scripts , meta ? { } + , passthru ? { } }: runCommandLocal name - { inherit files executable checkPhase meta destination; } + { inherit files executable checkPhase meta passthru destination; } '' file=$out$destination mkdir -p "$(dirname "$file")" diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index dfca50eb902e..b921efbf2dbc 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -28,6 +28,7 @@ telegram-desktop.overrideAttrs (old: rec { ]; cmakeFlags = (old.cmakeFlags or []) ++ [ + (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true) (lib.cmakeBool "disable_autoupdate" true) ]; diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index ddea9886a888..ca7b6fa5c617 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -4,13 +4,14 @@ fetchFromGitHub, nodejs_18, installShellFiles, + makeWrapper, stdenv, }: buildNpmPackage rec { pname = "clever-tools"; - version = "3.8.3"; + version = "3.9.0"; nodejs = nodejs_18; @@ -18,27 +19,32 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-70wyu8+Jb9kR5lIucBZG9UWIufMhsgMBMkT2ohGvE50="; + hash = "sha256-nSTcJIZO/CMliAYFUGu/oA+VdtONDPwyj6vCr5Ry6ac="; }; - npmDepsHash = "sha256-LljwS6Rd/8WnGpxSHwCr87KWLaRR2i7sMdUuuprYiOE="; + npmDepsHash = "sha256-+3/zSsO5+s1MUome3CQ1p1tN3OtWp+XE9Z6GSdDiRh8="; - dontNpmBuild = true; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; - nativeBuildInputs = [ installShellFiles ]; + installPhase = '' + mkdir -p $out/bin $out/lib/clever-tools + cp build/clever.cjs $out/lib/clever-tools/clever.cjs - makeWrapperArgs = [ "--set NO_UPDATE_NOTIFIER true" ]; + makeWrapper ${nodejs}/bin/node $out/bin/clever \ + --add-flags "$out/lib/clever-tools/clever.cjs" \ + --set NO_UPDATE_NOTIFIER true - postInstall = - lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd clever \ - --bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \ - --zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever) - '' - + '' - rm $out/bin/install-clever-completion - rm $out/bin/uninstall-clever-completion - ''; + runHook postInstall + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd clever \ + --bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \ + --zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever) + ''; meta = with lib; { homepage = "https://github.com/CleverCloud/clever-tools"; diff --git a/pkgs/by-name/ea/earlyoom/package.nix b/pkgs/by-name/ea/earlyoom/package.nix index 9452bbfabf79..fead6ff586e0 100644 --- a/pkgs/by-name/ea/earlyoom/package.nix +++ b/pkgs/by-name/ea/earlyoom/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; mainProgram = "earlyoom"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ge/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix index 5fbecd9da070..1cc81f0f137c 100644 --- a/pkgs/by-name/ge/geoserver/extensions.nix +++ b/pkgs/by-name/ge/geoserver/extensions.nix @@ -29,325 +29,325 @@ in { app-schema = mkGeoserverExtension { name = "app-schema"; - version = "2.25.3"; # app-schema - hash = "sha256-IvcJAu62wXAh5OQkG3cTUB/X7dc/2q6Le7GSwfJL/sA="; # app-schema + version = "2.26.0"; # app-schema + hash = "sha256-HOjhM9WI7lsqUNrozLB2oI6szqm+Cb7VqC0Hy9NlNMU="; # app-schema }; authkey = mkGeoserverExtension { name = "authkey"; - version = "2.25.3"; # authkey - hash = "sha256-4tEu9JOomMN/ntDHLqEwrn9lPrJ4LjTM/VuMsjARbF0="; # authkey + version = "2.26.0"; # authkey + hash = "sha256-34U3zq/SKm21fZV80+04N/0ygqShdYVMeQNuqtMSXgQ="; # authkey }; cas = mkGeoserverExtension { name = "cas"; - version = "2.25.3"; # cas - hash = "sha256-Am8tgF5APKuTa7XI7aI9Oq9jAiDPfJhGCXErtyPpDS8="; # cas + version = "2.26.0"; # cas + hash = "sha256-mosawsZkCKOm03CFg9poJ+XwbbGhvNt8AsxnegW59H4="; # cas }; charts = mkGeoserverExtension { name = "charts"; - version = "2.25.3"; # charts - hash = "sha256-0Vu9ldBYWe4vFQ6ftEO/WsmNz3Sf3W8iPS7t9W/+5fY="; # charts + version = "2.26.0"; # charts + hash = "sha256-rPnY9zYgdRoud2I2hcxnODDE/2gsBTMgTPrGAwDdrbM="; # charts }; control-flow = mkGeoserverExtension { name = "control-flow"; - version = "2.25.3"; # control-flow - hash = "sha256-zH+Hz7SySKRdrrmMBukXkaCziszIwOqzSmGYXWZGxs4="; # control-flow + version = "2.26.0"; # control-flow + hash = "sha256-4Kl0SgKW8MifMVY1+Aa9Ve0WufjHFQejobhQfnwGwbw="; # control-flow }; css = mkGeoserverExtension { name = "css"; - version = "2.25.3"; # css - hash = "sha256-c3VDxTGZebGCPfYhwUyENoGiDmVa1zttJEi/879RPsc="; # css + version = "2.26.0"; # css + hash = "sha256-CUG5cBxW/PyP/M2I5/1wC1UndzWSIg8aKeETtUnrH5A="; # css }; csw = mkGeoserverExtension { name = "csw"; - version = "2.25.3"; # csw - hash = "sha256-8G7GY5n0bV/xvwUkTijHLnsXBD4MczIastdeGmFcfSc="; # csw + version = "2.26.0"; # csw + hash = "sha256-ABNFf6grpU97nd81H/s8Gfd1G9mxMwVdUduubLWrsRE="; # csw }; csw-iso = mkGeoserverExtension { name = "csw-iso"; - version = "2.25.3"; # csw-iso - hash = "sha256-cSY981K9QiY3YJJR1zBCQArJESZO+80oIa/uj+qTsTM="; # csw-iso + version = "2.26.0"; # csw-iso + hash = "sha256-dKyVP5FuJ0Tl2z4veMeIJO66dBucfZo6qH+WvSBQ1Es="; # csw-iso }; db2 = mkGeoserverExtension { name = "db2"; - version = "2.25.3"; # db2 - hash = "sha256-0eRiLoPIWv5Bddi9RxRkxAVMSolZCpv1kKEK7FkQrXs="; # db2 + version = "2.26.0"; # db2 + hash = "sha256-L0Xrc0MuSiezKk7l4P4lm3phRou79neQds4Yu2VG5DY="; # db2 }; # Needs wps extension. dxf = mkGeoserverExtension { name = "dxf"; - version = "2.25.3"; # dxf - hash = "sha256-0i2F9343IhN6LZMdTj/dSP5k5QXd7Si/8ZWbxmkcdD4="; # dxf + version = "2.26.0"; # dxf + hash = "sha256-OtpYej/MxqeoMBw17Ltr9l5iOGUa91L30hgBz6ZbD+Y="; # dxf }; excel = mkGeoserverExtension { name = "excel"; - version = "2.25.3"; # excel - hash = "sha256-N7OCXq1HRwV1poPImct7T9ZWdbWWYprSBMarGXx33OI="; # excel + version = "2.26.0"; # excel + hash = "sha256-UHIVJnUJnzPDJWsrQw9YasUedpLujKr9s3VJtSgESHY="; # excel }; feature-pregeneralized = mkGeoserverExtension { name = "feature-pregeneralized"; - version = "2.25.3"; # feature-pregeneralized - hash = "sha256-R1jv7GPT3f7D18gQoWcLXqhtULtUvA3wEeXC2Q0+eQg="; # feature-pregeneralized + version = "2.26.0"; # feature-pregeneralized + hash = "sha256-WT1TsHcYoxJK0LWsF4h8VdUGxIecx9SuIqWoA9JjZfA="; # feature-pregeneralized }; # Note: The extension name ("gdal") clashes with pkgs.gdal. gdal = mkGeoserverExtension { name = "gdal"; - version = "2.25.3"; # gdal + version = "2.26.0"; # gdal buildInputs = [ pkgs.gdal ]; - hash = "sha256-n6B/FHpul29MTYuBsg0XNfTTANBXw/cSEolzIabhHA8="; # gdal + hash = "sha256-lGyBxRCz5DvDQUNQmsk1+DfArwx3kcMoSgQq+O/DqZc="; # gdal }; # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. #geofence = mkGeoserverExtension { # name = "geofence"; - # version = "2.25.3"; # geofence - # hash = "sha256-298rEz0JmFhXxfv0tpdsDOrFLyS7GcuFwp/tX/m+SyI="; # geofence + # version = "2.26.0"; # geofence + # hash = "sha256-Io71mNpUu15klMWFHCaFfRmxPUGGTASZE7MZWyv2TDQ="; # geofence #}; #geofence-server = mkGeoserverExtension { # name = "geofence-server"; - # version = "2.25.3"; # geofence-server - # hash = "sha256-PHP6OmulBbUJ1Q7qliYXX6fAA2C8q4h4i7qCXJpVUCQ="; # geofence-server + # version = "2.26.0"; # geofence-server + # hash = "sha256-UPRupgj9La/JWAneGeM+UdCvnkcW3ZTe7c1bYZRURGI="; # geofence-server #}; #geofence-wps = mkGeoserverExtension { # name = "geofence-wps"; - # version = "2.25.3"; # geofence-wps - # hash = "sha256-vH7gQsjfAEcpcM+JVRfbw5sH4eJz+051FBrmoS7MyYo="; # geofence-wps + # version = "2.26.0"; # geofence-wps + # hash = "sha256-SA7nWTyawzDZVsOATRLW/MQQfyXWhHQif3/4MdVogBM="; # geofence-wps #}; geopkg-output = mkGeoserverExtension { name = "geopkg-output"; - version = "2.25.3"; # geopkg-output - hash = "sha256-frcNjS+phsyuRo4PlmcSUu2Ylp3kHA8OYm+WCBAU/UI="; # geopkg-output + version = "2.26.0"; # geopkg-output + hash = "sha256-SKIInEC9TI2FBtduGHi3apZip5ubA4/ip58+w0O1a38="; # geopkg-output }; grib = mkGeoserverExtension { name = "grib"; - version = "2.25.3"; # grib - hash = "sha256-uQ7xe3sokrE89QTfTLynHSHE0W6LmiICO3XKkWKEJBU="; # grib + version = "2.26.0"; # grib + hash = "sha256-5Hn6LUxsCP5YvVsMgh6m/oMBJuIo2Y9XdbSRQAJm+vI="; # grib buildInputs = [ netcdf ]; }; gwc-s3 = mkGeoserverExtension { name = "gwc-s3"; - version = "2.25.3"; # gwc-s3 - hash = "sha256-1cc3JywXaCCQUojnTVYmkq9Gz5Y1atBJmd0GDhyGAIE="; # gwc-s3 + version = "2.26.0"; # gwc-s3 + hash = "sha256-www+MTFlkmJ6GeGd3v8uGTYV7PYVg5pIS9/2s1D6YeU="; # gwc-s3 }; h2 = mkGeoserverExtension { name = "h2"; - version = "2.25.3"; # h2 - hash = "sha256-Cp/3qrjNSKztAaMrxPoZo2YfGBEezLQp6/ZGOehkixM="; # h2 + version = "2.26.0"; # h2 + hash = "sha256-+Y7pILmnz51c5eO+OdqHGLD05fEqaM3vkFU7s0UiA2g="; # h2 }; iau = mkGeoserverExtension { name = "iau"; - version = "2.25.3"; # iau - hash = "sha256-MV/XYF61rQjuOJSU6n0ADauFYJGF0cZk4lMSoHs9drg="; # iau + version = "2.26.0"; # iau + hash = "sha256-5oM3JxD6HKVhq1/IxXWck1MtQ8KwsLtf+LQACpvdKMA="; # iau }; importer = mkGeoserverExtension { name = "importer"; - version = "2.25.3"; # importer - hash = "sha256-T6PGv3zfiwA8DE2XZ2CusaQ0vRGZ75mO4nxONsCQU+g="; # importer + version = "2.26.0"; # importer + hash = "sha256-HFBIEB8pgVaCMF34Z0Clp3+nk2h4Va0xV2ptSZUSx9I="; # importer }; inspire = mkGeoserverExtension { name = "inspire"; - version = "2.25.3"; # inspire - hash = "sha256-A4BBd0Q8NVjPLI6e8HTCg5zd4QOLQ6Ho3/2hnRXCeTM="; # inspire + version = "2.26.0"; # inspire + hash = "sha256-uIryr4WQbWdAMjqATGf0txp1sZWWABSMv8o2xiKaWiI="; # inspire }; # Needs Kakadu plugin from # https://github.com/geosolutions-it/imageio-ext #jp2k = mkGeoserverExtension { # name = "jp2k"; - # version = "2.25.3"; # jp2k - # hash = "sha256-0df5vPLYqxPAxqINwdWZ5RRJQVm/79sUcj8fB4RwMKY="; # jp2k + # version = "2.26.0"; # jp2k + # hash = "sha256-gPipm6hnkIyEU3a8NbSCm5QUSF+IKNHgt5DNFsvC++c="; # jp2k #}; libjpeg-turbo = mkGeoserverExtension { name = "libjpeg-turbo"; - version = "2.25.3"; # libjpeg-turbo - hash = "sha256-vQjeYuB6JY+bMlxRXZ7HqgS2hEtmEJJvowfwhWmYkY4="; # libjpeg-turbo + version = "2.26.0"; # libjpeg-turbo + hash = "sha256-I1Ojsgd+gRjSJJkx9wSfzJfVq5z3vgxA4zynZvVd4jU="; # libjpeg-turbo buildInputs = [ libjpeg.out ]; }; mapml = mkGeoserverExtension { name = "mapml"; - version = "2.25.3"; # mapml - hash = "sha256-3BMCWeAFn52Uiob53eer5OqBLOgQaMTmHPFTLs51mEg="; # mapml + version = "2.26.0"; # mapml + hash = "sha256-VGg/3cB+KUwZtbKQUoU4NURDjcANzQpPv4ZWeCzwkq0="; # mapml }; mbstyle = mkGeoserverExtension { name = "mbstyle"; - version = "2.25.3"; # mbstyle - hash = "sha256-SJAI4ssMZZL75gx1h7gwf+4YwXP/CNEm9BTtA/JNRW4="; # mbstyle + version = "2.26.0"; # mbstyle + hash = "sha256-Z5CNKP2fqMcw6prP/b84tOAPYwlLiFsbV26VdVnqFns="; # mbstyle }; metadata = mkGeoserverExtension { name = "metadata"; - version = "2.25.3"; # metadata - hash = "sha256-Gst1cctv/oKTS+jD0y8fHFrEBJyn77fEafV+QzspQVc="; # metadata + version = "2.26.0"; # metadata + hash = "sha256-6E9Z6WqCQxlDL3w1FiI+gOzjQ4ZyS5oucj1/02W4k4Y="; # metadata }; mongodb = mkGeoserverExtension { name = "mongodb"; - version = "2.25.3"; # mongodb - hash = "sha256-LVejtipIRZy3g5GKs8RkOqKHNRskf8YSD11fiFvBF3w="; # mongodb + version = "2.26.0"; # mongodb + hash = "sha256-thfgMeDrDb2rPh9h9R2AgYYWPBHcEG/sI4UhNBb/DfQ="; # mongodb }; monitor = mkGeoserverExtension { name = "monitor"; - version = "2.25.3"; # monitor - hash = "sha256-+FlKgoESE0j6JXM0yozYMyz6U2TshYNd6WHsKg9frAs="; # monitor + version = "2.26.0"; # monitor + hash = "sha256-vgeqZXzb8nz7daAeur1JMLS0Rospgyx+v9n687000EE="; # monitor }; mysql = mkGeoserverExtension { name = "mysql"; - version = "2.25.3"; # mysql - hash = "sha256-gfU67lID2YSNbi1aB8m1b+zGqtVnChi56HrtcBE6Aqw="; # mysql + version = "2.26.0"; # mysql + hash = "sha256-PCNCyqJwOK6P6sDWVMdV6gGXgHJOPw97cqkjaixZxwQ="; # mysql }; netcdf = mkGeoserverExtension { name = "netcdf"; - version = "2.25.3"; # netcdf - hash = "sha256-aMykYIBMwH46apDudKnApNba454Yep5HZeYPqEXoqcI="; # netcdf + version = "2.26.0"; # netcdf + hash = "sha256-0i/zmiIE+xjec6dOd237MdIBrCspZEL+8h1c/g0h7oU="; # netcdf buildInputs = [ netcdf ]; }; netcdf-out = mkGeoserverExtension { name = "netcdf-out"; - version = "2.25.3"; # netcdf-out - hash = "sha256-3gGzgC7IbwpettwSf4+b8HeJRuvkUfDu0xre9wyVap4="; # netcdf-out + version = "2.26.0"; # netcdf-out + hash = "sha256-xl2mY9QYSVeC2k43H2GFz2D56rajCT9FlpP47Q8aOe8="; # netcdf-out buildInputs = [ netcdf ]; }; ogr-wfs = mkGeoserverExtension { name = "ogr-wfs"; - version = "2.25.3"; # ogr-wfs + version = "2.26.0"; # ogr-wfs buildInputs = [ pkgs.gdal ]; - hash = "sha256-4rcUvN1py62JMQy51rxvNfV2AQIptXuRen7tvbrno6s="; # ogr-wfs + hash = "sha256-LiB+BE2Q3a2US7HJkBWT0Z9AMZ3A3M584qbEV1uhhEM="; # ogr-wfs }; # Needs ogr-wfs extension. ogr-wps = mkGeoserverExtension { name = "ogr-wps"; - version = "2.25.3"; # ogr-wps + version = "2.26.0"; # ogr-wps # buildInputs = [ pkgs.gdal ]; - hash = "sha256-RA1dxzjhOt7lQCu6SVSM8HiXYwtFbUfj0hdk831QE5g="; # ogr-wps + hash = "sha256-0o4cD8wv1Km5pljxAlokVRVEfMbklXgkYhxFZqPdROk="; # ogr-wps }; oracle = mkGeoserverExtension { name = "oracle"; - version = "2.25.3"; # oracle - hash = "sha256-fKJwLh4T445da1AWPzFpp++LGWiiKhN339VWt1N0s5Q="; # oracle + version = "2.26.0"; # oracle + hash = "sha256-mxc46ctIh7imjQgTI2zZ9gwtgDF6GkE/b5IogUktF9Y="; # oracle }; params-extractor = mkGeoserverExtension { name = "params-extractor"; - version = "2.25.3"; # params-extractor - hash = "sha256-zO9OwH7NCUILnxRqz1z/QJdfgsx9gfpf2R7rIsgTIr8="; # params-extractor + version = "2.26.0"; # params-extractor + hash = "sha256-dLzEdnNy+Nrxkc4aBCGTESuReW6mkgXEpXDo9rDzsBU="; # params-extractor }; printing = mkGeoserverExtension { name = "printing"; - version = "2.25.3"; # printing - hash = "sha256-QAy53/p+/mjCTXreKsVSRcpYgfAs7W9f+ZwE4Z6Gnx8="; # printing + version = "2.26.0"; # printing + hash = "sha256-31T/tizxkmzYbxR1eLiY3DanwlFVdeZvFOESgBnuG1A="; # printing }; pyramid = mkGeoserverExtension { name = "pyramid"; - version = "2.25.3"; # pyramid - hash = "sha256-kFTNQrxibatVZzPSC6Rv/SzU3FUJYQJ3dHZ5AfR3kD8="; # pyramid + version = "2.26.0"; # pyramid + hash = "sha256-lpDexw5nd1jm9cDFsQ/qXdwbX5vTD0RXKIAOg6dKQqE="; # pyramid }; querylayer = mkGeoserverExtension { name = "querylayer"; - version = "2.25.3"; # querylayer - hash = "sha256-TgQiroYcnVCe5QVIcEa8gsgYELqM2jS7RveGyetWokU="; # querylayer + version = "2.26.0"; # querylayer + hash = "sha256-ajrNJ0eG0pp+v/f4N5kxcUzYOyXuLhMRzvdfdiJh0Vk="; # querylayer }; sldservice = mkGeoserverExtension { name = "sldservice"; - version = "2.25.3"; # sldservice - hash = "sha256-5E410iNaZVEBKzRGSBcW3JNISap2NrcFtXAuP1+cVt0="; # sldservice + version = "2.26.0"; # sldservice + hash = "sha256-xxpKSDghK+Xz8buPU5lzEa7eiG5A0rPgzCaIO9GKCMY="; # sldservice }; sqlserver = mkGeoserverExtension { name = "sqlserver"; - version = "2.25.3"; # sqlserver - hash = "sha256-TNeyegWOz/a7uFsn1hBhOgpV0vnFncwQ+U9VqyY62+g="; # sqlserver + version = "2.26.0"; # sqlserver + hash = "sha256-UwZ4ho+HG+ocwri+N4ebTATGcT4tukAxwvx84rP0VWk="; # sqlserver }; vectortiles = mkGeoserverExtension { name = "vectortiles"; - version = "2.25.3"; # vectortiles - hash = "sha256-RQGeGhfixKrwRuzgmkZ/JDWaPZyDy8fAfGe0iXZfKdY="; # vectortiles + version = "2.26.0"; # vectortiles + hash = "sha256-rlQcWLEPvaKDT6JZ0RuZtaHz1bgtsblFOybKOVqDSVM="; # vectortiles }; wcs2_0-eo = mkGeoserverExtension { name = "wcs2_0-eo"; - version = "2.25.3"; # wcs2_0-eo - hash = "sha256-+li0zBzyHaq0an7qHAdSXKDpvpOZProHnCoHXjyVY7Y="; # wcs2_0-eo + version = "2.26.0"; # wcs2_0-eo + hash = "sha256-Ky+unKH+WBMvo/rlNPv2Uca3X610yXZvCy0/5KEN6wk="; # wcs2_0-eo }; web-resource = mkGeoserverExtension { name = "web-resource"; - version = "2.25.3"; # web-resource - hash = "sha256-m9+t3Q2yD+xqvuBvkc5jYWwtGqJit00xiHyDSLX8euE="; # web-resource + version = "2.26.0"; # web-resource + hash = "sha256-S7Wu4wGo2j8PcBC8VS7EECBlr7NN1hALC1VOM5b6Wk0="; # web-resource }; wmts-multi-dimensional = mkGeoserverExtension { name = "wmts-multi-dimensional"; - version = "2.25.3"; # wmts-multi-dimensional - hash = "sha256-b/16463iotuADA/bIwTutYCiRZYusMf/yB1xEMPZe9U="; # wmts-multi-dimensional + version = "2.26.0"; # wmts-multi-dimensional + hash = "sha256-BNigZB16d1BKRTl/UJs1oWYFKn/cFk5WX1fBwvC046I="; # wmts-multi-dimensional }; wps = mkGeoserverExtension { name = "wps"; - version = "2.25.3"; # wps - hash = "sha256-4WqZqfc80Qy3AACOb3MhDjocM02vKUEk9x8YfX5onyg="; # wps + version = "2.26.0"; # wps + hash = "sha256-HVTDMqG23Ign7qottKRo1PtQNr6606nV34SRopAMO1Q="; # wps }; # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not # available in nixpgs as of 2024/01. #wps-cluster-hazelcast = mkGeoserverExtension { # name = "wps-cluster-hazelcast"; - # version = "2.25.3"; # wps-cluster-hazelcast - # hash = "sha256-EDSSNVCZdcmv8ZfB3Gj80xm/ghlWNZwpTYhEwIoegM0="; # wps-cluster-hazelcast + # version = "2.26.0"; # wps-cluster-hazelcast + # hash = "sha256-R0Btbf6BNwGKC2TQ6BmSte612Sel7NspOX9KU+zsHBc="; # wps-cluster-hazelcast #}; wps-download = mkGeoserverExtension { name = "wps-download"; - version = "2.25.3"; # wps-download - hash = "sha256-70vw5PHh1hLLAocFKlzPKDZWMjQmwUbv/L4yCJGrDQ4="; # wps-download + version = "2.26.0"; # wps-download + hash = "sha256-sVbAi0y8n2shox6TX0Y4Hg5GhYakv5+tgloMix6Wbfg="; # wps-download }; # Needs Postrgres configuration or similar. # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html wps-jdbc = mkGeoserverExtension { name = "wps-jdbc"; - version = "2.25.3"; # wps-jdbc - hash = "sha256-5d+txy1gw36G7hXfOf5qH+bSPIRw3XeLeMCTw6yHp/M="; # wps-jdbc + version = "2.26.0"; # wps-jdbc + hash = "sha256-iJk24m4UDwK1PrU0PiCDPGj0eK7EEQajUFyl+9aIGpE="; # wps-jdbc }; ysld = mkGeoserverExtension { name = "ysld"; - version = "2.25.3"; # ysld - hash = "sha256-lbjfJPv9v4HUV31Hp5ZAEOe7IceRCxN7xtUxvOi2CYU="; # ysld + version = "2.26.0"; # ysld + hash = "sha256-/qbtfaIE/4haGeS6U+FML1JI/AyXWFyKOd8tGaYFCmw="; # ysld }; } diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index 76a68eea8c3a..15567ea5ca4e 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation (finalAttrs: rec { pname = "geoserver"; - version = "2.25.3"; + version = "2.26.0"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - hash = "sha256-EmW3i0qi7P48AftCz7tqI2Wtvdy3cpyR57+s42dYwt8="; + hash = "sha256-WeItL0j50xWYXIFmH4EFhHjxv9Xr6rG0YO8re1jUnNM="; }; patches = [ diff --git a/pkgs/by-name/go/go-chromecast/package.nix b/pkgs/by-name/go/go-chromecast/package.nix new file mode 100644 index 000000000000..52a8321c300e --- /dev/null +++ b/pkgs/by-name/go/go-chromecast/package.nix @@ -0,0 +1,58 @@ +{ + lib, + buildGo122Module, + fetchFromGitHub, + installShellFiles, + stdenvNoCC, + versionCheckHook, +}: + +# "go test" fails with go 1.23 +buildGo122Module rec { + pname = "go-chromecast"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "vishen"; + repo = "go-chromecast"; + rev = "refs/tags/v${version}"; + hash = "sha256-Kzo8iWj4mtnX1Jxm2sLsnmEOmpzScxWHZ/sLYYm3vQI="; + }; + + vendorHash = "sha256-cEUlCR/xtPJJSWplV1COwV6UfzSmVArF4V0pJRk+/Og="; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" + "-X=main.date=unknown" + ]; + + doInstallCheck = true; + + nativeBuildInputs = [ installShellFiles ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgramArg = "--version"; + + postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd go-chromecast \ + --bash <($out/bin/go-chromecast completion bash) \ + --fish <($out/bin/go-chromecast completion fish) \ + --zsh <($out/bin/go-chromecast completion zsh) + ''; + + meta = { + homepage = "https://github.com/vishen/go-chromecast"; + description = "CLI for Google Chromecast, Home devices and Cast Groups"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.zi3m5f ]; + mainProgram = "go-chromecast"; + }; +} diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json index d1b62fc29aae..be2e151a0f94 100644 --- a/pkgs/by-name/ke/keyguard/deps.json +++ b/pkgs/by-name/ke/keyguard/deps.json @@ -2,17 +2,17 @@ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://dl.google.com/dl/android/maven2": { - "androidx/activity#activity-compose/1.9.2": { - "module": "sha256-L3Jdm3GUbZ9FBOfFp768M7TsW8hwoSUb/dU/C1Zh6AU=", - "pom": "sha256-nYzZFp0iXZ48bJm7kC2xEFVMs7k7o7x3FML8tVbFw8E=" + "androidx/activity#activity-compose/1.9.3": { + "module": "sha256-+yJYhGSGHiedZtpv4kxZed2jS2m4RNI4DIq2eYxTMPk=", + "pom": "sha256-atgGcvLdAuuB/Hzl3OtAYenAl64WJnU+qWtPtlA/vtA=" }, - "androidx/activity#activity-ktx/1.9.2": { - "module": "sha256-Qqkke3aD9azp/srepo8rvNlepY1FUZvOJtdtc53iGMA=", - "pom": "sha256-xZIpvS4BeGpFRMcpFhIRpW5HkB1igrNvhD9Nl6MdbZ4=" + "androidx/activity#activity-ktx/1.9.3": { + "module": "sha256-MdDatmPQTZEaZ1iJMfhrEBEx4RaWu3KJWn5WA3F6wkE=", + "pom": "sha256-PIx4xqu50vaIXtgfKh2FewFLGaapoi9J2UIFAr/aKlM=" }, - "androidx/activity#activity/1.9.2": { - "module": "sha256-S2Kjf0hP+BCeWd6kisd7QIjTXCORT6ga88Rk1X9eK3Q=", - "pom": "sha256-JUcFSQUnpNsEe7eiVUrxCpAqHnm0YYVqolAs3OMkz6M=" + "androidx/activity#activity/1.9.3": { + "module": "sha256-fmok3aIF4csenJb6Nf9vJhYICH8x0yPUz/QrlxbX7Vc=", + "pom": "sha256-Pz4I4X2rXwdPqB25eL2lYmH7l8+eGS8zN4mM/YAaajQ=" }, "androidx/annotation#annotation-experimental/1.4.0": { "module": "sha256-WTDqfyH8ttDesroydIoO98j9LEI4SGBYK6fNIN65A3k=", @@ -22,12 +22,8 @@ "module": "sha256-KsL3EG4S8mNCW0pN/ICYlEf7iVZ1/pAthnWap0/RK30=", "pom": "sha256-/leyKEF/TXxneQPcYftKfPmT1gNJneJtjYET5HfMTxs=" }, - "androidx/annotation#annotation-jvm/1.8.0": { - "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=", - "module": "sha256-48tFJVOdDtdLsjjvksae7yKoDkIsDSrLxR5hh/67ChM=", - "pom": "sha256-2fkI7m1IgSSs7VVv2Ka6nf5kf+AUuFrXIhRhEQ0DI2E=" - }, "androidx/annotation#annotation-jvm/1.8.1": { + "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=", "module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=", "pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ=" }, @@ -65,13 +61,13 @@ "module": "sha256-VFHhsAgBaOJG7jVICY7iuEIqAHJ0GbNNw/NpDAO0Yn4=", "pom": "sha256-oVX2W6cA2yGiyIHd/g99z4WnMUcoeSPETvC51N2WZWg=" }, - "androidx/baselineprofile#androidx.baselineprofile.gradle.plugin/1.3.1": { - "pom": "sha256-BZQd/om3Iydt0EQl9joNOQZ9U6yNrnZ2hVVE+yeG2J0=" + "androidx/baselineprofile#androidx.baselineprofile.gradle.plugin/1.3.3": { + "pom": "sha256-ZYnvXw+bO8zqaMR+RNqnvYR0dmDhZxBQj1Wrsj3TJJo=" }, - "androidx/benchmark#benchmark-baseline-profile-gradle-plugin/1.3.1": { - "jar": "sha256-qDNAO89ka3bXSbQlXCHP0L9BG+ze6XDoJqn7qpLqE1M=", - "module": "sha256-j+nuWr7IfgX4NI92+gTX5Fy10knaB+uP5rfmkHwKLKw=", - "pom": "sha256-8MJDjRGVCHvxGlOt3hCrSz6TIn+S0QTzCxlkYS8OiTI=" + "androidx/benchmark#benchmark-baseline-profile-gradle-plugin/1.3.3": { + "jar": "sha256-TKAH2ltb/dN0oyfjMhbFYHfAX/NYhltKisnly3xTQBE=", + "module": "sha256-vxES0J8aprPfr5fyPn2DxdGY+JXEQ0SOloN9xdtGVOk=", + "pom": "sha256-nk9XEP4o1qFmNDXO0Pdo1N7pOA9j62QL6oouHVDMnFY=" }, "androidx/biometric#biometric-ktx/1.4.0-alpha02": { "module": "sha256-XlftRi6dw2P0RWxLf6eFe48clA3vatawHCMKVts0x20=", @@ -85,29 +81,29 @@ "module": "sha256-sTorfGTA8vNJoZ31EjYO2RemP4lPw94peh/eT7KHVGw=", "pom": "sha256-jJ19VEqBvl8eje0qT/R0wn6V1S1Qj1nUeSker3/gM38=" }, - "androidx/camera#camera-camera2/1.4.0-rc02": { - "module": "sha256-e7qskKx5eh7Ec8PHdsnx/cjyaKt21Ztqaj/5/qYtPcE=", - "pom": "sha256-Ca7pMgvmMOHdD97SbHkeE6PQbauA+GENC3ermmwYMx8=" + "androidx/camera#camera-camera2/1.4.0": { + "module": "sha256-drgu7NQwOhjrk/GIkO+iBqZ4bbRA9QTEgjhRy83DJ64=", + "pom": "sha256-K+q0XeFlcncn4+U0xXOI5WHUPA6WYWqb+EzbNLOhhYM=" }, - "androidx/camera#camera-core/1.4.0-rc02": { - "module": "sha256-gyKCSex584MOAOFd/FJYrJzltXb9tW06Y6TFeYoMe08=", - "pom": "sha256-hBesMfgTAskpCwxCS6N7HnIKOWBu6t1hDyODnSG2u/E=" + "androidx/camera#camera-core/1.4.0": { + "module": "sha256-YhzS8TFlQWPLeWci6brGUre2718uWInyveyK3lrev+c=", + "pom": "sha256-kIxHGTVflkb/V2A1BFxYfUT/2KEozDnMkxn3jvex6Rk=" }, - "androidx/camera#camera-extensions/1.4.0-rc02": { - "module": "sha256-Q9AvfZley507mYg6cV3UtIYL6ZwnyHZj0TmciLEh+MA=", - "pom": "sha256-rEE+UkUV2cWt9pBDpfLMXQLO+V4nqtwEHemlXTWxN+0=" + "androidx/camera#camera-extensions/1.4.0": { + "module": "sha256-ynxFG03NNyf2nnQUFDULo9T8q4ZTLdVuXZe4EbH5FrE=", + "pom": "sha256-qYJFwM6WPQVNBP0G3wNxjmyeRo0vOJDqNqW5CZAUbSo=" }, - "androidx/camera#camera-lifecycle/1.4.0-rc02": { - "module": "sha256-FDsXoLZr5ofKp+4YdJVZZSpUAMvupFhGNchhYCDi4SU=", - "pom": "sha256-3zwhtXWt5sROsYvjv14Igf1xgAH48wvjYkW7pNtIRNc=" + "androidx/camera#camera-lifecycle/1.4.0": { + "module": "sha256-ZdPS2POtzpQ4VYFP6fqKXZTb9vQmQJVge9O6ntIAGpw=", + "pom": "sha256-xxDllk/kVcjZ9tNHsMLdhL1Jngi+URow4z5HU0AmKZg=" }, - "androidx/camera#camera-video/1.4.0-rc02": { - "module": "sha256-CAQlCz+9htdQyszZo+KudN/z9zl08UZDAP3vJl7WHuM=", - "pom": "sha256-BONbwyqWaimMwtOf2kxaQnIELakH/4PjSzpXgPiV0P0=" + "androidx/camera#camera-video/1.4.0": { + "module": "sha256-mRe3EQjOtA+wIaLhCq6JgiryhDqxyENHUGtORuBtGMw=", + "pom": "sha256-q6ysRQwBXzE3zctyAwsYUiq4svySo7b1UKAVQ/z2slU=" }, - "androidx/camera#camera-view/1.4.0-rc02": { - "module": "sha256-ux6LqBw/KaL0NWgVYvQct5c90BPyUGbp04SCk1uoFmI=", - "pom": "sha256-UZd9Y9bxx6LUZArxhBvI5b7gy9hiard07IyL1M9q6Yc=" + "androidx/camera#camera-view/1.4.0": { + "module": "sha256-SGpo2BPphB1W23EWWgvjo3GLQ9xw5ecWDhIUmaPJ1S8=", + "pom": "sha256-9y8oiFiMIJat0Od1nc1ae6VSfl7bkqd3h86MFXhOr40=" }, "androidx/collection#collection-jvm/1.4.0": { "jar": "sha256-1c97cmR8eZUHFYj+hwRQ/5yPEn8lPS1IUeFhuAD2euA=", @@ -127,8 +123,8 @@ "androidx/compose#compose-bom/2023.10.01": { "pom": "sha256-brBsrckwx2qUp+PRzAYIkCdbYUJ7lpM9YFT09kHrGeE=" }, - "androidx/compose#compose-bom/2024.09.02": { - "pom": "sha256-m5ChXj8Tf1b7enp9aA0xZOtCXgJxuGD+4JK7pDB6h4k=" + "androidx/compose#compose-bom/2024.09.03": { + "pom": "sha256-TKZnMx2PrMhga+MI04mkwAlNuS2zfdZGmYyLESYNCeY=" }, "androidx/compose/animation#animation-android/1.7.1": { "module": "sha256-PFi192N3vQUR991Qv2VSPh+eCB7BwqSSRnpVw3x7Blo=", @@ -344,9 +340,9 @@ "module": "sha256-UOPdyUI2kQ5hRYijrCmm/XZbg526DMWDmkmNMYKX+I8=", "pom": "sha256-0cNjxT33H8deP2ehdUeUSeDdlB9FQJ8HJ3zNLUXopmE=" }, - "androidx/core#core-ktx/1.13.1": { - "module": "sha256-q1MLBOL75zIFSEiZo75WyQlohz60lvxS5ep1ltkQNdE=", - "pom": "sha256-Mcw0W4xs3SBG3PZ4ct+KjLT0TqDK3k34AALKp+O3GAk=" + "androidx/core#core-ktx/1.15.0": { + "module": "sha256-vum0RmT/N+LiIuvN5LMOOClKP5J0Ue3GEf7H9FT/pEI=", + "pom": "sha256-QXxqoCeex42wL+OV1AGgm8qqnYLZNRSKPi3pD9842Uw=" }, "androidx/core#core-splashscreen/1.2.0-alpha02": { "module": "sha256-gcUBgXOMI2x53hhnAYoawlCY7PSjIv3QhkVl0rfRrww=", @@ -356,13 +352,13 @@ "module": "sha256-Lg5uXBIFt0YqDFw+MrWMLlJUNYEu2JlGx75nN0k7UeM=", "pom": "sha256-RQLk7YtZEiAhrJocExLiMm5LD0P37Lu8m1Dud0KVdNQ=" }, - "androidx/core#core/1.13.1": { - "module": "sha256-KhCXm7s7zXslt/Zkq06bAW+r8hdKJnaLZ34S5L6kx8Q=", - "pom": "sha256-Unq/pajWr3SLN+HAFi0WM6LV6kOHsCBai0NrYhS6HPY=" + "androidx/core#core/1.15.0": { + "module": "sha256-6KbDhuF2XYcAEv7SIhFz1KLo0v1a7HMsUa+0qfRoRRk=", + "pom": "sha256-4WiuVgZLjlpAvOQV75X/1agTq7VFbSd18P70Ju1J41o=" }, - "androidx/credentials#credentials/1.5.0-alpha05": { - "module": "sha256-LN+mg+VI9ezkQHH5B3GOQpO3fpNH+hrwG6wALIR7CJE=", - "pom": "sha256-Or+sYjmkkUkdm91MTdxs9Z/rGHWe0Kb2uaWL/BFhKgE=" + "androidx/credentials#credentials/1.5.0-beta01": { + "module": "sha256-B/L48LIEgtXMj6HP7M1/FnOaQck7ca721Av14yIQ950=", + "pom": "sha256-rj8bwK/teqKqSRlXbhAZ3avOawZ/i6dBA988BWd8y+g=" }, "androidx/cursoradapter#cursoradapter/1.0.0": { "pom": "sha256-YtlciYUK8hAwsZ8U1ffs1ti8yaMBTFkALsmWJMqsgQA=" @@ -370,13 +366,13 @@ "androidx/customview#customview/1.0.0": { "pom": "sha256-zp5HuHGE9b1eE56b7NWyZHbULXjDG/L97cN6y0G5rUk=" }, - "androidx/databinding#databinding-common/8.7.0": { + "androidx/databinding#databinding-common/8.7.2": { "jar": "sha256-Zsq4JjnawPbCQzRkwJOwdNYIxLuIfsOKm4vErJgSZzI=", - "pom": "sha256-etTmwGJMO0eBWYYWQFMEuplOP77K/siKSjp7n7iG3aM=" + "pom": "sha256-AQGf9/Vhv2TVaegUbZt6csYkLy/b6toB+MgtUub0Js8=" }, - "androidx/databinding#databinding-compiler-common/8.7.0": { - "jar": "sha256-9MzA6vykpHvlv5ECCbmGrAkhtrW1LKob9KpSkA0kTt0=", - "pom": "sha256-zSUfiqqBlSb5RpTRRXf8VDOoGNA7FLGA2VdO78cYK0w=" + "androidx/databinding#databinding-compiler-common/8.7.2": { + "jar": "sha256-+BvLBHX5CY1U7RFBRSJY5Lk/4aihK14v97k7rKjicRQ=", + "pom": "sha256-2C3qfNGkIhr4HbOCWiEZBFM7SXrevHzN2GH6AESp/Y0=" }, "androidx/datastore#datastore-android/1.1.1": { "module": "sha256-cj7ozPSDglESIdoh4KPv3Nz1ix3kiU/drEBaFIERnCU=", @@ -416,114 +412,114 @@ "module": "sha256-rzJggI3OtlMu/C1yFb5Fhywkppna2n13v/c4zjuFp/A=", "pom": "sha256-+MoYd8ZuZCxVSQfhzlpJOol8opJwyxniu21CS6Q7bJg=" }, + "androidx/fragment#fragment/1.6.1": { + "module": "sha256-bXthnLEipKiiCSCHHbaohvOIQ/adLqqVISccLAi2NqA=", + "pom": "sha256-p7ITPxYF5+mMFRg27BYoyPBki4FWt3Yx8vIZbiTNOzA=" + }, "androidx/interpolator#interpolator/1.0.0": { "pom": "sha256-DdwHzDlpn0js2eyJS1gwwPCeIugpWSlO3zchciTIi3s=" }, "androidx/legacy#legacy-support-core-utils/1.0.0": { "pom": "sha256-j9CTAIs+58BuUseNoq+YCntHtpuWf6kdrXr0ZvegCjg=" }, - "androidx/lifecycle#lifecycle-common-jvm/2.8.6": { + "androidx/lifecycle#lifecycle-common-jvm/2.8.7": { "jar": "sha256-YchzpzJ8lG7AM8MQu5jz+S7qvO3g4aUgCrihiWSDx78=", - "module": "sha256-v8cWUtTFP6K8xNQV81odlVdxlmanhaGtYVtkGxgG5hQ=", - "pom": "sha256-eyfb/GATm8UCBnoPJovKa4lZl5oFpUu5Hq2euaMO//g=" + "module": "sha256-5IekwAfWq/KdAQg8M+KGls1Cz/z3FEidyR6Xw9QsYGA=", + "pom": "sha256-jwAH1nB0myxwwibXX+ODfGQ14bQANvHrgpB46QRhp+A=" }, - "androidx/lifecycle#lifecycle-common/2.8.6": { + "androidx/lifecycle#lifecycle-common/2.8.7": { "jar": "sha256-4mxtfQSkkMb9qhQVrJV5en3MdES+Pzqz2ayth9rkkhw=", - "module": "sha256-0CgJRRLgk9qZD6+uRvhrFOxzQdft+kVwneVRICfCLUo=", - "pom": "sha256-DWr4krkkdt+IY9YwIlSYET0zFKBiB4ILmV32e+MeAOk=" + "module": "sha256-DeePwG7lBF1o/H6BwxOio9U6x9En95+byVq/e+SeV2Q=", + "pom": "sha256-9Vz/SvKIUl1CXEZ43bNrqGRZH18O2huSIFZ8NshRO0k=" }, - "androidx/lifecycle#lifecycle-livedata-core-ktx/2.8.6": { - "module": "sha256-9xE2PFgyVHYR1BbIo6DcTmNi9K+wRQ0iuetXFlan+OU=", - "pom": "sha256-XGqveFJL0Qc92DnffeJLXrumDosGQOED7/GRvpsJ4tM=" + "androidx/lifecycle#lifecycle-livedata-core-ktx/2.8.7": { + "module": "sha256-PRiLtiL8uwIdk8wAfTxHfU9AKub1i3/EakQdCrcGeK0=", + "pom": "sha256-L+CUUbL5uqaNBcClSer9urSh5P69PvpHSraHXY5rJxw=" }, - "androidx/lifecycle#lifecycle-livedata-core/2.8.6": { - "module": "sha256-gkylmy7v2NtJMAvqT/afKNYfxFqK9ALlUVyJsvX7HCI=", - "pom": "sha256-uYdZtb80AXH4IGZnFnY6IoEhiPE63fygX+nfhJtIUtE=" + "androidx/lifecycle#lifecycle-livedata-core/2.8.7": { + "module": "sha256-sKHafx/jYGDseEfxlyhXokt9sp5s1FFuYsVSAAnYE8I=", + "pom": "sha256-5eML08Ctu0JGtP6vXTjgs+q25JWxJu6USX90kMo1FWo=" }, - "androidx/lifecycle#lifecycle-livedata-ktx/2.8.6": { - "module": "sha256-0g9Tn59yfEiiWd1gQSGzE4P594D4js0mKYbFc4XUfHU=", - "pom": "sha256-G9LZ96+nMgWYcC4ZoNG+EaAbNFlMyi0n239Bp1AtAz0=" + "androidx/lifecycle#lifecycle-livedata-ktx/2.8.7": { + "module": "sha256-QZCrI+E7vNbMP10HN7Rfg6QAQQR4Col8/YaX4CQhyJU=", + "pom": "sha256-kgv4IXw/1fkO03KmqIenBXnDiaHt3qoHiC7389ywPcc=" }, - "androidx/lifecycle#lifecycle-livedata/2.8.6": { - "module": "sha256-nOWJiUmAb5rhNuPZijI+Hg21HI+JJcaMCIp3/n70k+U=", - "pom": "sha256-8hb3WxZ6ZcoVWslLvQBt7wqY2SFZcM45gZY64kT5X+E=" + "androidx/lifecycle#lifecycle-livedata/2.8.7": { + "module": "sha256-1yUWz854vvZU/l30yZudq9GXgMlQUyaKbVtLDdotQyM=", + "pom": "sha256-0yTLeFE01Bl1dwkRj4biqI88wLIivYwjSV3by3qADKw=" }, - "androidx/lifecycle#lifecycle-process/2.8.6": { - "module": "sha256-csIIGfPJOQ+RrNnfj7yeYkbxvvTgj9UfeQ8BzaBArSw=", - "pom": "sha256-QCOkIKHiGSOrNWYx4s5wDgTlP9ykNaFJ3GUuIITmt+I=" + "androidx/lifecycle#lifecycle-process/2.8.7": { + "module": "sha256-mKHAjBDP1L2qienCVqm5bAnN1bz7sDqSYIF6bYnMI3g=", + "pom": "sha256-gbo66f/iWUvyGjXhgctTzns5bzV/fDy/++j906IzAzk=" }, - "androidx/lifecycle#lifecycle-runtime-android/2.8.6": { - "module": "sha256-kzdNZnU93hHZc12V5Y9PvJxXezJBjOCT5KOCIAfxJXE=", - "pom": "sha256-PgirDNhskFhYcxQroie35d1GlRsWRA8LT8o+vokFMfU=" + "androidx/lifecycle#lifecycle-runtime-android/2.8.7": { + "module": "sha256-TRs4gcmNQpNMuNXefIqeEgSVSaUUdxhkfXvmym2VjEY=", + "pom": "sha256-KMsZDeh94F08Gk92dNH0WLerk151z4O6KLFTm1+pPBo=" }, - "androidx/lifecycle#lifecycle-runtime-compose-android/2.8.6": { - "module": "sha256-EP6/9T6cZWTGGOd0pouKhYcN/SqUFe6/LV+oc+ARo2U=", - "pom": "sha256-bf2cbBp3F29E+yj+hW/mVzDHFWA2Qs1Q8+gLxYcBJrU=" + "androidx/lifecycle#lifecycle-runtime-compose-android/2.8.7": { + "module": "sha256-wCShZpTItcQeyO8O3iNl62Evij2iUBf98v80MCnzOQI=", + "pom": "sha256-DMi8bSk7qjYAj3HfaNrMZWx2D/6y8CsxNKY23LlHBeU=" }, - "androidx/lifecycle#lifecycle-runtime-compose-desktop/2.8.6": { - "jar": "sha256-ZR05Mr5ztRprhMzoiy7e7yGmr6YRGxgyfdB3Luw6HAo=", - "module": "sha256-8QsiOV9fXhpxteQqzt2qrIl+oRL0krO3Z0jysC+AP+I=", - "pom": "sha256-rx0/38DbtoYQOgB12MzK9Mt4DylAFZEEOMkF8s7MmII=" + "androidx/lifecycle#lifecycle-runtime-compose-jvmstubs/2.8.7": { + "jar": "sha256-+P5MfIt9nJzBfmA5L2T2FZD4WJU/WSNzqwyN3VrRGmg=", + "module": "sha256-5u7rnaQ7LvUAAI6coqmTMwDFfR0KoFyPO9MRMajSo1s=", + "pom": "sha256-iP5IfROOI3S8g8ZOBZyG3dG49V/45/7pHypoF9o7ot8=" }, - "androidx/lifecycle#lifecycle-runtime-compose/2.8.6": { - "jar": "sha256-Gs44yUcMeOiXHrzfjQOQvmQBD8hpp/08bl6vEDcOwbo=", - "module": "sha256-39DkQkEBKxPZVfF0Kr1O0YPKykHuCdXCzF/N0qJPCBk=", - "pom": "sha256-RbZBVmSy/2MkRlaDAgVFzKiJIB81rCswFYPjliyi+w0=" + "androidx/lifecycle#lifecycle-runtime-compose/2.8.7": { + "jar": "sha256-u1SJyb9WG3rdz/QXmxD5WbPUQaoPuuXC0kqQZZE/ohI=", + "module": "sha256-zJiohJ2B2rMGS8n/hx5D6RtI4Lp9Uh98mbomr+wlZXw=", + "pom": "sha256-zskvxmBNjuu5WJpsEdS75jYigPY62/hqns3GzD0UO6s=" }, - "androidx/lifecycle#lifecycle-runtime-desktop/2.8.6": { + "androidx/lifecycle#lifecycle-runtime-desktop/2.8.7": { "jar": "sha256-EL/lO7J1L5Z3UaUQLNt4Xu6lTh1N9r3oj7D1CwpJFWw=", - "module": "sha256-kq1WHlcSsxhBF7sMm4tES+8q0F5nZXR8n44VnEniHj8=", - "pom": "sha256-IY6pUIUJKL/ENIJv+OLr2X0XpCEbvwDDrNUelnc4SlE=" + "module": "sha256-1Av71SuALGpa8GMW9goihG5ljRLXw/xe+lqorJ1LAvo=", + "pom": "sha256-zvqomZ96sPTkSmm+lCK7LxJPBqYmZjQ+uus3fjCLlw4=" }, - "androidx/lifecycle#lifecycle-runtime-ktx-android/2.8.6": { - "module": "sha256-GEkqX9thU9CUKzZ9k2d4gAdCguPwXYm6W+erH92zSUk=", - "pom": "sha256-aw/cGAmhTDJyRutN5dou3tT/ibHMSitmV3K3Ug6pBJ8=" + "androidx/lifecycle#lifecycle-runtime-ktx-android/2.8.7": { + "module": "sha256-rcYVIeiU8WO+7jrtyMTA37WZFmO4jqHqd5j6yVaU4X0=", + "pom": "sha256-Htpm9jgGDNOY5EiW+TTCc/ADuejtNplc/fPrEx8HI2U=" }, - "androidx/lifecycle#lifecycle-runtime-ktx/2.8.6": { - "module": "sha256-bsekXvsY7kq/BTAqtTioEeRqzhEYpTCJ+C7DXwnh1QY=", - "pom": "sha256-kZTdaFi55iUSc4uisOLBVBtR32e+YSxHaob5zLyHEwE=" + "androidx/lifecycle#lifecycle-runtime-ktx/2.8.7": { + "module": "sha256-Ccbc8P7irWnFI9tsKjQxaKjZ6dJ3Q8+Etpx1e3/KskM=", + "pom": "sha256-sONluppAXk2pi58FCLmRzXb01aaCKQhHJMUFDied/BI=" }, - "androidx/lifecycle#lifecycle-runtime/2.8.6": { + "androidx/lifecycle#lifecycle-runtime/2.8.7": { "jar": "sha256-TueEUw5VB1QjA5XU9PVoF8n8vAjbTWRed0QfPdgsVrU=", - "module": "sha256-cfO/aHhz8W79hNrL46H0IdGWlQsi2aMO8wqRGfp8fOA=", - "pom": "sha256-YcWBu6Kgb5Y3B5XnzRrSfiyCvufTsqh1jeJT4pYWW0w=" + "module": "sha256-ywDly5KDt1lI3MDScjT7bXKoDDTct7O41JMYXkMWv4U=", + "pom": "sha256-YeEGnpk4pBTWv4OmwIjIpDaKJ6sjjmLvuN5E6dbqMfo=" }, - "androidx/lifecycle#lifecycle-viewmodel-android/2.8.6": { - "module": "sha256-fp3IlBPMdIWxRiHbXM8eEwZo8UY2iw/+ZuDzDNKqZQI=", - "pom": "sha256-RUUiujSKDyqMwil3K9v3JzxS0aQu0CS8je/OVdxT9nM=" + "androidx/lifecycle#lifecycle-viewmodel-android/2.8.7": { + "module": "sha256-sEmUzmfWmZQ4MW/0Gy3bhGE6ZLj4E5nvMHSJWtgQZdw=", + "pom": "sha256-s3waQR7rmHfw8leD0eyuz1ZWuEQsVEU4gEbmmqznxrA=" }, - "androidx/lifecycle#lifecycle-viewmodel-compose-android/2.8.6": { - "module": "sha256-JeRZ8PXWrPI80LwtFSzjlAfV8OpFlJ6BwsQAI/KUW8Y=", - "pom": "sha256-EK7C8fM984U3WZV4EQd/cBINVsfuLnm66vSGG0w2XqY=" + "androidx/lifecycle#lifecycle-viewmodel-compose-android/2.8.7": { + "module": "sha256-AysPqJLMBM7TnExfDHPloBSNoIR79L+3b8J14UPUjog=", + "pom": "sha256-TZIH05CtwnAzrm/o5nQefQ+DH4EQaIHf51o1y47mmAQ=" }, - "androidx/lifecycle#lifecycle-viewmodel-compose/2.8.6": { - "module": "sha256-IE/2DG0V2F/F3NykERxVr46JiTgkxBu3u+CAYj8NhRs=", - "pom": "sha256-SM5k+9vFkrDyhlWdrWnbYhx0q8ydapBv6McTZstw2H0=" + "androidx/lifecycle#lifecycle-viewmodel-compose/2.8.7": { + "module": "sha256-BRqR7t2IwYtSLEt7VA+TYQhe9EbyIjyhZYnZjtYmrHg=", + "pom": "sha256-7hQf0QJPhZOnqeLt7Ba8E50vj1X+/e4xSyVvBWLlq1w=" }, - "androidx/lifecycle#lifecycle-viewmodel-desktop/2.8.6": { + "androidx/lifecycle#lifecycle-viewmodel-desktop/2.8.7": { "jar": "sha256-IewOd9wC7Q1r/m88un9D4lQARG2J3thWjuFlQ34MGSI=", - "module": "sha256-wTRuA275rdk8d9bsI6BpBxGxErMYbi9b2HUJDQOCwxo=", - "pom": "sha256-+BLmr3NVnIgfejWPPN0ejd2GE4m3b2nomvRnqOBs8BA=" + "module": "sha256-WA2ZXD2wdDeY8sFz5jzxnIDUpxmZwgOaR2a2x8cQbWQ=", + "pom": "sha256-ohtgR3xEXNBIpmJuD2goSip9TJ0SEBATb07N8FqOa5E=" }, - "androidx/lifecycle#lifecycle-viewmodel-ktx/2.8.6": { - "module": "sha256-5cgGQ2qPGgZRkBPj41Hrlqc3Z6XjmQEpxxzetlL/4+8=", - "pom": "sha256-KJw1DgKA0MTpts9FuRJrItv+1E7myHHyM3dP1wwUQs0=" + "androidx/lifecycle#lifecycle-viewmodel-ktx/2.8.7": { + "module": "sha256-qZ49Ahjukr2o9cHr8l1IMrMB71gQYE4uluS2B+v2p/U=", + "pom": "sha256-kzgneQTN8EjY8dNZ+uVTejUMZPDeFrcf+k4gpCPIp8I=" }, - "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.6.1": { - "module": "sha256-2vuGSXY9KcKc2ie8IvzauanvxTwP/5rj3pCILquqiUQ=", - "pom": "sha256-qjTLhYY4S44xTP1lsYExl/Mve6cdJSmhHAcerwJ0Hls=" - }, - "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.8.6": { - "module": "sha256-hrNlXUG+xPLHkUREjIPG7HHD3WATQtX9uNNH3wxMniQ=", - "pom": "sha256-1ltx+CJUqXqhyA75V7ln/wMjCfvTbcv/Xq/rY0Q1sRI=" + "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.8.7": { + "module": "sha256-urIsBn8lV3pqwzToaCQUgYBz6fRFA40ZA5yQ+HFvv20=", + "pom": "sha256-m5HFWPwxzZpBgaQQ3bk2g1nLAjYqUK9koaMKEsPVwak=" }, "androidx/lifecycle#lifecycle-viewmodel/2.6.1": { "module": "sha256-K0BvrqXBLyuN9LemCTH4RmSPLh9NeDYeGY0RhPGaR5c=", "pom": "sha256-3C6OZdtT0hZZon7ZO5Zt7jNsHC6OhyhhZ3OJqZuLkTQ=" }, - "androidx/lifecycle#lifecycle-viewmodel/2.8.6": { - "module": "sha256-T/VDcJ4IUwF2erNzpbuFMkbWUh3JEBRwLv12fE3Ho4k=", - "pom": "sha256-3N7kezp5ve43ESOTrpb4V78BNerUVS8WJ6ZzIltvDNE=" + "androidx/lifecycle#lifecycle-viewmodel/2.8.7": { + "module": "sha256-8dgh/BgDbdIMwh/74C9UcSC/AFHgaunhl3FAITyTQ3I=", + "pom": "sha256-7h37GDtTqmIzrVLtp6dU9y2Vptttyi85FEoWDetBlfs=" }, "androidx/loader#loader/1.0.0": { "pom": "sha256-yXjVUICLR0NKpJpjFkEQpQtVsLzGFgqTouN9URDfjF4=" @@ -622,24 +618,24 @@ "androidx/viewpager#viewpager/1.0.0": { "pom": "sha256-H3L4NjOdA8brAT9lB152yocHWld1eOtPlfdKOl0lMSg=" }, - "androidx/work#work-runtime-ktx/2.9.1": { - "module": "sha256-cR+5UijQc0faUgid+10ZXFGgfddVKK1RR0w5cZavs1w=", - "pom": "sha256-EIx091ygy16ACVdo8o9Sn3aqg1CDjvji6XNTxkUdXTg=" + "androidx/work#work-runtime-ktx/2.10.0": { + "module": "sha256-gKptxuwMwhBHXIIKbTbcgQDV2prvfMysCBFpoaJQKwQ=", + "pom": "sha256-EnN38XWHfslygvmN0j5x48H37JSaoMLQKkUNtN0FhL0=" }, - "androidx/work#work-runtime/2.9.1": { - "module": "sha256-1UTtZMXLoYYflvSKzfFfegaJTzZ1oWqoFamfOqKQlGs=", - "pom": "sha256-2XC71x8rkoV4oAUexALJzKZxDV5ox96G/69eiHBr1dw=" + "androidx/work#work-runtime/2.10.0": { + "module": "sha256-RlwbR1AJLr8LAx4G7P2AEffhWs6NzLHkxH1An3e+y6A=", + "pom": "sha256-GuzFFWca/IS1/1so1Yle+0Q93atJ3VzHQAl2oc/FEMk=" }, - "com/android#signflinger/8.7.0": { + "com/android#signflinger/8.7.2": { "jar": "sha256-wdyixoNjTuGilCmPnHF5V4r2qG4IC9xA+WGRW8XIFC8=", - "pom": "sha256-3nZoa+311WsNLgStx7IEthYqUrUwNg3klHY0uaTWfGA=" + "pom": "sha256-+Nlz5WpB7x6khOXP7m2aIFcyrTGov5xBpGjcH/oKsJU=" }, - "com/android#zipflinger/8.7.0": { + "com/android#zipflinger/8.7.2": { "jar": "sha256-gd1IVhilCaMjWSm56xMJHYhEUmYd5s5aRcw4scVVQhw=", - "pom": "sha256-n5w8SGypunT4CBVFWLc5RXV7+MEhZc6DRvSWzzjofJ0=" + "pom": "sha256-JQzkBbIaA5xl06CkTwNwz1mfjR/mQQkG0NmPT5m6z8k=" }, - "com/android/application#com.android.application.gradle.plugin/8.7.0": { - "pom": "sha256-7h5ZwC4JeVS67atxKbxn0cANSSfoAFPMLT2TB1hiPQU=" + "com/android/application#com.android.application.gradle.plugin/8.7.2": { + "pom": "sha256-s0CUyf2Jvehy8Lz6h9d+++HRb0tKnLz64dxI2eNVyDU=" }, "com/android/billingclient#billing-ktx/7.1.1": { "pom": "sha256-PMPwTqj+PMOAi75eG0Y/3jQzM1RDOqeRERHQzK6Dt9g=" @@ -647,112 +643,112 @@ "com/android/billingclient#billing/7.1.1": { "pom": "sha256-S+5D2uFUS1LoqOUCefEyBPcrve1/ECdDCbG4ekhLdgU=" }, - "com/android/databinding#baseLibrary/8.7.0": { + "com/android/databinding#baseLibrary/8.7.2": { "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=", - "pom": "sha256-spuchjrVnveI/QF+UsxTC59xEU3SXBHwrvwewDdTC5w=" + "pom": "sha256-OcbTHhZrbU/09vCTLfB5kVZoDVfiX3E8WEAqMAmzsT8=" }, - "com/android/library#com.android.library.gradle.plugin/8.7.0": { - "pom": "sha256-qEI1Ny/YtfAS/MRRwaMWq9jVv/hFLnBVX1pHr2wabOY=" + "com/android/library#com.android.library.gradle.plugin/8.7.2": { + "pom": "sha256-pvWBDNz+bwVIHtJf5olffEDwL2ZcD6Okz3C5XNhgAWg=" }, - "com/android/test#com.android.test.gradle.plugin/8.7.0": { - "pom": "sha256-nlbxt2NGM3f+qeHaXfTCdbAeTw0wy6NyAAsyneJO7mc=" + "com/android/test#com.android.test.gradle.plugin/8.7.2": { + "pom": "sha256-RpF0YddrSbf5q0Aw1iebH5GJeFcvO6KrhKZtzVl3ncA=" }, - "com/android/tools#annotations/31.7.0": { + "com/android/tools#annotations/31.7.2": { "jar": "sha256-slmV+nsiDTX7uOMl3wcfgpFpG/uv+XNMmOOPRewqc+4=", - "pom": "sha256-hRjzbfHM0bJFjGRhGlXKu9zgCi5cyL5PvVc6ZWK7pUI=" + "pom": "sha256-gPvd6AprCtEgkWukhxS0YppDEhBuASGe4dZxuykI2OU=" }, - "com/android/tools#common/31.7.0": { - "jar": "sha256-KHe7/ziyy9GMT6c0AKhK3bYK3uaVr5S5hM813CZl47U=", - "pom": "sha256-I3c6OAlykdtH5legTMh00W0Uax6eI5KChaGbJky+Ftk=" + "com/android/tools#common/31.7.2": { + "jar": "sha256-eE+AUG0Xe3cNUT9DAzFWCYk6mElH7Oocbn8JDLZvPKI=", + "pom": "sha256-gubnuIknJjmS1z6STcWF0aq33B+DrxitmEO7QL30S24=" }, - "com/android/tools#dvlib/31.7.0": { + "com/android/tools#dvlib/31.7.2": { "jar": "sha256-j9NJWi67ULGqyxtDYtxKRxuHRiwersQ2kbtW+JXpxjY=", - "pom": "sha256-77YN2IPOd9FGZq+CQDFLhMuN/P8h9D0zG4RJ/jlMEhg=" + "pom": "sha256-dR+c4x3mn6slbazHyJbRJ3yuz47/OC+HFG/rivhh6kA=" }, - "com/android/tools#repository/31.7.0": { + "com/android/tools#repository/31.7.2": { "jar": "sha256-FpwueneqMJeIedv4swQ2ZxFlhy/L392mxzWq3bZxA0A=", - "pom": "sha256-gF/BqRqM2aW2MbDmKHfZwB8x/4P04HztbwuDQgbIoJ8=" + "pom": "sha256-xMZLLfgLHCvbIs9HRUxYLiSZB5lw078mu1DfdoieA8w=" }, - "com/android/tools#sdk-common/31.7.0": { + "com/android/tools#sdk-common/31.7.2": { "jar": "sha256-T6RKfZZ13xPaYU3uUS35CtPkMI0K3bMurZn1fOWPZ18=", - "pom": "sha256-XWcvw0L2prUWMoBq6/eVdlP1ODaP3DAxLGDF2LCSh+w=" + "pom": "sha256-bsFDlhq1jIWutSaYTCgs1vXTwdXiL+fn1KY6FnWGYWs=" }, - "com/android/tools#sdklib/31.7.0": { + "com/android/tools#sdklib/31.7.2": { "jar": "sha256-Cj9wl6SgCzhARreDtwU6WewL2SJWq4S6pr2AeqAoWLM=", - "pom": "sha256-tYwRPOs2Lu8I5HJOSXz61v5m9IyjbZE265oRs2FFWaM=" + "pom": "sha256-mCfT7BwVqKxPXthmHCQ6zK0UUlJ3LtrTF/daW3ibCpE=" }, - "com/android/tools/analytics-library#crash/31.7.0": { + "com/android/tools/analytics-library#crash/31.7.2": { "jar": "sha256-zKl6wpoTKb0xCj6DK25X9GIn5QGqUpwApj3yF8XX30E=", - "pom": "sha256-6gsKxUwhyPYOOgIj2BupCDXdmdspNMhp6rmItfbCPZA=" + "pom": "sha256-rBBC4sEx265SouZ2TDV4bxhBTgKqQWrGbQAlRgVzNEE=" }, - "com/android/tools/analytics-library#protos/31.7.0": { + "com/android/tools/analytics-library#protos/31.7.2": { "jar": "sha256-aSz5gTlf4XGi8in/cMxswd354iYbKOrdoiadZuVQl4Y=", - "pom": "sha256-6WFdvb0hsQOB+5XBVetsy4qHymEZAWgSF9Y0m9n56RQ=" + "pom": "sha256-cU7Ku1rvYje/tMFutI6tDSiW8q633v1nIuUYt5Nr9xY=" }, - "com/android/tools/analytics-library#shared/31.7.0": { + "com/android/tools/analytics-library#shared/31.7.2": { "jar": "sha256-yte7j5agR6XvehOxyDA0FCKenVByCWRuw7Y6ZIYeHOE=", - "pom": "sha256-BiLSvOTmMBZr8SgT6DhUOUFx+vJ1k6/S2kvpwtkJEL8=" + "pom": "sha256-HrmdoNGhdtIgvidf8ARgZBDLlHpNdUFKaBAFJLOow4g=" }, - "com/android/tools/analytics-library#tracker/31.7.0": { + "com/android/tools/analytics-library#tracker/31.7.2": { "jar": "sha256-4flUlzpHM/dgJ6X5b6RUctw8wi0nsdyT8/5qRqdWgb4=", - "pom": "sha256-dvrrRI7XbpYwXlV87CwMskFP+ZXCTF4KacthsDJIes4=" + "pom": "sha256-cqrveu3eQlqUxtXMt09Qcmfjjt+3GuqpyD2gFexBMGc=" }, - "com/android/tools/build#aapt2-proto/8.7.0-12006047": { - "jar": "sha256-/he6M0iin4xBkizK/wz1TvRAfD53QHqfh8HlVaFzTJA=", - "module": "sha256-d4xt5AOdryGQB5Kq/PoN5jdIJDfiyxA4FIhlaitml0k=", - "pom": "sha256-0MBH8qY4ilqNnHto3UuvCTwDhVxXJnNNRDOHwrc17EI=" + "com/android/tools/build#aapt2-proto/8.7.2-12006047": { + "jar": "sha256-yiM9kx8k9C69fjjvSwFU97qShAHuuhpx1xFMK4sVI3I=", + "module": "sha256-WUBXRxZ4oa78DSpch+nQYa2hE56o+mBfmMa3mtp/7Ts=", + "pom": "sha256-QYCpSSeK8+D+cSUssDv722/6CNTnSUBtD7xnN2jaPyk=" }, - "com/android/tools/build#aaptcompiler/8.7.0": { - "jar": "sha256-6kqIYAlERDX3oZ/K7eHq8YDo2FFF98UqS6h8vDVsVjo=", - "module": "sha256-3v4hb6toU2kC/2hPHVupgpWXVNoI0pYBmMg1zfnrRpU=", - "pom": "sha256-mDxsnWrL9rYdo/qn4WRgLx0Z7xigFcdpEmutZ3Yo86k=" + "com/android/tools/build#aaptcompiler/8.7.2": { + "jar": "sha256-lj8abX8TYfI+RT9Bd+wQVPqlzQ1V5vn3c9hn8IhfwEU=", + "module": "sha256-gY8GpdWl5kiO9YSC/6Kr68cVem/vYZARvpuMFAYEWd8=", + "pom": "sha256-p3dFTXMlI4OOOhVGMRYVFBIla2G3KWzMILYnG1xYvY4=" }, - "com/android/tools/build#apksig/8.7.0": { + "com/android/tools/build#apksig/8.7.2": { "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=", - "pom": "sha256-HoToNvBKfksjm+gnP/r23e28LYITkSiZ3XnfpvJUMTI=" + "pom": "sha256-0QaOHB2J/VPmVKdvmag2eIo6tyMEMktuKYK22J0BR5E=" }, - "com/android/tools/build#apkzlib/8.7.0": { + "com/android/tools/build#apkzlib/8.7.2": { "jar": "sha256-HBpn1vTxhkJ6wWbrqg3YZ/WV1RRPySUlKwX/udGhVrc=", - "pom": "sha256-YeIsbhnURBJstE09/zk40sqXiEGe1IeSZZGa6Zj/ZX4=" + "pom": "sha256-+Vo1Yrq5+yJH1mUV11BNGAAUEDhkMDaN7Hb5GMlnaPk=" }, - "com/android/tools/build#builder-model/8.7.0": { - "jar": "sha256-qW3HjPObTlad6Q6BULXvpmZC0lkIyvKJDGA8xkehbHg=", - "module": "sha256-9FjJyYRDzuRy8bIVS5wOZ6qqBYDNG7OuCMw0Z3N3qUc=", - "pom": "sha256-1ZHiHL89U4t1gaf8k8oCDye1lLTnmDM3WLcqy0/YTTI=" + "com/android/tools/build#builder-model/8.7.2": { + "jar": "sha256-RkgBANdcOWwtzwRqS7Je83VvZpvEs87QtnRBVy1MidI=", + "module": "sha256-f66ACHV/AddPO2Gxst1XZj1jwDvDrND2uHZGmOWo/9o=", + "pom": "sha256-JnhzHNlgHzbi9kWcxuIjHUH5lI0lzgPkzZQR4yudrDA=" }, - "com/android/tools/build#builder-test-api/8.7.0": { - "jar": "sha256-wyUGET0QpRlrXj+GmAJyLI8ijBIwhsBIUvhmzfeMBQ0=", - "module": "sha256-Jz8BFVEUVKBmmPHS6h0Hd8qy7gBknaSeNwNB+uSnSvY=", - "pom": "sha256-XXVdxCpB7BU1lnho/yUric2ul3fKD1CRuCXZ7SNWBDQ=" + "com/android/tools/build#builder-test-api/8.7.2": { + "jar": "sha256-+jL/JjBTSAwtICP9OhlbA13Q6YuT7oT91Zl+46LHp8o=", + "module": "sha256-PsegoYlTeeQvi4Ou0N4pAMYCtbnZPAWllIh/AKCj+WA=", + "pom": "sha256-HNMeW4I/5062W63lg35Zs68e74ex/4MdKmiIF1QaNwk=" }, - "com/android/tools/build#builder/8.7.0": { - "jar": "sha256-ibW+szlqi0UpvMxlOzIanNlo4lJFvjscMgGJdZq7bt8=", - "module": "sha256-v9ZsEzgsS+tKMHItT1j++OHNQ3dcAT8yygs7kmJvMW8=", - "pom": "sha256-DN4sH7Rl891OOgHJqcTRTDGT8c43t+nmSP1AAFNEkag=" + "com/android/tools/build#builder/8.7.2": { + "jar": "sha256-8p9ibOnkHd+vMFQBOXqITloxEmpB/Rj0D9thylRhAww=", + "module": "sha256-EfWL/6/TpHkm9wsk4pAxnB/+WBoKXIR4EcnssFluasY=", + "pom": "sha256-PLR1LKU9qfSgjooty2N4jfFFniNz6pU0n5j7huSiuns=" }, "com/android/tools/build#bundletool/1.17.1": { "jar": "sha256-OS/TsJm9grEWyHcquPxBOZhKkRCKZD+N/J7ilkiBitg=", "pom": "sha256-fN0zdkTVI/5gz7YyQQxrf7fZgu7FMnDdvt/xwmMzVF0=" }, - "com/android/tools/build#gradle-api/8.7.0": { - "jar": "sha256-CeRBcyyUyBG59oXYQO3uSphu57Mi4Qq7bwq9/Wx8M4I=", - "module": "sha256-LW3zWEKMh6teJWIpIET4/MuOk5NmPUR7bylWyzF6GcA=", - "pom": "sha256-sipgfp6d69MjAK1dHx0aUxj9GIobUZlQo3YYyJPbS14=" + "com/android/tools/build#gradle-api/8.7.2": { + "jar": "sha256-ohzomuUaP3MzNyVcKbHVESBN0ZOuUoD3Wk2B0hVMv1I=", + "module": "sha256-yph0Jjvn5igYSQivBtIwrGTLWrXKCv5F65GmvRznx2A=", + "pom": "sha256-xj3pBlGK6+VhHshZdZO9qtHkck+ytM3J1rCVzHXmSr8=" }, - "com/android/tools/build#gradle-settings-api/8.7.0": { - "jar": "sha256-fd/HczLe41hSQxUiOP8ArEexcHpBnA8USEU6BJj7aDY=", - "module": "sha256-UogIaEZOzhDffTxjbC97RXHyWORY8alHO8Wds9ktAMc=", - "pom": "sha256-lrCfK/WA+DHi3D+qL0/u/ODHyj7dxpOSjuEjiLxSPoc=" + "com/android/tools/build#gradle-settings-api/8.7.2": { + "jar": "sha256-r2oaF8zcVhvhBB7f7RNtot3euvcivJVOEZ8uBhpIONQ=", + "module": "sha256-Uy6JVY4zp+pA2fj0NIrekj8WZhIkxkV6DKHMZPo0ru0=", + "pom": "sha256-Md0thmxB4ku8c32fjuW8bBIhFmhXyUNKSfKyZ3Gt0EQ=" }, - "com/android/tools/build#gradle/8.7.0": { - "jar": "sha256-H1a4cMQJth55iDqkAnoixIyvwMrNAE9N7z8t6hiC+qU=", - "module": "sha256-jQyDawhju9N6R91wmJF6Q3IwwmNoXqd/S4vFman6E1Q=", - "pom": "sha256-/W/cIMQKcXosG1+bLUtGNgWxTm4zmLMzEAvw867m69k=" + "com/android/tools/build#gradle/8.7.2": { + "jar": "sha256-kGyVRG0MGZurpmCORLVJJCoPMmNfzUOvplY3yqLUk/Y=", + "module": "sha256-ZpeR3shz+2H44JOKpZRVlsy4SiBx5AnlW1tbFbb2pBQ=", + "pom": "sha256-LRFC0n6qSZVMdPfbABzhRQlgG8IgL0jrSs16cxnDG0g=" }, - "com/android/tools/build#manifest-merger/31.7.0": { - "jar": "sha256-q5InZDTlph6GxZDnsZ8t4WF3j6J1/Aio7shAgeJwO7M=", - "module": "sha256-EugDDYtTNOtaSsPQwQ9Q9I9fe0+FQpZlmd+kX4tsU9c=", - "pom": "sha256-XV78GWn1LfmVAx2XGIkWm39oRoVEZjG6ynrODjKtwRM=" + "com/android/tools/build#manifest-merger/31.7.2": { + "jar": "sha256-g+a/vHleFh7llgkXDpUuNZGuqGyJXBGevqRk6lP59QA=", + "module": "sha256-XYlnGbfMPK7aw1a4/BLqON3QFy3laJ8/e7dpMgNGnpg=", + "pom": "sha256-pagwwHgWGZT/NBRif8b8saon9ZxfXrK1L/46D5i7i4E=" }, "com/android/tools/build#transform-api/2.0.0-deprecated-use-gradle-api": { "jar": "sha256-TeSj0F4cU0wtueRYi/NAgrsr0jLYq7lyfEMCkM4iV0A=", @@ -768,61 +764,61 @@ "module": "sha256-NsJVdrGZk982AXBSjMYrckbDd3bWFYFUpnzfj8LVjhM=", "pom": "sha256-M7F/OWmJQEpJF0dIVpvI7fTjmmKkKjXOk9ylwOS6CEI=" }, - "com/android/tools/ddms#ddmlib/31.7.0": { + "com/android/tools/ddms#ddmlib/31.7.2": { "jar": "sha256-DX71OCP2ohuAfzmPDQOaXd4YS1jFWJYlYmykqj1hCO0=", - "pom": "sha256-xF5JiS4dMxYuu8Px1FpXrAO1M9sJI1HIChEXGsemC3s=" + "pom": "sha256-ge+WpZRhtLmdMSBSNnHhbIzzy/q9ARixnnVgtZcLYJ0=" }, - "com/android/tools/layoutlib#layoutlib-api/31.7.0": { + "com/android/tools/layoutlib#layoutlib-api/31.7.2": { "jar": "sha256-mLrjb/BR4RTdTu9e/6gPvl5VKUT0IzzokhYNos2e6u0=", - "pom": "sha256-Oc6KjaxnhwVd1yk9DuxGwGgoJ1pcMCDoB4aBmfue2Sw=" + "pom": "sha256-VtfZFwAPKmp8g884n+aC4KawfLysJXX8ze4L8ScncGE=" }, - "com/android/tools/lint#lint-model/31.7.0": { + "com/android/tools/lint#lint-model/31.7.2": { "jar": "sha256-n0wIehmRdFIdG8e4/wX/FIT3cPRRi3/Z9trmwmGILb0=", - "pom": "sha256-bOKv4L2eVokKZMnOl8xm1XgkBc4f5lVLf2LKeuSMl40=" + "pom": "sha256-1M8hv1CrYQinX1s9DLojlvzEaEhfuHjvTGmWKdwy1rY=" }, - "com/android/tools/lint#lint-typedef-remover/31.7.0": { + "com/android/tools/lint#lint-typedef-remover/31.7.2": { "jar": "sha256-W09IUhXKTYbvIxn8OYtfIlHmL1RGvF/Q4AZTZI3d4xg=", - "pom": "sha256-JClmoX4PSX7Pfw8ZbzDdHrz14v4CHvTi47QtFF53rq0=" + "pom": "sha256-n2H8dvOXG3W++jZyBxKSUvxdMp1mKSpTO04vDg/FpzY=" }, - "com/android/tools/utp#android-device-provider-ddmlib-proto/31.7.0": { + "com/android/tools/utp#android-device-provider-ddmlib-proto/31.7.2": { "jar": "sha256-2p8/Pa4mVEyQZoVJWEdl1YVKh8Ql0s/ld80002AOoJc=", - "pom": "sha256-jO6IDyp30tYiR3BtjUf85buIXCkz1hR5+H3TuFKcXTk=" + "pom": "sha256-fceVfuEAeETkitNQUrJh7EZ8jj0mc055gHXWDl0txrc=" }, - "com/android/tools/utp#android-device-provider-gradle-proto/31.7.0": { + "com/android/tools/utp#android-device-provider-gradle-proto/31.7.2": { "jar": "sha256-rSNCux1vlVY0AKMiST6hwinLk985RPEmG3OZ9xhJQEk=", - "pom": "sha256-K6qTHUdHBV/2rp+Adz/zqhxC+6D626Ghph4X9rQB9rQ=" + "pom": "sha256-b7wYgVZ6Ij0h8MU4FpxFRTqgTuZoarSxSTIaNpIdKH8=" }, - "com/android/tools/utp#android-device-provider-profile-proto/31.7.0": { + "com/android/tools/utp#android-device-provider-profile-proto/31.7.2": { "jar": "sha256-ENEAztXQg3FMHGi7uxC7N16FRvkqsOQhnA5KX/KYEV4=", - "pom": "sha256-/1hgmrxlfZWAFFBM/e6kG3J3wNI6sOtQikfu3uMPZ5Y=" + "pom": "sha256-NCYLH8BzJ0AW4K+jqJzkCnTAlTnOKDU170uwn6nUiZo=" }, - "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.7.2": { "jar": "sha256-OEUGlN5jKMLEy6aW+cBOzdXOaVI1X2jDoi+VQdHWVG8=", - "pom": "sha256-+yuHVmFNkIZ4QU7pbG+wphVTVSd8viOeCZogZhZxidE=" + "pom": "sha256-HZVLjspjr1oTeqIYvZBmn6pLPS6fKJpkEU3w6LI6wWM=" }, - "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.7.2": { "jar": "sha256-VD62yNcrLtdFH46TnV2AiQVm8UvCa335yDR1BrJY164=", - "pom": "sha256-3ShDC26IL1zYVG4V3puMjAzkwoVLg8xLAxOCj/9YaIw=" + "pom": "sha256-Wj7az0WoDtusdGLVwroPciKVO4ER9naXzOgVH39iP7E=" }, - "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.7.2": { "jar": "sha256-77TXAUqqc1UkagfC5DeiIx+yUlQP8bzmhyyI3I2onRI=", - "pom": "sha256-Kr+9L1LkoLxWGzY29JUmZ7zSseaNW3S4+ecDnogCzH4=" + "pom": "sha256-z95c2bXo9Uha7d8ExVVzwPdFvRh0wJDWdb6tVX8rAuQ=" }, - "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.7.2": { "jar": "sha256-rt7F7EYn2JjMzfQtgDjbIOukSVdTxT0bCzeHNEkcr18=", - "pom": "sha256-ClVyJT95043mEia9b0/2iv5kJ/IAzDsdfrHfl8I7jIQ=" + "pom": "sha256-ewlMa3tMgyeIeTNY8/gQ7t+oWkKRxCjGIyYE3Q30yVE=" }, - "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.7.2": { "jar": "sha256-kSkCS9jjg1O8o+sm39jjYo4FjVfW6dhFH/w18BZ1HmM=", - "pom": "sha256-mEg9815euIrO9MCHlq3RAHI+HgTV8bpojRc073/i8LI=" + "pom": "sha256-/DgckYxfXZ7Do8/3tSB2508CJgWZs6KaR9ybjfNGgLU=" }, - "com/android/tools/utp#android-test-plugin-host-retention-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-retention-proto/31.7.2": { "jar": "sha256-PbjtOO9JtpTK6kZq4i47Ns7clVezWJ0OB8DN2DKUWRw=", - "pom": "sha256-C0HkUK7ULzF6kiKOhy1zgrp8/6bVEeXxHx28aQGv3JI=" + "pom": "sha256-nMDyQxX/ewv9HxsCAFmGxbRSMbQZm1ddUY6uN/SXAhw=" }, - "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.7.2": { "jar": "sha256-y99xvKYOFMMOeyz0uQ8PCj6ME498rdh0sNnArgguAnQ=", - "pom": "sha256-uYdrvyTXt53Y7vvEl8+kC1LR89Lw9B/C4YltMEHtsX4=" + "pom": "sha256-zvNh4UxGVOKXJBHYPNscXKzTkkjwe0ABaN5/RF/r5n0=" }, "com/google/android/datatransport#transport-api/3.0.0": { "pom": "sha256-FTe+vUTaLrfjvnP8QlnhEW8qaKUwX0/iPGzqmm+E95E=" @@ -883,14 +879,14 @@ "com/google/android/odml#image/1.0.0-beta1": { "pom": "sha256-eV9Hk8N17t9DMqA4EIKYGlznC3oKd2IhyiStnUDL6hw=" }, - "com/google/android/play#core-common/2.0.2": { - "pom": "sha256-GUBYeVHY7e/s+jBJHYVzMon1q1K3q2fSXw+XNaxW//c=" + "com/google/android/play#core-common/2.0.4": { + "pom": "sha256-jd6WHLfhDKX6DlUmHnurweNAv1lyujU4x89ONNM4774=" }, - "com/google/android/play#review-ktx/2.0.1": { - "pom": "sha256-LtP+xq8/PoHy1NBqQh8uXWFk8GQPMzYKGFZhR/jSpOo=" + "com/google/android/play#review-ktx/2.0.2": { + "pom": "sha256-tllwHlCGY+vaa1CiaXuywPjJhGMxRrE5BtfJhqmdBDY=" }, - "com/google/android/play#review/2.0.1": { - "pom": "sha256-chcx/XEy53bt0gj5Z+3wOOI95uZQ8PBVxC1G2TZLznQ=" + "com/google/android/play#review/2.0.2": { + "pom": "sha256-308kkM3bZR/754TIxbl57GmZa8aHynzWeMfV9lsol+g=" }, "com/google/firebase#firebase-analytics-ktx/22.1.2": { "pom": "sha256-SLZ3ajqET+jxaebbQdCcwNFilqMjGBZHLvSwTl2f030=" @@ -901,8 +897,8 @@ "com/google/firebase#firebase-annotations/16.2.0": { "pom": "sha256-CFsRHeSXHLO5OP+QAMyAeQEE/WmlE0doTftybmnoUko=" }, - "com/google/firebase#firebase-bom/33.4.0": { - "pom": "sha256-vjxNSx4io2a3/RYgg/I9AW4g+ThDDrfMTZbPoXGnadU=" + "com/google/firebase#firebase-bom/33.5.1": { + "pom": "sha256-qmUG1IFF8L6ttoh2vcA7dkaxZFC1OVEqtUm7yOe6JTs=" }, "com/google/firebase#firebase-common-ktx/21.0.0": { "pom": "sha256-wn7MtIuViBFtb9MvRle8Wd+FUAJDIpNVjbuX6YeK3rg=" @@ -928,11 +924,11 @@ "module": "sha256-/vKMVYn+7ogZWmq5SylhBAL4dVQRoTUXbdXZSASY7gQ=", "pom": "sha256-1N7+UvJE/0C7+enGSoroyoocJs3y5lZ1fAY1CuUgeI4=" }, - "com/google/firebase#firebase-crashlytics-ktx/19.2.0": { - "pom": "sha256-rsljNsCG26s6XVWGVQ/sqyI1nXvKCwwnQvVEGwbNdEc=" + "com/google/firebase#firebase-crashlytics-ktx/19.2.1": { + "pom": "sha256-4z68t3jNh55vkF/z8CDvpxd2s1WxexwI8HyHnKnEayQ=" }, - "com/google/firebase#firebase-crashlytics/19.2.0": { - "pom": "sha256-AHkhpTDKn69Dc0V4SGTxFnczsQVFUMJaPy6mEkUnGdU=" + "com/google/firebase#firebase-crashlytics/19.2.1": { + "pom": "sha256-8gfVXglDfRP0ZlCCRTDCFVAPS3g8iFPO4iBEekUfaHU=" }, "com/google/firebase#firebase-encoders-json/17.1.0": { "pom": "sha256-yCPL7XoOdb8w/tu6Qv8cDIdS49wW7cz30PLl1stpx6g=" @@ -958,8 +954,8 @@ "com/google/firebase#firebase-measurement-connector/20.0.1": { "pom": "sha256-exiY9N12nBHKu6lwJUbWiAEV6B191v8ra+JI7hVtyLw=" }, - "com/google/firebase#firebase-sessions/2.0.5": { - "pom": "sha256-1Vw4Y6oAPcTNcFJEv8g7PYmlzR3Gz1lGX7fGfXO/0WA=" + "com/google/firebase#firebase-sessions/2.0.6": { + "pom": "sha256-VtizN1WQ+rqBl1T0uI535GODGqQe0xffqx52hvGYXbU=" }, "com/google/firebase/crashlytics#com.google.firebase.crashlytics.gradle.plugin/3.0.2": { "pom": "sha256-T51Vb0qwfPielD9NqD+p8nW4v02PZEKrG15fuwm5qdw=" @@ -995,8 +991,8 @@ } }, "https://plugins.gradle.org/m2": { - "app/cash/licensee#app.cash.licensee.gradle.plugin/1.11.0": { - "pom": "sha256-TW6qfssPqKRDuXUP+4I9kU0/bJeO67Jcf4gShq6VNb4=" + "app/cash/licensee#app.cash.licensee.gradle.plugin/1.12.0": { + "pom": "sha256-a1NXxoXtJlxl+2W5S49bIf7d5kyY5TS4JzFfugt9EVs=" }, "app/cash/sqldelight#app.cash.sqldelight.gradle.plugin/2.0.2": { "pom": "sha256-xI4eHTquSFcUqPmVqfwmIE3v0FJXhyJaRotJQfOPKwk=" @@ -1019,11 +1015,11 @@ "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" }, - "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.0.20-1.0.25": { - "pom": "sha256-yzUQdo5Yv9tQqt2JXf5jB6XPBHblZZ221YRYHBSBuy8=" + "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.0.21-1.0.26": { + "pom": "sha256-Z2JdXXdbvXnCpO5wWNDyGeskBBs6Dqyl60p6XExoRC4=" }, - "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.4": { - "pom": "sha256-Tkw14qX9gVWTV8wn9hfQfWRMQFn2MgCq4QpEucBn+iw=" + "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.5": { + "pom": "sha256-a+z8hpHftExSYVqCqWeS8TQBpXXleMkBkR1/qjMPgoo=" }, "org/gradle/kotlin#gradle-kotlin-dsl-plugins/4.5.0": { "jar": "sha256-Ga92VnnptJN0uyg6xE81O4EJrZz+ZmjO1tmmZFVA4vo=", @@ -1172,26 +1168,26 @@ "jar": "sha256-4NqKfwZIV8BIOmVyfRYtPtV84m1+R3ix8ADg0MDck3E=", "pom": "sha256-krQjr9XnKbsRT3G1ip4DhF3+K9pWJFTrvbg8nYOyMHE=" }, - "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.0.20": { - "pom": "sha256-xK4aEO2SGNYivOCqvA7d9JsnMahRbWjhzfhFpXD5HBo=" + "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.0.21": { + "pom": "sha256-nYQQN8WWRNxbvoFOeS7Yd060hkbws6d5YE7lwbMH+Wk=" }, - "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.20": { - "pom": "sha256-JyOoqUP6SkTTcD8VTEW31UcMcZ1OYKvz4ixzt3s4i5M=" + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.21": { + "pom": "sha256-Jk8V5sp1XIU/oPWvEPa9GgHwmLKsDPmOHP05kBF/tjo=" }, - "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.0.20": { - "pom": "sha256-3sIntTJrP/MWMuYmdesCZOtzhonuGoHHbOrP00HQDT8=" + "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.0.21": { + "pom": "sha256-A3jdmghkzs3xepZE4cpNaYzJBjT6z39QT1GiA+UnTSw=" }, - "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.20": { - "pom": "sha256-eB3fXoWUHaYbaNxvts/TEvQb20Z7A9LYFEkDkc8PHA0=" + "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.21": { + "pom": "sha256-tnnDkpTLqUUVcGw6nW/EDzGhCq5mqjPysFgNUp5Zx+A=" }, - "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.0.20": { - "pom": "sha256-qYIKx23l4slfvXM/0y0CQQRMWMo1cC1JvpkVeA4Eito=" + "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.0.21": { + "pom": "sha256-9hnDJ/rpwiSeUZmg9Takn0kRV2ZK+tFjyGOedA8ibUo=" }, - "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.20": { - "pom": "sha256-LVF6OaKUxLG4cV7ldiyhQx/EDL+VV5KSrSTU5B4lnFk=" + "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.21": { + "pom": "sha256-RJ1618SBWsfvZKnCwXOrJiAZ8W45q/EPx/wTvyBM82I=" }, - "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.20": { - "pom": "sha256-0s2V9THwNRgW+fg0bsbWB2xxyt9jLz6PZX3dft+RukE=" + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.21": { + "pom": "sha256-ZqPrh44Nk5i1JY0VveqGR1pdRJ9jthi1rcgMsz0bT5Y=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": { "jar": "sha256-eNbMcTX4TWkv83Uvz9H6G74JQNffcGUuTx6u7Ax4r7s=", @@ -1208,13 +1204,13 @@ } }, "https://repo.maven.apache.org/maven2": { - "app/cash/licensee#app.cash.licensee.gradle.plugin/1.11.0": { - "pom": "sha256-TW6qfssPqKRDuXUP+4I9kU0/bJeO67Jcf4gShq6VNb4=" + "app/cash/licensee#app.cash.licensee.gradle.plugin/1.12.0": { + "pom": "sha256-a1NXxoXtJlxl+2W5S49bIf7d5kyY5TS4JzFfugt9EVs=" }, - "app/cash/licensee#licensee-gradle-plugin/1.11.0": { - "jar": "sha256-421lXSEpw9HX+oVCAVAyX81n+tcPw5ELftex7w9vqXk=", - "module": "sha256-4hKLda1Y5Tr5CtcyLGKXfI/NonykVCykOQ+ysrr0QHc=", - "pom": "sha256-rRT8P6I5Wd+LQY8Ib0vxN/snc5TRccJWT1a/18xGJ9M=" + "app/cash/licensee#licensee-gradle-plugin/1.12.0": { + "jar": "sha256-oWiz6TSJ8RiIPrGD2uCfBAgqRIwzwKjrBipJ5co8WV0=", + "module": "sha256-lrpFacljyIiZDNT7YePL8HfdKrYRR74+2OZbvODrlqU=", + "pom": "sha256-hhw2H09+on8XdLSKb0NayvWJ2KW6pczg5WZ3xx/iSk8=" }, "app/cash/sqldelight#android-driver/2.0.2": { "module": "sha256-o/3k4blEM0Kq/3SeuCOxd3oh8Yqa0oiEJae416a4wXE=", @@ -1423,38 +1419,38 @@ "module": "sha256-pf5zlSZUrdVw3EuE5w0KeoQK5QZyqENfmFFs9WqWexE=", "pom": "sha256-g+AAH5lPJWhjyc4wzYMlf7qjQEayclcfyGQ0O8x43TQ=" }, - "com/github/bumptech/glide#disklrucache/4.16.0": { - "pom": "sha256-pejfbx0ifD6b4W/L39P1M7IdjQPiaCrddxr498u9qUQ=" + "com/github/bumptech/glide#disklrucache/5.0.0-rc01": { + "pom": "sha256-rTCxr8Od/ObYsLN/OXXMI1iY4bM67RBfEUoqgPlH9zM=" }, - "com/github/bumptech/glide#gifdecoder/4.16.0": { - "pom": "sha256-MKYI93fKdyACjDZd1nD7XDctDhFRuUAWgOPQlHLbABc=" + "com/github/bumptech/glide#gifdecoder/5.0.0-rc01": { + "pom": "sha256-bWon0m4DSok1jGLEO7/aF+vyDM4I5GItBHhFUrnEXrY=" }, - "com/github/bumptech/glide#glide/4.16.0": { - "pom": "sha256-5yyOMQ16K5zuWs3NuS/S72OU63LlapbKy1aSQEcC5XE=" + "com/github/bumptech/glide#glide/5.0.0-rc01": { + "pom": "sha256-t4B6qZ0o2S98YxD/gOEo36btXUzZsH7sQKuU2Bi2kQE=" }, "com/github/jai-imageio#jai-imageio-core/1.4.0": { "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=", "pom": "sha256-Ac0LjPRGoe4kVuyeg8Q11gRH0G6fVJBMTm/sCPfO8qw=" }, - "com/github/skydoves#landscapist-android/2.4.0": { - "module": "sha256-Iqip9b/NaDVEyHqOLbYgXHE9u+Bdrvc2Bo0zo98kKFo=", - "pom": "sha256-mohtrp2I43wKcmCGxLS+zENS3V98+Xvk5fr8UWZb4bQ=" + "com/github/skydoves#landscapist-android/2.4.1": { + "module": "sha256-CTabQKPpIMrvOjGdj/U/X3bifUQHKejj/T6ArRKtbPw=", + "pom": "sha256-HDoFMmJl4MMZmvYwaRvY9JsVB7uo1dWcUXdM0zm9r/Q=" }, - "com/github/skydoves#landscapist-glide/2.4.0": { - "module": "sha256-OJN/jZK/wE6f06GNVKUgFxVMoshfUFs/B/C5w3cN/YY=", - "pom": "sha256-aJH4hyrihRy22EWcGkIC5BtViDpNjvfQfP5XkUfpXwg=" + "com/github/skydoves#landscapist-glide/2.4.1": { + "module": "sha256-8mmntu8gt7n0OqzL7ZuzoTWBf2q1eB3CEGULrtztEso=", + "pom": "sha256-TYUKEnhZzXwXlS98Nha2HMgtxSXa8BQClPoXld2KvMA=" }, - "com/github/skydoves#landscapist-placeholder-android/2.4.0": { - "module": "sha256-fC7SUqnzD9u2B2TCzs+WWO5rB5GlIpMpUG1kLlLsETQ=", - "pom": "sha256-ojiYeuJG+n3S33m+wW9gFmRn/JmL997R2zoEcISTOG0=" + "com/github/skydoves#landscapist-placeholder-android/2.4.1": { + "module": "sha256-ycd1URN0vJMSrKqZVwPpq1YTnCTh1f5nas39bbVZpBI=", + "pom": "sha256-Ioz9A84Hdk4FgM4aLQa83LGcUwU8g5pHPboF5b49MsI=" }, - "com/github/skydoves#landscapist-placeholder/2.4.0": { - "module": "sha256-uyaHzkRh61cDI/C9DjVGxJKJtXv1b+KH+mBt4TTzu7A=", - "pom": "sha256-UKohOAS24T1yD3xKXtBp6hXfTQQ5bD81S5bpaWp9mds=" + "com/github/skydoves#landscapist-placeholder/2.4.1": { + "module": "sha256-lun5yfhpSIfMLMG79kczkV0U6sIyG0j4/3Y9hZqqaSw=", + "pom": "sha256-viPts4vQrpOlnm7gP8hECEj5jreFWQKvs3COoJ+VhOE=" }, - "com/github/skydoves#landscapist/2.4.0": { - "module": "sha256-kbVxRSW+nuZiuJ7ZO2OSnBYQqbnM8Hq5+zcBZSHNQb4=", - "pom": "sha256-Fsnfutava8Ul5R7/DmNgSI+OS2abRm/nSg6SkMyxUFc=" + "com/github/skydoves#landscapist/2.4.1": { + "module": "sha256-uYel+PoSDuDea1Ghy8galJH7VRBtwdgZditT4YAR0hM=", + "pom": "sha256-ROr1OImdYtx5/F7iv4U9t3j9SzvKNIvrdoV793cuZsA=" }, "com/google/accompanist#accompanist-drawablepainter/0.36.0": { "module": "sha256-LR2pP7TwcbJ3xHuLD439Ie53v7BUsWpWeT/xjThB2A8=", @@ -1516,32 +1512,32 @@ "jar": "sha256-8d0j+K40qOkTZnI5kerQ1kmdGj6RY85VDCALAtdqhys=", "pom": "sha256-JlupWajhPDoGEz8EtTkWnBAY2v/U0z9TxFOrTLOG9XA=" }, - "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.0.20-1.0.25": { - "pom": "sha256-yzUQdo5Yv9tQqt2JXf5jB6XPBHblZZ221YRYHBSBuy8=" + "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.0.21-1.0.26": { + "pom": "sha256-Z2JdXXdbvXnCpO5wWNDyGeskBBs6Dqyl60p6XExoRC4=" }, "com/google/devtools/ksp#symbol-processing-api/1.9.23-1.0.19": { "jar": "sha256-vuN5tEleLbL6L56WQysQzr9WCo5udUnVen8oIst6Jfw=", "module": "sha256-aT0JqlhIGPS2yK2oI6VLDLK8sITgWgX+WqaA9YlD9G4=", "pom": "sha256-Oup3dI9mum/DvGrSjD07+lnt9jMyAYlGCrcIWx88KXM=" }, - "com/google/devtools/ksp#symbol-processing-api/2.0.20-1.0.25": { - "jar": "sha256-vdOj527iHJWODypi1xfMYWZeb1oLFB7/AOBW659Y2P4=", - "module": "sha256-XXBDIYzfJjWb3+xLpniu15S6qtSn4EA0TTOi7ZKIR+4=", - "pom": "sha256-jjjxZ9N69wbkkn3PI/IczZKr9DXKQTC0YF9E3GTfelw=" + "com/google/devtools/ksp#symbol-processing-api/2.0.21-1.0.26": { + "jar": "sha256-BsS8s+tAlT1ENeziIyrWt2CGhjGWhZbOZmz5+AVyml8=", + "module": "sha256-ajqhacgqqBf0biw0rQajdVLjehcI8rlzMqiva35bYI0=", + "pom": "sha256-MUzVy+PX+Mw/sOa0jfrrnISBf3fYdDMGlyEUhpWHbRY=" }, - "com/google/devtools/ksp#symbol-processing-common-deps/2.0.20-1.0.25": { - "jar": "sha256-bCly0hPau2S6jdjBRxHJA0wTqjzs9Y9eyKjc40vUpPA=", - "module": "sha256-Q5xUkJOChRNfbVdylQUSnWixhp0pVMVKQ0AnMmfXsOQ=", - "pom": "sha256-pdbQUAbsbfVDFLhNRqWa8ZsNisI7TRymfZhKMyXjUdY=" + "com/google/devtools/ksp#symbol-processing-common-deps/2.0.21-1.0.26": { + "jar": "sha256-9U3futWSOlb8pZ8s/8/6SWFIizOWmTXCXpSS9N51TOQ=", + "module": "sha256-mDHtWjLSJCMF9GCKM3RLOJierSpbAUpEQCDbCuMvSh8=", + "pom": "sha256-tZqVRlTVsPdKwO33x499WS/c4kUguOIOocUGtkFgS3A=" }, - "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.0.20-1.0.25": { - "jar": "sha256-TOH8G26gjE6txjB2jWCKYk9VbWWwVr6g97l4kBgQWkE=", - "module": "sha256-+gLE/UYfiow7j2o265zQQWySRBg61m1c2eIFsId1VZs=", - "pom": "sha256-fi22jD+Ksa+WoDdPRNgBaIpX03/gG4GCLsjPPVG5vf0=" + "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.0.21-1.0.26": { + "jar": "sha256-wB+hdK5CikTHfFQ6sP5qytZj8uyvmon/BT8gmfQ8804=", + "module": "sha256-gLkXElrOkTMqyrUxTqXHYs8TC/TGS6QTUfqHY1FlfHA=", + "pom": "sha256-opW31fnR1sMOuItUi6fQE2PtsP++YeNHVDIIN95ryM4=" }, - "com/google/devtools/ksp#symbol-processing/2.0.20-1.0.25": { - "jar": "sha256-5xdB6pE0JqUlMnIZkb2kqRihibNyVpVzMdww/PLb6xE=", - "pom": "sha256-2S7Uicdzd9fEaDuflleaNjQc/EfzwlJ095vzeMYr0qU=" + "com/google/devtools/ksp#symbol-processing/2.0.21-1.0.26": { + "jar": "sha256-Wo4TWFWSMrLNcFdf7QnSHRUQ3uQuJ27qUZNqR2mWNnU=", + "pom": "sha256-JU/hkxHS2kHNBwgHfCVfQgXsD8ZKHAfuE7Cxr7i0TYo=" }, "com/google/errorprone#error_prone_annotations/2.11.0": { "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" @@ -1761,6 +1757,11 @@ "module": "sha256-LiFIzSE7T49U1m0FSKIoBX4fe2czLg+Xmxoc42sidqc=", "pom": "sha256-MVkkh9X6euW87fZ4Bqy93Eh9zPROH9t/z3zlNkrPyFw=" }, + "com/squareup/okhttp3#okhttp-sse/4.12.0": { + "jar": "sha256-v/T7yu96rC2RDU/0ba+qTm0V2hJ99rrJchbaRpQ6fUw=", + "module": "sha256-c+RIzK9gfU9gO4tuZmGHKk/6PCZBGTyLvE1r2h5Ww0I=", + "pom": "sha256-lKunzO96e5DcolIFhb8LEjNtyO+U1ZGWPu2sV3lnkzw=" + }, "com/squareup/okhttp3#okhttp/4.11.0": { "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=", "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", @@ -1780,15 +1781,10 @@ "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" }, - "com/squareup/okio#okio-jvm/3.7.0": { - "jar": "sha256-2LNa3Ch2j0OuWv5qfRqiqHi6UeC5ak8wiBHzsfWxPlU=", - "module": "sha256-b64CAbCuSKGWBt4Ab/6YQtjQ/CoeQ04Hhc7Ni3Wr5HQ=", - "pom": "sha256-d07LnSsHlLT7J+eeCHYMpWC39U+qlRm5GDxn/rRfLJc=" - }, - "com/squareup/okio#okio-jvm/3.9.0": { - "jar": "sha256-3cOG/xS9JdXJNBZxlur0WxjeTyjhxVpNs3rllMv9N+Q=", - "module": "sha256-z5coTsYbtR5t/Lx/K22VVsm3s+PLIswOLU8O7782GVs=", - "pom": "sha256-VEiNRUqsyvaPcZnz3l3Ns4CBblfUYJBJF06FZSAROH4=" + "com/squareup/okio#okio-jvm/3.9.1": { + "jar": "sha256-/m/pE3j5v6ewjDhkgozkGABc8orMoS6IR+tlxWXDdQA=", + "module": "sha256-sK+pGSxC18Rj3jjWMlk2xpAdnjtxSXNf/RihHfMQNKs=", + "pom": "sha256-VXZInO8kBTNoAPxt6VhUU18zVxpO/lpa0OybmwkNIdU=" }, "com/squareup/okio#okio/3.2.0": { "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", @@ -1798,13 +1794,9 @@ "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" }, - "com/squareup/okio#okio/3.7.0": { - "module": "sha256-88rgCfC2yEL7vFLOd1QsGdGdVu6ZpeVVZH8Lr8nVDPo=", - "pom": "sha256-H2KMRSg726uM4DwHps+3akeLjdrhgL2PNKusJz5Id24=" - }, - "com/squareup/okio#okio/3.9.0": { - "module": "sha256-aNHIef9liTHQKzrb6vu1EuFjwgqQyt8H2QyNvqfnYhA=", - "pom": "sha256-FPNR2puXtDaeP26PaWsK1ANtFNIbD9l6pcjG7BW+fZA=" + "com/squareup/okio#okio/3.9.1": { + "module": "sha256-m5C0J0pa1gLdV01tS0iQNmOy3ppgufw0AiSCk9hD4SE=", + "pom": "sha256-06DDd+epr8zbsCqrXgUNwhL/2pQNvUcOo5cSpDQt8I4=" }, "com/sun/activation#all/1.2.0": { "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" @@ -1861,18 +1853,10 @@ "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" }, - "commons-io#commons-io/2.11.0": { - "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", - "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" - }, "commons-io#commons-io/2.13.0": { "jar": "sha256-Zx6qOWiNrC/6pGRbPJmAri0OokceSual2hmc0VriNmY=", "pom": "sha256-2z/tZMLhd06/1rGnSQN3MrFJuREd1+a5hfCN2lVHBDk=" }, - "commons-logging#commons-logging/1.0.4": { - "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=", - "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ=" - }, "commons-logging#commons-logging/1.2": { "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" @@ -1948,13 +1932,13 @@ "module": "sha256-lYBVD63Yll7/0JcuBPyr18a4tGnbZYJETGBDlhpwU3w=", "pom": "sha256-5qaM9mg8s0uAuqRMq+AKR8yzYVAK1ANjoksSYKFVePg=" }, - "io/github/pdvrieze/xmlutil#core/0.86.3": { - "module": "sha256-MzlXsdCR2LrPqwYCCGgi+a2S9hMCy3Ru8g4Z9nprTbk=", - "pom": "sha256-ngeyUCJI+U7AYn9Wsn3wiBySBCrfzoCg35oa6sQWg4M=" + "io/github/pdvrieze/xmlutil#core/0.90.2": { + "module": "sha256-h13of98HvSr9BM7PRgnTA8adxpnAJD2UPXuLR3WC5ec=", + "pom": "sha256-cZNkfkOFEPBfYeVd6cDcF9hHe4R3ndIyadDs6EIk1IA=" }, - "io/github/pdvrieze/xmlutil#serialization/0.86.3": { - "module": "sha256-gWAn/0s15EE1ZytqCH8U4O9pyfVXeUJpvXN4wm9mhOE=", - "pom": "sha256-dr67jk0C9ZRpOV1p9HIsz+W34gMz2w3sLpZXZRK5+MI=" + "io/github/pdvrieze/xmlutil#serialization/0.90.2": { + "module": "sha256-+Yzn81bcp0UrrS+E9ogdLQI1Y0b+V7FHZTOnPLU7860=", + "pom": "sha256-gW/FQKiUEdXSOCkpBj1bgVfrpgLKG0rS/y+hq2/4sYk=" }, "io/github/reactivecircus/cache4k#cache4k-jvm/0.13.0": { "jar": "sha256-jhGawjDyzFFVaPyo/o7q/TgvyPCTl6JHSqsY5JZidcs=", @@ -1997,138 +1981,184 @@ "jar": "sha256-bm7hQVOfoU2fpHn39RFgVUREPH4BHnjic8+UaKoYMGA=", "pom": "sha256-bURZSHxiHf8xUQqIgpBjYx6RXS3Md01xkoQYEW5ZqI0=" }, - "io/ktor#ktor-client-content-negotiation-jvm/2.3.12": { - "jar": "sha256-tlKQrBAAljY9AepxAn2XDOxqSNB2tuSzbeHK4sGDzXI=", - "module": "sha256-aE9TOE1TEuLn/JQRyIMdkhnRnT48Ykph2Tcm+rrNH5U=", - "pom": "sha256-BQ388K9CsJyFJJmnK6F/mi2c7RimnnHA7LhmJ6in+Kk=" + "io/ktor#ktor-client-cio-jvm/3.0.0": { + "jar": "sha256-C+BPu8totNQEhT43DXXHqVqwkUmxPq8m9bQWAhs0bQQ=", + "module": "sha256-ypP35C2hTnq0db27+u6c1qddrxM3kLcJKMNVtUprdsQ=", + "pom": "sha256-KXVutf4U73dFHckAjV6EPXMEtM8JUm2aIDR8mwqvTr8=" }, - "io/ktor#ktor-client-content-negotiation/2.3.12": { - "jar": "sha256-Ak3H3Td7OXwXg7LDbJeQ8BYVbphzGEP1phOc8o3uP70=", - "module": "sha256-c7tFC5zZ1K6AmA8McRto9+iaYPQ4DQ1EtBeNQnmmxfM=", - "pom": "sha256-fq1NUgsZkUKY11B/SlxwkGkkMPSJXTWcc0KzjVwUZbI=" + "io/ktor#ktor-client-cio/3.0.0": { + "module": "sha256-iudmnpXhbVcoZ74lGx6jkWg3X//6ksd/ETjRSk80GgY=", + "pom": "sha256-SzlUFp02r11bGgxSfgytL026K1PGyFdvRsZkTG6GZoo=" }, - "io/ktor#ktor-client-core-jvm/2.3.12": { - "jar": "sha256-tAeoHZLmzUH5LBUPH9MGDV/KNJHOAq+39xNCRAQIHHo=", - "module": "sha256-tLgSabjOWrX2/g+F/kfRVoqOlZxKuUtn1XQn6XEzVh4=", - "pom": "sha256-DRlPg9ywetvZfpAp+cotuwCcqXJXd8bRuezOqvw7Fns=" + "io/ktor#ktor-client-content-negotiation-jvm/3.0.0": { + "jar": "sha256-m9WHswowDLaO9d47j9P9bqqm3HQ9jAeQjRt7WJceW10=", + "module": "sha256-07tySO95a59///X7utw4OyLzbd2DygXQ3M4FFTWbleI=", + "pom": "sha256-fa9qTK+Ho2lVVzlB4+4HuHKFpXPLBjMoXnxKTOa0ib0=" }, - "io/ktor#ktor-client-core/2.3.12": { - "jar": "sha256-E/nV7COKqNoX8sCAUA0GipY6OKMaFkFQl7hA5fjDv/Y=", - "module": "sha256-hCfawQzvA9tUJUm9tArUlCSP/tB5Ar35BeSw6MVB7UU=", - "pom": "sha256-0rEDA3TSk+63skT9xwQxmThMh6oJh0Wv+OqCxcnj8fM=" + "io/ktor#ktor-client-content-negotiation/3.0.0": { + "jar": "sha256-9OSVojUAqGywmqk37Jc1I/0dP8pazVarSIkSbwyE52U=", + "module": "sha256-1HEXV3yDW0vWu09WiAEO1whHuwVdcaOPyYwBGreoT8M=", + "pom": "sha256-daODY/EQym4aPbMclIxY/wCt8ZmA2AmLDvfqVLL4v8c=" }, - "io/ktor#ktor-client-darwin/2.3.11": { - "module": "sha256-YoVOVpzRv6jTMgt1jPOc1arRZi+nFzYX5r52c6ZmhCw=", - "pom": "sha256-fbAq8OBLy7jeADx7NjTeLQzx9hH76pnEZM8GDz4lkf4=" + "io/ktor#ktor-client-core-jvm/3.0.0": { + "jar": "sha256-QNLQ70M+/dc6f3lVP1INp9eg6u5Ss6mla6DnDQyplhM=", + "module": "sha256-DkDPlWGCAsCVe5ESvcCj7ViMqZeSr3+Q1dpUEOVKUL8=", + "pom": "sha256-jYcwy42ptl7pZ26tKS8gZwnSOhLKBLZl8ptQRcNaiJ4=" }, - "io/ktor#ktor-client-logging-jvm/2.3.12": { - "jar": "sha256-KQI3ExFtuckQYY7b08oOeg8H7RimeFI7iS/RZNHJ2s8=", - "module": "sha256-aRw5R1p+oq4uGM3UqbzfudfoJK+5PUfLVpimVeaH4uM=", - "pom": "sha256-eZbE6aHzj2YbMQLSwXo/UvQvLXmo8SzSjsfe6muNTXI=" + "io/ktor#ktor-client-core/3.0.0": { + "jar": "sha256-ju597n1o1mxjmmW6cqeQHwa5PDaB7+fkZcMzYP/dr9o=", + "module": "sha256-J5RlKvbMd7eog3ypfs6URW18KdutmaFS43z1QibT8Io=", + "pom": "sha256-un9vXGzVyAMMxRNmp4m52IiIxneZhJ6wqboVvFHYljY=" }, - "io/ktor#ktor-client-logging/2.3.12": { - "jar": "sha256-5j6nvrSK6N2AcBfkydxyZtUg1DTMyMmTHyONgvPXEX8=", - "module": "sha256-ELZ6GceSS+/J6/AN65qaIlFv6hW3/SRLoRjgpIL+fzQ=", - "pom": "sha256-TjkQM8cnuQsynsNMAFSWexRK+Z23LM5Xk+nVw0ceCdQ=" + "io/ktor#ktor-client-darwin/3.0.0": { + "module": "sha256-GXxqh0vyPTsH5HPIUnpG34WtfbRwQ6XC4uBga1rsJ3c=", + "pom": "sha256-5vYXKJXZezPLdShe5XWT7Jf3CMEptt0XSlEl0MAg6bM=" }, - "io/ktor#ktor-client-okhttp-jvm/2.3.12": { - "jar": "sha256-MfTZz7AtqNh08FDJhBsssx5TX5sTqXl69HmdWwNW0Qo=", - "module": "sha256-3LbvJt/LC5G4gprlRHqpPgkPOO9JoNNSHFKdD4dCUX8=", - "pom": "sha256-duHyGn0yARx70fSo5+PQLAlLqTBUbUNoJFfP/dYa91I=" + "io/ktor#ktor-client-logging-jvm/3.0.0": { + "jar": "sha256-VPWVvr26mEql1nZr/k2ZlLErMOLu+gMd0ZzF0+cASgk=", + "module": "sha256-BG20wfsZIQVklg9QhnAW2+9KpjXbvEp9Y1XEQtgZ5r4=", + "pom": "sha256-bfYvdXx5aBJP2B737DJs8i2xfbMIbxfp9qEACBn8Fn8=" }, - "io/ktor#ktor-client-okhttp/2.3.12": { - "module": "sha256-qbO/16t1wKjwHfdeBFgZ+QarS+hmNntpPI8rEV7ib9E=", - "pom": "sha256-bJpOKExTlJOcWcJPMBw+Um0v9ST/MY3+xTHPz53+CPA=" + "io/ktor#ktor-client-logging/3.0.0": { + "jar": "sha256-mHGJZAhCeexxqus3CN4eJKA33wamhBHIvjT2LBgQNMw=", + "module": "sha256-ldf3dcH61Ixik2hxBWXeb1gf257VUT7QvdzTxTagLvE=", + "pom": "sha256-uX8Y+QLz7wPBRngBvPYPTbeOw7vM/FWLNJSOR16A6Gs=" }, - "io/ktor#ktor-client-websockets-jvm/2.3.12": { - "jar": "sha256-1oyl95W+4IelVSiXQe9jhlFJuOUFuy0I5Fyh8x2MYuI=", - "module": "sha256-SNST0Ov+mK7puBx4WrgBR30iVTSC2UGUqEaeuPzp4cA=", - "pom": "sha256-VxEuZo1G9lKoq7yyVorduwzHbenEQb7+I86hrwYljNo=" + "io/ktor#ktor-client-okhttp-jvm/3.0.0": { + "jar": "sha256-p9mmD55TfEseB73ca/N7D+bSXFiNmT+DE2eHsevH5SY=", + "module": "sha256-tfBQk+8L6NeGdHdEtW059dJyhfG54umsf+32GBAXrfA=", + "pom": "sha256-b3jxdL69Mwc2L7OXgQjvZhIU6dqIjqvkTrJxewLevIc=" }, - "io/ktor#ktor-client-websockets/2.3.12": { - "jar": "sha256-qr3hPBfOOQOkZD+X89uWRfRiuDLtXQeDb2WBtNMMoz0=", - "module": "sha256-lBQ+mI228ZzeU2u7pdkwc2gxy+OFaPQoH5VSQgpanJ0=", - "pom": "sha256-DjRE95fKkOKxq4ZqH799sfnZBQguKl7v0YKoSrDxQyU=" + "io/ktor#ktor-client-okhttp/3.0.0": { + "module": "sha256-mnEmHQPWnGpy0G7rE8CFfxxjX5zEZkYE4dBa1VFJtl0=", + "pom": "sha256-4Un/ScN05PknjuBYCQ235TK6LoFPjHwILD14HRMfS1A=" }, - "io/ktor#ktor-events-jvm/2.3.12": { - "jar": "sha256-RPCx3msJRxgtJUCNEQHFbPjAGnuAnuAVK9gdmtyapXY=", - "module": "sha256-wbvWTDPBa1jkGAsX84UjGAVQl72vhJFKSCNhkxLtJ7U=", - "pom": "sha256-PKeHv6OHkBQvbKaLwYR7+AAtHiSDh3nhihK1vwIna5A=" + "io/ktor#ktor-client-websockets-jvm/3.0.0": { + "jar": "sha256-b6MvwTEvhkbtaoRXSNk2nvC/xOuKz/LxLHOFmFJ/g/8=", + "module": "sha256-vTOmfaXJez0PEd5S8bXiTWc1VTAibWp7Qc0LslIHZUI=", + "pom": "sha256-vECMavY453lRRmLluc/uzXiJvnUN9yhlgnYlyTfUbpw=" }, - "io/ktor#ktor-events/2.3.12": { - "jar": "sha256-dQdvbe9/VwlGkWmYMw0n28OvdhfOyyXRZXyaDUKQFgQ=", - "module": "sha256-+Smg6nj7EudbLYIlbMUfGL77D+8ZpGHuuJOJyVG43q4=", - "pom": "sha256-OUMSxuErQx+I/6KbrRS7mTXvJRBgyWWhatNcLxEr56w=" + "io/ktor#ktor-client-websockets/3.0.0": { + "jar": "sha256-bHJ51BRecggrWv5RsTn4KhIy0Z0y71tjU26cokrHfwg=", + "module": "sha256-WYHr66PadulBfFn1s5H+B1WRzJHdWnHKy5Jf8Pv0s08=", + "pom": "sha256-q0VIACgLhfvUBfvS8V5MW1Lbyvn1J75E7Acw9+/i6vA=" }, - "io/ktor#ktor-http-jvm/2.3.12": { - "jar": "sha256-kHERxDmzvUQz0t67aHkg1fjfjGIpto7VQIBdXjdjtqg=", - "module": "sha256-HbJfyAaPHE6s8LRgJCSSclOZItL3xCWOUR+F4FhSuMY=", - "pom": "sha256-QULK0p5v7rrjm64YKryEmVrsdwRk8lLfT+ZF4aXdfBM=" + "io/ktor#ktor-events-jvm/3.0.0": { + "jar": "sha256-hYuNvw+oTgKBYMw1jYgAKeImhgqWUdE1I95DaGn1qAQ=", + "module": "sha256-MrOYUrHaB8Ok/JO52KygXs/M1JdDIIsMxN8Zo9BdKw0=", + "pom": "sha256-pvL+a0iw1GRaHneE7ksqXYhRzhANxmiPXBnd+dRPLUA=" }, - "io/ktor#ktor-http/2.3.12": { - "jar": "sha256-2RVRfiXE5feMUP0Yg3twtGKbhQ7sXmTz5GF8Jj5ovbc=", - "module": "sha256-97kqlGhYpGSFonWEZ7EolLEmNK3B1AKQN62Fiec7MOU=", - "pom": "sha256-urBNfz5lqaxHnOzij77ymx/UAVkT6ZUZfHbORE9uWGA=" + "io/ktor#ktor-events/3.0.0": { + "jar": "sha256-9ZTNha1EJSlDiwtnUxk/nQcddWC+0Jh/RI/N1eKFUBM=", + "module": "sha256-f6YQu/QOHvwO0R7EfBuHmxtfoj+BGuo3SPBn12I4d5A=", + "pom": "sha256-2HDxlAmG2penAr/ssP/r0mn+Gh+dmlVtwZRsNu0zzEQ=" }, - "io/ktor#ktor-io-jvm/2.3.12": { - "jar": "sha256-HZOkVmX2dE/5bNe5ekX7hf/scltjvMMn0zomocfgX70=", - "module": "sha256-ZH9Yx3f3Z9IIkwbbiF9o9YyJjqGwm4+956NwUC/61BQ=", - "pom": "sha256-W8eJXaz7EhDj8C/Qchz7sSaQOaFqr5PppHGpMa9Ufe4=" + "io/ktor#ktor-http-cio-jvm/3.0.0": { + "jar": "sha256-uMqpcgttvrmKEuPXZlLZePe9237p0QO4xHJ+SK2t+Ew=", + "module": "sha256-F1/xTt58LIlDrv6ZM1mfNI0twO4Z0bMJnR0P2hm6SOg=", + "pom": "sha256-hcmW2+P201EgrxIjDwMrQ7d4x0H4tfHZJWgCvsFj9CE=" }, - "io/ktor#ktor-io/2.3.12": { - "jar": "sha256-n4jHL7xCPrCerCM9Qc4/npXZJQ4EntgD4HSoIeQsv3U=", - "module": "sha256-QCIhmbDLWK9t6Kv8UzMIVLv3h05GYpsma49J68XW54U=", - "pom": "sha256-WAtT3KPqyxvto29WIH+8uA3T9hk5h5/iEhd/G2RLJb8=" + "io/ktor#ktor-http-cio/3.0.0": { + "module": "sha256-BryhzL2ZnhkXL9sMP9fFchEO2Zb2er/p77yKCqOjX4k=", + "pom": "sha256-rQVo9KYQTK3KH7vr8bytRxo5cPCCMfE5Lv3WhMZeMKI=" }, - "io/ktor#ktor-serialization-jvm/2.3.12": { - "jar": "sha256-DgVTT7w7CUESe27znnBcNMNn2uiwoIKQcBxg6X6I+nI=", - "module": "sha256-GTKCfmbOzf9dgIaAjJdK/es3fM/bL50f+UBFdX8o1LE=", - "pom": "sha256-NrmT7RV8Xg2N6VDQjNIZyykQnY37JPYIyonzI062VzA=" + "io/ktor#ktor-http-jvm/3.0.0": { + "jar": "sha256-5YLda+2FFQWMn2obwwfIkawnkL0teyzJ7uwBbOUiru0=", + "module": "sha256-4gQAv16GCdB4DmNqz41jTEbprpYcDcYQaf9ednDfzJI=", + "pom": "sha256-66HWXy8EQXLl17IU9TKqngBZH9IEbddnqwwCX36quME=" }, - "io/ktor#ktor-serialization-kotlinx-jvm/2.3.12": { - "jar": "sha256-xhQnYJ9dbw45jfvySnyafftK1ZDon1TFwCHNfHEtSn8=", - "module": "sha256-UO9Nf4ee4QDi2uz81/tHpIX7/CPcNXDAPki21LZIfgg=", - "pom": "sha256-XbOFoQf2k+Mgk+TrG92VWfIqVsJdvxkN77eCrAtQocI=" + "io/ktor#ktor-http/3.0.0": { + "jar": "sha256-CEl/mOtpUABmJ4T12qd2FOw+ZsoemAM5zLPYri5Hr1c=", + "module": "sha256-lM74twGDwzx0gSwe4aD8lnlUAj7VzCIeZaW42UkqmXA=", + "pom": "sha256-jlUcXPg38AJy34ylxQOfRDIeoIO+8rLP73qofrqNVaw=" }, - "io/ktor#ktor-serialization-kotlinx/2.3.12": { - "jar": "sha256-+lu+kbBqPGUW1olfbvKp15rAEJO5jDKAzCv/+kgktQg=", - "module": "sha256-giYVZjIHuPTT72bZO+yzk1QhDhUEgOcHrI/LFkmYPRA=", - "pom": "sha256-1WBIrQOYmjq3ZFiYEZZ/Pt3edNBwPNGIQyS4LWCDHZc=" + "io/ktor#ktor-io-jvm/3.0.0": { + "jar": "sha256-ustZQyg85u0gFCYJeUXppbVqyV94O6abqFRWT3POT70=", + "module": "sha256-C868aTrqNg4R36xXe+9d4qo8QhBcCHPUPMj/sTzvRoM=", + "pom": "sha256-6uEaluV4CT87forg1wW3Xx11llzvt3Xq8SNz+O/zDjU=" }, - "io/ktor#ktor-serialization/2.3.12": { - "jar": "sha256-I/oFsvofdMi+5JsvpNCmzRaXdvXLw7e00I5nfmr7n14=", - "module": "sha256-k6tLV6lbcXNH6smUDI5QkhvQ2EBKw4j6mDlLRaqMRGo=", - "pom": "sha256-Q3WCoJTbZp2kPogfpctbs8IGJ+O+HgNkqk53hSqrG4Q=" + "io/ktor#ktor-io/3.0.0": { + "jar": "sha256-CZDBLe1OL74D6pFX4X0hoNH0IXtdjKlqV8r0NY00Mhg=", + "module": "sha256-9ZwwqS0Pw6mfz+Iho1F78enmaHznA8neNopHZmyBy8U=", + "pom": "sha256-Z49tKZWdnC2PV78B76DN0wNBhlxiC3eGpw9EaHhvtb8=" }, - "io/ktor#ktor-utils-jvm/2.3.12": { - "jar": "sha256-anLWhnMwBl7UYZUv/xnqVbqEQ1L3SM7Bhy9bx7Ie/AI=", - "module": "sha256-rYMuChkwgwCinDQNvY2I0pAcLzuw+CFhrWamLSB4VgQ=", - "pom": "sha256-Xi3ckkIaAAWDUdMPo45yB6qYsZ6fLYCYRFmIB3yPNGE=" + "io/ktor#ktor-network-jvm/3.0.0": { + "jar": "sha256-aKbOFcq9o5XK+Nq1X6+NfcnjH3BshrLOkMz+dHSIwwU=", + "module": "sha256-QQObTaUHAcPcLz0ef8qOhRrQPvN7Rndws1JQPo2MoRY=", + "pom": "sha256-84dDKHVkySEeG9z4f5anqHzR/TiiZqQsBjkUPDbESPw=" }, - "io/ktor#ktor-utils/2.3.12": { - "jar": "sha256-SJeUj4AL85YHGPuaWv9QErcht7iWZjhZWCbGstp8TiU=", - "module": "sha256-Rxwq3h1BTGX6Y9C0LIdLqcuUhGsZQQnD0PAEOwtnt6E=", - "pom": "sha256-lIfQwBRDfsjcthP6Gl345WmTsc7wQqKXMPw99SQlsrg=" + "io/ktor#ktor-network-tls-jvm/3.0.0": { + "jar": "sha256-w6Xr0Z1DiWKpZFjTptuyJDJTxSjWtgloLPObh68bkNk=", + "module": "sha256-/tUy73zGrUvrVIBb82LrIiG1SHQkxHQIZw3HOFXOM04=", + "pom": "sha256-NLeibN8zzWUCpPOngEj5sgX5ZAqRBh5EFYx+lck9IiY=" }, - "io/ktor#ktor-websocket-serialization-jvm/2.3.12": { - "jar": "sha256-v/iQ16thcVUa5PBjLprsy5BI3zHW1zz1Cr1bMwCArTo=", - "module": "sha256-PeyRtQnxTtpFGjWpyOY+bmuNJz/4i2u74BK7dTzdOwk=", - "pom": "sha256-pqTtw4NX9DjErB5Zbqp4SILGmurmVz1ksaKrc/cNBp0=" + "io/ktor#ktor-network-tls/3.0.0": { + "module": "sha256-zSpBln//ZOOe8ow60Hta9o2BF0C+eIJVCj24o8qgoAM=", + "pom": "sha256-WsIkLG+Uxz8ZmNky70+OxI8omNwjuunuPp5F1xdYChQ=" }, - "io/ktor#ktor-websocket-serialization/2.3.12": { - "jar": "sha256-JCEwwgnDIoLZ8g7EnlfXSBihpyiADs2QLe7dzwURgMU=", - "module": "sha256-lbcbDeXFGs93fnTXkCAnFoZi59dR3aU7lJ/C+ChHSuE=", - "pom": "sha256-eU8LskUjFQQH8+ZTrYqUYzKptPmp1ryv/RBlvxN9iSw=" + "io/ktor#ktor-network/3.0.0": { + "module": "sha256-3EgpWzP2klWeajqD3fBLMXBIVt7y86oaF4x7qyKM4qQ=", + "pom": "sha256-A8TtZp2CmBY+KwEWDTKyqtNMpMtY40U8UYP6xzjY2NE=" }, - "io/ktor#ktor-websockets-jvm/2.3.12": { - "jar": "sha256-3DXMU59N+lpK2bORwU0GUn36xPZLPj8FD1FDzrIVvKQ=", - "module": "sha256-Xcz1g9dBybFg9pnYyGS53n6JrFz+f2fTHQIHvaejvl0=", - "pom": "sha256-Pc9D1TtWf3T3z2VvF/r7QfRtqztf+6AHZ2EsJH/W7Rw=" + "io/ktor#ktor-serialization-jvm/3.0.0": { + "jar": "sha256-tphacvF9XmNyJga+0q4+7V8qG2guBQ00s/RiOJ1BZMU=", + "module": "sha256-WxJ3pA51L/9d16G0KUIX5yA05F0DkLvYDVXSwOzeduI=", + "pom": "sha256-dbdCQwGmzkLBWMaLHdk1WFR5kPgldH2k++lrx/jb7rY=" }, - "io/ktor#ktor-websockets/2.3.12": { - "jar": "sha256-XdKULp+AhVyqGFXiShT3DxqHWcg3tFTplRdqPMl3QVg=", - "module": "sha256-7biouqRoijD0YqQtIuirAHY4HvISCkwKqyasIkTsQaw=", - "pom": "sha256-fikEQUdSd1ifC2TgEptfmZHQir9YQwZCzMXfiYbEh+E=" + "io/ktor#ktor-serialization-kotlinx-jvm/3.0.0": { + "jar": "sha256-Y/3fsW8jhfou66QDYK36mZORJmfjNbBUbizE3g/WamQ=", + "module": "sha256-pNrlPxx/8Gok5UuUZh8MSsuG6p2okwAAW1kzbcBnbXc=", + "pom": "sha256-Cn/umjR5S15uoqzhlA97DP+2eYKJhtzQEInaoLzFgmw=" + }, + "io/ktor#ktor-serialization-kotlinx/3.0.0": { + "jar": "sha256-AWgIAmI0ygHr3iE67Uc/T8+4VA3xLkPvqd9NjB2HBtc=", + "module": "sha256-2n1xFSKjIhKqqzrFXOi+g272X+fBxaibqH0DbTOsUEg=", + "pom": "sha256-hrIYOupbviqDE5LlbUGlsNlnzL/pUs1rydbtBTYJw/g=" + }, + "io/ktor#ktor-serialization/3.0.0": { + "jar": "sha256-sgYtSF4XAhkeDpzlck6xSIxujiT3pzHd/GVp18XNFtc=", + "module": "sha256-6Hm2OkUpK6vY+9Vq/apM0tRcgl9UDUCbV1qtMreBzgU=", + "pom": "sha256-GCmTn7aFj24LQt0gXZm6Rbs0WQXtGX9nZsNKxRXzHHw=" + }, + "io/ktor#ktor-sse-jvm/3.0.0": { + "jar": "sha256-2JiNEV264UTuMIXtHBdKj9liZbxgM08oe6T1MvsGEk4=", + "module": "sha256-8jNJUX6IfymWJgNyBJg++6eqZV76pBSoeI0GxaCiflg=", + "pom": "sha256-Pf5Qu4jMkmzPn4pQouE0/ZzLPrN7W8pXW54OH0T4hu8=" + }, + "io/ktor#ktor-sse/3.0.0": { + "jar": "sha256-CkMI+fHIHh4OBspttiiNLerdin6lbj0ecsGurdY8FE8=", + "module": "sha256-JuiqoUnE62CLupjnCtcASvcN+DTD+BhRxeSOpA6ocX4=", + "pom": "sha256-J62e0p1svkljhSjK59ygtKmhdrhhdFBSSw+KIG6OoSo=" + }, + "io/ktor#ktor-utils-jvm/3.0.0": { + "jar": "sha256-lDZE3TKFJchGh7zbQjblTTN9Gh0MQShovw7dU6XwZ24=", + "module": "sha256-No4rXA43P0HACHGBm0/PSaZbUDuLld9t3uy8RnAUrvk=", + "pom": "sha256-kBqY9RkGg97j1yDTayuOhAcVLMTA/H5ZQTqYP8JITjo=" + }, + "io/ktor#ktor-utils/3.0.0": { + "jar": "sha256-KhfT/Xw0P8joWZ4YGu61WK9gg97quti+DONF/yODxHI=", + "module": "sha256-ycYexU9YjOSZHvczyapSggPDQV3d2mJS/sxpLk5sgyM=", + "pom": "sha256-I7S5AYs7mWJg4MgMDskOaOQgknoBshGwqkZBa+NDkOU=" + }, + "io/ktor#ktor-websocket-serialization-jvm/3.0.0": { + "jar": "sha256-Xbqz6z12xUytvAAfC1DEK9ypIJIcKuLGnMCBg6DsM0A=", + "module": "sha256-0eyfafctLS7fjzXprokVGSMPbvj17Y10IunQO+d7s9c=", + "pom": "sha256-4YgNYCDataGuPj6V+Sp+NxpC67ddXbp+DovuLvyUsNk=" + }, + "io/ktor#ktor-websocket-serialization/3.0.0": { + "jar": "sha256-5AGS3sjS8nW1CBCTYUwci8XWzz9Dg0GmVK241fmFwnE=", + "module": "sha256-k+e4Y1Helw6ePdNX1gkxKjmQAFku8/FRs0VsXQI76z4=", + "pom": "sha256-exvxu8zgYx2lyIa1b62xwd2aPTqLDL21Lp56URCPx5Q=" + }, + "io/ktor#ktor-websockets-jvm/3.0.0": { + "jar": "sha256-dQt7iJh6EZ+jK9yt14FVV8NWNYe7temFx2l98hBieaM=", + "module": "sha256-9PY7ei2ivWRtfqoKU8pULQE4YkuMTKMzTEaK92lxizc=", + "pom": "sha256-+aeJOtYmEras6xdL+BwwdUGKIJ15JodU/XnYKKAM9Tk=" + }, + "io/ktor#ktor-websockets/3.0.0": { + "jar": "sha256-phi7sxswNCc9YhDNMuTD5OJ+2vi0npU/Kf9vQdfcso4=", + "module": "sha256-fOCebPFtIZtUgJ98HXjDuuY3LAEmB+IEgVbGaeKiGF8=", + "pom": "sha256-eNL1rfAuoz38I4lK4bYLfhbKJiGwPmKBOlEgUMgBMlI=" }, "io/netty#netty-buffer/4.1.93.Final": { "jar": "sha256-AHx9nDeN8C05BWfQ1931Qv/dsCG3MT2/UCOSET/6uwg=", @@ -2206,23 +2236,77 @@ "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" }, - "media/kamel#kamel-core-desktop/0.9.5": { - "jar": "sha256-q9TSnDOThoqV9YEyU1cBjuowoN2a7QbDDNyv8cJ+m0w=", - "module": "sha256-bExl33UFF/bJa7mRqh+JVA8lYD4G7y9V7svnkzBA9lc=", - "pom": "sha256-4+vAf2+3wh9bib7xc+5KQns3xzvEFhWMJ8l0EayFgms=" + "media/kamel#kamel-core-desktop/1.0.1": { + "jar": "sha256-8vKOmPKlyGT/PHcEyrH0BQkYGsp07Qcz0P0+DR2Zw+8=", + "module": "sha256-CKKOsNNILL/MVX4eNg5YSEBWr0cKOfmzDZkLyiKZIr0=", + "pom": "sha256-/9V0d+0R5jbb9z0u6zw9ZPi6k4CpwDcKx4tqSbnze4w=" }, - "media/kamel#kamel-core/0.9.5": { - "module": "sha256-o7ZF44wFJCXXyhmWWE6+nEX0L67aYyEXV9ZTC4Pz2zE=", - "pom": "sha256-iRvxS1TFkxpw4QWQkAYp8mgA1FWM3hdldMZJvEy1Z+4=" + "media/kamel#kamel-core/1.0.1": { + "module": "sha256-H4FkNQdjPKhfz2S3yuvawg0mru3nm5QuvEHIooyg5Kc=", + "pom": "sha256-HN563jjU0YGQRjG648IZ0yD3nQ0agoTbTCYZoY98jYc=" }, - "media/kamel#kamel-image-desktop/0.9.5": { - "jar": "sha256-hcIZ8U9u3bJM+u3uLnf9U7lPaBBpRrKpjLC3ZODCFKQ=", - "module": "sha256-GIUN5w3IniJ03C0xIzhABInowxxi1niWQRj0Yh8Lcww=", - "pom": "sha256-dMQr6gAM5sTJPssay+jFNi70msEMTJDz9CzS9YusgEM=" + "media/kamel#kamel-decoder-animated-image-jvm/1.0.1": { + "jar": "sha256-SVItvyv5ILBqn+cR2fnlU/IPLMvKyPgL16UD8f5wWVU=", + "module": "sha256-fG/Oz6p5DSvMU1oMy2i90w9Wuqh4VGxxL12b6QAi69A=", + "pom": "sha256-0rTizFuE/zZB7f0bgvm8gSitaKv59SRdu9sUXvjshF0=" }, - "media/kamel#kamel-image/0.9.5": { - "module": "sha256-lKjteS+qHphhO9C1gpeipIVDqKqp41kXB1x32sQiunE=", - "pom": "sha256-IxeO09JzxhY98/inBV9cU4oksNpXGYUFsFyQ1bdau98=" + "media/kamel#kamel-decoder-animated-image/1.0.1": { + "module": "sha256-PTstgotFXOJ/IDn+68g0Y14z2CjE+K5b/Azw0KZ0vjA=", + "pom": "sha256-s9YLVLRetKBzBcSbHTAs5ARfq0AzU9GPrJZdUaieG1Q=" + }, + "media/kamel#kamel-decoder-image-bitmap-jvm/1.0.1": { + "jar": "sha256-YJ8Kq8+FBtNrcg7BzuUZO/BJqWi1cMb1ACmGokZ3bqA=", + "module": "sha256-Hj8292JjzDiNFyosy2mtPdgnY856U71BWpNHN6JXykg=", + "pom": "sha256-TsyEfyOCza1utcvDidlsTTx5P2z/SdsjS40KBBVoLF0=" + }, + "media/kamel#kamel-decoder-image-bitmap/1.0.1": { + "module": "sha256-bGMQcs47rFFKZtxyfPG3+Y3q9FW5omsJHUUMOFsA9NQ=", + "pom": "sha256-2H7DNLj5q7ydVwLOuasaj2wBCSblSwHPa7DZXsYPXFw=" + }, + "media/kamel#kamel-decoder-image-vector-jvm/1.0.1": { + "jar": "sha256-yt6sb2hn2pNOYwhsvvA4zXbQYP7BaAbCnSSKddGUGgE=", + "module": "sha256-5fkYIJR3T1ape4M0kyi/WcYfgnqgwwCy02yEfBCJYTU=", + "pom": "sha256-xHylt0kkZXXK1JHg6thTVBafGpZsG2swu2NPm0PW5aM=" + }, + "media/kamel#kamel-decoder-image-vector/1.0.1": { + "module": "sha256-2zU1AaJ92tjuTAs+BXrnDgf1dxTvMFxAFdUbHV4DxOw=", + "pom": "sha256-U27v42PhrWYaZuPN1q5Y6dK7TYTo7t+6AAfoQF3ykHs=" + }, + "media/kamel#kamel-decoder-svg-std-jvm/1.0.1": { + "jar": "sha256-ERkO0a3BAKbPH1DgdnxHWGB6m8+heC2yZ1Vf578zZMY=", + "module": "sha256-KtMHGYxMW2yHCKSFdNeHJ950taP/KPwha1yls3EwDVI=", + "pom": "sha256-BBMl8hh54taGflYEuB0uwI6VZvi0ozxzYNqwvTsY8V0=" + }, + "media/kamel#kamel-decoder-svg-std/1.0.1": { + "module": "sha256-wQW13UlxDGTDkWUkPgK2FpgNi8WN7V+3e/kEfHdOR10=", + "pom": "sha256-onFDz/fQpE9590nSpZnX6iaH7oafEK8MjkabCYcZNPo=" + }, + "media/kamel#kamel-fetcher-resources-jvm-jvm/1.0.1": { + "jar": "sha256-waJjSnPzMBsj21DVp90moiFGpbgp8IMMsQIdhLch80I=", + "module": "sha256-1GTYoXbFRIau3JzvaQfon7V2B5Xtr7WXDgXFwX15zB0=", + "pom": "sha256-ssYSzIH/yo138/ZgDq6UgT9hYamPBnllM2H2g52Igww=" + }, + "media/kamel#kamel-fetcher-resources-jvm/1.0.1": { + "module": "sha256-//HU2afNeW4SzaPxdhZyIjfSZNZ6lTfld/+X1d+jSxY=", + "pom": "sha256-VU0rk/zn0iyxqraaTEq9OKH0ug9MA6uOY4YRsOmJbOo=" + }, + "media/kamel#kamel-image-default-jvm/1.0.1": { + "jar": "sha256-/CcFqll+8JmLBj2FkiWajx0HcfzReIjPL54CYD/CiwQ=", + "module": "sha256-jcOjGd53g4DBbJCxI9MfR0FgBUsHDUF6UFsUDdu1k8w=", + "pom": "sha256-Wj+xE+vtx9mCeSGmns8aHnIOPPLmp9HfC88eQSi/vNY=" + }, + "media/kamel#kamel-image-default/1.0.1": { + "module": "sha256-SFbCHa/OFee6/3kqMXUFUPsJJ+qyfhucXDyhdLK1p/Y=", + "pom": "sha256-83dDAmegjOsqSwGiZj6K18Ur63RjP+McmtbnnDzG22I=" + }, + "media/kamel#kamel-image-desktopjvm/1.0.1": { + "jar": "sha256-vgmSUIpe4daxBiqdbPUJGBL2BgOLrS6c0waIl1L9Ln8=", + "module": "sha256-O59acoMjfMgzDcGJFaMlj/tkyzfJuSv+F+E0KH5YrfQ=", + "pom": "sha256-YIiiImO40TkdYTIPYsQKsyPAZsY9XVCkiZsujhMQXsQ=" + }, + "media/kamel#kamel-image/1.0.1": { + "module": "sha256-faLXSUC3gTNAbabysCyh9o+WAK6wO7fOLvdxHTodonY=", + "pom": "sha256-QXovGqqUSErVNV0ylHdRkhVC/TgIKtC7YWQLBEMMdWg=" }, "net/harawata#appdirs/1.2.2": { "jar": "sha256-wf0q5mJLk4+7/Cr4fTdlb6lTYRNW4lKOhN0EYor4B68=", @@ -2278,13 +2362,13 @@ "module": "sha256-6NeZJbYmUlEtku/D9v+0SL97teQQtwDt7KpabA6mfm0=", "pom": "sha256-gMRjsS90NbGxi0UXYRjAKoktGFJnfzP7sHF29hI3UlA=" }, - "nl/littlerobots/vcu#plugin/0.8.4": { - "jar": "sha256-54Zg4AVaPeGW7E9O7cBB34upJus06eLzIlnIj9/OLrc=", - "module": "sha256-cFqZ+tmabls7BiLsrXcF3+D1jfkXOzo5UdozWkYGNqQ=", - "pom": "sha256-U3Oz7JPtlCF07QEuUZBTR/PCmms0DEl+PJBfc8HEiUo=" + "nl/littlerobots/vcu#plugin/0.8.5": { + "jar": "sha256-bMCdHHgrZ1qTLIzypOMDQA3uPPRGShOuUa5k04oBgtI=", + "module": "sha256-B9AOrP99ZqEmVYp7WU1BaSfj9QBjGHoApMhdmf16ZwM=", + "pom": "sha256-8ydVioHfhiKEe6DDTyxKRH8/pEW/gumvo7vaTbktX0I=" }, - "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.4": { - "pom": "sha256-wXuWwZU3Y1m5uVZLE/ivDIGvCWFYZJaY3rlpYET4L68=" + "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.5": { + "pom": "sha256-W/veb7xPghahHsYmub2pMmzhrSEt+/slMg0YtjBCoFc=" }, "org/apache#apache/13": { "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" @@ -2304,29 +2388,16 @@ "org/apache#apache/29": { "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" }, - "org/apache#apache/3": { - "pom": "sha256-OTxQr7S3qm61flN3pVoaBhCxn3W1Ls4BMI2wShGHog4=" - }, - "org/apache#apache/31": { - "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" - }, "org/apache#apache/32": { "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" }, "org/apache#apache/33": { "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" }, - "org/apache#apache/7": { - "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" - }, "org/apache/commons#commons-compress/1.21": { "jar": "sha256-auz9VFlyillWAc+gcljRMZcv/Dm0kutIvdWWV3ovJEo=", "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" }, - "org/apache/commons#commons-lang3/3.12.0": { - "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", - "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" - }, "org/apache/commons#commons-lang3/3.17.0": { "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=", "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw=" @@ -2379,106 +2450,27 @@ "jar": "sha256-CysRAsGNPH4Fp3IUubdQGm9gVhdK5WBODiVndu2nVT4=", "pom": "sha256-37/W/+KnhMqYF8RjZap/ileDILgFveOdb1WgsJ2KqMo=" }, - "org/apache/maven#maven-artifact/3.9.6": { - "jar": "sha256-rXoPtAj45HWFzMDQAR4LUB2Tv8mIjTabvUoEPRlHUHM=", - "pom": "sha256-thCjsCWYK5hXbXZkkArOMTYvAFgnBR82mOZJ0onz/7U=" + "org/apache/maven#maven-artifact/3.9.9": { + "jar": "sha256-MPAV0cGjk+GcGM1PQ1MgicNtTKMoYIzj3aeLdNPTFRU=", + "pom": "sha256-Zd33a5KnB7nxJA7Mu0d0sw1Md3eGcSkf01XgbU06lt8=" }, - "org/apache/maven#maven-builder-support/3.9.6": { - "jar": "sha256-4fTSeERZzoo0udrhgpoZmbVp5IPiHun6pzaGkecpKW4=", - "pom": "sha256-fel2uM6xpmr+Jn8qp9YVcA0JxREHqt4hifaf5DNIKlA=" + "org/apache/maven#maven-builder-support/3.9.9": { + "jar": "sha256-LKSpZ73RKp6F1A4BI3T4bmPUoQMMGZ2kgy49ChxncNg=", + "pom": "sha256-CsMYAC8RBXG6pXHs8gaX/sR2cEjSl+JohFW5FNUDD/4=" }, - "org/apache/maven#maven-model-builder/3.9.6": { - "jar": "sha256-X5ba+8QR7ksehCY2jQ0x0Fq1pNrOaYCBQxQqABdZhyE=", - "pom": "sha256-yMK3G3CDmPoHecNIR04O/+R3kb/MgPkikhnzCzoqRSw=" + "org/apache/maven#maven-model-builder/3.9.9": { + "jar": "sha256-pDdxgqwuWt/ha+OzyBmBpezdqwFBhN5yrh5SLwSndgI=", + "pom": "sha256-nSOvDg8jIkwgMgnRG3asYJClqWfT2IepIKekeyYMC9g=" }, - "org/apache/maven#maven-model/3.9.6": { - "jar": "sha256-T48H/ba4cB+omiOi7fgwgI/WWJLZDM5AwObffI8vy2I=", - "pom": "sha256-xNfsyyheYhET5UPvKT/SffqNEuoGEh81e8sR69gHrnU=" + "org/apache/maven#maven-model/3.9.9": { + "jar": "sha256-j1mwoW/pyTO+dJpgrgcFoMsze7WrrziAG0C3QP93Vyc=", + "pom": "sha256-G0gGKxU4fBxCBBV64ZpWCRnftXKLPpKhHlUD8iL6q0o=" }, - "org/apache/maven#maven-parent/41": { - "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM=" + "org/apache/maven#maven-parent/43": { + "pom": "sha256-RooSYumqpf6/nWBOKDYmf4FTUfK0Ug8o+xf1PHHjNVQ=" }, - "org/apache/maven#maven/3.9.6": { - "pom": "sha256-ugvzJcUpVAWOmnAp5AJzof4GvkpQUw9qTrpGxVih5Kw=" - }, - "org/apache/xmlgraphics#batik-anim/1.17": { - "jar": "sha256-Z9nWkezshXrDYo+9IWfCAZQNPEtlq3OGSErHMMuM+eo=", - "pom": "sha256-SNpMQT2e8VZ6EKLn7UNPpbuOzrfolW9jxLlw42/avxw=" - }, - "org/apache/xmlgraphics#batik-awt-util/1.17": { - "jar": "sha256-f+OPlFHrlFdSFDIyYcgZK2Px39JhBlklX7u7/elKKmY=", - "pom": "sha256-K0uhvyKqtiKmdyIXZTnRlWJ92KVfggGRq0udbh/PrgI=" - }, - "org/apache/xmlgraphics#batik-bridge/1.17": { - "jar": "sha256-O9An4ZoL4klsLDlQFSUlyRRhp9CB7b2Ci7PS0mnsWHA=", - "pom": "sha256-SfOQORML7tSikG1DGOSpv8l+yRax0bo+trqK9BigvVc=" - }, - "org/apache/xmlgraphics#batik-codec/1.17": { - "jar": "sha256-ZDSkhxe2nwWYaGZlPnXVKED4Es0rwnpb9diK7pXkEh8=", - "pom": "sha256-cfyOmfGNajQC9Dtl+R9OwtkiHy22pzTOvohmAUKOhJ4=" - }, - "org/apache/xmlgraphics#batik-constants/1.17": { - "jar": "sha256-ddsAGAveTvXK7jkW1vZeUEUFHVnPUdV+ZzwDlp17u80=", - "pom": "sha256-BtbvBrb+NCkKDiopaz95YejFX18VgvCVIcguAAt5Px8=" - }, - "org/apache/xmlgraphics#batik-css/1.17": { - "jar": "sha256-3PmpAr0MSxqErAVh17ZgUryTOBxJI6W8VgIpDByCt3k=", - "pom": "sha256-kt6q1WROf4uqA6h0YZwha2eEc02elByJYnkzsKmxUTs=" - }, - "org/apache/xmlgraphics#batik-dom/1.17": { - "jar": "sha256-8kLdsFsmixX/BV0dGq8tycNBjoQrqAZzFAiphNTjJAw=", - "pom": "sha256-5j2XE/BJoPrXcWpbixROVgr7L4Opygbe0mi0QlRTjyY=" - }, - "org/apache/xmlgraphics#batik-ext/1.17": { - "jar": "sha256-gmf8YLSlsPKvp9z9rUC+sOcj1qGbZrjiS8N8LsbcVFA=", - "pom": "sha256-SIjUiOkeJB9Apenz6xS3eg+/tGK29U7i4krFp0NYh94=" - }, - "org/apache/xmlgraphics#batik-gvt/1.17": { - "jar": "sha256-k/TkqETK/Fs9VzGimbwAzxRAQCbdyx10nSnKeUhrS5A=", - "pom": "sha256-zIhrsEtaMpUrKgtYmx3XNZNoZg/ysqxcBJ5MNkdSmpE=" - }, - "org/apache/xmlgraphics#batik-i18n/1.17": { - "jar": "sha256-1aZGgDY+ezaz8ow0o6U2126Ef3fOwHQKq3x5mme1LYs=", - "pom": "sha256-LczXNOp8Pf3cOQDcrOgYGIsUZsAq6dqK4wpwj3Tw9MI=" - }, - "org/apache/xmlgraphics#batik-parser/1.17": { - "jar": "sha256-XkSLv69hJ1Z/QfaY7iWtebhENjBxwS0RdYlseIkXF9c=", - "pom": "sha256-O4WKAV0DzUCF+HnRF81IbyijM3IIG0oRL/w5OjPzMOs=" - }, - "org/apache/xmlgraphics#batik-script/1.17": { - "jar": "sha256-LMu0vW1aYw+30m8N0xGNR0L3uuDpcu5nITDoA/ZylQw=", - "pom": "sha256-cev1FjXjwA1UnPAc/HxAZXssvZOCUVkUf73N0U83xqI=" - }, - "org/apache/xmlgraphics#batik-shared-resources/1.17": { - "jar": "sha256-XXQYK5yhns2NSBTy/0tCpK7qbhiXfpBcyE6Kb4GUDJ8=", - "pom": "sha256-ut4U1rq9//BiLBjNPCUf9flZN4MFieL2jgO92nu1RxE=" - }, - "org/apache/xmlgraphics#batik-svg-dom/1.17": { - "jar": "sha256-GTRyGKSQZwxLnSzRWkUVXBr59B539+rameuU27kL6OM=", - "pom": "sha256-BRKX2S6SjPAcAWqpNp8zhw7EEBQ0j30C6avoVZKIvlA=" - }, - "org/apache/xmlgraphics#batik-svggen/1.17": { - "jar": "sha256-EI9yX/4TXcpWbZJfOs4mpfgDmfKIyhkFYYBd7CgAXWM=", - "pom": "sha256-3HgOLwRWFTzXBP+zLhjGababh+ZW77ku3KNv7tIz1DA=" - }, - "org/apache/xmlgraphics#batik-transcoder/1.17": { - "jar": "sha256-H2nphrRukfcHzxMUP04ukwufYKaXhY26vbq1y4bNWg8=", - "pom": "sha256-4UQOu5q+0Ev3RDbBkVOFeGNE4iFBaooCLHGO2oY8al0=" - }, - "org/apache/xmlgraphics#batik-util/1.17": { - "jar": "sha256-oeT3Q8i4CsaC7dSzl/qkrELeWRNDA2MkyA7o8ilzyXY=", - "pom": "sha256-gtWFfUG9TeWskX7sgSoz0zKXN04UOAew4KYt7KBVofk=" - }, - "org/apache/xmlgraphics#batik-xml/1.17": { - "jar": "sha256-+8wjAAZqxAQodsUsMnrN8LUVli8WkEAO16eO0sDUwbQ=", - "pom": "sha256-0ypeBt4LkxxN2ebgS/oSQHwkNwmmmNdpZ7TnkYoPLn0=" - }, - "org/apache/xmlgraphics#batik/1.17": { - "pom": "sha256-D9ZlDtWtkmuw6X2xx/yMJqQOOmtrShOxR2XryjKvsTo=" - }, - "org/apache/xmlgraphics#xmlgraphics-commons/2.9": { - "jar": "sha256-Lr0zOrKmJFFHk8M2468IZghnMob+N7oeY54Kw+G1i+I=", - "pom": "sha256-CS1SCmHKS4pFkEN0JMQhzbDPQOeYrs7PKwUm8q+PH4g=" + "org/apache/maven#maven/3.9.9": { + "pom": "sha256-0k7WiSPfIQ0IW7XThtQzbRLt5UczkuFZ1ebmRJevbzk=" }, "org/apfloat#apfloat-parent/1.10.1": { "pom": "sha256-rHDBL+cJtXDurKOZT4NbpGnnJaWbvjYRDTpBImHgUt8=" @@ -2495,29 +2487,29 @@ "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=", "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0=" }, - "org/bouncycastle#bcpkix-jdk18on/1.78.1": { - "jar": "sha256-S0jqCE5SMrnXnryhiHud4DexJJMYB81gcQdIwq7gjMk=", - "pom": "sha256-CVIrr36Zuqk6JRXRbPHLlT+iJ41+PEbIvv8n3AQXKDE=" + "org/bouncycastle#bcpkix-jdk18on/1.79": { + "jar": "sha256-NjmiTd+bpLfroGWbRHcOkeuoFkIYiOVx8oWq3v5TLNY=", + "pom": "sha256-NeSfQTTeKsMmw6UKJXYsu021bzgC+j9zDMhbZTrQmHs=" }, "org/bouncycastle#bcprov-jdk18on/1.77": { "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" }, - "org/bouncycastle#bcprov-jdk18on/1.78.1": { - "jar": "sha256-rdWRXmrPxqtYNuH9il4hxkiFNqjB8h84bus78oC3Atc=", - "pom": "sha256-KJEtE5+e7RQcOUNx++W6b//5HnjxycuDSPlEok0gTtI=" + "org/bouncycastle#bcprov-jdk18on/1.79": { + "jar": "sha256-DYHswxJFNrU5vOmqP+liG3+Eyc7jcbY1pbMceLeasdo=", + "pom": "sha256-2PGgaxSddG6dmN5U4veqmy62E/s1ymfYrjls6qxmHuQ=" }, - "org/bouncycastle#bctls-jdk18on/1.78.1": { - "jar": "sha256-SDvRWC05V63+EAdH8ixtoP+VMtZGT5xFQYH5m/pE5Ss=", - "pom": "sha256-Y4vYWwP9193HoELp+C8gXgNq/6DfjS4vXbvzsIEQKBA=" + "org/bouncycastle#bctls-jdk18on/1.79": { + "jar": "sha256-Sv6EeOVsB7vaRetA+omJjxPEf7mW77IDjz91ob2kS1o=", + "pom": "sha256-igGqMNhmTofBiuQ0VlTc28EtiT44bh+KBjmZj4QjeG0=" }, "org/bouncycastle#bcutil-jdk18on/1.77": { "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=", "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug=" }, - "org/bouncycastle#bcutil-jdk18on/1.78.1": { - "jar": "sha256-2fpW+XsPdhzjvI2ddMXXE3qYe/W9Or/hAD+br6RaHS8=", - "pom": "sha256-dB1Vy0XEwsiJtaQ2t0fcIVKSMTLkJr5u9VUA7uf6UxI=" + "org/bouncycastle#bcutil-jdk18on/1.79": { + "jar": "sha256-xwuIraWJOMvC8AXUAykFQHi8+hFJ5v/APpJC62qyGDY=", + "pom": "sha256-4kwftM8WBUBaaYjp5NbksuH0OT/HOompRSrmJe4xHQI=" }, "org/checkerframework#checker-qual/2.5.8": { "pom": "sha256-M6xqDxNBrpZkfH1EZfSqPST+l9Jpe87izq5vyLXvLDw=" @@ -2541,9 +2533,9 @@ "org/codehaus/mojo#mojo-parent/74": { "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM=" }, - "org/codehaus/plexus#plexus-interpolation/1.26": { - "jar": "sha256-s7VBLOF4iRA+pWS838+fs9+lQDRP/qxrU4pzydcYJmI=", - "pom": "sha256-4cELOmM1ZB63SmaNqp7oauSrBmEBdOWboHyMaAQjJ/c=" + "org/codehaus/plexus#plexus-interpolation/1.27": { + "jar": "sha256-P7T7YUP9+WQCTDy3OFUVJLnqhOXCEc1mDFWa0HA+UjA=", + "pom": "sha256-1U+8vEOZ41IyKHSkEoudKP6f4Vg/iew2HeJC6jjTP5s=" }, "org/codehaus/plexus#plexus-utils/3.5.1": { "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", @@ -2552,8 +2544,8 @@ "org/codehaus/plexus#plexus/10": { "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" }, - "org/codehaus/plexus#plexus/5.1": { - "pom": "sha256-o0PkT/V5au0OpgvhFFTJNc4gqxxfFkrMjaV0SC3Lx+k=" + "org/codehaus/plexus#plexus/16": { + "pom": "sha256-aNTu1lo9u8NC7YDdE4++nGfLf7TCq8T1IBzbW59kWGg=" }, "org/commonmark#commonmark-ext-autolink/0.21.0": { "jar": "sha256-PNV9XR295yTmcAxTpZBTS7JPPiaV/zUF66MtxMd4G6k=", @@ -2580,12 +2572,12 @@ "org/eclipse/ee4j#project/1.0.5": { "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" }, - "org/eclipse/sisu#org.eclipse.sisu.inject/0.9.0.M2": { - "jar": "sha256-m2K8/DUqLsh9qLAeN8lSpU01i7sa8/ISZIrq/nqy27U=", - "pom": "sha256-BWZvJ5QRF8yt+rYykRjBw0j4uDjOie0jGCwVHLKUPuk=" + "org/eclipse/sisu#org.eclipse.sisu.inject/0.9.0.M3": { + "jar": "sha256-FTNcTc8IL1mfuO3c+1jWp+mpyX3iiDwlcImkebmyRSI=", + "pom": "sha256-V+0X4Fe6cWzB8eWy1OAUpow9UL0zSYInqQ9xJRkzTdQ=" }, - "org/eclipse/sisu#sisu-inject/0.9.0.M2": { - "pom": "sha256-djD0zU0WIAZ/qD4ddIsBLP+gZV5TgMwOSl4oPTtEH9s=" + "org/eclipse/sisu#sisu-inject/0.9.0.M3": { + "pom": "sha256-LkNlY9XK6jUbzl8IY+vGN2QFy2Wm9mSyVfqtnnLjuFQ=" }, "org/glassfish/jaxb#jaxb-bom/2.3.2": { "pom": "sha256-oQGLtUZ47Z9ayy96QITjhf9RAgH06dv1913GpnX2a+c=" @@ -2695,6 +2687,9 @@ "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.7.0": { "pom": "sha256-2/9VPqXxybksnQwdoeEr983HeciyDY+m/CotdzXJpnY=" }, + "org/jetbrains/compose/desktop#desktop-jvm-macos-arm64/1.7.0": { + "pom": "sha256-WIlrEnKu7QOcgli6rohipcNQqRgL5uaabEz8p9JOoa4=" + }, "org/jetbrains/compose/desktop#desktop-jvm/1.7.0": { "jar": "sha256-YsgWBzGVzAEZ3B1msXhUS9t3Lvi+5IeZVFKMZ5ixfr4=", "module": "sha256-Fl1IccnE3fepQGDfGDhdfsuzzefe543VqcfoC50GzZY=", @@ -2876,105 +2871,105 @@ "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" }, - "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.0.20": { - "module": "sha256-T0tsqhEaZFnFKSfpM2+DG8qDIUtuiYndph8BAYXe5qo=", - "pom": "sha256-Q9nypAfaiyhtjfMNZw8lVhUPZW9RnYQWqbGOTHGrfFo=" + "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.0.21": { + "module": "sha256-eP8Nm7m6KylBJw6aHmdCeG+r3oCAjSVLMhb7YvOGr5s=", + "pom": "sha256-9Bb6+imfEFZlOB1F3CPLdS6sGXAzy7sOfrP4M0CbrfE=" }, - "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.0.20/gradle85": { - "jar": "sha256-wMMkdfUoT+fBgMrwC/QLb6OjsOkP7FgXttAg6xDtKbw=" + "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-aNTHT22g1eErtyVbjW3b2IaPCiSdTf307OcPbT+/XQM=" }, "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/1.9.24": { "jar": "sha256-AoVjJSRkxIYBkX8rbFTRuOQhzcfya/L5zzCIlcgSSgY=", "pom": "sha256-Hzfc9EhcI3qtLk70O40RQJleMTKduiTJ9qa3uEBrg9Q=" }, - "org/jetbrains/kotlin#kotlin-build-common/2.0.20": { - "jar": "sha256-NvDXXOmviQZNnbT9IeIsVQdyAP5OOufZnjREmCZ6oNs=", - "pom": "sha256-EOhYxaCAxN21Wx0GvujV6Ea4YQX1aw5A8ojj+mGWEXI=" + "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { + "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", + "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" }, - "org/jetbrains/kotlin#kotlin-build-statistics/2.0.20": { - "jar": "sha256-c6fXFRN1WzF9Kxttp2bW5reiXcmdzv5DEzJTNkIuzhE=", - "pom": "sha256-10GK0lyAbeg2FQvdNQsAvmwtJQmeXXQd3+PzgcUurY0=" + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": { + "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=", + "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.20": { - "jar": "sha256-V+1QIg547DnoqAAUMw8pXlSFtWOMESmvntfVPXhYxcI=", - "pom": "sha256-nHrVho+yGJsb9NbCL2yUmDs6jhopTpWlQSy4Lg9C3bI=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" }, - "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.20": { - "jar": "sha256-nOb4Gmmcw32zY6KDcVC8YqJJA9r2EhA00Sl5qpUBRGs=", - "pom": "sha256-DyiqOx3o2AWm+HlX08PWbDOeDEMmaZlc9Zf58r6J4II=" + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": { + "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=", + "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE=" }, "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.24": { "jar": "sha256-5x/xnmsUGrhakyj9AQlBUxowJUMCa9QkTJWtwgjVAfY=", "pom": "sha256-1w0fiFkkQ/R1eVFUVqTWwxBRztoK0RRGkjrK/kwMldE=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.20": { - "jar": "sha256-o2BL81DIvM4nECFYu7OD+k0YFLxIaq7VnyeOraUf9q0=", - "pom": "sha256-WXBD+4xlJ/QpmcoE7TUpY5Is0W5piKqlLT2zLaHbhZ0=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.20": { - "jar": "sha256-4DzwSwNA8a4VEhBjC10pFcKXmIxuIuTe206nz7dKz2c=", - "pom": "sha256-3M3xugxPzYvUIwNFroP6fb6SglY9ilP9XmHFM1tbcYA=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" }, - "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.0.20": { - "jar": "sha256-549YH9VsEe1nrxzZhA3y8OCC9duKj5s949hygeZRUPg=", - "pom": "sha256-y6whk7JPaifqr5kWlZydoO+5EvrFfpWzkG5kwKbxJkc=" + "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-SaUyw+hjiBeUKVdB+A+/t5QeaLGGPPlMRoXgC01urOA=", + "pom": "sha256-CNjXRPVM+aKlZwoS4HP6qjG7F0DSivWD9v7dCAvXw64=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/2.0.20": { - "jar": "sha256-cxUswf2CHQcTlHOry/jH0B0A5oaEuWHhkurogNycfaQ=", - "pom": "sha256-qUcReIj0z/tjk9QurqYRtj31ib8pYXgmzLclNxK/OsM=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" }, "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.24": { "jar": "sha256-F3vIsqQHbcznh4rQ2P0HFjrzF44/qQ7mPU9zO7R7/ck=", "pom": "sha256-T7V/xqxyCVGzIkd0s7sqVFSelj0vTf3GhB6Ex77WKrE=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.20": { - "jar": "sha256-W9URO4WrhSjhkuK7P8GX9bw0SLzb0Fh5Czf9N/TuV68=", - "pom": "sha256-IZgoJm6keO7rQuT1L5bQuQfYykhHz4aq45FprYsupKU=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.20": { - "jar": "sha256-i2O0/7e6aOKHIFaa1HqWzAZclFZO0WHuoVrIZIh7pN4=", - "pom": "sha256-D8eaPIg8fbbsD6lU1cimiugRBlIm+4WRbhy/9pnlwUc=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": { + "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=", + "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20": { - "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0=", - "module": "sha256-CJ8SCJE61calM09nu8pI/HsK+hCv0L2lFT+8tSzCqWw=", - "pom": "sha256-IQOK734wtxG0qE3grS1TO9MgXhOKrWfP1YnXl+/afII=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", + "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=", + "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20/gradle85": { - "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.20": { - "jar": "sha256-Ce2wJ7mh899xYnGuyte7QaHdvC+cETFyl5ANTyvc6Iw=", - "pom": "sha256-wZireMJmzzvnodJHBeW7GIbUlF/cpPcX9U77hv9M10o=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": { + "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=", + "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.20": { + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": { "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", - "module": "sha256-wy8Uw0SXgCqOjXk7K11nkj4gIlOUePNm4Yp+9kFOut4=", - "pom": "sha256-Vn7N8kaceWkMLgmdz6r8PhF67GTe3BejtJ/Uo/ptDgg=" + "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=", + "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.20": { - "jar": "sha256-UUx/F9xeVO5dFqdhs2S500OVa8rUnf0I4IWWIldzfhk=", - "module": "sha256-HPn20+xtMFqgiQMqyJL/rogcwQUAP0VvLBX9PDAyCm4=", - "pom": "sha256-SEIbKUnHKiDU4OPybYcYxruScIbHbF/AlSCg1jbPumc=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": { + "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=", + "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=", + "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20": { - "module": "sha256-aBPMpB7w+/FciL7MQB44cGuWlEwhtr7HPdiM+QoPIB4=", - "pom": "sha256-eEmYfUbGj7neKvOwReEq1nPm1mOvbqpf2MYRlCt3LF0=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": { + "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=", + "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20/gradle85": { - "jar": "sha256-gSn2LLfGJ7XOghh+QqbYfEKVK8e6ZLgFo1R/aFIxlmI=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.20": { - "module": "sha256-GwMjHvp7O20xsJNocpQfh+J6gZwANxiz0JiAt25j180=", - "pom": "sha256-TDLrNQlMFjWd943q7BHOUjvjYEB0FPoK7Miu/GftSkM=" + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": { + "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=", + "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.20": { - "jar": "sha256-QsQvvic/oDBOThf3OSxms56R+Z01+FwGixG91Wuemdw=", - "pom": "sha256-5f4GjE69XIhYw1w56GI6vrnIb4oXJUdC5/VZjkP62jw=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": { + "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=", + "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ=" }, - "org/jetbrains/kotlin#kotlin-native-utils/2.0.20": { - "jar": "sha256-wWbyBR6R0ZnpYP/HsnZEhcFRDNF2dN17jOPC/NBqhys=", - "pom": "sha256-mISZMftwkWhS6qfCDm2Pr1IsUNd627r9k2T1JrfN7EI=" + "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": { + "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=", + "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0=" }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", @@ -3000,55 +2995,55 @@ "jar": "sha256-MUx9MI/nUGVDZbrGFEeAYTyRac89nh2vurkc+AvcNXw=", "pom": "sha256-mGDF58qg5AlxmVCQEtoD01GX/teewKkKUOKPjeh1QE0=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/2.0.20": { - "jar": "sha256-/pcAKmeY9yB1ZGSJGdbuzPszi5XcBLSIhthWZVvGSk4=", - "pom": "sha256-o6N2KcmFzt17+d12rGdJaz+ApZIoVB6WiAKg7obEuRQ=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": { + "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=", + "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ=" }, "org/jetbrains/kotlin#kotlin-scripting-common/1.9.24": { "jar": "sha256-KqeY6XgokBDYByTdGdn+GQtSQkFIEQT89RjAO8OdTks=", "pom": "sha256-S9rpUqslCWFRsfqERCooGupzwW0dTNVdigLDccqJusQ=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/2.0.20": { - "jar": "sha256-XTdTOT5/7PHSG67l2314gyZ4K9v4qOxqKyzM97Ve5sY=", - "pom": "sha256-BesUmiCZ8ILJf1xFQ1HQuMphLFUwo6wyHSyMB12wEVU=" + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": { + "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=", + "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.24": { "jar": "sha256-02gR+1yZeXaEH/PQqxnGt96RkomeQIK6Hz/7oH6UBfQ=", "pom": "sha256-FUgOkd8v/sfFfOHgpfFBBltFIrbbyJsv2yk9xsVwwMU=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.20": { - "jar": "sha256-Ie8wOrS54Pnzl8FIliU6rkkCV7+w3VAInBwcBPAYcXE=", - "pom": "sha256-zr8swRmuHPJqP2tECxidwrruhS0nASU06qNqrNue4VI=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": { + "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=", + "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.24": { "jar": "sha256-i/2A2RNqKjJhALC3O/saG7NX7d+uDYEiDkYSa4im7no=", "pom": "sha256-Sg6yUXF8Sih6ZBfp/QRBZ4xJatxnAdhasPFi8W0s+4c=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.20": { - "jar": "sha256-WgaucwO1TL0XdYnWEFumv9WbGxgur7W2aHJf9ypf0y0=", - "pom": "sha256-z6al9YOJy3K0SRLTABoB9eqL+vx5mbr6BRGz7t/LYdI=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": { + "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=", + "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE=" }, "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.24": { "jar": "sha256-G9aQBgqUhDl3N0pFds2J10nk7srx+3pYA2/rOuVRxKw=", "pom": "sha256-kkM+M+MLpFvMS/hKxUsX0p8Dlkp2BwYW1sZS3WxhySU=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.20": { - "jar": "sha256-sLtQD2MztLFsjraeo5TvaE8zRT+NNDEDSokHqfGNtvE=", - "pom": "sha256-m8uNHCOvcm21KpNrpbkXeyRoKSBYxT8Ckd5MwNpOzh4=" + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": { + "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", + "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" }, - "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.0.20": { - "jar": "sha256-zI9QG2dslESLAWgNyvZ68cjFfOqEFQKnFuttEX+Xy4Y=", - "pom": "sha256-X74y6I+ly4WFjb1wpPZKWsJTSaTijzlQ3zJrMSRmUGY=" + "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-3v0m28WB8x1QKe5EmZ4QRpLrAw6rrX2TZMI9jwuP2Fk=", + "pom": "sha256-0opI/fcJ0wz4lqL3XMbx7aA3L2r+MYdCDPigSrJCb/w=" }, - "org/jetbrains/kotlin#kotlin-serialization/2.0.20": { - "module": "sha256-rsyQ8DJ7IQJTYRNdyJQBDmHDVzVFBtLTP3pZeakRxGQ=", - "pom": "sha256-wYgmEN73pFKwREi8GVqr+D6CqMEcUSmFYUAbGyxfKCw=" + "org/jetbrains/kotlin#kotlin-serialization/2.0.21": { + "module": "sha256-HXUsci8E/La3an9mSgXqFQAuEO1c/30pBJtd5ZfxID8=", + "pom": "sha256-Ju6iFEnSY66HScTjq7enkNl1ubpRP2jVSMzFCOFfUkI=" }, - "org/jetbrains/kotlin#kotlin-serialization/2.0.20/gradle85": { - "jar": "sha256-Jjd6xiKasd8/ojVJPYxWfkcLjYa2PolUSMwmbL/Ob1o=" + "org/jetbrains/kotlin#kotlin-serialization/2.0.21/gradle85": { + "jar": "sha256-wd9+ggYbMC3WH0hoOT54Uy/qeKprY7eBmybK9sJHRME=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.22": { - "pom": "sha256-pysR3wi1Mi16Xo5iB4nuPkz+846GxDDn0RO/qeVMWB4=" + "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.10": { + "pom": "sha256-91ryF83Y3Z4HseDgGAhKMgkqCRo5C3P+qmV+xE5c8JQ=" }, "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.0": { "jar": "sha256-KDJ0IEvXwCB4nsRvj45yr0JE1/VQszkqV+XKAGrXqiw=", @@ -3058,9 +3053,9 @@ "module": "sha256-6Y6oxE+zaCDQG7iwAxaOI6IhtAHLQyVtcjo/C3fWFsI=", "pom": "sha256-XZfiDNWGLoR6aYF1uTno3Fxr11vtmZ1vPU6ghIESFsA=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.20": { - "module": "sha256-tZe3Be/U4tgnFCCQw2BUJlVI7VG09SN38r+JxFlNU28=", - "pom": "sha256-o11/wINw+TE6S5U7zu7d2F4OHnLTEGLTe/jHeBs/b18=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": { + "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", + "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.3.72": { "pom": "sha256-nVoT2avDNEXhNm0livCnfkLwGUWs73wJF7nVOYVOL84=" @@ -3121,45 +3116,49 @@ "pom": "sha256-uc6tTCIt7pDHT28BPTFqnlD4EaApMxPDNRrssvfM7V8=" }, "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { - "jar": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY=", "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=", "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.0.20/all": { + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21/all": { "jar": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg=" }, - "org/jetbrains/kotlin#kotlin-tooling-core/2.0.20": { + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": { "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", - "pom": "sha256-XhIxEeAQewRmSIOgpAjB/zvbXQR+SQH4L0xC8QV4Bi0=" + "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo=" }, - "org/jetbrains/kotlin#kotlin-util-io/2.0.20": { - "jar": "sha256-ZGTbjUFywhoXp5C20XiQIu1nrbN8UL5ri59YK1UrhSI=", - "pom": "sha256-LrBxVfqEF46ZVjnOe3aRcofK5UKjXSm1a7CZEB0oajw=" + "org/jetbrains/kotlin#kotlin-util-io/2.0.21": { + "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=", + "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA=" }, - "org/jetbrains/kotlin#kotlin-util-klib/2.0.20": { - "jar": "sha256-h92Djcd3gsuVZ/GnYUmbPkpQ9SjABbJjii4+V0EKljs=", - "pom": "sha256-fbTRw72mdZvifuk35gfoscRpWNwIR3Ey/a7t4BbnOP8=" + "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { + "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", + "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" }, - "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.0.20": { - "pom": "sha256-kGFltQT4vUoqP4eFvhbp89a8mtiG6lXoMtQRG/rkt38=" + "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.0.21": { + "pom": "sha256-Yf+ockTHIjCtz8MiedShzEFxLCvF61CXG2MO2IDeSF8=" }, - "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.20": { - "pom": "sha256-sNVZXjrtI9TH63BSN0pZQGXaYdxG0GYxHT1YVz2jSSE=" + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.21": { + "pom": "sha256-qUIL3zmifFDNZ/njC5vSJk/P4Yaq8iHrw8t5VZ8iIEw=" }, - "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.0.20": { - "pom": "sha256-2zSCieaFMro55pUv9XVm/50NnslJBYTuLprNllrMHFI=" + "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.0.21": { + "pom": "sha256-K2hwNmz5nvZS5bVbw7kDfxwS3rMy3GauAgKn/CI2WLk=" }, - "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.20": { - "pom": "sha256-I25/dk1/4C5RCIG/1ShkK+c4Y6oDbjRvs4PL3cXB8sw=" + "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.21": { + "pom": "sha256-0+fOgZ7Wkw4mf8bW9uQ/NYX66BNTJTdaUy3CSeuM5Kk=" }, - "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.0.20": { - "pom": "sha256-+kn1eMN8x3/hA7MrEU+iTbkblHrjQAQivCcuk658pYY=" + "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.0.21": { + "pom": "sha256-unqwb198FjgzO/+AScoZX9YY02+UtM0jJeIh4qruOB4=" }, - "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.20": { - "pom": "sha256-7W4IMHEMURJT2NQTEs1MMDP9pkXAFJ0/EYULaPzTPJk=" + "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.21": { + "pom": "sha256-WlFqKbXkklcrjyCq65qyEnkyzSFiQJC8Ur5bjZ0yLnI=" }, - "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.20": { - "pom": "sha256-iVt45mokOOVxOXu8KVbSUgqTpl2jHB2Ce2NEIvbOsQ4=" + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.21": { + "pom": "sha256-qWzO0nL6L6tLdB40cgtedO9RS0QRFSMD7fnBJ5V6R6o=" }, "org/jetbrains/kotlinx#atomicfu-jvm/0.23.2": { "jar": "sha256-EB/0P/Vj/KFnr1remMO2m/VpAQ6rdFATuE2JVQNNOzw=", @@ -3192,9 +3191,6 @@ "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.1": { - "pom": "sha256-uSWqmIxApceqDHeyE3P+sYw5QUkmvVHHbvRENPW66cI=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.9.0": { "pom": "sha256-vqVRHpAB8sWTq1CA3xMbIZq14ghcxZec5YPqzUlG/Xg=" }, @@ -3213,23 +3209,10 @@ "module": "sha256-rVNANKlTtOEsvuuHTGat+LHKFN8V/g0uZUeqNOht/so=", "pom": "sha256-dw8nk9BeKwJ7nHmZOOwdLU7xQc5YGceAwyw5lcrbCkc=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-jdk8/1.7.1": { - "module": "sha256-sJV+aTzxwefUrWJGqm4weV2/S/t1jB5LMv25wkQJuXM=", - "pom": "sha256-x3kWU2lOpaVLnN1HCAgtv7i9apeKX0IYSxFBz7SjDnU=" - }, - "org/jetbrains/kotlinx#kotlinx-coroutines-jdk8/1.9.0": { - "jar": "sha256-0YE4yMHDSyuprzcyQec0E3b9+A0ecC36kJKdMgEx83w=", - "module": "sha256-UZXcGgvvl7cdtHJ+R9QlIFaTtT9Gs4MbVeqQtk0Qj9U=", - "pom": "sha256-i4RBO/nktxLB5mvV4mkihWTfePlxKaLw3msyuJ/MoOo=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-play-services/1.9.0": { "module": "sha256-k9zumoMaL53NqVKLqyjXJOFeigv+xBlO+B1Ox+cwH/I=", "pom": "sha256-BMklOqqrM6EDRGL//unXOkNiKpSBh/gDSLpcuXqydLE=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.7.1": { - "module": "sha256-I8EQcq7URvsrZsj57aP4mWbe09mP9bnfCg3LeTwBX/o=", - "pom": "sha256-HEWyu0XLYIIjT06yJj46XBxzQ4Rm6NUlr2gZCxbIklM=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.9.0": { "jar": "sha256-hCh6m9dNy+ad6MFwGQsVWhHrtJqJ6U4DaslPx4MecyU=", "module": "sha256-ki7Xf8+ELN0KiwAi3bcPQdynPhc/WU5r/VkrTQONY64=", @@ -3250,6 +3233,26 @@ "module": "sha256-ZoDoXgAKb/ckfN38YkZyPzlXCWzT7qCp9/Qqumlzaug=", "pom": "sha256-Wx4Ylt2DYUnbnUuSIRXKxiIrDKKIm1VDTbi+hOI0wUs=" }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring-jvm/0.5.4": { + "jar": "sha256-H8luGbRFOH28SRg9DMYjxaYb+kfIbPgar1r/SEUVT6s=", + "module": "sha256-D6a3n1wQfnNp/IMquGDLY1Ac96oH/ovZTRUTzmFOAoc=", + "pom": "sha256-DMAsF8sJSA/qlURmv8/O+JYq6+AuV+35tHZ0ZEek1eQ=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.5.4": { + "jar": "sha256-jMGXmjmiO2RLGRCjv22efNg4aGSKDb3auRs44DxfTBk=", + "module": "sha256-npefmLnoEmKwjAHFosKwBSEwE9SigNR1nBkEYFvcZ3c=", + "pom": "sha256-bKYOZ58tAJw94jCnSaYwqxi8Z+YAoj+4d4xPu820thQ=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.5.4": { + "jar": "sha256-3DWHwSeVrwEjFZHA7wmkE538qBE8KYknO5a5WABoU8M=", + "module": "sha256-PTizMz62XBMqfFZuAxDfoJEw2t+SirkjBHAstPFmjbE=", + "pom": "sha256-Diy3MY4zyA2U8M/EyEn8YsXLzQwxYOyhojm2ebn+dXM=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core/0.5.4": { + "jar": "sha256-7XupL4/u1v8jBKsvd4DYf4HITxVfce9zwfhsW/mM8EM=", + "module": "sha256-3j/q85vfcKlbT85FjMMI6MNzfPl/rIcvSbT26/VXdgU=", + "pom": "sha256-ot/XmJrts7onKtrlmPfuuDTmnhVNSuylMFYwwY+K9CU=" + }, "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.2": { "pom": "sha256-ew4dde6GIUmc+VQwyhL9qjL0p/kg1cMBv+lfoYfyczc=" }, @@ -3325,6 +3328,10 @@ "jar": "sha256-L72ZRbh+1QE5HTE+jK396wDXXKsyhiIgzOs4Uuv/3Hc=", "pom": "sha256-Nfg93UsA2fZYuezotPCaYkwrwPbGNGgtxS6a5FyNHQQ=" }, + "org/jetbrains/skiko#skiko-awt-runtime-macos-arm64/0.8.15": { + "jar": "sha256-FoepnFtMLNiavGVlVmidzgGkaBKSqTzu9KnEl+nhQNk=", + "pom": "sha256-e4KThaZFcZwANJjph1MCGfssKV7TwosVbio3nQxf/NQ=" + }, "org/jetbrains/skiko#skiko-awt/0.8.15": { "jar": "sha256-LW7+mI+NOlfmP8+SPzQ5zau4iUfjUfl9BuybKmqH//A=", "module": "sha256-1I2dg0p9yC6vpxX0nxLI+uKg35vEPqw3RJi/EdFrECU=", @@ -3346,6 +3353,18 @@ "jar": "sha256-SamJjaN1hlk4jxMzxTzK22+9FCp9GKp7GjNXcJBoQnk=", "pom": "sha256-Fge2IOHytOGg9IkQELNJCx+0qD5xOsTTiwjcLGf6PlE=" }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, "org/junit#junit-bom/5.11.0": { "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" @@ -3354,14 +3373,6 @@ "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" }, - "org/junit#junit-bom/5.7.1": { - "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", - "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" - }, - "org/junit#junit-bom/5.7.2": { - "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", - "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" - }, "org/junit#junit-bom/5.9.2": { "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" @@ -3476,10 +3487,10 @@ "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" }, "org/slf4j#slf4j-api/1.7.36": { - "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" }, "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" }, "org/slf4j#slf4j-bom/2.0.16": { @@ -3508,14 +3519,6 @@ "jar": "sha256-Uylw98VdRF8E5NBaa0Pw6Gdjgi0IrYnkxp4ymdMaDXQ=", "module": "sha256-ccMC3YcbfoIsZ5V28baF6UueyQUshzkF6yFN+kqrufw=", "pom": "sha256-rk4+z470z6LX39SJRUeIM+pDNL4Kq2+XoENzJBX7rr8=" - }, - "xml-apis#xml-apis-ext/1.3.04": { - "jar": "sha256-0LSIfcNNV95JB0pYr/rUOaAT0Lr/oagDT47ypeoZFkY=", - "pom": "sha256-G1k5qTEKWcDfDANyZyHV/JUh6H1sIDv6ciC66Cow2eg=" - }, - "xml-apis#xml-apis/1.4.01": { - "jar": "sha256-qECWgXZkVoS7Aa7TduBnqzlhSIX57uRKvjWl8g6+f60=", - "pom": "sha256-Cagv8VCshr+jEUXgpq/YmgLkUEeF9doRLk+uFCUCDpI=" } } } diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix index 5929e48efba7..48d175882475 100644 --- a/pkgs/by-name/ke/keyguard/package.nix +++ b/pkgs/by-name/ke/keyguard/package.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keyguard"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "AChep"; repo = "keyguard-app"; - rev = "8f6d527a42f13c6bdcee2ca3f133dd19751fc37a"; - hash = "sha256-llr+792hzifV5vP0e7AKWhW3OtYcyAhzXPR45Do62ug="; + rev = "81a8486ca31c86630c84c78285c49d16d7491328"; + hash = "sha256-e0Ea2QSAMQqZRVPy5/5pblHfeG+L6oHEXHV5mepE5Z8="; }; inherit gradleBuildTask gradleUpdateTask desktopItems; diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 50c6e4306ffe..8dcd685da4dd 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "rmg"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "Rosalie241"; repo = "RMG"; rev = "v${version}"; - hash = "sha256-mgb9Ed11fBQVnhhU5w1958a19dbTOL0ADczUOxKAnqA="; + hash = "sha256-3Bl9SEHWQbi58VPpCT4H8TC1E5J5j4lRXS1QF+udPdg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix index ec6c62e96e36..79b5180c065a 100644 --- a/pkgs/by-name/rs/rs-tftpd/package.nix +++ b/pkgs/by-name/rs/rs-tftpd/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "rs-tftpd"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "altugbakan"; repo = "rs-tftpd"; rev = version; - hash = "sha256-ZWafSqHEBgS7LR9hTfatatvAFZnCP8L5rHLerdjyrUc="; + hash = "sha256-RUjxCHO4X3V3Mt6zargqqT2v92XTt8FO9S68+tYZFC0="; }; - cargoHash = "sha256-uBVDH7YYSuFv0r5T2+EAoL02ta+1hjaza/Ilu+a+k0k="; + cargoHash = "sha256-sLdOVthIHXzdY0/tVn2J0CUr3IqLsVHO/5S4X0NmN64="; buildFeatures = [ "client" ]; diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix new file mode 100644 index 000000000000..acc989e0283a --- /dev/null +++ b/pkgs/by-name/s7/s7/package.nix @@ -0,0 +1,159 @@ +{ + lib, + fetchFromGitLab, + stdenv, + notcurses, + gmp, + mpfr, + libmpc, + flint3, + unstableGitUpdater, + writeScript, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "s7"; + version = "11.2-unstable-2024-11-02"; + + src = fetchFromGitLab { + domain = "cm-gitlab.stanford.edu"; + owner = "bil"; + repo = "s7"; + rev = "6b6651de318c3360aa2711a445659f372ffe894e"; + hash = "sha256-9x1u60jflESAHgP0gwIDVFwhI5XU5gsAiXaic8zdW2U="; + }; + + buildInputs = [ + notcurses + gmp + mpfr + libmpc + flint3 + ]; + + # The following scripts are modified from [Guix's](https://packages.guix.gnu.org/packages/s7/). + + patchPhase = '' + runHook prePatch + + substituteInPlace s7.c \ + --replace-fail libc_s7.so $out/lib/libc_s7.so + + runHook postPatch + ''; + + buildPhase = '' + runHook preBuild + + # The older REPL + cc s7.c -o s7-repl \ + -O2 -I. \ + -Wl,-export-dynamic \ + -lm -ldl \ + -DWITH_MAIN \ + -DS7_LOAD_PATH=\"$out/share/s7/scm\" + + # The newer REPL powered by Notcurses + cc s7.c -o s7-nrepl \ + -O2 -I. \ + -Wl,-export-dynamic \ + -lm -ldl \ + -DWITH_MAIN \ + -DWITH_NOTCURSES -lnotcurses-core \ + -DS7_LOAD_PATH=\"$out/share/s7/scm\" + + cc libarb_s7.c -o libarb_s7.so \ + -O2 -I. \ + -shared \ + -lflint -lmpc \ + -fPIC + + cc notcurses_s7.c -o libnotcurses_s7.so \ + -O2 -I. \ + -shared \ + -lnotcurses-core \ + -fPIC + + cc s7.c -c -o s7.o \ + -O2 -I. \ + -ldl -lm + + cc ffitest.c s7.o -o ffitest \ + -I. \ + -Wl,-export-dynamic \ + -ldl -lm + + ./s7-repl libc.scm + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + dst_bin=$out/bin + dst_lib=$out/lib + dst_inc=$out/include + dst_share=$out/share/s7 + dst_scm=$out/share/s7/scm + dst_doc=$out/share/doc/s7 + mkdir -p $dst_bin $dst_lib $dst_inc $dst_share $dst_scm $dst_doc + + cp -pr -t $dst_bin s7-repl s7-nrepl + ln -s s7-nrepl $dst_bin/s7 + cp -pr -t $dst_lib libarb_s7.so libnotcurses_s7.so libc_s7.so + cp -pr -t $dst_share s7.c + cp -pr -t $dst_inc s7.h + cp -pr -t $dst_scm *.scm + cp -pr -t $dst_doc s7.html + + runHook postInstall + ''; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + $dst_bin/s7-repl s7test.scm + + runHook postInstallCheck + ''; + + passthru.updateScript = unstableGitUpdater rec { + branch = "master"; + tagConverter = writeScript "update-s7-version-number" '' + #! /usr/bin/env nix-shell + #! nix-shell -p curl -i bash + set -eu -o pipefail + read tag # should be "0" if the upstream sticks to tagging nothing. + curl -sS https://cm-gitlab.stanford.edu/bil/s7/-/raw/${branch}/s7.h \ + | grep '#define S7_VERSION' \ + | awk -F \" '{print $2}' + ''; + }; + + meta = { + description = "Scheme interpreter intended as an extension language for other applications"; + longDescription = '' + s7 is a Scheme interpreter intended as an extension language for other + applications. + + Although it is a descendant of tinyScheme, s7 is closest as a Scheme + dialect to Guile 1.8. It is expected to be compatible with r5rs and r7rs. + It has continuations, ratios, complex numbers, macros, keywords, + hash-tables, multiprecision arithmetic, generalized `set!`, unicode, and so + on. It does not have `syntax-rules` or any of its friends, and it thinks + there is no such thing as an inexact integer. + + s7 is an extension language of Snd and sndlib, Rick Taube's Common Music + (commonmusic at sourceforge), Kjetil Matheussen's Radium music editor, and + Iain Duncan's Scheme for Max (or Pd). + ''; + homepage = "https://ccrma.stanford.edu/software/s7/"; + license = lib.licenses.bsd0; + maintainers = with lib.maintainers; [ rc-zb ]; + mainProgram = "s7"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/tu/tunnelgraf/package.nix b/pkgs/by-name/tu/tunnelgraf/package.nix index a24ea1b67fc6..08086fc91807 100644 --- a/pkgs/by-name/tu/tunnelgraf/package.nix +++ b/pkgs/by-name/tu/tunnelgraf/package.nix @@ -1,28 +1,28 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "tunnelgraf"; - version = "0.6.1"; + version = "0.7.2"; pyproject = true; src = fetchFromGitHub { owner = "denniswalker"; repo = "tunnelgraf"; rev = "refs/tags/v${version}"; - hash = "sha256-CsrbSpp1VszEAKpmHx8GbB7vfZCOvB+tDFNFwWKexEw="; + hash = "sha256-pwHP9eAf2S08ucUawxrQvzMBJNITxbddoLzEoSNUdao="; }; pythonRelaxDeps = [ "click" + "paramiko" "pydantic" ]; - build-system = with python3.pkgs; [ - hatchling - ]; + build-system = with python3.pkgs; [ hatchling ]; dependencies = with python3.pkgs; [ click @@ -37,13 +37,12 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "tunnelgraf" - ]; + pythonImportsCheck = [ "tunnelgraf" ]; meta = with lib; { description = "Tool to manage SSH tunnel hops to many endpoints"; homepage = "https://github.com/denniswalker/tunnelgraf"; + changelog = "https://github.com/denniswalker/tunnelgraf/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "tunnelgraf"; diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix deleted file mode 100644 index c9e9b34e6ee0..000000000000 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook -, pcsclite -}: - -stdenv.mkDerivation rec { - pname = "javacard-devkit"; - version = "2.2.2"; - uscoreVersion = builtins.replaceStrings ["."] ["_"] version; - - src = requireFile { - name = "java_card_kit-${uscoreVersion}-linux.zip"; - url = "http://www.oracle.com/technetwork/java/javasebusiness/downloads/" - + "java-archive-downloads-javame-419430.html#java_card_kit-2.2.2-oth-JPR"; - sha256 = "1rzkw8izqq73ifvyp937wnjjc40a40drc4zsm0l1s6jyv3d7agb2"; - }; - - nativeBuildInputs = [ unzip oraclejdk8 makeWrapper autoPatchelfHook ]; - buildInputs = [ pcsclite ]; - - zipPrefix = "java_card_kit-${uscoreVersion}"; - - sourceRoot = "."; - unpackCmd = '' - unzip -p "$curSrc" "$zipPrefix/$zipPrefix-rr-bin-linux-do.zip" | jar x - ''; - - installPhase = '' - mkdir -p "$out/share/$pname" - cp -rt "$out/share/$pname" api_export_files - cp -rt "$out" lib - - for i in bin/*; do - case "$i" in - *.so) install -vD "$i" "$out/libexec/$pname/$(basename "$i")";; - *) target="$out/bin/$(basename "$i")" - install -vD "$i" "$target" - sed -i -e 's|^$JAVA_HOME/bin/java|''${JAVA:-$JAVA_HOME/bin/java}|' "$target" - wrapProgram "$target" \ - --set JAVA_HOME "$JAVA_HOME" \ - --prefix CLASSPATH : "$out/share/$pname/api_export_files" - ;; - esac - done - - makeWrapper "$JAVA_HOME/bin/javac" "$out/bin/javacardc" \ - --prefix CLASSPATH : "$out/lib/api.jar" - ''; - - meta = { - description = "Official development kit by Oracle for programming for the Java Card platform"; - longDescription = '' - This Java Card SDK is the official SDK made available by Oracle for programming for the Java Card platform. - - Instructions for usage: - - First, compile your '.java' (NixOS-specific: you should not need to set the class path -- if you need, it's a bug): - javacardc -source 1.5 -target 1.5 [MyJavaFile].java - Then, test with 'jcwde' (NixOS-specific: you can change the java version used to run jcwde with eg. JAVA=jdb): - CLASSPATH=. jcwde [MyJcwdeConfig].app & sleep 1 && apdutool [MyApdus].apdu - Finally, convert the '.class' file into a '.cap': - converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version] - For more details, please refer to the documentation by Oracle - ''; - homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.ekleog ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh deleted file mode 100644 index 459bfce50988..000000000000 --- a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh +++ /dev/null @@ -1,60 +0,0 @@ -source $stdenv/setup - -echo "Unpacking distribution" -unzip ${src} || true - -# set the dynamic linker of unpack200, necessary for construct script -echo "patching unpack200" -patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 - -echo "constructing JDK and JRE installations" -if test -z "$installjdk"; then - sh ${construct} . tmp-linux-jdk tmp-linux-jre - mkdir -p $out - cp -R tmp-linux-jre/* $out -else - sh ${construct} . $out tmp-linux-jre -fi - -echo "removing files at top level of installation" -for file in $out/* -do - if test -f $file ; then - rm $file - fi -done -rm -rf $out/docs - -# construct the rpath -rpath= -for i in $libraries; do - rpath=$rpath${rpath:+:}$i/lib -done - -if test -z "$installjdk"; then - jrePath=$out -else - jrePath=$out/jre -fi - -if test -n "$jce"; then - unzip $jce - cp -v jce/*.jar $jrePath/lib/security -fi - -rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli - -# set all the dynamic linkers -find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - -find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - -if test -z "$pluginSupport"; then - rm -f $out/bin/javaws -fi - -mkdir $jrePath/lib/$architecture/plugins -ln -s $jrePath/lib/$architecture/libnpjp2.so $jrePath/lib/$architecture/plugins - diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix deleted file mode 100644 index 05045f9bccd2..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ /dev/null @@ -1,193 +0,0 @@ -{ productVersion -, patchVersion -, sha256 -, jceName -, sha256JCE -}: - -{ swingSupport ? true -, lib, stdenv -, requireFile -, makeWrapper -, unzip -, file -, xorg ? null -, installjdk ? true -, pluginSupport ? true -, installjce ? false -, config -, glib -, libxml2 -, ffmpeg -, libxslt -, libGL -, freetype -, fontconfig -, gtk2 -, pango -, cairo -, alsa-lib -, atk -, gdk-pixbuf -, setJavaClassPath -}: - -assert swingSupport -> xorg != null; - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = { - i686-linux = "i386"; - x86_64-linux = "amd64"; - armv7l-linux = "arm"; - aarch64-linux = "aarch64"; - }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - - jce = - if installjce then - requireFile { - name = jceName; - url = "http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"; - sha256 = sha256JCE; - } - else - ""; - - rSubPaths = [ - "lib/${architecture}/jli" - "lib/${architecture}/server" - "lib/${architecture}/xawt" - "lib/${architecture}" - ]; - -in - -let result = stdenv.mkDerivation rec { - pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin"; - version = "${productVersion}u${patchVersion}"; - - src = - let - platformName = { - i686-linux = "linux-i586"; - x86_64-linux = "linux-x64"; - armv7l-linux = "linux-arm32-vfp-hflt"; - aarch64-linux = "linux-aarch64"; - }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - in requireFile { - name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; - url = "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"; - sha256 = sha256.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - }; - - nativeBuildInputs = [ file makeWrapper ] - ++ lib.optional installjce unzip; - - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = 1; - - installPhase = '' - cd .. - - if test -z "$installjdk"; then - mv $sourceRoot/jre $out - else - mv $sourceRoot $out - fi - - shopt -s extglob - for file in $out/!(*src.zip) - do - if test -f $file ; then - rm $file - fi - done - - if test -n "$installjdk"; then - for file in $out/jre/* - do - if test -f $file ; then - rm $file - fi - done - fi - - if test -z "$installjdk"; then - jrePath=$out - else - jrePath=$out/jre - fi - - if test -n "${jce}"; then - unzip ${jce} - cp -v UnlimitedJCEPolicy*/*.jar $jrePath/lib/security - fi - - if test -z "$pluginSupport"; then - rm -f $out/bin/javaws - if test -n "$installjdk"; then - rm -f $out/jre/bin/javaws - fi - fi - - mkdir $jrePath/lib/${architecture}/plugins - ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins - - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - cat <> $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - postFixup = '' - rpath+="''${rpath:+:}${lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}" - - # set all the dynamic linkers - find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - - find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - - # Oracle Java Mission Control needs to know where libgtk-x11 and related is - if test -n "$installjdk" -a -x $out/bin/jmc; then - wrapProgram "$out/bin/jmc" \ - --suffix-each LD_LIBRARY_PATH ':' "$rpath" - fi - ''; - - inherit installjdk pluginSupport; - - /** - * libXt is only needed on amd64 - */ - libraries = - [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsa-lib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ - lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc]; - - rpath = lib.strings.makeLibraryPath libraries; - - passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; - - passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package - - passthru.home = result; - - passthru.architecture = architecture; - - meta = with lib; { - license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms - mainProgram = "java"; - knownVulnerabilities = [ - "The Oracle JDKs included with Nixpkgs have not been updated since 2021. They contain many known vulnerabilities (https://openjdk.org/groups/vulnerability/advisories/). OpenJDK provides a comparable alternative." - ]; - }; - -}; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix deleted file mode 100644 index a232b796a068..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv -, requireFile -, xorg -, zlib -, freetype -, alsa-lib -, setJavaClassPath -}: - -let result = stdenv.mkDerivation rec { - pname = "oraclejdk"; - version = "11.0.10"; - - src = requireFile { - name = "jdk-${version}_linux-x64_bin.tar.gz"; - url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html"; - sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2"; - }; - - installPhase = '' - mv ../$sourceRoot $out - - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - cat <> $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - postFixup = '' - rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}" - - for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true - patchelf --set-rpath "$rpath" "$f" || true - done - - for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do - if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi - done - ''; - - passthru.jre = result; - passthru.home = result; - - dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10 - - meta = with lib; { - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - }; -}; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix deleted file mode 100644 index 206df75b9ebf..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ /dev/null @@ -1,10 +0,0 @@ -import ./jdk-linux-base.nix { - productVersion = "8"; - patchVersion = "281"; - sha256.i686-linux = "/yEY5O6MYNyjS5YSGZtgydb8th6jHQLNvI9tNPIh3+0="; - sha256.x86_64-linux = "hejH2nJIx0UPsQVWeniEHQlzWXhQd2wkpSf+sC7z5YY="; - sha256.armv7l-linux = "oXbW8hZxesDqwV79ANB4SdnS71O51ZApKbQhqq4i/EM="; - sha256.aarch64-linux = "oFH3TeIzVsFk6IZcDEHVDVJC7dSbGcwhdUH/WUXSNDM="; - jceName = "jce_policy-8.zip"; - sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w"; -} diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index ea5582375abd..c2b36703d51d 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -30,19 +30,6 @@ let }; }; - IteratorSimple = perlPackages.buildPerlPackage { - pname = "Iterator-Simple"; - version = "0.07"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz"; - hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q="; - }; - meta = { - description = "Simple iterator and utilities"; - license = with lib.licenses; [ artistic1 gpl2Only ]; - }; - }; - IteratorSimpleLookahead = perlPackages.buildPerlPackage { pname = "Iterator-Simple-Lookahead"; version = "0.09"; @@ -50,9 +37,9 @@ let url = "mirror://cpan/authors/id/P/PS/PSCUST/Iterator-Simple-Lookahead-0.09.tar.gz"; hash = "sha256-FmPE1xdU8LAXS21+H4DJaQ87qDi4Q4UkLawsUAqseZw="; }; - propagatedBuildInputs = [ IteratorSimple ] ++ (with perlPackages; [ - ClassAccessor - ]); + propagatedBuildInputs = with perlPackages; [ + ClassAccessor IteratorSimple + ]; meta = { description = "Simple iterator with lookahead and unget"; license = with lib.licenses; [ artistic1 gpl2Only ]; @@ -67,9 +54,9 @@ let hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M="; }; propagatedBuildInputs = [ - IteratorSimple IteratorSimpleLookahead ] ++ (with perlPackages; [ + IteratorSimple TextTemplate DataDump FileSlurp diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index e7d26606f271..3c0ba58041a4 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz"; - hash = "sha256-zbFefuMeBmNYnTEHp5mIo3t7FxnfPSTyBYVF0bzdWDc="; + hash = "sha256-RY9g346PHy/a2TyPJOGqj0sJXMYaFPrIG5BoDXMGpC4="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index f6f85b5b8e2a..313a1066e4f3 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -137,8 +137,8 @@ , withXcbShape ? withFullDeps # X11 grabbing shape rendering , withXcbShm ? withFullDeps # X11 grabbing shm communication , withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering -, withXevd ? withFullDeps && lib.versionAtLeast version "7" && !xevd.meta.broken # MPEG-5 EVC decoding -, withXeve ? withFullDeps && lib.versionAtLeast version "7" && !xeve.meta.broken # MPEG-5 EVC encoding +, withXevd ? withFullDeps && lib.versionAtLeast version "7.1" && !xevd.meta.broken # MPEG-5 EVC decoding +, withXeve ? withFullDeps && lib.versionAtLeast version "7.1" && !xeve.meta.broken # MPEG-5 EVC encoding , withXlib ? withFullDeps # Xlib support , withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers , withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index fa86bc4a18c9..c1d8fd62497f 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.22"; + version = "1.4.23"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-qafyTwp6hxYX526MxuZVaueIBC8cAGGVZlUFSZsjNLE="; + hash = "sha256-k6PxhrgsYEKmahlwvUeNeRTtscVmm2QtgLTqrPKi0X4="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index 0270050cd001..044d1b25fafe 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { ] ++ [ "--enable-xspice" "--enable-cider" + "--enable-osdi" ]; enableParallelBuilding = true; @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { mainProgram = "ngspice"; homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING - maintainers = with maintainers; [ bgamari rongcuid ]; + maintainers = with maintainers; [ bgamari ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index ffc6665af42a..23de85f33a76 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "4.0.3"; + version = "4.0.7"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "minizip-ng"; rev = finalAttrs.version; - hash = "sha256-rP3WficGQZ2sSYnU9Tj0lVl36ShwV76fn/1lv+TrK2c="; + hash = "sha256-scoEqymRMBTZZVr1fxtKOyBj4VLCgI8jQpanUKrJhiQ="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 51c1f255c326..4decdf16d38b 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.5.15.0"; + version = "2.5.16.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenImageIO"; rev = "v${version}"; - hash = "sha256-jtX6IDR/yFn10hf+FxM0s4St9XYxhQ1UlMAsNzOxuio="; + hash = "sha256-hUCwlzQW5mJH5HYPbLWOcupc36nxM12CV0sakZhiGzo="; }; # Workaround broken zlib version detecion in CMake < 3.37. diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 569752ceaa81..bc0983599b36 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdkafka"; - version = "2.5.3"; + version = "2.6.0"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-2AURPvhpgdIm034KEMm7Tmf8Zx/XER76aT6SiINs6wg="; + sha256 = "sha256-QjmVu9d/wlLjt5WWyZi+WEWibfDUynHGvTwLbH36T84="; }; nativeBuildInputs = [ pkg-config python3 which ]; diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index 45d5fc5b1f9b..cb83b2141819 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "osi"; - version = "0.108.10"; + version = "0.108.11"; src = fetchFromGitHub { owner = "coin-or"; repo = "Osi"; rev = "releases/${version}"; - hash = "sha256-rHNGnnDFU9UrszjjkZQkgWCfjjBIQba6vVbK/HLpRsQ="; + hash = "sha256-3aTO7JGEOP/RCOZ1X9b68rrtv6T78euf1TYGTjyXSRE="; }; buildInputs = diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 773b0ea81eba..e8cf9e4f85ba 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "lwt"; - version = "5.7.0"; + version = "5.8.0"; minimalOCamlVersion = "4.08"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "ocsigen"; repo = "lwt"; rev = version; - hash = "sha256-o0wPK6dPdnsr/LzwcSwbIGcL85wkDjdFuEcAxuS/UEs="; + hash = "sha256-GX5CSJuTajvZJ0TgG95aHeOCBi2B9Aw2URLZRCdp91A="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index ff53efb9d9a4..902a1dbeefc7 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -5,11 +5,11 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-mtime"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; - sha256 = "Pz2g6gBts0RlsDCE3npYqxWg8W9HgoxQC+U63fHgROs="; + sha256 = "sha256-CXyygC43AerZVy4bSD1aKMbi8KOUSfqvm0StiomDTYg="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index 1f23194582a0..7110a66c8f60 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -11,12 +11,12 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") "ptime is not available for OCaml ${ocaml.version}" stdenv.mkDerivation (finalAttrs: { - version = "1.1.0"; + version = "1.2.0"; pname = "ocaml${ocaml.version}-ptime"; src = fetchurl { url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz"; - hash = "sha256-y/WxVFT7JxBeLDNAI+HhHY+TnXF4hw9cvo7SbfcBPrE="; + hash = "sha256-lhZ0f99JDsNugCTKsn7gHjoK9XfYojImY4+kA03nOrA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/res/default.nix b/pkgs/development/ocaml-modules/res/default.nix index 779a3c3d8a5f..b7a4edd69f8e 100644 --- a/pkgs/development/ocaml-modules/res/default.nix +++ b/pkgs/development/ocaml-modules/res/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "res"; - version = "5.0.1"; + version = "5.0.2"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mmottl/res/releases/download/${version}/res-${version}.tbz"; - hash = "sha256-rSrDMQBfnbWAr2LuajP3fveOtOwLyRbKPkaTKsnocQ4="; + hash = "sha256-hQxRETCYxy7ZHah5cg+XHtH3wCj/ofq1VHxsPHu91FU="; }; doCheck = true; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 1395a37c69d3..0e4b1cf83e2c 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -7,7 +7,7 @@ else let pname = "tsdl"; - version = "1.0.0"; + version = "1.1.0"; webpage = "https://erratique.ch/software/${pname}"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - hash = "sha256-XdgzCj9Uqplt/8Jk8rSFaQf8zu+9SZa8b9ZIlW/gjyE="; + hash = "sha256-ZN4+trqesU1IREKcwm1Ro37jszKG8XcVigoE4BdGhzs="; }; strictDeps = true; diff --git a/pkgs/development/python-modules/boiboite-opener-framework/default.nix b/pkgs/development/python-modules/boiboite-opener-framework/default.nix index 9be58802c5e3..79442baf25b4 100644 --- a/pkgs/development/python-modules/boiboite-opener-framework/default.nix +++ b/pkgs/development/python-modules/boiboite-opener-framework/default.nix @@ -34,7 +34,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "bof" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Race condition, https://github.com/secdev/scapy/pull/4558 + # pythonImportsCheck = [ "bof" ]; disabledTests = [ # Tests are using netcat and cat to do UDP connections diff --git a/pkgs/development/python-modules/gradio-pdf/default.nix b/pkgs/development/python-modules/gradio-pdf/default.nix index abceb8b1c5c0..d35698c9f77e 100644 --- a/pkgs/development/python-modules/gradio-pdf/default.nix +++ b/pkgs/development/python-modules/gradio-pdf/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "gradio-pdf"; - version = "0.0.15"; - format = "pyproject"; + version = "0.0.17"; + pyproject = true; src = fetchPypi { pname = "gradio_pdf"; inherit version; - hash = "sha256-R+4CDJo84/+PUTTxoz9CsZlHUVsldgjufWsRkALrfN4="; + hash = "sha256-LoVcwE7eGcK5Nc6qKTnrnI+rNlsDbekhKUP+Fzq2SQ8="; }; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatch-requirements-txt hatchling @@ -36,10 +36,10 @@ buildPythonPackage rec { # tested in `gradio` doCheck = false; - meta = with lib; { + meta = { description = "Python library for easily interacting with trained machine learning models"; homepage = "https://pypi.org/project/gradio-pdf/"; - license = licenses.asl20; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index d07f962b2668..aa869e445c54 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { # not to be confused with @gradio/client@${version} rev = "refs/tags/gradio_client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-UZQWguUN3l0cj2wb2f7A61RTLy9nPYcIEwHIo+F1kR0="; + hash = "sha256-pS7yrqBuq/Pe7sEfReAM6OL2qFQVA+vWra36UuhyDkk="; }; prePatch = '' cd client/python @@ -108,10 +108,11 @@ buildPythonPackage rec { extraArgs = [ "--version-regex" "gradio_client@(.*)" ]; }; - meta = with lib; { + meta = { homepage = "https://www.gradio.app/"; + changelog = "https://github.com/gradio-app/gradio/releases/tag/gradio_client@${version}"; description = "Lightweight library to use any Gradio app as an API"; - license = licenses.asl20; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py b/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py index eb2385bca8d6..a34ee1bbcd87 100644 --- a/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py +++ b/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py @@ -28,6 +28,8 @@ def pytest_runtest_makereport(item, call): for exc in iterate_exc_chain(call.excinfo.value): if isinstance(exc, NixNetworkAccessDeniedError): tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access." + if isinstance(exc, socket.gaierror): + tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access." if isinstance(exc, httpx.ConnectError): tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access." if isinstance(exc, FileNotFoundError): # gradio specific diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index f1698a9b0125..1b9e20496f6d 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -64,15 +64,15 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.44.1"; - format = "pyproject"; + version = "5.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; # We use the Pypi release, since it provides prebuilt webui assets src = fetchPypi { inherit pname version; - hash = "sha256-popSSYrGtj+IZO+Ev3hmpw59B+vpE+35IeHSo3CK1a4="; + hash = "sha256-0hU2aObeLfegG7M/AaB0/HcW7IY8QPRy2OQ5Q57x4VM="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -95,7 +95,7 @@ buildPythonPackage rec { "ruff" ]; - nativeBuildInputs = [ + build-system = [ hatchling hatch-requirements-txt hatch-fancy-pypi-readme @@ -172,6 +172,7 @@ buildPythonPackage rec { disabledTests = [ # Actually broken "test_mount_gradio_app" + "test_processing_utils_backwards_compatibility" # type error # requires network, it caught our xfail exception "test_error_analytics_successful" @@ -284,14 +285,16 @@ buildPythonPackage rec { pythonRemoveDeps = (old.pythonRemoveDeps or [ ]) ++ [ "gradio-client" ]; doInstallCheck = false; doCheck = false; + preCheck = ""; pythonImportsCheck = null; dontCheckRuntimeDeps = true; }); - meta = with lib; { + meta = { homepage = "https://www.gradio.app/"; + changelog = "https://github.com/gradio-app/gradio/releases/tag/gradio@${version}"; description = "Python library for easily interacting with trained machine learning models"; - license = licenses.asl20; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index c53c3c2e3670..fa40d34c8a82 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -45,6 +45,8 @@ buildPythonPackage rec { disabledTests = [ # super slow "test_source_code_from_libcst_node_type" + # https://github.com/Zac-HD/hypothesmith/issues/38 + "test_black_autoformatter_from_grammar" ]; pythonImportsCheck = [ "hypothesmith" ]; diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix index f31daa71f443..bd3f1e2daa5d 100644 --- a/pkgs/development/python-modules/mmengine/default.nix +++ b/pkgs/development/python-modules/mmengine/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system setuptools, @@ -41,6 +42,14 @@ buildPythonPackage rec { hash = "sha256-bZ6O4UOYUCwq11YmgRWepOIngYxYD/fNfM/VmcyUv9k="; }; + patches = [ + (fetchpatch2 { + name = "mmengine-torch-2.5-compat.patch"; + url = "https://github.com/open-mmlab/mmengine/commit/4c22f78cdea2981a2b48a167e9feffe4721f8901.patch"; + hash = "sha256-k+IFLeqTEVUGGiqmZg56LK64H/UTvpGN20GJT59wf4A="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 2a3ff3c5ad34..41da67e108e2 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -11,11 +11,11 @@ }: stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.15.14"; + version = "5.15.15"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - hash = "sha256-MmURlPamt7zkLwTmixQBrSCH5HiaTI8/uGSehhicY3I="; + hash = "sha256-IdaBiwZINLCFARgOSIkOX9h98vs3afgMWBQ0V/VIxAg="; }; patches = [ diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index bbf905dcb82c..a783600fc5de 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.21.5"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-n39H3mh5nLK8ueSG9I13ufWJYrkvukPLiGDacLPFfRs="; + hash = "sha256-P9Ht6skj0ZVsDpB8lz+4O9pGW+rn8FRxazcbKT+bX9w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix index c8a0102e49ed..bb2211a43dfb 100644 --- a/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -2,7 +2,8 @@ lib, buildPythonPackage, fetchPypi, - poetry-core, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -10,13 +11,15 @@ buildPythonPackage rec { version = "0.10.2"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchPypi { pname = "types_s3transfer"; inherit version; hash = "sha256-YBZ6O/tcU27GzbWBj3+aKO3KncPgtf+FrjdFJvxeV24="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ setuptools ]; # Module has no tests doCheck = false; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index bc28ff15db2e..a65a16fdbf8f 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -11,14 +11,14 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.120.0"; + version = "1.127.0"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-sam-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-XFVh7e9ooIBhWRkVovPdrSuyosBMQ84PDRjV2o0x9ns="; + hash = "sha256-5/zXvO5xrNkhPCei4O/nMXA/e18VNrED2lpBbflaJLQ="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix deleted file mode 100644 index 655156c176c6..000000000000 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: - -let - version = "20.4.0.379.2205"; - - desktopItem = makeDesktopItem { - name = "sqldeveloper"; - exec = "sqldeveloper"; - icon = "sqldeveloper"; - desktopName = "Oracle SQL Developer"; - genericName = "Oracle SQL Developer"; - comment = "Oracle's Oracle DB GUI client"; - categories = [ "Development" ]; - }; -in - stdenv.mkDerivation { - - inherit version; - pname = "sqldeveloper"; - - src = requireFile rec { - name = "sqldeveloper-${version}-no-jre.zip"; - url = "https://www.oracle.com/tools/downloads/sqldev-downloads.html"; - message = '' - This Nix expression requires that ${name} already be part of the store. To - obtain it you need to - - - navigate to ${url} - - make sure that it says "Version ${version}" above the list of downloads - - if it does not, click on the "Previous Version" link below the downloads - and repeat until the version is correct. This is necessarry because as the - time of this writing there exists no permanent link for the current version - yet. - Also consider updating this package yourself (you probably just need to - change the `version` variable and update the sha256 to the one of the - new file) or opening an issue at the nixpkgs repo. - - accept the license agreement - - download the file listed under "Other Platforms" - - sign in or create an oracle account if neccessary - - and then add the file to the Nix store using either: - - nix-store --add-fixed sha256 ${name} - - or - - nix-prefetch-url --type sha256 file:///path/to/${name} - ''; - sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k"; - }; - - nativeBuildInputs = [ makeWrapper unzip ]; - - unpackCmd = "unzip $curSrc"; - - installPhase = '' - mkdir -p $out/libexec $out/share/{applications,pixmaps} - mv * $out/libexec/ - - mv $out/libexec/icon.png $out/share/pixmaps/sqldeveloper.png - cp ${desktopItem}/share/applications/* $out/share/applications - - makeWrapper $out/libexec/sqldeveloper/bin/sqldeveloper $out/bin/sqldeveloper \ - --set JAVA_HOME ${jdk.home} \ - --chdir "$out/libexec/sqldeveloper/bin" - ''; - - meta = with lib; { - description = "Oracle's Oracle DB GUI client"; - longDescription = '' - Oracle SQL Developer is a free integrated development environment that - simplifies the development and management of Oracle Database in both - traditional and Cloud deployments. SQL Developer offers complete - end-to-end development of your PL/SQL applications, a worksheet for - running queries and scripts, a DBA console for managing the database, - a reports interface, a complete data modeling solution, and a migration - platform for moving your 3rd party databases to Oracle. - ''; - homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ardumont ]; - }; -} diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock index dab324f352f1..9359528117d1 100644 --- a/pkgs/development/tools/sqlint/Gemfile.lock +++ b/pkgs/development/tools/sqlint/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - google-protobuf (3.25.0) + google-protobuf (3.25.5) pg_query (4.2.3) google-protobuf (>= 3.22.3) sqlint (0.3.0) diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix index 05925a45e69e..4ad8655564e9 100644 --- a/pkgs/development/tools/sqlint/gemset.nix +++ b/pkgs/development/tools/sqlint/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18d1w5j7vjaza3v1ig9j7zyis04kxqdkb1272vbgncxn03ck45mm"; + sha256 = "0fanhdf3vzghma51w1hqpp8s585mwzxgqkwvxj5is4q9j0pgwcs3"; type = "gem"; }; - version = "3.25.0"; + version = "3.25.5"; }; pg_query = { dependencies = ["google-protobuf"]; diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index e682bb398f91..de94d317a55b 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "i2c-tools"; - version = "4.3"; + version = "4.4"; src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/snapshot/i2c-tools-v${version}.tar.gz"; - sha256 = "sha256-HlmIocum+HZEKNiS5BUwEIswRfTMUhD1vCPibAuAK0Q="; + sha256 = "sha256-Zm83gxdZH2XQCc/Dihp7vumF9WAvKgt6OORns5Mua7M="; }; buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/universal-pidff/default.nix b/pkgs/os-specific/linux/universal-pidff/default.nix index 3325735c279b..e073d5a01ff6 100644 --- a/pkgs/os-specific/linux/universal-pidff/default.nix +++ b/pkgs/os-specific/linux/universal-pidff/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/JacKeTUs/universal-pidff"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - danerieber + computerdane racci ]; platforms = lib.platforms.linux; diff --git a/pkgs/servers/atlassian/bamboo.nix b/pkgs/servers/atlassian/bamboo.nix deleted file mode 100644 index b5e97a87da56..000000000000 --- a/pkgs/servers/atlassian/bamboo.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenvNoCC, lib, fetchurl, mysql_jdbc -, withMysql ? true -}: - - -stdenvNoCC.mkDerivation rec { - pname = "atlassian-bamboo"; - version = "9.6.4"; - - src = fetchurl { - url = "https://product-downloads.atlassian.com/software/bamboo/downloads/atlassian-bamboo-${version}.tar.gz"; - hash = "sha256-Gd4+rH/40s9AvJi/waEVfVwWtT0H3bSlknNV6wxGpNg="; - }; - - buildPhase = '' - echo "bamboo.home=/run/bamboo/home" > atlassian-bamboo/WEB-INF/classes/bamboo-init.properties - mv conf/server.xml conf/server.xml.dist - ln -sf /run/atlassian-bamboo/server.xml conf/server.xml - rm -r logs; ln -sf /run/atlassian-bamboo/logs/ . - rm -r temp; ln -sf /run/atlassian-bamboo/temp/ . - rm -r work; ln -sf /run/atlassian-bamboo/work/ . - '' + lib.optionalString withMysql '' - cp -v ${mysql_jdbc}/share/java/*jar atlassian-bamboo/lib/ - ''; - - installPhase = '' - cp -rva . $out - patchShebangs $out/bin - ''; - - meta = with lib; { - description = "Bamboo Data Center is a continuous delivery server"; - homepage = "https://www.atlassian.com/software/bamboo"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = with licenses; [ unfree ]; - maintainers = with maintainers; [ techknowlogick ]; - }; -} diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix deleted file mode 100644 index ea33a66ee044..000000000000 --- a/pkgs/servers/atlassian/confluence.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenvNoCC, lib, fetchurl, mysql_jdbc ? null -, enableSSO ? false -, crowdProperties ? null -, withMysql ? true -}: - -assert withMysql -> (mysql_jdbc != null); - -lib.warnIf (crowdProperties != null) "Using `crowdProperties` is deprecated!" -(stdenvNoCC.mkDerivation rec { - pname = "atlassian-confluence"; - version = "9.0.1"; - - src = fetchurl { - url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - hash = "sha256-WCshWmJaTfyjRLaXUtkDuXHO5eEhHa/rDCPVFSLd3aU="; - }; - - buildPhase = '' - echo "confluence.home=/run/confluence/home" > confluence/WEB-INF/classes/confluence-init.properties - mv conf/server.xml conf/server.xml.dist - ln -sf /run/confluence/home/deploy conf/Standalone - ln -sf /run/confluence/server.xml conf/server.xml - rm -r logs; ln -sf /run/confluence/logs/ . - rm -r work; ln -sf /run/confluence/work/ . - rm -r temp; ln -sf /run/confluence/temp/ . - '' + lib.optionalString enableSSO '' - substituteInPlace confluence/WEB-INF/classes/seraph-config.xml \ - --replace com.atlassian.confluence.user.ConfluenceAuthenticator\ - com.atlassian.confluence.user.ConfluenceCrowdSSOAuthenticator - '' + lib.optionalString (crowdProperties != null) '' - cat < confluence/WEB-INF/classes/crowd.properties - ${crowdProperties} - EOF - '' + lib.optionalString withMysql '' - cp -v ${mysql_jdbc}/share/java/*jar confluence/WEB-INF/lib/ - ''; - - installPhase = '' - cp -rva . $out - patchShebangs $out/bin - ''; - - meta = with lib; { - description = "Team collaboration software written in Java and mainly used in corporate environments"; - homepage = "https://www.atlassian.com/software/confluence"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.unfree; - maintainers = with maintainers; [ willibutz ciil techknowlogick ]; - }; -}) diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix deleted file mode 100644 index 44c44a0d2681..000000000000 --- a/pkgs/servers/atlassian/crowd.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchurl, home ? "/var/lib/crowd" -, port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }: - -lib.warnIf (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is deprecated!" -(stdenv.mkDerivation rec { - pname = "atlassian-crowd"; - version = "5.0.1"; - - src = fetchurl { - url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz"; - sha256 = "sha256-ccXSNuiXP0+b9WObboikqVd0nKH0Fi2gMVEF3+WAx5M="; - }; - - buildPhase = '' - mv apache-tomcat/conf/server.xml apache-tomcat/conf/server.xml.dist - ln -s /run/atlassian-crowd/server.xml apache-tomcat/conf/server.xml - - rm -rf apache-tomcat/{logs,work} - ln -s /run/atlassian-crowd/logs apache-tomcat/logs - ln -s /run/atlassian-crowd/work apache-tomcat/work - - ln -s /run/atlassian-crowd/database database - - substituteInPlace apache-tomcat/bin/startup.sh --replace start run - - echo "crowd.home=${home}" > crowd-webapp/WEB-INF/classes/crowd-init.properties - substituteInPlace build.properties \ - --replace "openidserver.url=http://localhost:8095/openidserver" \ - "openidserver.url=http://localhost:${toString port}/openidserver" - substituteInPlace crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ - --replace "http://localhost:8095/" \ - "http://localhost:${toString port}/" - sed -r -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ - -e 's,application.password\s+password,application.password ${openidPassword},' - '' + lib.optionalString (proxyUrl != null) '' - sed -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ - -e 's,http://localhost:${toString port}/openidserver,${proxyUrl}/openidserver,' - ''; - - installPhase = '' - cp -rva . $out - ''; - - meta = with lib; { - description = "Single sign-on and identity management tool"; - homepage = "https://www.atlassian.com/software/crowd"; - license = licenses.unfree; - maintainers = [ ]; - }; -}) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix deleted file mode 100644 index ea0f6579845b..000000000000 --- a/pkgs/servers/atlassian/jira.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, lib -, fetchurl -, gawk -, enableSSO ? false -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "atlassian-jira"; - version = "9.17.1"; - - src = fetchurl { - url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - hash = "sha256-hSwPVYIN1/BG6d8UepopLEMExjwDg/w/Bwj9k27nmDQ="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildPhase = '' - mv conf/server.xml conf/server.xml.dist - ln -sf /run/atlassian-jira/server.xml conf/server.xml - rm -r logs; ln -sf /run/atlassian-jira/logs/ . - rm -r work; ln -sf /run/atlassian-jira/work/ . - rm -r temp; ln -sf /run/atlassian-jira/temp/ . - substituteInPlace bin/check-java.sh \ - --replace "awk" "${gawk}/bin/gawk" - '' + lib.optionalString enableSSO '' - substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \ - --replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \ - com.atlassian.jira.security.login.SSOSeraphAuthenticator - ''; - - installPhase = '' - cp -rva . $out - ''; - - meta = with lib; { - description = "Proprietary issue tracking product, also providing project management functions"; - homepage = "https://www.atlassian.com/software/jira"; - license = licenses.unfree; - maintainers = with maintainers; [ ciil megheaiulian techknowlogick ]; - }; -} diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix index 7123389e8bc1..98ba5281c5df 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix @@ -1,6 +1,7 @@ { lib , buildHomeAssistantComponent , fetchFromGitHub +, pycryptodome }: buildHomeAssistantComponent rec { @@ -15,6 +16,8 @@ buildHomeAssistantComponent rec { hash = "sha256-xTnbA4GztHOE61QObEJbzUSdbuSrhbcJ280DUDdM+n4="; }; + dependencies = [ pycryptodome ]; + meta = with lib; { description = "Auto-configure and then control your Midea M-Smart devices (Air conditioner, Fan, Water heater, Washer, etc) via local area network"; homepage = "https://github.com/georgezhao2010/midea_ac_lan/"; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index ff628ba2e329..27581d185463 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "skydns"; @@ -25,11 +25,13 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - meta = with lib; { + meta = { description = "Distributed service for announcement and discovery of services"; homepage = "https://github.com/skynetservices/skydns"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "skydns"; + # link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index e4bb9ba3ae2d..ee9eb2e640ae 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -1,23 +1,19 @@ -{ lib -, stdenv -, buildNpmPackage -, overrideSDK -, fetchFromGitHub -, testers -, balena-cli -, node-gyp -, python3 -, udev -, cctools -, darwin +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + testers, + balena-cli, + node-gyp, + python3, + udev, + cctools, + apple-sdk_12, + darwinMinVersionHook, }: -let - # Fix for: https://github.com/NixOS/nixpkgs/issues/272156 - buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; -in buildNpmPackage' rec { +buildNpmPackage rec { pname = "balena-cli"; version = "19.0.13"; @@ -35,19 +31,22 @@ in buildNpmPackage' rec { ''; makeCacheWritable = true; - nativeBuildInputs = [ - node-gyp - python3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools - ]; + nativeBuildInputs = + [ + node-gyp + python3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - udev - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + udev + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_12 + ]; passthru.tests.version = testers.testVersion { package = balena-cli; @@ -69,7 +68,10 @@ in buildNpmPackage' rec { homepage = "https://github.com/balena-io/balena-cli"; changelog = "https://github.com/balena-io/balena-cli/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = [ maintainers.kalebpace maintainers.doronbehar ]; + maintainers = [ + maintainers.kalebpace + maintainers.doronbehar + ]; mainProgram = "balena"; }; } diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index 363663af4133..1d86649c2ff1 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -27,16 +27,16 @@ in buildGoModule rec { pname = "berglas"; - version = "2.0.2"; + version = "2.0.6"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+fpxklkcjGiBMyW+L9nNdzXwhGcE2yIbZ/wPbpj9bV0="; + sha256 = "sha256-aTUMEn/QkPzvAyUvMxyqLl6KWFHs+dQK0VDqYv36AGM="; }; - vendorHash = "sha256-BDQJFrFbJGuoDpjGn0T9xWk6huUmDpOTO/JSDIYUKYg="; + vendorHash = "sha256-n/NOAmOOoZMFZGreUGNgrZ3XGbhmI52KtgakcJ/SJIc="; ldflags = [ "-s" diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index ebbae9ad48c1..ac34affce1c8 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,19 +11,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.56.2"; + version = "0.57.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-wqiFUiNZ3VG4c/QkoliU2BtqanyC4GwlwUZomOX3VrU="; + hash = "sha256-al8hxVNyDoGQaoqa0fmA7Bn7M1twwlS4I5+XZnETXyc="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-+WkOGy/Z4BuDlwpfisWqhjJlshPXTxjRy2pmmHxU6B8="; + vendorHash = "sha256-TEjV9Cr5oXNMvzFpRDQ9MxgbZMJnq++eU/xJi2/piF8="; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index b1daf3aa13e6..9a2eb15fee14 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -19,13 +19,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "0-unstable-2024-09-16"; + version = "0-unstable-2024-10-04"; src = fetchFromGitHub { owner = "kaldi-asr"; repo = "kaldi"; - rev = "d9ab0465aa2849ff645c027110c48899d5ec6ca8"; - sha256 = "sha256-usrHtVGkp++mU9rWI3u3vXJ8aAycujw9+5VQd0X0idY="; + rev = "4a8b7f673275597fef8a15b160124bd0985b59bd"; + sha256 = "sha256-CY40zkVP0ZTjOBjnmVyFdqaHdAxuGGH82GzudoA5MyM="; }; cmakeFlags = [ diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 6f8b166d4444..dff2a8d8c7c8 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/kpcli/${pname}-${version}.pl"; - sha256 = "sha256-hvyCC8eUXNm1d1g+/kEnVllRJokChgJWzuoQB5Xd8j8="; + hash = "sha256-hvyCC8eUXNm1d1g+/kEnVllRJokChgJWzuoQB5Xd8j8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { makeWrapper $out/share/kpcli.pl $out/bin/kpcli --set PERL5LIB \ "${with perlPackages; makePerlPath ([ - CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser + BHooksEndOfScope CaptureTiny Clipboard Clone CryptRijndael CryptX DevelGlobalDestruction ModuleImplementation + ModuleRuntime SortNaturally SubExporterProgressive TermReadKey TermShellUI TryTiny FileKDBX FileKeePass + PackageStash RefUtil TermReadLineGnu XMLParser boolean namespaceclean ] ++ lib.optional stdenv.hostPlatform.isDarwin MacPasteboard)}" ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cfbc05fa7739..6603b96b8191 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -115,6 +115,10 @@ mapAliases { aria = aria2; # Added 2024-03-26 armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 aseprite-unfree = aseprite; # Added 2023-08-26 + atlassian-bamboo = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02 + atlassian-confluence = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02 + atlassian-crowd = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02 + atlassian-jira = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02 audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06 auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14 @@ -273,6 +277,7 @@ mapAliases { dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07 dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 + docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02 docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29 docker-distribution = distribution; # Added 2023-12-26 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 @@ -536,6 +541,7 @@ mapAliases { jami-client-qt = jami-client; # Added 2022-11-06 jami-client = jami; # Added 2023-02-10 jami-daemon = jami.daemon; # Added 2023-02-10 + javacard-devkit = throw "javacard-devkit was dropped due to having a dependency on the Oracle JDK, as well as being several years out-of-date."; # Added 2024-11-01 jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07 @@ -894,6 +900,15 @@ mapAliases { onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24 + oraclejdk = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + oraclejdk8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + oraclejre = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + oraclejre8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + jrePlugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + jre8Plugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + jdkdistro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + oraclejdk8distro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + oraclejdk11 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 OSCAR = oscar; # Added 2024-06-12 osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 @@ -1112,6 +1127,7 @@ mapAliases { spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07 spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17 + sqldeveloper = throw "sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support"; # Added 2024-11-02 srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d66ad450ec82..aff676385035 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5027,8 +5027,6 @@ with pkgs; gfxreconstruct = callPackage ../tools/graphics/gfxreconstruct { }; - go-chromecast = callPackage ../applications/video/go-chromecast { }; - go-containerregistry = callPackage ../development/tools/go-containerregistry { }; inherit (go-containerregistry) crane gcrane; @@ -6938,8 +6936,6 @@ with pkgs; docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; - docear = callPackage ../applications/office/docear { }; - dockbarx = callPackage ../applications/misc/dockbarx { }; dog = callPackage ../tools/system/dog { }; @@ -15012,35 +15008,12 @@ with pkgs; openspin = callPackage ../development/compilers/openspin { }; - oraclejdk = jdkdistro true false; - - oraclejdk8 = oraclejdk8distro true false; - - oraclejre = lowPrio (jdkdistro false false); - - oraclejre8 = lowPrio (oraclejdk8distro false false); - - jrePlugin = jre8Plugin; - - jre8Plugin = lowPrio (oraclejdk8distro false true); - - jdkdistro = oraclejdk8distro; - - oraclejdk8distro = installjdk: pluginSupport: - (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { - inherit installjdk pluginSupport; - }); - - oraclejdk11 = callPackage ../development/compilers/oraclejdk/jdk11-linux.nix { }; - jasmin = callPackage ../development/compilers/jasmin { }; java-service-wrapper = callPackage ../tools/system/java-service-wrapper { }; jna = callPackage ../development/java-modules/jna { }; - javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; - juniper = callPackage ../development/compilers/juniper { }; inherit (callPackage ../development/compilers/julia { }) @@ -15708,10 +15681,6 @@ with pkgs; spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; - sqldeveloper = callPackage ../development/tools/database/sqldeveloper { - jdk = oraclejdk; - }; - sqlfluff = callPackage ../development/tools/database/sqlfluff { }; sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { @@ -23971,11 +23940,6 @@ with pkgs; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; - atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { }; - atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { }; - atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { }; - atlassian-jira = callPackage ../servers/atlassian/jira.nix { }; - cadvisor = callPackage ../servers/monitoring/cadvisor { }; cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { @@ -30264,7 +30228,7 @@ with pkgs; kondo = callPackage ../applications/misc/kondo { }; - kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { + kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; @@ -32577,7 +32541,7 @@ with pkgs; taskopen = callPackage ../applications/misc/taskopen { }; - telegram-desktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { + telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d703f43124e..78175b359655 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9938,6 +9938,21 @@ with self; { }; }; + FileKDBX = buildPerlPackage { + pname = "File-KDBX"; + version = "0.906"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CC/CCM/File-KDBX-0.906.tar.gz"; + hash = "sha256-tHt/kzOrtJHqrsY0WhTn+TlW0UOUTBS4Fkp/0bIkvW8="; + }; + propagatedBuildInputs = [ CryptArgon2 CryptX DevelGlobalDestruction FileKeePass IteratorSimple RefUtil XMLLibXML boolean namespaceclean ]; + buildInputs = [ ScopeGuard TestDeep TestFatal TestWarnings ]; + meta = { + description = "Interface to KeePass V3 and V4 database files"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileKeePass = buildPerlPackage { pname = "File-KeePass"; version = "2.03"; @@ -13317,6 +13332,19 @@ with self; { }; }; + IteratorSimple = buildPerlPackage { + pname = "Iterator-Simple"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz"; + hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q="; + }; + meta = { + description = "Simple iterator and utilities"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; + IPCSignal = buildPerlPackage { pname = "IPC-Signal"; version = "1.00";