diff --git a/pkgs/development/python-modules/mathics/disable_console_tests.patch b/pkgs/development/python-modules/mathics/disable_console_tests.patch deleted file mode 100644 index 6e20686fc41..00000000000 --- a/pkgs/development/python-modules/mathics/disable_console_tests.patch +++ /dev/null @@ -1,21 +0,0 @@ -These tests require that Mathics already be installed to work, -which is not true when nix runs them. - ---- a/test/test_console.py 2015-09-07 21:41:08.530501979 -0700 -+++ b/test/test_console.py 2015-09-07 21:42:44.082176084 -0700 -@@ -13,6 +13,7 @@ - os.environ["TERM"] = "dumb" - self.console = pexpect.spawn('python2 mathics/main.py --color NOCOLOR') - -+ @unittest.expectedFailure - def testLaunch(self): - cons = self.console - -@@ -41,6 +42,7 @@ - 'Quit by pressing CONTROL-D\r\n' - '\r\n') - -+ @unittest.expectedFailure - def testPrompt(self): - cons = self.console - cons.expect('Quit by pressing CONTROL-D\r\n\r\n') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c4adbcfaaf..577be216865 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11800,17 +11800,15 @@ in modules // { mathics = buildPythonPackage rec { name = "mathics-${version}"; - version = "0.8"; + version = "0.9"; src = pkgs.fetchFromGitHub { owner = "mathics"; repo = "Mathics"; rev = "v${version}"; - sha256 = "1hyrxnhxw35vn00k55hp9bkg8vg4dsphrpfg1yg4cn53y78rk1im"; + sha256 = "0xzz7j8xskj5y6as178mjmm0i2xbhd4q4mwmdnvghpd2aqq3qx1c"; }; - disabled = isPy3k; - - patches = [ ../development/python-modules/mathics/disable_console_tests.patch ]; + disabled = isPy26; buildInputs = with self; [ pexpect ]; @@ -11819,17 +11817,17 @@ in modules // { ''; propagatedBuildInputs = with self; [ - argparse cython - colorama - dateutil - django_1_6 - mpmath - readline - interruptingcow - ply - sqlite3 sympy + django_1_8 + ply + mpmath + dateutil + colorama + six + + readline + sqlite3 ]; meta = {