From 16cfc2a602caf2c8e78ced1e3549512b0e64e438 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Mon, 6 Aug 2018 23:40:13 -0700 Subject: [PATCH] pythonPackages.pymysql: 0.6.6 -> 0.9.2; move to python-modules --- .../python-modules/pymysql/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 ++------------- 2 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pymysql/default.nix diff --git a/pkgs/development/python-modules/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix new file mode 100644 index 000000000000..b440df309977 --- /dev/null +++ b/pkgs/development/python-modules/pymysql/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cryptography +}: + +buildPythonPackage rec { + pname = "PyMySQL"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gvi63f1zq1bbd30x28kqyx351hal1yc323ckp0mihainb5n1iwy"; + }; + + propagatedBuildInputs = [ cryptography ]; + + # Wants to connect to MySQL + doCheck = false; + + meta = with lib; { + description = "Pure Python MySQL Client"; + homepage = https://github.com/PyMySQL/PyMySQL; + license = licenses.mit; + maintainers = [ maintainers.kalbasit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f18bf46eb884..40273b563402 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -352,6 +352,8 @@ in { plantuml = callPackage ../tools/misc/plantuml { }; + pymysql = callPackage ../development/python-modules/pymysql { }; + Pmw = callPackage ../development/python-modules/Pmw { }; py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; @@ -8097,25 +8099,6 @@ in { }; }; - pymysql = buildPythonPackage rec { - name = "pymysql-${version}"; - version = "0.6.6"; - src = pkgs.fetchgit { - url = https://github.com/PyMySQL/PyMySQL.git; - rev = "refs/tags/pymysql-${version}"; - sha256 = "0kpw11rxpyyhs9b139hxhbnx9n5kzjjw10wgwvhnf9m3mv7j4n71"; - }; - - buildInputs = with self; [ unittest2 ]; - - checkPhase = '' - ${python.interpreter} runtests.py - ''; - - # Wants to connect to MySQL - doCheck = false; - }; - pymysqlsa = self.buildPythonPackage rec { name = "pymysqlsa-${version}"; version = "1.0";