From 5ec1bfa7fc95198db0656a1b8cf95ca7d54ad8ad Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Oct 2018 17:46:49 -0400 Subject: [PATCH] pythonPackages.mathics: refactor move to python-modules --- .../python-modules/mathics/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 44 +--------------- 2 files changed, 52 insertions(+), 42 deletions(-) create mode 100644 pkgs/development/python-modules/mathics/default.nix diff --git a/pkgs/development/python-modules/mathics/default.nix b/pkgs/development/python-modules/mathics/default.nix new file mode 100644 index 00000000000..b20cc070909 --- /dev/null +++ b/pkgs/development/python-modules/mathics/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, django +, python +, cython +, sympy +, ply +, mpmath +, dateutil +, colorama +, six +, pexpect +}: + +if (stdenv.lib.versionOlder django.version "1.8") || + (stdenv.lib.versionAtLeast django.version "1.9") + then throw "mathics only supports django-1.8.x" + else buildPythonPackage rec { + pname = "mathics"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "mathics"; + repo = "Mathics"; + rev = "v${version}"; + sha256 = "0xzz7j8xskj5y6as178mjmm0i2xbhd4q4mwmdnvghpd2aqq3qx1c"; + }; + + buildInputs = [ pexpect ]; + + prePatch = '' + substituteInPlace setup.py --replace "sympy==0.7.6" "sympy" + ''; + + postFixup = '' + wrapPythonProgramsIn $out/bin $out + patchPythonScript $out/${python.sitePackages}/mathics/manage.py + ''; + + propagatedBuildInputs = [ cython sympy django ply mpmath dateutil colorama six ]; + + meta = with stdenv.lib; { + description = "A general-purpose computer algebra system"; + homepage = http://www.mathics.org; + license = licenses.gpl3; + maintainers = [ maintainers.benley ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c4845974fa..af4e51df2db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5813,49 +5813,9 @@ in { markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; - mathics = if (versionOlder self.django.version "1.8") || - (versionAtLeast self.django.version "1.9") - then throw "mathics only supports django-1.8.x" - else buildPythonPackage rec { - name = "mathics-${version}"; - version = "0.9"; - src = pkgs.fetchFromGitHub { - owner = "mathics"; - repo = "Mathics"; - rev = "v${version}"; - sha256 = "0xzz7j8xskj5y6as178mjmm0i2xbhd4q4mwmdnvghpd2aqq3qx1c"; - }; - - buildInputs = with self; [ pexpect ]; - - prePatch = '' - substituteInPlace setup.py --replace "sympy==0.7.6" "sympy" - ''; - - postFixup = '' - wrapPythonProgramsIn $out/bin $out - patchPythonScript $out/${python.sitePackages}/mathics/manage.py - ''; - - propagatedBuildInputs = with self; [ - cython - sympy - django - ply - mpmath - dateutil - colorama - six - ]; - - meta = { - description = "A general-purpose computer algebra system"; - homepage = http://www.mathics.org; - license = licenses.gpl3; - maintainers = [ maintainers.benley ]; - }; - }; + markdown-macros = callPackage ../development/python-modules/markdown-macros { }; + mathics = callPackage ../development/python-modules/mathics { }; matplotlib = callPackage ../development/python-modules/matplotlib { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;