Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a9b4f2dec2ac
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d02087843e1e
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 10, 2017

  1. matrix-synapse: 0.19.3 -> 0.20.0 

    (cherry picked from commit 0f64656)
    @fadenb @fpletz
    fadenb authored and fpletz committed Jul 10, 2017
    Copy the full SHA
    9e08a70 View commit details

  2. matrix-synapse: 0.20.0 -> 0.21.0 

    (cherry picked from commit 2b7eb32)
    @fadenb @fpletz
    fadenb authored and fpletz committed Jul 10, 2017
    Copy the full SHA
    cad1a8f View commit details

  3. matrix-synapse service: restart on failure 

    (cherry picked from commit 4ec0947)
    @fpletz
    fpletz committed Jul 10, 2017
    Copy the full SHA
    42ce762 View commit details

  4. matrix-synapse: 0.21.0 -> 0.22.1 

    (cherry picked from commit 90f9d52)
    @fpletz
    fpletz committed Jul 10, 2017
    Copy the full SHA
    d020878 View commit details
Showing with 5 additions and 2 deletions.
  1. +2 −0 nixos/modules/services/misc/matrix-synapse.nix
  2. +3 −2 pkgs/servers/matrix-synapse/default.nix
2 changes: 2 additions & 0 deletions nixos/modules/services/misc/matrix-synapse.nix
View file
Original file line number Diff line number Diff line change
@@ -606,6 +606,7 @@ in {
} ];

systemd.services.matrix-synapse = {
description = "Synapse Matrix homeserver";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
@@ -621,6 +622,7 @@ in {
WorkingDirectory = "/var/lib/matrix-synapse";
PermissionsStartOnly = true;
ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse";
Restart = "on-failure";
};
};
};
5 changes: 3 additions & 2 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,13 +24,13 @@ let
};
in pythonPackages.buildPythonApplication rec {
name = "matrix-synapse-${version}";
version = "0.19.3";
version = "0.22.1";

src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
sha256 = "0dnlv2rgda94zlgwkpryjsypcf995l7zdp19d2xiq7zpd13x6yag";
sha256 = "06kqqsfqmziff7i99yyxqvkqjm7fwi56abc2vy25g9kqzpdvkay7";
};

patches = [ ./matrix-synapse.patch ];
@@ -41,6 +41,7 @@ in pythonPackages.buildPythonApplication rec {
signedjson systemd twisted ujson unpaddedbase64 pyyaml
matrix-angular-sdk bleach netaddr jinja2 psycopg2
psutil msgpack lxml matrix-synapse-ldap3
phonenumbers jsonschema
];

# Checks fail because of Tox.