about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2018-04-25 07:41:29 +0200
committerGitHub <noreply@github.com>2018-04-25 07:41:29 +0200
commit304c3ebc6d8f6db72035413c95dde6537465b640 (patch)
treedfb772739d1ed77a709aef667774adc8f03f1bbf /pkgs/development
parentfbd169ae5fa3345a602b699fa9c5263c8982810f (diff)
parent9c194b1b63ffc92f289a783398f71ce6dfb70d18 (diff)
downloadnixlib-304c3ebc6d8f6db72035413c95dde6537465b640.tar
nixlib-304c3ebc6d8f6db72035413c95dde6537465b640.tar.gz
nixlib-304c3ebc6d8f6db72035413c95dde6537465b640.tar.bz2
nixlib-304c3ebc6d8f6db72035413c95dde6537465b640.tar.lz
nixlib-304c3ebc6d8f6db72035413c95dde6537465b640.tar.xz
nixlib-304c3ebc6d8f6db72035413c95dde6537465b640.tar.zst
nixlib-304c3ebc6d8f6db72035413c95dde6537465b640.zip
Merge pull request #39285 from florianjacob/synapse
matrix-synapse: 0.27.2 -> 0.27.4
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/python-modules/canonicaljson/default.nix23
-rw-r--r--pkgs/development/python-modules/frozendict/default.nix20
2 files changed, 43 insertions, 0 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;
+  };
+}