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

Commits on Nov 4, 2018

  1. matrix-synapse: 0.33.6 -> 0.33.8 

    Also reworked dependencies:
 * blist and ujson are marked as no longer needed
 * pytz has no mention throughout `git log -p` on synapse's repository
 * systemd and affinity are optional (but turned on by default)

(cherry picked from commit bb86056)
    @Ekleog
    Ekleog committed Nov 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Synthetica9 Patrick Hilhorst
    GPG key ID: 589BB0A8DAFEF2B2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    139fd45 View commit details

  2. Merge pull request #49606 from Ekleog/synapse-0.33.8-b18.09 

    matrix-synapse: 0.33.6 -> 0.33.8
    @7c6f434c
    7c6f434c authored Nov 4, 2018
    Copy the full SHA
    6ea2f78 View commit details
Showing with 39 additions and 12 deletions.
  1. +39 −12 pkgs/servers/matrix-synapse/default.nix
51 changes: 39 additions & 12 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ stdenv, python2Packages, fetchurl, fetchFromGitHub }:
{ lib, stdenv, python2Packages, fetchurl, fetchFromGitHub
, enableSystemd ? true
}:
let
matrix-angular-sdk = python2Packages.buildPythonPackage rec {
name = "matrix-angular-sdk-${version}";
@@ -26,30 +28,55 @@ let
};
in python2Packages.buildPythonApplication rec {
name = "matrix-synapse-${version}";
version = "0.33.6";
version = "0.33.8";

src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
sha256 = "0c1dr09f1msv6xvpmdlncx7yyj6qxnpihd93lqckd115fds12g5h";
sha256 = "122ba09xkc1x35qaajcynkjikg342259rgy81m8abz0l8mcg4mkm";
};

patches = [
./matrix-synapse.patch
];

propagatedBuildInputs = with python2Packages; [
blist canonicaljson daemonize dateutil frozendict pillow pyasn1
pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests
signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client
matrix-angular-sdk bleach netaddr jinja2 psycopg2
psutil msgpack-python lxml matrix-synapse-ldap3
phonenumbers jsonschema affinity bcrypt sortedcontainers treq
];
bcrypt
bleach
canonicaljson
daemonize
dateutil
frozendict
jinja2
jsonschema
lxml
matrix-angular-sdk
matrix-synapse-ldap3
msgpack-python
netaddr
phonenumbers
pillow
prometheus_client
psutil
psycopg2
pyasn1
pydenticon
pymacaroons-pynacl
pynacl
pyopenssl
pysaml2
pyyaml
requests
signedjson
sortedcontainers
treq
twisted
unpaddedbase64
] ++ lib.optional enableSystemd systemd;

# Checks fail because of Tox.
doCheck = false;
doCheck = true;
checkPhase = "python -m twisted.trial test";

buildInputs = with python2Packages; [
mock setuptoolsTrial