From 397e59b4c93af1a090841c762cd845e216ba3c1f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 15 Feb 2017 12:56:58 +0100
Subject: pythonPackages.Keras: 1.0.3 -> 1.2.2

---
 pkgs/development/python-modules/keras/default.nix | 43 +++++++++++++++++++++++
 pkgs/top-level/python-packages.nix                | 22 +-----------
 2 files changed, 44 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/keras/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
new file mode 100644
index 000000000000..65c72ca98314
--- /dev/null
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, pytestcov
+, pytestpep8
+, pytest_xdist
+, six
+, Theano
+, pyyaml
+}:
+
+buildPythonPackage rec {
+  pname = "Keras";
+  version = "1.2.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bby93sffjadrxnx9j9nn2lq0ygsgqjp16260c6lz77b6r1qrcfj";
+  };
+
+  checkInputs = [
+    pytest
+    pytestcov
+    pytestpep8
+    pytest_xdist
+  ];
+
+  propagatedBuildInputs = [
+    six Theano pyyaml
+  ];
+
+  # Couldn't get tests working
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Deep Learning library for Theano and TensorFlow";
+    homepage = "https://keras.io";
+    license = licenses.mit;
+    maintainers = with maintainers; [ NikolaMandic ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b4e8a3443dd..f7084938b965 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31100,27 +31100,7 @@ EOF
     };
   };
 
-  Keras = buildPythonPackage rec {
-    name = "Keras-${version}";
-    version = "1.0.3";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/keras/${name}.tar.gz";
-      sha256 = "0wi826bvifvy12w490ghj1g45z5xb83q2cadqh425sg56p98khaq";
-    };
-
-    propagatedBuildInputs = with self; [
-      six Theano pyyaml
-    ];
-
-    meta = {
-      description = "Deep Learning library for Theano and TensorFlow";
-      homepage = "https://keras.io";
-      license = licenses.mit;
-      maintainers = with maintainers; [ NikolaMandic ];
-    };
-  };
+  Keras = callPackage ../development/python-modules/keras { };
 
   Lasagne = buildPythonPackage rec {
     name = "Lasagne-${version}";
-- 
cgit 1.4.1