From: "Ludovic Courtès" <ludo@gnu.org>
To: Sharlatan Hellseher <sharlatanus@gmail.com>
Cc: 55935-done@debbugs.gnu.org
Subject: bug#55935: [PATCH 1/1] gnu: Add casacore
Date: Thu, 23 Jun 2022 23:20:16 +0200 [thread overview]
Message-ID: <87edzfvzzj.fsf@gnu.org> (raw)
In-Reply-To: <CAO+9K5qbn-OGDas-tUiia2maSNkyL_sDu2wk6TtSyb0Q8s2CNQ@mail.gmail.com> (Sharlatan Hellseher's message of "Sun, 12 Jun 2022 22:33:13 +0100")
[-- Attachment #1: Type: text/plain, Size: 1094 bytes --]
Hi,
Sharlatan Hellseher <sharlatanus@gmail.com> skribis:
> From 916bde255b94eab85c10e55104b0e088781ef943 Mon Sep 17 00:00:00 2001
> From: Sharlatan Hellseher <sharlatanus@gmail.com>
> Date: Sun, 12 Jun 2022 22:25:07 +0100
> Subject: [PATCH 1/1] gnu: Add casacore
>
> * gnu/packages/astronomy.scm (casacore): New variable.
> Modules sorted alphabetically to easy maintannce.
> ---
> gnu/packages/astronomy.scm | 102 +++++++++++++++++++++++++++++++++++--
> 1 file changed, 97 insertions(+), 5 deletions(-)
Applied with the changes below:
• use ‘this-package-input’ to refer to the same Python package that
appears in ‘inputs’;
• use ‘search-input-file’ rather than ‘which’ for “rm”, which is more
correct if we ever want to cross-compile it (it makes sure we pick
“rm” among the inputs rather than among native inputs);
• remove now-unneeded trailing #t from build phases;
• change license to ‘gpl2+’ because source file headers explicitly say
“or any later version”.
Thanks!
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 3589 bytes --]
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index a0de5a617f..61c10c985f 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -130,11 +130,11 @@ (define-public casacore
(build-system cmake-build-system)
(arguments
(list
- ;; NOTE: (Sharlatan-20220611T213043+0100): There are multiple fails in
+ ;; Note: There are multiple failures in
;; tests which require additional measures data. They are
;; distributed via FTP without any license:
;; ftp://ftp.astron.nl/outgoing/Measures/
- ;; Check how to fix tests.
+ ;; TODO: Check how to fix tests.
#:tests? #f
#:parallel-build? #t
#:configure-flags
@@ -145,25 +145,27 @@ (define-public casacore
"-DUSE_OPENMP=OFF"
"-DUSE_THREADS=ON"
(string-append "-DDATA_DIR=" #$output "/data")
- (string-append "-DPYTHON3_EXECUTABLE=" #$python "/bin")
- (string-append "-DPYTHON3_INCLUDE_DIR=" #$python "/include")
- (string-append "-DPYTHON3_LIBRARY=" #$python "/lib"))
+ (string-append "-DPYTHON3_EXECUTABLE="
+ #$(this-package-input "python") "/bin")
+ (string-append "-DPYTHON3_INCLUDE_DIR="
+ #$(this-package-input "python") "/include")
+ (string-append "-DPYTHON3_LIBRARY="
+ #$(this-package-input "python") "/lib"))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'set-env
(lambda _
(setenv "HOME" "/tmp")))
(add-after 'unpack 'use-absolute-rm
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "casa/OS/test/tFile.run"
- (("/bin/rm") (which "rm")))
- #t))
+ (("/bin/rm")
+ (search-input-file inputs "/bin/rm")))))
(add-after 'unpack 'use-absolute-python3
(lambda _
(substitute* "build-tools/casacore_floatcheck"
(("#!/usr/bin/env python")
- (string-append "#!" #$python "/bin/python3")))
- #t))
+ (string-append "#!" (which "python3"))))))
;; NOTE: (Sharlatan-20220611T200837+0100): Workaround for casacore
;; tests stuck with missing "qsub" issue.
;; https://github.com/casacore/casacore/issues/1122
@@ -171,8 +173,7 @@ (define-public casacore
(lambda _
(substitute* "build-tools/casacore_assay"
(("QSUBP=.*$") "QSUBP=\n")
- (("YODP=.*$") "YODP=\n"))
- #t)))))
+ (("YODP=.*$") "YODP=\n")))))))
(native-inputs
(list bison
boost
@@ -194,10 +195,10 @@ (define-public casacore
(synopsis "Suite of C++ libraries for radio astronomy data processing")
(description
"The casacore package contains the core libraries of the old
-@code{AIPS++/CASA} (Common Astronomy Software Application) package. This split
-was made to get a better separation of core libraries and applications.
-(CASA @url{https://casa.nrao.edu/}) is now built on top of Casacore.")
- (license license:gpl2)))
+AIPS++/CASA (Common Astronomy Software Application) package. This split was
+made to get a better separation of core libraries and applications.
+@url{https://casa.nrao.edu/, CASA} is now built on top of Casacore.")
+ (license license:gpl2+)))
(define-public cfitsio
(package
prev parent reply other threads:[~2022-06-23 21:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-12 21:33 [bug#55935] [PATCH 1/1] gnu: Add casacore Sharlatan Hellseher
2022-06-23 21:20 ` Ludovic Courtès [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87edzfvzzj.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=55935-done@debbugs.gnu.org \
--cc=sharlatanus@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).