Merge master into staging-next

- `cloudflare-ddns`: Added package cloudflare-ddns.

- `clickhouse`: Added `serverConfig`, `usersConfig` configuration options accepting Nix attribute sets. Also added `extraServerConfig` and `extraUsersConfig` options accepting plain text (expecting XML configuration).

- [`homebox` 0.20.0](https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0) changed how assets are stored and hashed. It is recommended to back up your database before this update. In particular, `--storage-data` was replaced with `--storage-conn-string` and `--storage-prefix-path`. If your configuration set `HBOX_STORAGE_DATA` manually, you must migrate it to `HBOX_STORAGE_CONN_STRING` and `HBOX_STORAGE_PREFIX_PATH`.

}:

let

  cfg = config.services.clickhouse;

  format = pkgs.formats.yaml { };

  serverConfigFile = format.generate "config.yaml" cfg.serverConfig;

  usersConfigFile = format.generate "users.yaml" cfg.usersConfig;

in

{

  meta.maintainers = [ "thevar1able" ];

  ###### interface

  options = {

      enable = lib.mkEnableOption "ClickHouse database server";

      package = lib.mkPackageOption pkgs "clickhouse" { };

      package = lib.mkPackageOption pkgs "clickhouse" {

        example = "pkgs.clickhouse-lts";

      };

      serverConfig = lib.mkOption {

        type = format.type;

        default = { };

        example = lib.literalExpression ''

          {

            http_port = 8123;

            tcp_port = 9000;

            remote_servers = {

              default = {

                shard = {

                  replica = [

                    { host = "::"; port = "9000"; }

                    { host = "::"; port = "9001"; }

                    { host = "::"; port = "9002"; }

                  ];

                };

              };

            };

          }

        '';

        description = ''

          Your {file}`config.yaml` as a Nix attribute set.

          Check the [documentation](https://clickhouse.com/docs/operations/configuration-files)

          for possible options.

        '';

      };

      usersConfig = lib.mkOption {

        type = format.type;

        default = { };

        example = lib.literalExpression ''

          {

            profiles = {};

            users = {

              default = {

                profile = "default";

                password_sha256_hex = "36dd292533174299fb0c34665df468bb881756ca9eaf9757d0cfde38f9ededa1";  # `echo -n verysecret | sha256sum`

              };

            };

          }

        '';

        description = ''

          Your {file}`users.yaml` as a Nix attribute set.

          Check the [documentation](https://clickhouse.com/docs/operations/configuration-files#user-settings)

          for possible options.

        '';

      };

      extraServerConfig = lib.mkOption {

        type = lib.types.lines;

        default = "";

        example = ''

          <clickhouse>

            <max_connections>500</max_connections>

            <keep_alive_timeout>3</keep_alive_timeout>

          </clickhouse>

        '';

        description = "Additional raw XML configuration for ClickHouse server.";

      };

      extraUsersConfig = lib.mkOption {

        type = lib.types.lines;

        default = "";

        example = ''

          <clickhouse>

            <users>

              <readonly>

                <profile>readonly</profile>

              </readonly>

            </users>

          </clickhouse>

        '';

        description = "Additional raw XML configuration for ClickHouse server.";

      };

    };

      description = "ClickHouse server";

      wantedBy = [ "multi-user.target" ];

      after = [ "network.target" ];

      serviceConfig = {

        Type = "notify";

        User = "clickhouse";

        Group = "clickhouse";

        ConfigurationDirectory = "clickhouse-server";

        AmbientCapabilities = "CAP_SYS_NICE";

        StateDirectory = "clickhouse";

        LogsDirectory = "clickhouse";

        ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=/etc/clickhouse-server/config.xml";

        ExecStart = "${cfg.package}/bin/clickhouse-server --config=/etc/clickhouse-server/config.xml";

        TimeoutStartSec = "infinity";

      };

      "clickhouse-server/users.xml" = {

        source = "${cfg.package}/etc/clickhouse-server/users.xml";

      };

      "clickhouse-server/config.d/100-nixos-module-config.yaml" = lib.mkIf (cfg.serverConfig != { }) {

        source = serverConfigFile;

      };

      "clickhouse-server/users.d/100-nixos-module-config.yaml" = lib.mkIf (cfg.usersConfig != { }) {

        source = usersConfigFile;

      };

      "clickhouse-server/config.d/200-nixos-module-extra-config.xml" =

        lib.mkIf (cfg.extraServerConfig != "")

          {

            text = cfg.extraServerConfig;

          };

      "clickhouse-server/users.d/200-nixos-module-extra-config.xml" =

        lib.mkIf (cfg.extraUsersConfig != "")

          {

            text = cfg.extraUsersConfig;

          };

    };

    environment.systemPackages = [ cfg.package ];

    blueballs-neovim = throw "`blueballs-neovim` has been removed"; # added 2025-06-17

    BufOnly = BufOnly-vim;

    calendar = calendar-vim;

    coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # addedd 2025-10-01

    coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01

    coc-vetur = throw "coc-vetur was removed, as vetur is unmaintained by Vue. You should switch to Volar, which supports Vue 3"; # added 2025-10-01

    coffee-script = vim-coffee-script;

    coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18

    repeat = vim-repeat;

    riv = riv-vim;

    rhubarb = vim-rhubarb;

    rust-tools-nvim = lib.warnOnInstantiate "rust-tools-nvim is abandoned by upstream; you should use rustaceanvim" rust-tools-nvim;

    sensible = vim-sensible;

    signature = vim-signature;

    snipmate = vim-snipmate;

    name = "harper";

    publisher = "elijah-potter";

    version = harper.version;

    hash = "sha256-kWO3Gd2g5IsMCg+rvlQ3LpU/g5hUrpCsg3+vmOO0mnA=";

    hash = "sha256-KyN3WXJIZVgMe4zoxI6ijmltDLLvHOeYbuxLAYX+x0k=";

  };

  nativeBuildInputs = [

     createSwDoc();

     SwDoc* pDoc = getSwDoc();

     IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess();

--- a/sw/qa/extras/layout/layout4.cxx	2025-11-05 10:23:47.982125220 +0100

+++ b/sw/qa/extras/layout/layout4.cxx	2025-11-05 10:24:21.813125756 +0100

@@ -1647,6 +1647,7 @@

 CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf162314)

 {

+    return ; // Missing glyphs in the system font version

     // Regression test for bidi portion line breaking where the portion layout ends with underflow,

     // but the bidi portion should not be truncated.

     createSwDoc("tdf162314.fodt");

--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx	2025-11-05 10:25:25.693126767 +0100

+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx	2025-11-05 10:27:38.216128865 +0100

@@ -5127,6 +5127,7 @@

 // tdf#134226 - Tests that shaping is not broken by invisible spans

 CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf134226)

 {

+    return ; // flaky layout test; depends on system font versions?

     saveAsPDF(u"tdf134226-shadda-in-hidden-span.fodt");

     std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport();

@@ -5605,6 +5606,7 @@

 // tdf#151748 - Textboxes should validate kashida positions

 CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf151748KashidaSpace)

 {

+    return ; // flaky layout test; depends on the system font versions?

     saveAsPDF(u"tdf151748.fodt");

     auto pPdfDocument = parsePDFExport();

@@ -5665,6 +5667,7 @@

 // tdf#163105 - Writer kashida justification should expand spaces

 CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf163105SwKashidaSpaceExpansion)

 {

+    return ; // flaky layout test; depends on the system font versions?

     saveAsPDF(u"tdf163105-kashida-spaces.fodt");

     auto pPdfDocument = parsePDFExport();