From 79df9105bab9a7bc96f2b00391a03b3c242ab024 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 30 Sep 2017 11:33:14 +0200 Subject: [PATCH 1/3] giac, xcas: init at 1.4.9 --- .../science/math/giac/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/science/math/giac/default.nix diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix new file mode 100644 index 0000000000000..d1645bf90107b --- /dev/null +++ b/pkgs/applications/science/math/giac/default.nix @@ -0,0 +1,63 @@ +{stdenv, fetchurl, gmp, mpfr, pari, ntl, gsl, blas, +readline, gettext, liblapackWithAtlas, bison, yacc, flex, +mpfi, libpng, libao, gfortran, texlive, hevea, perl, +enableGui ? true, mesa ? null, xorg ? null, fltk ? null, +}: + +assert enableGui -> mesa != null && xorg != null && fltk != null; + +stdenv.mkDerivation rec { + name = "giac-${version}"; + version = "1.4.9"; + + src = fetchurl { + url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/${name}.tar.bz2"; + sha256 = "1n7xxgpqrsq7cv5wgcmgag6jvxw5wijkf1yv1r5aizlf1rc7dhai"; + }; + + + patchPhase = '' + for i in doc/*/Makefile* ; do + substituteInPlace "$i" --replace "/bin/cp" "cp"; + done; + ''; + + nativeBuildInputs = [ + texlive.combined.scheme-small hevea + ]; + + buildInputs = [ + gmp mpfr pari ntl gsl mpfi liblapackWithAtlas bison yacc flex readline + gettext blas libpng gfortran perl + ] ++ stdenv.lib.optionals enableGui [ + mesa fltk xorg.libX11 + ]; + + enableParallelBuilding = true; + hardeningDisable = [ "format" "bindnow" "relro" ]; + + configureFlags = [ + "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" + "--enable-pari" "--enable-ntl" "--enable-gmpxx" # "--enable-cocoa" + "--enable-ao" ] ++ stdenv.lib.optionals enableGui [ + "--enable-gui" "--with-x" + ]; + + postInstall = '' + # example Makefiles contain the full path to some commands + # notably texlive, and we don't want texlive to become a runtime + # dependency + for file in $(find $out -name Makefile) ; do + sed -i "s@/nix/store/[^/]*/bin/@@" "$file" ; + done; + ''; + + meta = with stdenv.lib; { + description = "A free computer algebra system (CAS)"; + homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; + license = licenses.gpl3Plus; + ## xcas is buildable on darwin but there are specific instructions I could + ## not test + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbd6a59088dc8..24d8aa5ddaf28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18435,6 +18435,9 @@ with pkgs; gfan = callPackage ../applications/science/math/gfan {}; + xcas = callPackage ../applications/science/math/giac { }; + giac = xcas.override { enableGui = false;}; + ginac = callPackage ../applications/science/math/ginac { }; glucose = callPackage ../applications/science/logic/glucose { }; From 10a612120fc7426c7038fdac9a1d1fefed2b3fa9 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 30 Sep 2017 21:40:50 +0200 Subject: [PATCH 2/3] xcas, giac: add myself as maintainer --- lib/maintainers.nix | 1 + pkgs/applications/science/math/giac/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a978313c42c1d..28636f64aa66d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -575,6 +575,7 @@ swarren83 = "Shawn Warren "; swflint = "Samuel W. Flint "; swistak35 = "Rafał Łasocha "; + symphorien = "Guillaume Girol "; szczyp = "Szczyp "; sztupi = "Attila Sztupak "; taeer = "Taeer Bar-Yam "; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index d1645bf90107b..5f1af4fe9c609 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { ## xcas is buildable on darwin but there are specific instructions I could ## not test platforms = platforms.linux; + maintainers = [ maintainers.symphorien ]; }; } From 0c14753a4a122109690a6d968c63813e55b5e5a5 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 30 Sep 2017 13:34:11 +0000 Subject: [PATCH 3/3] giac: refactor --- .../science/math/giac/default.nix | 44 ++++++++++--------- pkgs/top-level/all-packages.nix | 8 ++-- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 5f1af4fe9c609..4ef00d56f1822 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,47 +1,51 @@ -{stdenv, fetchurl, gmp, mpfr, pari, ntl, gsl, blas, -readline, gettext, liblapackWithAtlas, bison, yacc, flex, -mpfi, libpng, libao, gfortran, texlive, hevea, perl, -enableGui ? true, mesa ? null, xorg ? null, fltk ? null, +{ stdenv, fetchurl, texlive, bison, flex +, gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas +, readline, gettext, libpng, libao, gfortran, perl +, enableGUI ? false, mesa ? null, xorg ? null, fltk ? null }: -assert enableGui -> mesa != null && xorg != null && fltk != null; +assert enableGUI -> mesa != null && xorg != null && fltk != null; stdenv.mkDerivation rec { - name = "giac-${version}"; + name = "${attr}-${version}"; + attr = if enableGUI then "giac-with-xcas" else "giac"; version = "1.4.9"; src = fetchurl { - url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/${name}.tar.bz2"; + url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/giac-${version}.tar.bz2"; sha256 = "1n7xxgpqrsq7cv5wgcmgag6jvxw5wijkf1yv1r5aizlf1rc7dhai"; }; - - patchPhase = '' - for i in doc/*/Makefile* ; do + postPatch = '' + for i in doc/*/Makefile*; do substituteInPlace "$i" --replace "/bin/cp" "cp"; done; - ''; + ''; nativeBuildInputs = [ - texlive.combined.scheme-small hevea + texlive.combined.scheme-small bison flex ]; + # perl is only needed for patchShebangs fixup. buildInputs = [ - gmp mpfr pari ntl gsl mpfi liblapackWithAtlas bison yacc flex readline - gettext blas libpng gfortran perl - ] ++ stdenv.lib.optionals enableGui [ + gmp mpfr pari ntl gsl blas mpfi liblapackWithAtlas + readline gettext libpng libao gfortran perl + ] ++ stdenv.lib.optionals enableGUI [ mesa fltk xorg.libX11 ]; + outputs = [ "out" ]; + enableParallelBuilding = true; hardeningDisable = [ "format" "bindnow" "relro" ]; configureFlags = [ - "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" - "--enable-pari" "--enable-ntl" "--enable-gmpxx" # "--enable-cocoa" - "--enable-ao" ] ++ stdenv.lib.optionals enableGui [ - "--enable-gui" "--with-x" - ]; + "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" + "--enable-pari" "--enable-ntl" "--enable-gmpxx" # "--enable-cocoa" + "--enable-ao" + ] ++ stdenv.lib.optionals enableGUI [ + "--enable-gui" "--with-x" + ]; postInstall = '' # example Makefiles contain the full path to some commands diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24d8aa5ddaf28..28a6eafe13065 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9279,8 +9279,8 @@ with pkgs; libminc = callPackage ../development/libraries/libminc { }; - libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; - + libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; + libmkv = callPackage ../development/libraries/libmkv { }; libmms = callPackage ../development/libraries/libmms { }; @@ -18435,8 +18435,8 @@ with pkgs; gfan = callPackage ../applications/science/math/gfan {}; - xcas = callPackage ../applications/science/math/giac { }; - giac = xcas.override { enableGui = false;}; + giac = callPackage ../applications/science/math/giac { }; + giac-with-xcas = giac.override { enableGUI = true; }; ginac = callPackage ../applications/science/math/ginac { };