diff options
author | Joachim Fasting <joachifm@fastmail.fm> | 2018-10-15 10:31:10 +0200 |
---|---|---|
committer | Joachim Fasting <joachifm@fastmail.fm> | 2018-10-15 10:32:56 +0200 |
commit | ff473c9ec7aeaec73058b5f2a171dfed7d47c811 (patch) | |
tree | e28bbe78bb9bc178962344ce65a03cc57bc9d029 /pkgs | |
parent | 1a3ae02e669f63fd3951bd40b41e75dbe09d516f (diff) | |
download | nixpkgs-ff473c9ec7aeaec73058b5f2a171dfed7d47c811.tar nixpkgs-ff473c9ec7aeaec73058b5f2a171dfed7d47c811.tar.gz nixpkgs-ff473c9ec7aeaec73058b5f2a171dfed7d47c811.tar.bz2 nixpkgs-ff473c9ec7aeaec73058b5f2a171dfed7d47c811.tar.lz nixpkgs-ff473c9ec7aeaec73058b5f2a171dfed7d47c811.tar.xz nixpkgs-ff473c9ec7aeaec73058b5f2a171dfed7d47c811.tar.zst nixpkgs-ff473c9ec7aeaec73058b5f2a171dfed7d47c811.zip |
pythonPackages.jsonrpclib: move expression to python-modules
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/jsonrpclib/default.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 21 |
2 files changed, 23 insertions, 20 deletions
diff --git a/pkgs/development/python-modules/jsonrpclib/default.nix b/pkgs/development/python-modules/jsonrpclib/default.nix new file mode 100644 index 00000000000..9f3efdf627e --- /dev/null +++ b/pkgs/development/python-modules/jsonrpclib/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27, cjson }: + +buildPythonPackage rec { + pname = "jsonrpclib"; + version = "0.1.7"; + + disabled = !isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z"; + }; + + propagatedBuildInputs = [ cjson ]; + + meta = { + description = "JSON RPC client library"; + homepage = https://pypi.python.org/pypi/jsonrpclib/; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.joachifm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11622642823..8fb12c45036 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2835,26 +2835,7 @@ in { }; }; - jsonrpclib = buildPythonPackage rec { - name = "jsonrpclib-${version}"; - version = "0.1.7"; - - disabled = !isPy27; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jsonrpclib/${name}.tar.gz"; - sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z"; - }; - - propagatedBuildInputs = with self; [ cjson ]; - - meta = { - description = "JSON RPC client library"; - homepage = https://pypi.python.org/pypi/jsonrpclib/; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.joachifm ]; - }; - }; + jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix {}; |