From a70f5124606de16862b65027d645c9e2af3b7361 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 4 Sep 2015 18:28:00 -0700
Subject: [PATCH 1/4] interruptingcow: init at 0.6

---
 pkgs/top-level/python-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b81bb0e247a7..86dc2383627c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7026,6 +7026,23 @@ let
     };
   };
 
+  interruptingcow = buildPythonPackage rec {
+    name = "interruptingcow-${version}";
+    version = "0.6";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/interruptingcow/${name}.tar.gz";
+      sha256 = "1cv4pm2h0f87n9w4r3l1f96skwmng95sawn7j00ns0rdp1zshr9d";
+    };
+
+    meta = {
+      description = "A watchdog that interrupts long running code";
+      homepage = https://bitbucket.org/evzijst/interruptingcow;
+      license = licenses.mit;
+      maintainers = with maintainers; [ benley ];
+    };
+  };
+
   iptools = buildPythonPackage rec {
     version = "0.6.1";
     name = "iptools-${version}";

From 646cd4260dbe17a0ae471f601156de0e26dfc086 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 4 Sep 2015 18:28:58 -0700
Subject: [PATCH 2/4] mpmath: 0.17 -> 0.19

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86dc2383627c..f4657335d767 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8106,11 +8106,11 @@ let
   };
 
   mpmath = buildPythonPackage rec {
-    name = "mpmath-0.17";
+    name = "mpmath-0.19";
 
     src = pkgs.fetchurl {
-      url    = "https://mpmath.googlecode.com/files/${name}.tar.gz";
-      sha256 = "1blgzwq4irzaf8abb4z0d2r48903n9zxf51fhnv3gv09bgxjqzxh";
+      url = "https://pypi.python.org/packages/source/m/mpmath/${name}.tar.gz";
+      sha256 = "08ijsr4ifrqv3cjc26mkw0dbvyygsa99in376hr4b96ddm1gdpb8";
     };
 
     meta = {

From f99566d35f5efd80194e182bed2689bc92548404 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 4 Sep 2015 18:30:07 -0700
Subject: [PATCH 3/4] ply: 3.4 -> 3.7

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f4657335d767..cdc5a9514e8c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9191,11 +9191,11 @@ let
   };
 
   ply = buildPythonPackage (rec {
-    name = "ply-3.4";
+    name = "ply-3.7";
 
     src = pkgs.fetchurl {
       url = "http://www.dabeaz.com/ply/${name}.tar.gz";
-      sha256 = "0sslnbpws847r1j1f41fjpn76w0asywfqgxwzyjrvmmxnw8myhxg";
+      sha256 = "105gw1xayqww99qsls0lv37z4hzg5qnglxkd7s3h96hw9jsbfpzq";
     };
 
     meta = {

From 9f1860626173e2c671afd196d0106baa4eed0694 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 4 Sep 2015 18:31:45 -0700
Subject: [PATCH 4/4] mathics: init at 0.8

---
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/python-packages.nix | 35 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1139d7c5cdd..9836c37be222 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -898,6 +898,8 @@ let
 
   gmic = callPackage ../tools/graphics/gmic { };
 
+  mathics = pythonPackages.mathics;
+
   mcrl = callPackage ../tools/misc/mcrl { };
 
   mcrl2 = callPackage ../tools/misc/mcrl2 { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cdc5a9514e8c..cbe90c93eb58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7752,6 +7752,41 @@ let
   };
 
 
+  mathics = buildPythonPackage rec {
+    name = "mathics-${version}";
+    version = "0.8";
+    src = pkgs.fetchFromGitHub {
+      owner = "mathics";
+      repo = "Mathics";
+      rev = "v${version}";
+      sha256 = "1hyrxnhxw35vn00k55hp9bkg8vg4dsphrpfg1yg4cn53y78rk1im";
+    };
+
+    buildInputs = with self; [ pexpect ];
+
+    propagatedBuildInputs = with self; [
+      argparse
+      cython
+      colorama
+      dateutil
+      django_1_6
+      mpmath
+      readline
+      interruptingcow
+      ply
+      sqlite3
+      sympy
+    ];
+
+    meta = {
+      description = "A general-purpose computer algebra system";
+      homepage = http://www.mathics.org;
+      license = licenses.gpl3;
+      maintainers = [ maintainers.benley ];
+    };
+  };
+
+
   matplotlib = callPackage ../development/python-modules/matplotlib/default.nix {
     stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
     enableGhostscript = true;