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: ef1be47edb0f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4835f65e9507
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 18, 2019

  1. matrix-synapse: 1.2.1 -> 1.3.1

    @mguentner
    mguentner committed Aug 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mguentner Maximilian Güntner
    GPG key ID: 96126664034A9D85
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    86a57e4 View commit details

  2. nixos/matrix-synapse: use notify instead of simple 

    Starting with 1.3.0, matrix-synapse supports notifying
systemd. Relevant PR: matrix-org/synapse#5732
    @mguentner
    mguentner committed Aug 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mguentner Maximilian Güntner
    GPG key ID: 96126664034A9D85
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dac8fe9 View commit details

  3. Merge pull request #66814 from mguentner/synapse_1_3_1 

    matrix-synapse: 1.2.1 -> 1.3.1
    @WilliButz
    WilliButz authored Aug 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4835f65 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 nixos/modules/services/misc/matrix-synapse.nix
  2. +2 −2 pkgs/servers/matrix-synapse/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/matrix-synapse.nix
View file
Original file line number Diff line number Diff line change
@@ -684,7 +684,7 @@ in {
fi
'';
serviceConfig = {
Type = "simple";
Type = "notify";
User = "matrix-synapse";
Group = "matrix-synapse";
WorkingDirectory = cfg.dataDir;
4 changes: 2 additions & 2 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.2.1";
version = "1.3.1";

src = fetchPypi {
inherit pname version;
sha256 = "0pr17n52vdq490q6c282nqnn51j5k0lf7mzaazpxjy4q86pxdfy5";
sha256 = "1nz9bhy5hraa1h7100vr0innz8npnpha6xr9j2ln7h3cgwv73739";
};

patches = [