about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Jacob <projects+git@florianjacob.de>2018-04-21 18:46:44 +0200
committerFlorian Jacob <projects+git@florianjacob.de>2018-04-22 15:25:33 +0200
commit63901546df7b0b473459ad076c9dd190b5a0aba7 (patch)
tree3ed37a7b7e5471fb28440d15d412c6e489f0ee60
parent3d974552f35c450d6f6f74e18932e1d55d06e541 (diff)
downloadnixlib-63901546df7b0b473459ad076c9dd190b5a0aba7.tar
nixlib-63901546df7b0b473459ad076c9dd190b5a0aba7.tar.gz
nixlib-63901546df7b0b473459ad076c9dd190b5a0aba7.tar.bz2
nixlib-63901546df7b0b473459ad076c9dd190b5a0aba7.tar.lz
nixlib-63901546df7b0b473459ad076c9dd190b5a0aba7.tar.xz
nixlib-63901546df7b0b473459ad076c9dd190b5a0aba7.tar.zst
nixlib-63901546df7b0b473459ad076c9dd190b5a0aba7.zip
canonicaljson: separating from pythonPackages
-rw-r--r--pkgs/development/python-modules/canonicaljson/default.nix23
-rw-r--r--pkgs/top-level/python-packages.nix15
2 files changed, 24 insertions, 14 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c2465a8e2f22..878292cb2025 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16638,20 +16638,7 @@ EOF
     };
   };
 
-  canonicaljson = buildPythonPackage rec {
-    name = "canonicaljson-${version}";
-    version = "1.1.3";
-
-    src = pkgs.fetchgit {
-      url = "https://github.com/matrix-org/python-canonicaljson.git";
-      rev = "refs/tags/v${version}";
-      sha256 = "11j0xmbw2hbl789pyfga02w8aa3s8rkc8pk6501r1sfy8xljd8zy";
-    };
-
-    propagatedBuildInputs = with self; [
-      frozendict simplejson six
-    ];
-  };
+  canonicaljson = callPackage ../development/python-modules/canonicaljson { };
 
   daemonize = buildPythonPackage rec {
     name = "daemonize-${version}";