public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gildas: 20200101_a -> 20200201_a

Browse Source 
- Upgrade gildas to the latest version

 - Remove a patch that has been included upstream

 - Re-enable parallel building (fixed upstream)
This commit is contained in:
Sébastien Maret 2020-02-20 15:26:04 +01:00
parent f098b0dd2c
commit 7667207f3d
No known key found for this signature in database
GPG Key ID: 86E30E5A0F5FC59C
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/science/astronomy/gildas/default.nix
View File

@ -7,8 +7,8 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
srcVersion = "jan20a"; srcVersion = "feb20a";
version = "20200101_a"; version = "20200201_a";
pname = "gildas"; pname = "gildas";
src = fetchurl { src = fetchurl {
@ -16,19 +16,15 @@ stdenv.mkDerivation rec {
# source code of the previous release to a different directory # source code of the previous release to a different directory
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" 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" ]; "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 ]; nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ];
buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ]
++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); ++ 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"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";

12
pkgs/applications/science/astronomy/gildas/imager-py3.patch
View File

@ -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