From 35ef822992d3201b2940721bee8e48e505e403ec Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:36:13 -0400 Subject: [PATCH] pythonPackages.rethinkdb: refactor move to python-modules --- .../python-modules/rethinkdb/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +-------------- 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/rethinkdb/default.nix diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix new file mode 100644 index 000000000000..f6d816d37c0e --- /dev/null +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "rethinkdb"; + version = "2.3.0.post6"; + + src = fetchPypi { + inherit pname version; + sha256 = "05qwkmq6kn437ywyjs02jxbry720gw39q4z4jdb0cnbbi76lwddm"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python driver library for the RethinkDB database server"; + homepage = "https://pypi.python.org/pypi/rethinkdb"; + license = licenses.agpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2fa31d7a338..d864a580b294 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2137,23 +2137,7 @@ in { rawkit = callPackage ../development/python-modules/rawkit { }; - rethinkdb = buildPythonPackage rec { - name = "rethinkdb-${version}"; - version = "2.3.0.post6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/rethinkdb/${name}.tar.gz"; - sha256 = "05qwkmq6kn437ywyjs02jxbry720gw39q4z4jdb0cnbbi76lwddm"; - }; - - doCheck = false; - - meta = { - description = "Python driver library for the RethinkDB database server"; - homepage = "https://pypi.python.org/pypi/rethinkdb"; - license = licenses.agpl3; - }; - }; + rethinkdb = callPackage ../development/python-modules/rethinkdb { }; roman = buildPythonPackage rec { version = "2.0.0";