From 5e74f259f3a08fd5fac5854dba7f12619b9ba324 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 2 Mar 2021 22:06:48 -0300 Subject: [PATCH] sympow: work around extra logfile output from pari 2.13 --- ...clean-extra-logfile-output-from-pari.patch | 39 +++++++++++++++++++ .../libraries/science/math/sympow/default.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch diff --git a/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch b/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch new file mode 100644 index 00000000000..cbcf18b4cdb --- /dev/null +++ b/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch @@ -0,0 +1,39 @@ +commit 433a8b99da9d71e96434bd421c2468cbda29d37c +Author: Mauricio Collares +Date: Tue Mar 2 22:07:11 2021 -0300 + + trim logfile information from pari 2.13 output + + Pari (since commit 609fb01faf827d91dfa9136849a647a3bbfe8036) prints + extra logfile information such as + + [logfile is "/tmp/nix-shell.2BquN9/home/.sympow/datafiles/P02HM.txt"] + + which messes up sympow's parsing. This commit reuses the same trimming + mechanism already in sympow to trim this new message. + +diff --git a/Configure b/Configure +index 1ef9756..776bec2 100755 +--- a/Configure ++++ b/Configure +@@ -322,7 +322,7 @@ echo "datafiles/param_data: \$(OTHERb)" >> $FILE + echo " \$(MKDIR) -p datafiles" >> $FILE + echo " \$(TOUCH) datafiles/param_data" >> $FILE + echo " \$(SH) armd.sh" >> $FILE +-echo " \$(SED) -i -e '/logfile =/d' datafiles/*.txt" >> $FILE ++echo " \$(SED) -i -e '/logfile /d' datafiles/*.txt" >> $FILE + echo "sympow.1: sympow" >> $FILE + echo " \$(HELP2MAN) \$(H2MFLAGS) -s 1 -n \"SYMPOW program\" -I sympow.h2m -o \$@ ./\$<" >> $FILE + echo "clean:" >> $FILE +diff --git a/generate.c b/generate.c +index dbb811f..783320c 100644 +--- a/generate.c ++++ b/generate.c +@@ -148,6 +148,7 @@ static void trimit(char *A) + " -e '" + "/^\?/d" ";" + "/^(/d" ";" ++ "/logfile /d" ";" + "/Warning:/d" ";" + "/^About to find TOO_BIG/d" ";" + "/^Now working backwards/d" ";" diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index 3c31ed8a361..c31c705d39d 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl"; }; + patches = [ ./clean-extra-logfile-output-from-pari.patch ]; + postUnpack = '' patchShebangs . '';