diff options
Diffstat (limited to 'pkgs/applications/science/astronomy')
| -rw-r--r-- | pkgs/applications/science/astronomy/gildas/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/applications/science/astronomy/gildas/imager-py3.patch | 12 |
2 files changed, 24 insertions, 10 deletions
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 4bb3c7b34fe..cc6af8a17c0 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, gtk2-x11 , pkgconfig , python27 , gfortran , lesstif -, cfitsio , getopt , perl , groff , which, darwin +{ stdenv, fetchurl, gtk2-x11 , pkgconfig , python3 , gfortran , lesstif +, cfitsio , getopt , perl , groff , which, darwin, ncurses }: let - python27Env = python27.withPackages(ps: with ps; [ numpy ]); + python3Env = python3.withPackages(ps: with ps; [ numpy ]); in stdenv.mkDerivation rec { - srcVersion = "dec19a"; - version = "20191201_a"; + srcVersion = "jan20a"; + version = "20200101_a"; pname = "gildas"; src = fetchurl { @@ -16,17 +16,19 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "0kwq5gzgzx5hkbabwvbrw2958pqz4m2s501k5cbllgxh4sqp86b1"; + sha256 = "12n08pax7gwg2z121ix3ah5prq3yswqnf2yc8jgs4i9rgkpbsfzz"; }; - enableParallelBuilding = true; + # Python scripts are not converted to Python 3 syntax when parallel + # building is turned on. Disable it until this is fixed upstream. + enableParallelBuilding = false; nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; - buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ] + buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); - patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; + patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./imager-py3.patch ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out - substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env} + substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python3Env} substituteInPlace utilities/main/gag-makedepend.pl --replace '/usr/bin/perl' ${perl}/bin/perl source admin/gildas-env.sh -c gfortran -o openmp echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl diff --git a/pkgs/applications/science/astronomy/gildas/imager-py3.patch b/pkgs/applications/science/astronomy/gildas/imager-py3.patch new file mode 100644 index 00000000000..71a129164ba --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/imager-py3.patch @@ -0,0 +1,12 @@ +diff -ruN gildas-src-jan20a.orig/contrib/imager/pro/define.ima gildas-src-jan20a/contrib/imager/pro/define.ima +--- gildas-src-jan20a.orig/contrib/imager/pro/define.ima 2020-01-01 02:15:16.000000000 +0100 ++++ gildas-src-jan20a/contrib/imager/pro/define.ima 2020-01-14 11:18:46.000000000 +0100 +@@ -9,7 +9,7 @@ + ! + ! Patch for a Bug on Mac-OS/X where Python blocks if activated first + ! from a script launched by a widget. +-python print "Starting Python" ++python print("Starting Python") + ! + ! INPUT, GO and UVT_CONVERT always defined by GreG + define command GO "@ p_go.ima" gag_pro:go_greg.hlp |