alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #30266 from Ralith/matrix-synapse

Browse source 
matrix-synapse: 0.22.1 -> 0.24.1
This commit is contained in:
Frederik Rietdijk 2017-11-05 09:39:16 +01:00 committed by GitHub
parent 316de025d1 11d3143f91
commit f825642e74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/python-modules/affinity/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "affinity";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6";
};
meta = {
description = "control processor affinity on windows and linux";
homepage = http://cheeseshop.python.org/pypi/affinity;
license = with lib.licenses; [ psfl ];
};
}

12
pkgs/servers/matrix-synapse/default.nix
View file

@ -1,6 +1,6 @@
{ lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub }:
let
matrix-angular-sdk = pythonPackages.buildPythonApplication rec {
matrix-angular-sdk = pythonPackages.buildPythonPackage rec {
name = "matrix-angular-sdk-${version}";
version = "0.6.8";
@ -9,7 +9,7 @@ let
sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2";
};
};
matrix-synapse-ldap3 = pythonPackages.buildPythonApplication rec {
matrix-synapse-ldap3 = pythonPackages.buildPythonPackage rec {
name = "matrix-synapse-ldap3-${version}";
version = "0.1.2";
@ -24,24 +24,24 @@ let
};
in pythonPackages.buildPythonApplication rec {
name = "matrix-synapse-${version}";
version = "0.22.1";
version = "0.24.1";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
sha256 = "06kqqsfqmziff7i99yyxqvkqjm7fwi56abc2vy25g9kqzpdvkay7";
sha256 = "08w8sawq0nj28dzi9wc4rsg9z2qv528djj4zbcs5c4yc3mylq1nq";
};
patches = [ ./matrix-synapse.patch ];
propagatedBuildInputs = with pythonPackages; [
blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1
blist canonicaljson daemonize dateutil frozendict pillow pyasn1
pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests
signedjson systemd twisted ujson unpaddedbase64 pyyaml
matrix-angular-sdk bleach netaddr jinja2 psycopg2
psutil msgpack lxml matrix-synapse-ldap3
phonenumbers jsonschema
phonenumbers jsonschema affinity bcrypt
];
# Checks fail because of Tox.

2
pkgs/top-level/python-packages.nix
View file

@ -108,6 +108,8 @@ in {
aenum = callPackage ../development/python-modules/aenum { };
affinity = callPackage ../development/python-modules/affinity { };
agate = callPackage ../development/python-modules/agate { };
agate-dbf = callPackage ../development/python-modules/agate-dbf { };