From 4cbd5e4141422b835a86bb1b5e2d004a3c9a3a3e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 27 May 2017 14:05:39 +0200
Subject: python.pkgs.sqlalchemy: 1.0.15 -> 1.1.10

---
 .../python-modules/sqlalchemy/default.nix          | 37 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix                 | 27 +---------------
 2 files changed, 38 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/python-modules/sqlalchemy/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
new file mode 100644
index 000000000000..3fdb7cf9a6e7
--- /dev/null
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pytest
+, mock
+, pytest_xdist
+, isPy3k
+, pysqlite
+}:
+
+buildPythonPackage rec {
+  pname = "SQLAlchemy";
+  name = "${pname}-${version}";
+  version = "1.1.10";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "dbd92b8af2306d600efa98ed36262d73aad227440a758c8dc3a067ca30096bd3";
+  };
+
+  checkInputs = [ pytest mock pytest_xdist ]
+    ++ lib.optional (!isPy3k) pysqlite;
+
+  # Test-only dependency pysqlite doesn't build on Python 3. This isn't an
+  # acceptable reason to make all dependents unavailable on Python 3 as well
+  #doCheck = !(isPyPy || isPy3k);
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with lib; {
+    homepage = http://www.sqlalchemy.org/;
+    description = "A Python SQL toolkit and Object Relational Mapper";
+    license = licenses.mit;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0c088dc7fc5d..0cc9820f4c12 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24073,32 +24073,7 @@ in {
 
 
 
-  sqlalchemy = buildPythonPackage rec {
-    name = "SQLAlchemy-${version}";
-    version = "1.0.15";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz";
-      sha256 = "586f5ccf068211795a89ed22d196c5cc3006b6be00261bcac6f584c0b8e0845a";
-    };
-
-    buildInputs = with self; [ pytest mock pytest_xdist ]
-      ++ stdenv.lib.optional (!isPy3k) pysqlite;
-
-    # Test-only dependency pysqlite doesn't build on Python 3. This isn't an
-    # acceptable reason to make all dependents unavailable on Python 3 as well
-    #doCheck = !(isPyPy || isPy3k);
-
-    checkPhase = ''
-      py.test
-    '';
-
-    meta = {
-      homepage = http://www.sqlalchemy.org/;
-      description = "A Python SQL toolkit and Object Relational Mapper";
-      license = licenses.mit;
-    };
-  };
+  sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
 
   SQLAlchemy-ImageAttach = buildPythonPackage rec {
     pname = "SQLAlchemy-ImageAttach";
-- 
cgit 1.4.1