From 40fb3ed6dc4c817e0416ae7c562aa6efff3fe241 Mon Sep 17 00:00:00 2001 From: Masanori Ogino <167209+omasanori@users.noreply.github.com> Date: Tue, 27 Oct 2020 06:08:21 +0900 Subject: [PATCH] maxima: remove 5.41.0 It had been kept for SageMath, but it uses the default version nowadays and this version is not referenced in nixpkgs. Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com> --- .../applications/science/math/maxima/5.41.nix | 102 ------------------ .../math/maxima/known-ecl-failures.patch | 21 ---- 2 files changed, 123 deletions(-) delete mode 100644 pkgs/applications/science/math/maxima/5.41.nix delete mode 100644 pkgs/applications/science/math/maxima/known-ecl-failures.patch diff --git a/pkgs/applications/science/math/maxima/5.41.nix b/pkgs/applications/science/math/maxima/5.41.nix deleted file mode 100644 index 829dffc6116e..000000000000 --- a/pkgs/applications/science/math/maxima/5.41.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null -, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false -}: - -let - name = "maxima"; - # old version temporarily kept for sage, see discussion at - # https://github.com/NixOS/nixpkgs/commit/82254747af35f3e0e0d6f78023ded3a81e25331b - version = "5.41.0"; - - searchPath = - stdenv.lib.makeBinPath - (stdenv.lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]); -in -stdenv.mkDerivation ({ - inherit version; - name = "${name}-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "0x0n81z0s4pl8nwpf7ivlsbvsdphm9w42250g7qdkizl0132by6s"; - }; - - buildInputs = stdenv.lib.filter (x: x != null) [ - sbcl ecl texinfo perl python makeWrapper - ]; - - 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 - '' - + (stdenv.lib.optionalString ecl-fasl '' - 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 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"; - }) - - # 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 { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar"; - }) - # There are some transient test failures. I hope this disables all those tests. - # If those test failures ever happen in the non-ecl version, that should be - # reportetd upstream. - ./known-ecl-failures.patch - ]; - - # Failures in the regression test suite won't abort the build process. We run - # the suite only so that potential errors show up in the build log. See also: - # https://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933. - doCheck = true; - - enableParallelBuilding = true; - - meta = { - description = "Computer algebra system"; - homepage = "http://maxima.sourceforge.net"; - license = stdenv.lib.licenses.gpl2; - - 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. - ''; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; - }; -}) diff --git a/pkgs/applications/science/math/maxima/known-ecl-failures.patch b/pkgs/applications/science/math/maxima/known-ecl-failures.patch deleted file mode 100644 index f1d612d993e6..000000000000 --- a/pkgs/applications/science/math/maxima/known-ecl-failures.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/tests/testsuite.lisp b/tests/testsuite.lisp -index 45a81f4..36c35b8 100644 ---- a/tests/testsuite.lisp -+++ b/tests/testsuite.lisp -@@ -25,13 +25,14 @@ - ((mlist simp) "rtest10" 24 25) - ((mlist) "rtest11" #+(or gcl cmucl ccl64) 158 #+(or gcl cmucl ccl64) 174 #+gcl 175) - "rtest13" "rtest13s" -- "rtest14" -+ ;; "rtest14" ;; some tests sometimes fail with ecl, hard to reproduce. Observed failing: 250, 267, 297, 307, 310, 312, 315, 319 - "rtest15" - ;; ccl versions 1.11 and earlier fail test 50. Mark it as a - ;; known failure. Presumably 1.12 will have this fixed. - ((mlist simp) "rtest16" #+ccl 50) - "rtestode" "rtestode_zp" -- "rtest3" "rtest8" -+ "rtest3" -+ ((mlist simp) "rtest8" 104) ;; fails with ecl - ((mlist simp) "rtest12" 76 78) - "rexamples" - ((mlist simp) "rtesthyp" 105 112 113 123 124 128)