Merge master into staging-next

- `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides

- `gitlab` installations created or updated between versions \[15.11.0, 15.11.2] have an incorrect database schema. This will become a problem when upgrading to `gitlab` >=16.2.0. A workaround for affected users can be found in the [GitLab docs](https://docs.gitlab.com/ee/update/versions/gitlab_16_changes.html#undefined-column-error-upgrading-to-162-or-later).

- `consul` has been updated to `1.16.0`. See the [release note](https://github.com/hashicorp/consul/releases/tag/v1.16.0) for more details. Once a new Consul version has started and upgraded its data directory, it generally cannot be downgraded to the previous version.

- `himalaya` has been updated to `0.8.0`, which drops the native TLS support (in favor of Rustls) and add OAuth 2.0 support. See the [release note](https://github.com/soywod/himalaya/releases/tag/v0.8.0) for more details.

{

  options = {

    services.atuin = {

      enable = lib.mkEnableOption (mdDoc "Enable server for shell history sync with atuin");

      enable = lib.mkEnableOption (mdDoc "Atuin server for shell history sync");

      openRegistration = mkOption {

        type = types.bool;

        ''Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.

          Please back up your data and migrate to the gitlab-container-registry package.''

      )

      (mkIf

        (versionAtLeast (getVersion cfg.packages.gitlab) "16.2.0" && versionOlder (getVersion cfg.packages.gitlab) "16.5.0")

        ''GitLab instances created or updated between versions [15.11.0, 15.11.2] have an incorrect database schema.

        Check the upstream documentation for a workaround: https://docs.gitlab.com/ee/update/versions/gitlab_16_changes.html#undefined-column-error-upgrading-to-162-or-later''

      )

    ];

    assertions = [

        Restart = "on-failure";

        WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";

        ExecStart = concatStringsSep " " [

          "${cfg.packages.gitlab.rubyEnv}/bin/puma"

          "${cfg.packages.gitlab.rubyEnv}/bin/bundle" "exec" "puma"

          "-e production"

          "-C ${cfg.statePath}/config/puma.rb"

          "-w ${cfg.puma.workers}"

stdenv.mkDerivation rec {

  pname = "ocenaudio";

  version = "3.12.5";

  version = "3.12.6";

  src = fetchurl {

    url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";

    sha256 = "sha256-+edswdSwuEiGpSNP7FW6xvZy/rH53KcSSGAFXSb0DIM=";

    sha256 = "sha256-kQR0FaZbcdKf1yKHwTA525qzyFldSESQq6NRSZipUQw=";

  };

  nativeBuildInputs = [

stdenv.mkDerivation (finalAttrs: {

  pname = "praat";

  version = "6.3.15";

  version = "6.3.16";

  src = fetchFromGitHub {

    owner = "praat";

    repo = "praat";

    rev = "v${finalAttrs.version}";

    hash = "sha256-Lo0aJ3BbFkZxAJZyOTzso9esYnkTkeKAFNUi7Q2d/hI=";

    hash = "sha256-0g16EblefuUU99RgcwtGrPWniGGlOt6GjVjyNdzN3GY=";

  };

  nativeBuildInputs = [