From 013da4ef669359ee0f5e8605870cb618e3579f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:43:27 +0100 Subject: [PATCH] pythonPackages.demjson: move to python-modules/ Easier maintenance when expressions are in separate files. --- .../python-modules/demjson/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------------ 2 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/demjson/default.nix diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix new file mode 100644 index 000000000000..4f5d7a11bd8f --- /dev/null +++ b/pkgs/development/python-modules/demjson/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy36 }: + +buildPythonPackage rec { + pname = "demjson"; + version = "2.2.4"; + name = "${pname}-${version}"; + disabled = isPy36; + + src = fetchPypi { + inherit pname version; + sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; + }; + + meta = with stdenv.lib; { + description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; + homepage = http://deron.meranda.us/python/demjson/; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2759ec201212..b7624cef55eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4832,26 +4832,7 @@ in { }; }; - - demjson = buildPythonPackage rec { - pname = "demjson"; - version = "2.2.4"; - name = "${pname}-${version}"; - disabled = isPy36; - - src = fetchPypi { - inherit pname version; - sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; - }; - - meta = { - description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; - homepage = http://deron.meranda.us/python/demjson/; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; - }; - }; + demjson = callPackage ../development/python-modules/demjson { }; derpconf = self.buildPythonPackage rec { name = "derpconf-0.4.9";