From 63901546df7b0b473459ad076c9dd190b5a0aba7 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Sat, 21 Apr 2018 18:46:44 +0200
Subject: canonicaljson: separating from pythonPackages

---
 .../python-modules/canonicaljson/default.nix       | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/canonicaljson/default.nix

(limited to 'pkgs/development')

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;
+  };
+}
-- 
cgit 1.4.1


From 2749531e0f1a76c7e611ce8a7f553de337c1f8e9 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Sat, 21 Apr 2018 18:48:10 +0200
Subject: frozendict: move to separate module

---
 pkgs/development/python-modules/frozendict/default.nix | 17 +++++++++++++++++
 pkgs/top-level/python-packages.nix                     | 15 +--------------
 2 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/frozendict/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix
new file mode 100644
index 000000000000..4ec8eff70c6d
--- /dev/null
+++ b/pkgs/development/python-modules/frozendict/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "frozendict";
+  version = "1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/slezica/python-frozendict;
+    description = "An immutable dictionary";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1de6d8bafa3f..b4028e01a4e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2557,20 +2557,7 @@ in {
 
   fritzconnection = callPackage ../development/python-modules/fritzconnection { };
 
-  frozendict = buildPythonPackage rec {
-    name = "frozendict-1.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/f/frozendict/${name}.tar.gz";
-      sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp";
-    };
-
-    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 { };
 
-- 
cgit 1.4.1


From 9c194b1b63ffc92f289a783398f71ce6dfb70d18 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Mon, 23 Apr 2018 15:29:50 +0200
Subject: frozendict: disable checks as there are none

---
 pkgs/development/python-modules/frozendict/default.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'pkgs/development')

diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix
index 4ec8eff70c6d..94d42206d63d 100644
--- a/pkgs/development/python-modules/frozendict/default.nix
+++ b/pkgs/development/python-modules/frozendict/default.nix
@@ -9,6 +9,9 @@ buildPythonPackage rec {
     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";
-- 
cgit 1.4.1