diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/affinity/default.nix | 16 | ||||
-rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 24 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/affinity/default.nix b/pkgs/development/python-modules/affinity/default.nix new file mode 100644 index 000000000000..f2cb2ef6445e --- /dev/null +++ b/pkgs/development/python-modules/affinity/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c7c33928714b..73498e5b8844 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -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. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7664f422c0b9..0ecd625e7744 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { }; |