Unverified Commit a1ecbe2e authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #270701 from sumnerevans/matrix-synapse-1.97 

matrix-synapse: 1.95.1 -> 1.97.0
parents 8247d172 fd522b61

nixos/tests/matrix/synapse.nix

+14 −30
Original line number Diff line number Diff line 
import ../make-test-python.nix ({ pkgs, ... } : let





  runWithOpenSSL = file: cmd: pkgs.runCommand file {

    buildInputs = [ pkgs.openssl ];

  } cmd;





  ca_key = runWithOpenSSL "ca-key.pem" "openssl genrsa -out $out 2048";

  ca_pem = runWithOpenSSL "ca.pem" ''

    openssl req \

      -x509 -new -nodes -key ${ca_key} \

      -days 10000 -out $out -subj "/CN=snakeoil-ca"

  ca_key = mailerCerts.ca.key;

  ca_pem = mailerCerts.ca.cert;



  bundle = pkgs.runCommand "bundle" {

    nativeBuildInputs = [ pkgs.minica ];

  } ''

    minica -ca-cert ${ca_pem} -ca-key ${ca_key} \

      -domains localhost

    install -Dm444 -t $out localhost/{key,cert}.pem

  '';

  key = runWithOpenSSL "matrix_key.pem" "openssl genrsa -out $out 2048";

  csr = runWithOpenSSL "matrix.csr" ''

    openssl req \

       -new -key ${key} \

       -out $out -subj "/CN=localhost" \

  '';

  cert = runWithOpenSSL "matrix_cert.pem" ''

    openssl x509 \

      -req -in ${csr} \

      -CA ${ca_pem} -CAkey ${ca_key} \

      -CAcreateserial -out $out \

      -days 365

  '';





  mailerCerts = import ../common/acme/server/snakeoil-certs.nix;

  mailerDomain = mailerCerts.domain;
@@ -82,8 +66,8 @@ in { 
            host = "localhost";

            port = config.services.redis.servers.matrix-synapse.port;

          };

          tls_certificate_path = "${cert}";

          tls_private_key_path = "${key}";

          tls_certificate_path = "${bundle}/cert.pem";

          tls_private_key_path = "${bundle}/key.pem";

          registration_shared_secret = registrationSharedSecret;

          public_baseurl = "https://example.com";

          email = {
@@ -203,8 +187,8 @@ in { 
        settings = {

          inherit listeners;

          database.name = "sqlite3";

          tls_certificate_path = "${cert}";

          tls_private_key_path = "${key}";

          tls_certificate_path = "${bundle}/cert.pem";

          tls_private_key_path = "${bundle}/key.pem";

        };

      };

    };
@@ -222,7 +206,7 @@ in { 
        "journalctl -u matrix-synapse.service | grep -q 'Connected to redis'"

    )

    serverpostgres.require_unit_state("postgresql.service")

    serverpostgres.succeed("register_new_matrix_user -u ${testUser} -p ${testPassword} -a -k ${registrationSharedSecret} https://localhost:8448/")

    serverpostgres.succeed("REQUESTS_CA_BUNDLE=${ca_pem} register_new_matrix_user -u ${testUser} -p ${testPassword} -a -k ${registrationSharedSecret} https://localhost:8448/")

    serverpostgres.succeed("obtain-token-and-register-email")

    serversqlite.wait_for_unit("matrix-synapse.service")

    serversqlite.wait_until_succeeds(

pkgs/servers/matrix-synapse/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -17,20 +17,20 @@ let 
in

python3.pkgs.buildPythonApplication rec {

  pname = "matrix-synapse";

  version = "1.95.1";

  version = "1.97.0";

  format = "pyproject";



  src = fetchFromGitHub {

    owner = "matrix-org";

    repo = "synapse";

    rev = "v${version}";

    hash = "sha256-5RyJCMYsf6p9rd1ATEHa+FMV6vv3ULbcx7PXxMSUGSU=";

    hash = "sha256-KusCJj5MVmRbniI9aTjRInPMpIDZKWs5w+TImVKHrPc=";

  };



  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src;

    name = "${pname}-${version}";

    hash = "sha256-gNjpML+j9ABv24WrAiJI5hoEoIqcVPL2I4V/W+sWFSg=";

    hash = "sha256-SImgV47EfKy70VmcBREu1aiZFvX0+h0Ezw+/rUZufAg=";

  };



  postPatch = ''