diff options
-rw-r--r-- | pkgs/development/octave-modules/symbolic/default.nix | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/pkgs/development/octave-modules/symbolic/default.nix b/pkgs/development/octave-modules/symbolic/default.nix index e40d27e7c38..51382653992 100644 --- a/pkgs/development/octave-modules/symbolic/default.nix +++ b/pkgs/development/octave-modules/symbolic/default.nix @@ -1,38 +1,27 @@ { buildOctavePackage , lib -, fetchurl +, fetchFromGitHub # Octave's Python (Python 3) , python -# Needed only to get the correct version of sympy needed -, python2Packages }: let - # Need to use sympy 1.5.1 for https://github.com/cbm755/octsympy/issues/1023 - # It has been addressed, but not merged yet. - # In the meantime, we create a Python environment with Python 3, its mpmath - # version and sympy 1.5 from python2Packages. - pythonEnv = (let - overridenPython = let - packageOverrides = self: super: { - sympy = super.sympy.overridePythonAttrs (old: rec { - version = python2Packages.sympy.version; - src = python2Packages.sympy.src; - }); - }; - in python.override {inherit packageOverrides; self = overridenPython; }; - in overridenPython.withPackages (ps: [ + pythonEnv = python.withPackages (ps: [ ps.sympy ps.mpmath - ])); + ]); in buildOctavePackage rec { pname = "symbolic"; - version = "2.9.0"; + version = "unstable-2021-10-16"; - src = fetchurl { - url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "1jr3kg9q6r4r4h3hiwq9fli6wsns73rqfzkrg25plha9195c97h8"; + # https://github.com/cbm755/octsympy/issues/1023 has been resolved, however + # a new release has not been made + src = fetchFromGitHub { + owner = "cbm755"; + repo = "octsympy"; + rev = "5b58530f4ada78c759829ae703a0e5d9832c32d4"; + sha256 = "sha256-n6P1Swjl4RfgxfLY0ZuN3pcL8PcoknA6yxbnw96OZ2k="; }; propagatedBuildInputs = [ pythonEnv ]; |