Unverified Commit c67b8fa7 authored by Michael Daniels's avatar Michael Daniels Committed by GitHub
Browse files

matrix-tuwunel: 1.5.1 -> 1.6.0 (#510007)

parents 3ce0aa7d 6b1773cc

nixos/modules/services/matrix/tuwunel.nix

+0 −9
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ in 
            description = ''

              Addresses (IPv4 or IPv6) to listen on for connections by the reverse proxy/tls terminator.

              If set to `null`, tuwunel will listen on IPv4 and IPv6 localhost.

              Must be `null` if `unix_socket_path` is set.

            '';

          };

          global.port = lib.mkOption {
@@ -167,14 +166,6 @@ in 


  config = lib.mkIf cfg.enable {

    assertions = [

      {

        assertion = !(cfg.settings ? global.unix_socket_path) || !(cfg.settings ? global.address);

        message = ''

          In `services.matrix-tuwunel.settings.global`, `unix_socket_path` and `address` cannot be set at the

          same time.

          Leave one of the two options unset or explicitly set them to `null`.

        '';

      }

      {

        assertion = cfg.user != defaultUser -> config ? users.users.${cfg.user};

        message = "If `services.matrix-tuwunel.user` is changed, the configured user must already exist.";

pkgs/by-name/ma/matrix-tuwunel/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -89,16 +89,16 @@ let 
in

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "matrix-tuwunel";

  version = "1.5.1";

  version = "1.6.0";



  src = fetchFromGitHub {

    owner = "matrix-construct";

    repo = "tuwunel";

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

    hash = "sha256-VdG8tSbRPTG915l0Y7eYsGprPSerYF2dpo64D4er5io=";

    hash = "sha256-7w2+hltPj0mP3xcmHfjFvIqxwFkcf71bzm4TFiz745g=";

  };



  cargoHash = "sha256-97DM+khPcwze3iH4DJODyI8WEjqcl3ftg26odcRdrKc=";

  cargoHash = "sha256-DuHV4/a3B/Khq9/RgxFg5RfQ2svdKPv+QyuUqKGAveo=";



  nativeBuildInputs = [

    pkg-config