diff options
Diffstat (limited to 'pkgs/development/libraries/science')
| -rw-r--r-- | pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/science/math/sympow/default.nix | 41 |
2 files changed, 20 insertions, 27 deletions
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 index cbcf18b4cdb23..97c0a7dad3005 100644 --- 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 @@ -13,18 +13,18 @@ Date: Tue Mar 2 22:07:11 2021 -0300 mechanism already in sympow to trim this new message. diff --git a/Configure b/Configure -index 1ef9756..776bec2 100755 +index 53b556e..53999ae 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 " \$(SED) -i -e '/logfile /d' datafiles/*.txt" >> $FILE + echo " \$(SED) -i -e '/logfile is/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 diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index 1033f26f43603..91daf30686f8f 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -1,16 +1,17 @@ -{ lib, stdenv -, fetchFromGitLab -, fetchpatch -, makeWrapper -, which -, autoconf -, help2man -, file -, pari +{ + lib, + stdenv, + fetchFromGitLab, + makeWrapper, + which, + autoconf, + help2man, + file, + pari, }: stdenv.mkDerivation rec { - version = "2.023.6"; + version = "2.023.7"; pname = "sympow"; src = fetchFromGitLab { @@ -18,17 +19,10 @@ stdenv.mkDerivation rec { owner = "forks"; repo = "sympow"; rev = "v${version}"; - sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl"; + hash = "sha256-sex8gRiBdTcVMV3nSeiTYamAjPoXQdiiZwjRmeKA+mc="; }; - patches = [ - ./clean-extra-logfile-output-from-pari.patch - (fetchpatch { - name = "null-terminate-dupdirname.patch"; - url = "https://gitlab.com/rezozer/forks/sympow/-/merge_requests/5.diff"; - sha256 = "sha256-yKjio+qN9teL8L+mb7WOBN/iv545vRIxW20FJU37oO4="; - }) - ]; + patches = [ ./clean-extra-logfile-output-from-pari.patch ]; postUnpack = '' patchShebangs . @@ -66,12 +60,11 @@ stdenv.mkDerivation rec { # Example from the README as a sanity check. doInstallCheck = true; installCheckPhase = '' - export HOME="$TMP/home" - mkdir -p "$HOME" + export HOME=$TMPDIR "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705' ''; - meta = with lib; { + meta = { description = "Compute special values of symmetric power elliptic curve L-functions"; mainProgram = "sympow"; license = { @@ -79,7 +72,7 @@ stdenv.mkDerivation rec { fullName = "Custom, BSD-like. See COPYING file."; free = true; }; - maintainers = teams.sage.members; - platforms = platforms.linux; + maintainers = lib.teams.sage.members; + platforms = lib.platforms.linux; }; } |