From 282778ccddcee722f427f6fd7b9f20a0cc000762 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 10 Mar 2018 13:17:00 +0100 Subject: [PATCH] anyjson: move to own directory --- .../python-modules/anyjson/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +---------------- 2 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/anyjson/default.nix diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix new file mode 100644 index 000000000000..ba32cf7ea695 --- /dev/null +++ b/pkgs/development/python-modules/anyjson/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, nose }: + +buildPythonPackage rec { + pname = "anyjson"; + version = "0.3.3"; + + # The tests are written in a python2 syntax but anyjson is python3 valid + doCheck = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba"; + }; + + buildInputs = [ nose ]; + + meta = { + homepage = https://pypi.python.org/pypi/anyjson/; + description = "Wrapper that selects the best available JSON implementation"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c56e8642abb3..96f8101b0439 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -513,24 +513,7 @@ in { }; }; - anyjson = buildPythonPackage rec { - name = "anyjson-0.3.3"; - - # The tests are written in a python2 syntax but anyjson is python3 valid - doCheck = !isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/anyjson/${name}.tar.gz"; - sha256 = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba"; - }; - - buildInputs = with self; [ self.nose ]; - - meta = { - homepage = https://pypi.python.org/pypi/anyjson/; - description = "Wrapper that selects the best available JSON implementation"; - }; - }; + anyjson = callPackage ../development/python-modules/anyjson {}; amqp = buildPythonPackage rec { name = "amqp-${version}";