diff options
-rw-r--r-- | pkgs/development/python-modules/canonicaljson/default.nix | 23 | ||||
-rw-r--r-- | pkgs/development/python-modules/frozendict/default.nix | 20 | ||||
-rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 30 |
4 files changed, 47 insertions, 30 deletions
diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix new file mode 100644 index 000000000000..b7fd01472aab --- /dev/null +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, frozendict, simplejson, six +}: + +buildPythonPackage rec { + pname = "canonicaljson"; + version = "1.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q50zk9a0r7kd56rdf9cgyxxj7vy54j96sgh8vc8jhmsvdv8dzh6"; + }; + + propagatedBuildInputs = [ + frozendict simplejson six + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/matrix-org/python-canonicaljson; + description = "Encodes objects and arrays as RFC 7159 JSON."; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix new file mode 100644 index 000000000000..94d42206d63d --- /dev/null +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "frozendict"; + version = "1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; + }; + + # frozendict does not come with tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/slezica/python-frozendict; + description = "An immutable dictionary"; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 3cf460539699..4c82f5cfdde8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,13 +26,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.27.2"; + version = "0.27.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "00hcjs5hbayamckcsfd92s7f3da9jv5nm5ygvwinyc7ml7gn66i3"; + sha256 = "051bwr4vz8mwglh1m9rqlljbn8g3alvd52f09ff887nsi6z3jc17"; }; patches = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a1b89818d09..0b78cb40656d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2561,20 +2561,7 @@ in { fritzconnection = callPackage ../development/python-modules/fritzconnection { }; - frozendict = buildPythonPackage rec { - name = "frozendict-0.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/frozendict/${name}.tar.gz"; - sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n"; - }; - - meta = { - homepage = https://github.com/slezica/python-frozendict; - description = "An immutable dictionary"; - license = stdenv.lib.licenses.mit; - }; - }; + frozendict = callPackage ../development/python-modules/frozendict { }; ftputil = callPackage ../development/python-modules/ftputil { }; @@ -16650,20 +16637,7 @@ EOF }; }; - canonicaljson = buildPythonPackage rec { - name = "canonicaljson-${version}"; - version = "1.0.0"; - - src = pkgs.fetchgit { - url = "https://github.com/matrix-org/python-canonicaljson.git"; - rev = "refs/tags/v${version}"; - sha256 = "0r82zlip93y169ijkn8xpbp0yr22mf92pni6dw420vb53l27sprq"; - }; - - propagatedBuildInputs = with self; [ - frozendict simplejson - ]; - }; + canonicaljson = callPackage ../development/python-modules/canonicaljson { }; daemonize = buildPythonPackage rec { name = "daemonize-${version}"; |