fixup! giac: 1.9.0-43 -> 1.9.0-993

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

@@ -9,15 +9,14 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation rec {
   pname = "giac${lib.optionalString enableGUI "-with-xcas"}";
-  version = "1.9.0-993";
+  version = "1.9.0-993"; # 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-pqytFWrSWfEwQqRdRbaigGCq68s8mdgj2j8M+kclslE=";
   };
 
   patches = [
-    ./remove-old-functional-patterns.patch
     ./fix-fltk-guard.patch
 
     (fetchpatch {
@@ -30,7 +29,25 @@ stdenv.mkDerivation rec {
       name = "infinity.patch";
       url = "https://github.com/geogebra/giac/commit/851c2cd91e879c79d6652f8a5d5bed03b65c6d39.patch";
       sha256 = "sha256-WJRT2b8I9kgAkRuIugMiXoF4hT7yR7qyad8A6IspNTM=";
-      stripLen = 5; extraPrefix = "/src/"; excludes = [ "src/kdisplay.cc" ];
+      stripLen = 5;
+      extraPrefix = "/src/";
+      excludes = [ "src/kdisplay.cc" ];
+    })
+
+    (fetchpatch {
+      name = "cpp17_part1.patch";
+      url = "https://github.com/geogebra/giac/commit/e1f2e8899f7a579168f5565a05adf987457ddcff.patch";
+      sha256 = "sha256-PAMJSsPv895fx7KrbttOfc++Ox+KPLDZhiR4epkPN5M=";
+      stripLen = 5;
+      extraPrefix = "/src/";
+    })
+
+    (fetchpatch {
+      name = "cpp17_part2.patch";
+      url = "https://github.com/geogebra/giac/commit/2f6ea6cd85ccc224d5ce2f8947ecbd2cc7840f1b.patch";
+      sha256 = "sha256-FrFGPm2yrNBSdaGSUKYN+lO7AZne2tXi6fzfTJSwvO4=";
+      stripLen = 5;
+      extraPrefix = "/src/";
     })
 
     # giac calls scanf/printf with non-constant first arguments, which
@@ -101,6 +118,9 @@ stdenv.mkDerivation rec {
     echo > check/chk_fhan2
     echo > check/chk_fhan9
   '' + lib.optionalString (stdenv.isDarwin) ''
+    # these cover a known regression in giac, likely due to how pari state
+    # is shared between multiple giac instances (see pari.cc.old).
+    # see https://github.com/NixOS/nixpkgs/pull/264126 for more information
     echo > check/chk_fhan4
     echo > check/chk_fhan6
   '';
@@ -148,8 +168,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html";
     license = licenses.gpl3Plus;
     platforms = platforms.linux ++ (optionals (!enableGUI) platforms.darwin);
-    # still failing 2 testcases; see https://github.com/NixOS/nixpkgs/pull/264126
-    # broken = stdenv.isDarwin && stdenv.isAarch64;
     maintainers = [ maintainers.symphorien ];
   };
 }