Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f60352728b49
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5c4059dd7536
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 19, 2019

  1. matrix-synapse.ldap3: 0.1.3 -> 0.1.4 

    https://github.com/matrix-org/matrix-synapse-ldap3/releases/tag/v0.1.4
(cherry picked from commit e533a8c)
    @Ma27
    Ma27 committed Dec 19, 2019
    Copy the full SHA
    71738bf View commit details

  2. matrix-synapse: 1.6.1 -> 1.7.0 

    https://github.com/matrix-org/synapse/releases/tag/v1.7.0
(cherry picked from commit 7332273)
    @Ma27
    Ma27 committed Dec 19, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7695df5 View commit details

  3. matrix-synapse: 1.7.0 -> 1.7.1 

    https://github.com/matrix-org/synapse/releases/tag/v1.7.1
(cherry picked from commit f1acc6e)
    @Ma27
    Ma27 committed Dec 19, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5c4059d View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/servers/matrix-synapse/default.nix
8 changes: 4 additions & 4 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ with python3.pkgs;
let
matrix-synapse-ldap3 = buildPythonPackage rec {
pname = "matrix-synapse-ldap3";
version = "0.1.3";
version = "0.1.4";

src = fetchPypi {
inherit pname version;
sha256 = "0a0d1y9yi0abdkv6chbmxr3vk36gynnqzrjhbg26q4zg06lh9kgn";
sha256 = "01bms89sl16nyh9f141idsz4mnhxvjrc3gj721wxh1fhikps0djx";
};

propagatedBuildInputs = [ service-identity ldap3 twisted ];
@@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.6.1";
version = "1.7.1";

src = fetchPypi {
inherit pname version;
sha256 = "184d7qd76bb2714pfkx9p4zzn4akb6xkx2iw86cpn7aqmccxysld";
sha256 = "1aix4n4nk90xh6y3w3gvq3wzvykzz7mhj9isl437nid7mf9mcj6n";
};

patches = [