diff options
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/math/maxima/default.nix | 31 | ||||
-rw-r--r-- | pkgs/applications/science/misc/convertall/default.nix | 37 |
2 files changed, 53 insertions, 15 deletions
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 49ff0d5d5a05..1bf7d16f2904 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null -, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false +{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, autoreconfHook +, rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false }: let name = "maxima"; - version = "5.42.2"; + version = "5.44.0"; searchPath = stdenv.lib.makeBinPath @@ -16,14 +16,20 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "0kdncy6137sg3rradirxzj10mkcvafxd892zlclwhr9sa7b12zhn"; + sha256 = "1v6jr5s6hhj6r18gfk6hgxk2qd6z1dxkrjq9ss2z1y6sqi45wgyr"; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = stdenv.lib.filter (x: x != null) [ sbcl ecl texinfo perl python makeWrapper gnuplot # required in the test suite ]; + postPatch = '' + substituteInPlace doc/info/Makefile.am --replace "/usr/bin/env perl" "${perl}/bin/perl" + ''; + postInstall = '' # Make sure that maxima can find its runtime dependencies. for prog in "$out/bin/"*; do @@ -57,13 +63,6 @@ stdenv.mkDerivation ({ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) - - # upstream bug https://sourceforge.net/p/maxima/bugs/2520/ (not fixed) - # introduced in https://trac.sagemath.org/ticket/13364 - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0xa0b6cr458zp7lc7qi0flv5ar0r3ivsqhjl0c3clv86di2y522d"; - }) ] ++ stdenv.lib.optionals ecl-fasl [ # build fasl, needed for ECL support (fetchpatch { @@ -74,11 +73,13 @@ stdenv.mkDerivation ({ # The test suite is disabled since 5.42.2 because of the following issues: # - # Errors found in /build/maxima-5.42.2/share/linearalgebra/rtest_matrixexp.mac, problems: + # Error(s) found: + # /build/maxima-5.44.0/share/linearalgebra/rtest_matrixexp.mac problems: # (20 21 22) - # Error found in rtest_arag, problem: - # (error break) - # 3 tests failed out of 3,881 total tests. + # Tests that were expected to fail but passed: + # /build/maxima-5.44.0/share/vector/rtest_vect.mac problem: + # (19) + # 3 tests failed out of 16,184 total tests. # # These failures don't look serious. It would be nice to fix them, but I # don't know how and probably won't have the time to find out. diff --git a/pkgs/applications/science/misc/convertall/default.nix b/pkgs/applications/science/misc/convertall/default.nix new file mode 100644 index 000000000000..63ed18c89b2f --- /dev/null +++ b/pkgs/applications/science/misc/convertall/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, python3, wrapQtAppsHook }: + +let + inherit (python3.pkgs) wrapPython pyqt5; +in stdenv.mkDerivation rec { + pname = "convertall"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "doug-101"; + repo = "ConvertAll"; + rev = "v${version}"; + sha256 = "02xxasgbjbivsbhyfpn3cpv52lscdx5kc95s6ns1dvnmdg0fpng0"; + }; + + nativeBuildInputs = [ python3 wrapPython wrapQtAppsHook ]; + + propagatedBuildInputs = [ pyqt5 ]; + + installPhase = '' + python3 install.py -p $out -x + ''; + + postFixup = '' + buildPythonPath $out + patchPythonScript $out/share/convertall/convertall.py + makeQtWrapper $out/share/convertall/convertall.py $out/bin/convertall + ''; + + meta = with stdenv.lib; { + homepage = "https://convertall.bellz.org/"; + description = "Graphical unit converter"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ orivej ]; + platforms = pyqt5.meta.platforms; + }; +} |