From 7667207f3da9d566b86e62bf28e2bc72b5053c78 Mon Sep 17 00:00:00 2001 From: Sébastien Maret Date: Thu, 20 Feb 2020 15:26:04 +0100 Subject: gildas: 20200101_a -> 20200201_a - Upgrade gildas to the latest version - Remove a patch that has been included upstream - Re-enable parallel building (fixed upstream) --- pkgs/applications/science/astronomy/gildas/default.nix | 12 ++++-------- pkgs/applications/science/astronomy/gildas/imager-py3.patch | 12 ------------ 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 pkgs/applications/science/astronomy/gildas/imager-py3.patch diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index cc6af8a17c0..9908439e10d 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "jan20a"; - version = "20200101_a"; + srcVersion = "feb20a"; + version = "20200201_a"; pname = "gildas"; src = fetchurl { @@ -16,19 +16,15 @@ 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 = "12n08pax7gwg2z121ix3ah5prq3yswqnf2yc8jgs4i9rgkpbsfzz"; + sha256 = "05f34kpi3pfgf4dsyka7mkcln26yzb2mixnnc306krq0isjm7m26"; }; - # 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 python3Env ncurses ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); - patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./imager-py3.patch ]; + patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; diff --git a/pkgs/applications/science/astronomy/gildas/imager-py3.patch b/pkgs/applications/science/astronomy/gildas/imager-py3.patch deleted file mode 100644 index 71a129164ba..00000000000 --- a/pkgs/applications/science/astronomy/gildas/imager-py3.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 -- cgit 1.4.1