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: db60b6501c78
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 39a8f717b879
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 29, 2019

  1. matrix-synapse: 1.4.1 -> 1.5.0 

    https://github.com/matrix-org/synapse/releases/tag/v1.5.0
    @Ma27
    Ma27 committed Oct 29, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 76AA3F9F2BD3E3A0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ec83cda View commit details

Commits on Oct 30, 2019

  1. Merge pull request #72263 from Ma27/bump-matrix-synapse 

    matrix-synapse: 1.4.1 -> 1.5.0
    @Ekleog
    Ekleog authored Oct 30, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 76AA3F9F2BD3E3A0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    39a8f71 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/servers/matrix-synapse/default.nix
5 changes: 3 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.4.1";
version = "1.5.0";

src = fetchPypi {
inherit pname version;
sha256 = "10vfjf5f4micqwpxnw2dliq4y0j0mqj0087p6kgnfi5w9syz8g75";
sha256 = "0skhzbwzq2985frnd86fn2hxhsmy0q1l5p9aich8l2gyg1dd3wb8";
};

patches = [
@@ -71,6 +71,7 @@ in buildPythonApplication rec {
treq
twisted
unpaddedbase64
typing-extensions
] ++ lib.optional enableSystemd systemd;

checkInputs = [ mock parameterized openssl ];