Commit 19bf4ba0 authored by Mauricio Collares's avatar Mauricio Collares
Browse files

giac, giac-with-xcas: 1.9.0-29 -> 1.9.0-43

parent 51541df9

pkgs/applications/science/math/giac/default.nix

+6 −10
Original line number Diff line number Diff line
@@ -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 = [
@@ -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:

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