From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 0MdPLIvetGJWXwEAbAwnHQ (envelope-from ) for ; Thu, 23 Jun 2022 23:43:39 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id uJBELIvetGK7JAEA9RJhRA (envelope-from ) for ; Thu, 23 Jun 2022 23:43:39 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 30239230C2 for ; Thu, 23 Jun 2022 23:43:39 +0200 (CEST) Received: from localhost ([::1]:42540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4Ubx-00071s-NV for larch@yhetil.org; Thu, 23 Jun 2022 17:43:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4UG6-0001s5-Lu for guix-patches@gnu.org; Thu, 23 Jun 2022 17:21:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46242) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o4UG6-0004YQ-DU for guix-patches@gnu.org; Thu, 23 Jun 2022 17:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o4UG6-0007UZ-5o for guix-patches@gnu.org; Thu, 23 Jun 2022 17:21:02 -0400 Subject: bug#55935: [PATCH 1/1] gnu: Add casacore Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 23 Jun 2022 21:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 55935 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Sharlatan Hellseher Cc: 55935-done@debbugs.gnu.org Mail-Followup-To: 55935@debbugs.gnu.org, ludo@gnu.org, sharlatanus@gmail.com Received: via spool by 55935-done@debbugs.gnu.org id=D55935.165601922828727 (code D ref 55935); Thu, 23 Jun 2022 21:21:01 +0000 Received: (at 55935-done) by debbugs.gnu.org; 23 Jun 2022 21:20:28 +0000 Received: from localhost ([127.0.0.1]:40136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4UFY-0007TH-6t for submit@debbugs.gnu.org; Thu, 23 Jun 2022 17:20:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4UFV-0007T1-RH for 55935-done@debbugs.gnu.org; Thu, 23 Jun 2022 17:20:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4UFP-0004QF-5u; Thu, 23 Jun 2022 17:20:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=RjfJasTsQEwgrsRtX4Em+vdzL2OflgtEUgRPlcSkovE=; b=MNZnrQOs1VpurCHLhCeD CBxD0gvK4yAGX4bKHuUM1RdV0uQkT81ayEEiOpXVHuzoLztFHEl1G9EIP9XiFiA+In/QyLSaBNM1N WjEU0o3N1YXaCe7VQuO8mT7BCDLaVTTOO3Aua9TIfDa1Uw++ZVsMEwCoK87rlx+MyaRLmsKiolWJi yle6TOo6rUXf3swwG0AIObteCvvoGfSA+lSg18gm2tN9hVYwUemjC2uptdbI1/0szyZ/ljJC1KfPE tciHzY4kSejzF0zct+WfV+PAi0ZF1BDP6imNc4RPc0jIYpsLRqrHgY8xX2sKnt2CtW98EOnzTk2vX oA/MvHJPXHqmCQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:64848 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4UFO-0007B3-Q3; Thu, 23 Jun 2022 17:20:19 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Thu, 23 Jun 2022 23:20:16 +0200 In-Reply-To: (Sharlatan Hellseher's message of "Sun, 12 Jun 2022 22:33:13 +0100") Message-ID: <87edzfvzzj.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1656020619; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=RjfJasTsQEwgrsRtX4Em+vdzL2OflgtEUgRPlcSkovE=; b=BP4VjyFP14npHyW/PSWOL48g2PC2iXClLTZTmmzRCzAeYnp0HvWQ3dGLfmcMfrpEkPb1Kw 97VVWAWuunHL4GML6f4NTPJ3t/q5yg2dR9l2fE/BlLvyPOXPLq8iVwmYWtz/BHZtyQK8LZ m3y5jYMGKl1TIzxdqh3ys1Ynm+yl873RDpHPNtf1cpXbZXoMZkGOJAPRdiSKUhnu9rv1Oz Mrn8AvkyJCQZt8sc8vXx6O+4OLD3TRfFCCGjNvnQn35W8mN/rtyl2GvjnkaDkgMH/ZPRs7 /sl2euMKSrrqbsVgXXybvuD0IVdB+YGK0rJfv7MJ5eluqJilBiyoLAfi82KlzA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1656020619; a=rsa-sha256; cv=none; b=pAHXjXXnbCioYQN/rqkBhFgBl8lVUFw2nzZGc8mxOMsYFU9I2SxRSlHcnwOnn+HtDrGyyo BtoMIfdMeLZCkY7bRbgolmXfktKNK0vCHbDFeu94W8YgUMXfqLMS4JDqxikKE9Kkp0u0OP WnR6vT1QTlRbkwjhK299AS4jx3iRY0IKF+K5+tp9EgUlIt3OEdEcy3LH7+O/ffjphnANEe Ou5m4rwr2hEv2PD+6DbLgbVMJFelcqJsY/2zS7Y2V2OxOiISnpFAzYgSGtrscBWUEHvB6w 5CxxhSaE2YXpT8g7FNPUqmvxk/hUT4MtTUIY6OskPxkXpK6BF7ahkWDj7gx8qw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=MNZnrQOs; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.26 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=MNZnrQOs; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 30239230C2 X-Spam-Score: -4.26 X-Migadu-Scanner: scn0.migadu.com X-TUID: 6Key8LCOpaRg --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Sharlatan Hellseher skribis: > From 916bde255b94eab85c10e55104b0e088781ef943 Mon Sep 17 00:00:00 2001 > From: Sharlatan Hellseher > 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: =E2=80=A2 use =E2=80=98this-package-input=E2=80=99 to refer to the same P= ython package that appears in =E2=80=98inputs=E2=80=99; =E2=80=A2 use =E2=80=98search-input-file=E2=80=99 rather than =E2=80=98wh= ich=E2=80=99 for =E2=80=9Crm=E2=80=9D, which is more correct if we ever want to cross-compile it (it makes sure we pick =E2=80=9Crm=E2=80=9D among the inputs rather than among native inputs); =E2=80=A2 remove now-unneeded trailing #t from build phases; =E2=80=A2 change license to =E2=80=98gpl2+=E2=80=99 because source file h= eaders explicitly say =E2=80=9Cor any later version=E2=80=9D. Thanks! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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 --=-=-=--