Loading pkgs/applications/science/math/giac/default.nix +6 −10 Original line number Diff line number Diff line Loading @@ -9,11 +9,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; version = "1.9.0-29"; # TODO try to remove preCheck phase on upgrade version = "1.9.0-43"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; sha256 = "sha256-9jUVcsrV8jMfqrmnymZ4vIaWlabF9ppCuq7VDlZ5Cw4="; sha256 = "sha256-466jB8ZRqHkU5XCY+j0Fh7Dq/mMaOu10rHECKbtNGrs="; }; patches = [ Loading @@ -27,16 +27,12 @@ stdenv.mkDerivation rec { # the compiler rightfully warns about (with an error nowadays). (fetchpatch { name = "fix-string-compiler-error.patch"; url = "https://salsa.debian.org/science-team/giac/-/raw/08cb807ef41f5216b712928886ebf74f69d5ddf6/debian/patches/fix-string-compiler-error.patch"; sha256 = "sha256-K4KAJY1F9Y4DTZFmVEOCXTnxBmHo4//3A10UR3Wlliw="; url = "https://salsa.debian.org/science-team/giac/-/raw/9ca8dbf4bb16d9d96948aa4024326d32485d7917/debian/patches/fix-string-compiler-error.patch"; sha256 = "sha256-r+M+9MRPRqhHcdhYWI6inxyNvWbXUbBcPCeDY7aulvk="; }) # increase pari stack size for test chk_fhan4 (fetchpatch { name = "increase-pari-stack-size.patch"; url = "https://salsa.debian.org/science-team/giac/-/raw/08cb807ef41f5216b712928886ebf74f69d5ddf6/debian/patches/increase-pari-size.patch"; sha256 = "sha256-764P0IJ7ndURap7hotOmYJK0wAhYdqMbQNOnhJxVNt0="; }) # increase pari stack size for test chk_fhan{4,6} ./increase-pari-stack-size.patch ] ++ lib.optionals (!enableGUI) [ # when enableGui is false, giac is compiled without fltk. That # means some outputs differ in the make check. Patch around this: Loading pkgs/applications/science/math/giac/increase-pari-stack-size.patch 0 → 100644 +18 −0 Original line number Diff line number Diff line diff -ur a/check/chk_fhan4 b/check/chk_fhan4 --- a/check/chk_fhan4 2018-03-13 19:27:11.000000000 +0100 +++ b/check/chk_fhan4 2023-05-20 16:31:30.349063063 +0200 @@ -1,4 +1,5 @@ #! /bin/sh unset LANG +export PARI_SIZE=2048000 ../src/icas TP04-sol.cas > TP04.tst diff TP04.tst TP04-sol.cas.out1 diff -ur a/check/chk_fhan6 b/check/chk_fhan6 --- a/check/chk_fhan6 2018-03-13 19:27:21.000000000 +0100 +++ b/check/chk_fhan6 2023-05-20 16:32:04.199407065 +0200 @@ -1,4 +1,5 @@ #! /bin/sh unset LANG +export PARI_SIZE=2048000 ../src/icas TP06-sol.cas > TP06.tst diff TP06.tst TP06-sol.cas.out1 pkgs/applications/science/math/maxima/5.45.nixdeleted 100644 → 0 +0 −126 Original line number Diff line number Diff line { lib , stdenv , fetchurl , fetchpatch , texinfo , perl , python3 , makeWrapper , autoreconfHook , rlwrap ? null , tk ? null , gnuplot ? null , lisp-compiler }: let # Allow to remove some executables from the $PATH of the wrapped binary searchPath = lib.makeBinPath (lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]); in stdenv.mkDerivation rec { pname = "maxima"; # old version temporarily kept for sage due to # https://github.com/sagemath/sage/issues/33718 version = "5.45.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-/pAWJ2lwvvIUoaJENIVYZEUU1/36pPyLnQ6Hr8u059w="; }; nativeBuildInputs = [ autoreconfHook lisp-compiler makeWrapper python3 texinfo ]; strictDeps = true; nativeCheckInputs = [ gnuplot ]; 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 wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}" done # Move emacs modules and documentation into the right place. mkdir -p $out/share/emacs $out/share/doc ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp ln -s ../maxima/${version}/doc $out/share/doc/maxima '' + (lib.optionalString (lisp-compiler.pname == "ecl") '' cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/" '') ; patches = [ # fix path to info dir (see https://trac.sagemath.org/ticket/11348) (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x"; }) # fix https://sourceforge.net/p/maxima/bugs/2596/ (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg"; }) # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca # see https://trac.sagemath.org/ticket/13364#comment:93 (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) ] ++ lib.optionals (lisp-compiler.pname == "ecl") [ # build fasl, needed for ECL support (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar"; }) ]; # The test suite is disabled since 5.42.2 because of the following issues: # # Error(s) found: # /build/maxima-5.44.0/share/linearalgebra/rtest_matrixexp.mac problems: # (20 21 22) # 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. doCheck = false; # try to re-enable after next version update enableParallelBuilding = true; passthru = { inherit lisp-compiler; }; meta = with lib; { description = "Computer algebra system"; homepage = "http://maxima.sourceforge.net"; license = licenses.gpl2Plus; longDescription = '' Maxima is a fairly complete computer algebra system written in lisp with an emphasis on symbolic computation. It is based on DOE-MACSYMA and licensed under the GPL. Its abilities include symbolic integration, 3D plotting, and an ODE solver. ''; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.unix; }; } pkgs/applications/science/math/pari/default.nix +7 −6 Original line number Diff line number Diff line Loading @@ -15,7 +15,7 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; version = "2.15.2"; version = "2.15.3"; src = fetchurl { urls = [ Loading @@ -23,15 +23,16 @@ stdenv.mkDerivation rec { # old versions are at the url below "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" ]; hash = "sha256-sEYoER7iKHZRmksc2vsy/rqjTq+iT56B9Y+NBX++4N0="; hash = "sha256-rfWlhjjNr9cqi0i8n0RJcrIzKcjVRaHT7Ru+sbZWkmg="; }; patches = [ # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2441 # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2466 (fetchpatch { name = "fix-find_isogenous_from_Atkin.patch"; url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/bug2441.patch?id=9.8.rc0"; hash = "sha256-DvOUFlFDnopN+MJY6GYRPNabuoHPFch/nNn+49ygznc="; name = "incorrect-result-from-qfbclassno.patch"; url = "https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=commitdiff_plain;h=7ca0c2eae87def89fa7253c60e4791a8ef26629d"; excludes = [ "src/test/32/quadclassunit" "CHANGES" ]; hash = "sha256-CQRkIYDFMrWHCoSWGsIydPjGk3w09zzghajlNuq29Jk="; }) ]; Loading pkgs/applications/science/math/sage/default.nix +1 −1 Original line number Diff line number Diff line Loading @@ -128,7 +128,7 @@ let singular = pkgs.singular.override { inherit flint; }; maxima = pkgs.maxima-ecl-5_45.override { maxima = pkgs.maxima-ecl.override { lisp-compiler = pkgs.ecl.override { # "echo syntax error | ecl > /dev/full 2>&1" segfaults in # ECL. We apply a patch to fix it (write_error.patch), but it Loading Loading
pkgs/applications/science/math/giac/default.nix +6 −10 Original line number Diff line number Diff line Loading @@ -9,11 +9,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; version = "1.9.0-29"; # TODO try to remove preCheck phase on upgrade version = "1.9.0-43"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; sha256 = "sha256-9jUVcsrV8jMfqrmnymZ4vIaWlabF9ppCuq7VDlZ5Cw4="; sha256 = "sha256-466jB8ZRqHkU5XCY+j0Fh7Dq/mMaOu10rHECKbtNGrs="; }; patches = [ Loading @@ -27,16 +27,12 @@ stdenv.mkDerivation rec { # the compiler rightfully warns about (with an error nowadays). (fetchpatch { name = "fix-string-compiler-error.patch"; url = "https://salsa.debian.org/science-team/giac/-/raw/08cb807ef41f5216b712928886ebf74f69d5ddf6/debian/patches/fix-string-compiler-error.patch"; sha256 = "sha256-K4KAJY1F9Y4DTZFmVEOCXTnxBmHo4//3A10UR3Wlliw="; url = "https://salsa.debian.org/science-team/giac/-/raw/9ca8dbf4bb16d9d96948aa4024326d32485d7917/debian/patches/fix-string-compiler-error.patch"; sha256 = "sha256-r+M+9MRPRqhHcdhYWI6inxyNvWbXUbBcPCeDY7aulvk="; }) # increase pari stack size for test chk_fhan4 (fetchpatch { name = "increase-pari-stack-size.patch"; url = "https://salsa.debian.org/science-team/giac/-/raw/08cb807ef41f5216b712928886ebf74f69d5ddf6/debian/patches/increase-pari-size.patch"; sha256 = "sha256-764P0IJ7ndURap7hotOmYJK0wAhYdqMbQNOnhJxVNt0="; }) # increase pari stack size for test chk_fhan{4,6} ./increase-pari-stack-size.patch ] ++ lib.optionals (!enableGUI) [ # when enableGui is false, giac is compiled without fltk. That # means some outputs differ in the make check. Patch around this: Loading
pkgs/applications/science/math/giac/increase-pari-stack-size.patch 0 → 100644 +18 −0 Original line number Diff line number Diff line diff -ur a/check/chk_fhan4 b/check/chk_fhan4 --- a/check/chk_fhan4 2018-03-13 19:27:11.000000000 +0100 +++ b/check/chk_fhan4 2023-05-20 16:31:30.349063063 +0200 @@ -1,4 +1,5 @@ #! /bin/sh unset LANG +export PARI_SIZE=2048000 ../src/icas TP04-sol.cas > TP04.tst diff TP04.tst TP04-sol.cas.out1 diff -ur a/check/chk_fhan6 b/check/chk_fhan6 --- a/check/chk_fhan6 2018-03-13 19:27:21.000000000 +0100 +++ b/check/chk_fhan6 2023-05-20 16:32:04.199407065 +0200 @@ -1,4 +1,5 @@ #! /bin/sh unset LANG +export PARI_SIZE=2048000 ../src/icas TP06-sol.cas > TP06.tst diff TP06.tst TP06-sol.cas.out1
pkgs/applications/science/math/maxima/5.45.nixdeleted 100644 → 0 +0 −126 Original line number Diff line number Diff line { lib , stdenv , fetchurl , fetchpatch , texinfo , perl , python3 , makeWrapper , autoreconfHook , rlwrap ? null , tk ? null , gnuplot ? null , lisp-compiler }: let # Allow to remove some executables from the $PATH of the wrapped binary searchPath = lib.makeBinPath (lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]); in stdenv.mkDerivation rec { pname = "maxima"; # old version temporarily kept for sage due to # https://github.com/sagemath/sage/issues/33718 version = "5.45.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-/pAWJ2lwvvIUoaJENIVYZEUU1/36pPyLnQ6Hr8u059w="; }; nativeBuildInputs = [ autoreconfHook lisp-compiler makeWrapper python3 texinfo ]; strictDeps = true; nativeCheckInputs = [ gnuplot ]; 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 wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}" done # Move emacs modules and documentation into the right place. mkdir -p $out/share/emacs $out/share/doc ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp ln -s ../maxima/${version}/doc $out/share/doc/maxima '' + (lib.optionalString (lisp-compiler.pname == "ecl") '' cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/" '') ; patches = [ # fix path to info dir (see https://trac.sagemath.org/ticket/11348) (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x"; }) # fix https://sourceforge.net/p/maxima/bugs/2596/ (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg"; }) # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca # see https://trac.sagemath.org/ticket/13364#comment:93 (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) ] ++ lib.optionals (lisp-compiler.pname == "ecl") [ # build fasl, needed for ECL support (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar"; }) ]; # The test suite is disabled since 5.42.2 because of the following issues: # # Error(s) found: # /build/maxima-5.44.0/share/linearalgebra/rtest_matrixexp.mac problems: # (20 21 22) # 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. doCheck = false; # try to re-enable after next version update enableParallelBuilding = true; passthru = { inherit lisp-compiler; }; meta = with lib; { description = "Computer algebra system"; homepage = "http://maxima.sourceforge.net"; license = licenses.gpl2Plus; longDescription = '' Maxima is a fairly complete computer algebra system written in lisp with an emphasis on symbolic computation. It is based on DOE-MACSYMA and licensed under the GPL. Its abilities include symbolic integration, 3D plotting, and an ODE solver. ''; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.unix; }; }
pkgs/applications/science/math/pari/default.nix +7 −6 Original line number Diff line number Diff line Loading @@ -15,7 +15,7 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; version = "2.15.2"; version = "2.15.3"; src = fetchurl { urls = [ Loading @@ -23,15 +23,16 @@ stdenv.mkDerivation rec { # old versions are at the url below "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" ]; hash = "sha256-sEYoER7iKHZRmksc2vsy/rqjTq+iT56B9Y+NBX++4N0="; hash = "sha256-rfWlhjjNr9cqi0i8n0RJcrIzKcjVRaHT7Ru+sbZWkmg="; }; patches = [ # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2441 # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2466 (fetchpatch { name = "fix-find_isogenous_from_Atkin.patch"; url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/bug2441.patch?id=9.8.rc0"; hash = "sha256-DvOUFlFDnopN+MJY6GYRPNabuoHPFch/nNn+49ygznc="; name = "incorrect-result-from-qfbclassno.patch"; url = "https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=commitdiff_plain;h=7ca0c2eae87def89fa7253c60e4791a8ef26629d"; excludes = [ "src/test/32/quadclassunit" "CHANGES" ]; hash = "sha256-CQRkIYDFMrWHCoSWGsIydPjGk3w09zzghajlNuq29Jk="; }) ]; Loading
pkgs/applications/science/math/sage/default.nix +1 −1 Original line number Diff line number Diff line Loading @@ -128,7 +128,7 @@ let singular = pkgs.singular.override { inherit flint; }; maxima = pkgs.maxima-ecl-5_45.override { maxima = pkgs.maxima-ecl.override { lisp-compiler = pkgs.ecl.override { # "echo syntax error | ecl > /dev/full 2>&1" segfaults in # ECL. We apply a patch to fix it (write_error.patch), but it Loading