From patchwork Sun Dec 11 22:25:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 45177 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CCF7827BBEC; Sun, 11 Dec 2022 22:26:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EDE1827BBE9 for ; Sun, 11 Dec 2022 22:26:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4Ulo-0005DL-Ff; Sun, 11 Dec 2022 17:26:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4Uln-0005Bi-6r for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4Ulm-0004D0-Gr for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4Ulm-0003xs-D4 for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59978] [PATCH 1/6] gnu: cfitsio: Update to 4.2.0. References: <20221211222330.32212-1-sharlatanus@gmail.com> In-Reply-To: <20221211222330.32212-1-sharlatanus@gmail.com> Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Dec 2022 22:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59978 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59978@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 59978-submit@debbugs.gnu.org id=B59978.167079756015218 (code B ref 59978); Sun, 11 Dec 2022 22:26:02 +0000 Received: (at 59978) by debbugs.gnu.org; 11 Dec 2022 22:26:00 +0000 Received: from localhost ([127.0.0.1]:48558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulh-0003x5-K8 for submit@debbugs.gnu.org; Sun, 11 Dec 2022 17:26:00 -0500 Received: from mail-wm1-f48.google.com ([209.85.128.48]:44012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulf-0003wk-Ar for 59978@debbugs.gnu.org; Sun, 11 Dec 2022 17:25:55 -0500 Received: by mail-wm1-f48.google.com with SMTP id k22-20020a05600c1c9600b003d1ee3a6289so3730831wms.2 for <59978@debbugs.gnu.org>; Sun, 11 Dec 2022 14:25:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=k65IQ9fy6bzsDx1zf4A5YiOSYGLipuEf7/7WTRh0Qzc=; b=ObZwQH+bOYwnWp8L0H7dmSkZvMIgHi5MIHX10g7uqEAkGNSjsB6Bx/zo6ISTzBNNIP pT4INP651NRQvOpjI+nvHECFm1PKOYZK3UZv8eKRs7dN/FoxLHyISu6OsxMF1kAk+QmA MTFgafjkLHk8inVkuIIBzQPfuYnZ1ULbHAjpQsnGiIOn0WvQw7r1lJ6ZaBjArS3xprI6 ZKTHxM02tucOpQQsSn17A4IRmsLolSDYIGv7yiXVuh5R0JVsRY2a8sSPisg4ADGi3ahH N7InUd3R7b+IDeOTUm1Cv5aRqnVPPrR1M+iP+KRzLx/yr4XflRGb8teQOwip7kT6fFfm a/0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=k65IQ9fy6bzsDx1zf4A5YiOSYGLipuEf7/7WTRh0Qzc=; b=d82YmuHxI4nV6iwYwRZFZOp2KXIOcPqFJBgS216qIxOC50d7glyzqO9aoz7m92Cpe2 GcD01R6it+ud0XlryYg0aHLGzmlkqnaxO99RuXnei0EYU1tEaw8b57R+doTdpo6qtPdp zfrpQiA5DguTxae4byaK6Zro7UCllKa3cFi7MQQL7R/ghor7XY01MzF/+SYWtEHR4lki CSlI/4jSlPPS561d/Cup9oKqbjVY3Ry4oaVNjRVTXSdZrzDvExdCu2vGgxkqhw8H/ahG ST9KJDnURWtD7alUB2cr959vlXe9awSGymiI2QenwaWlMHBpSYLIEY56zT2zQYWVJFBh 86Pw== X-Gm-Message-State: ANoB5pm849M1FAiGvmUh4mtLx2rbSJKZfx8O4+o0E55nW+wRyWnsopsN UWdKV1twZfgjMyQhgxIg11AgOzHvhnM= X-Google-Smtp-Source: AA0mqf7dj0z4fd6ATClfctietR/x1j6rZRGmt8wNQYK4SttXdhzuFlUWMNnnWm2BYQ3h3oMF756Lnw== X-Received: by 2002:a05:600c:3d98:b0:3d0:a31b:ca32 with SMTP id bi24-20020a05600c3d9800b003d0a31bca32mr10530256wmb.1.1670797549298; Sun, 11 Dec 2022 14:25:49 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id r11-20020a05600c424b00b003d1e34bcbb2sm6758967wmm.13.2022.12.11.14.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 14:25:48 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Dec 2022 22:25:40 +0000 Message-Id: <20221211222545.32318-1-sharlatanus@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Fix build on aarch64-linux as reported in: - https://issues.guix.gnu.org/59323 - https://github.com/rwesson/ALFA/issues/29 The latest version passed build on aarch64-linux system with curl and gfortran enabled. wcslib@7.5 passed build with curl enabled (was marked as failing in cements). * gnu/packages/astronomy.scm (cfitsio): Update to 4.2.0. [arguments]: Use Gexp, enable tests. [arguments](phases): Delete check and add post-install-check phases. [native-inputs]: Add gfortran. [inputs]: Add curl, zlib. --- gnu/packages/astronomy.scm | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index c59f4d02a4..8d9cce5158 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -356,7 +356,7 @@ (define-public casacore (define-public cfitsio (package (name "cfitsio") - (version "3.49") + (version "4.2.0") (source (origin (method url-fetch) @@ -364,18 +364,27 @@ (define-public cfitsio "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" "cfitsio-" version ".tar.gz")) (sha256 - (base32 "1cyl1qksnkl3cq1fzl4dmjvkd6329b57y9iqyv44wjakbh6s4rav")))) + (base32 "128qsv2q0f0g714ahlsixiikvvbwxi9bg9q9pcr5cd3f7wdkv9gb")))) (build-system gnu-build-system) - ;; XXX Building with curl currently breaks wcslib. It doesn't use - ;; pkg-config and hence won't link with -lcurl. (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda _ - (substitute* "Makefile.in" (("/bin/") "")) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "Makefile.in" (("/bin/") "")))) + (delete 'check) + ;; TODO: Testing steps are sourced from docs/fitsio.pdf, implement + ;; the logic in Guile in the future. + (add-after 'install 'post-install-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "testprog") + (with-output-to-file "testprog.lis" (lambda _(invoke "./testprog"))) + (invoke "diff" "-r" "testprog.lis" "testprog.out") + (invoke "cmp" "-l" "testprog.fit" "testprog.std"))))))) + (native-inputs (list gfortran)) + (inputs (list curl zlib)) (home-page "https://heasarc.gsfc.nasa.gov/fitsio/fitsio.html") (synopsis "Library for reading and writing FITS files") (description "CFITSIO provides simple high-level routines for reading and @@ -384,7 +393,7 @@ (define-public cfitsio provides many advanced features for manipulating and filtering the information in FITS files.") (license (license:non-copyleft "file://License.txt" - "See License.txt in the distribution.")))) + "See License.txt in the distribution.")))) (define-public python-fitsio (package From patchwork Sun Dec 11 22:25:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 45178 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6154B27BBE9; Sun, 11 Dec 2022 22:26:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 66FE327BBEB for ; Sun, 11 Dec 2022 22:26:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4Ulo-0005D9-5S; Sun, 11 Dec 2022 17:26:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4Uln-0005C1-FP for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4Uln-0004DE-78 for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4Ulm-0003xz-OS for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59978] [PATCH 2/6] gnu: cfitsio: Build with bzip2 support. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Dec 2022 22:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59978 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59978@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 59978-submit@debbugs.gnu.org id=B59978.167079756015228 (code B ref 59978); Sun, 11 Dec 2022 22:26:02 +0000 Received: (at 59978) by debbugs.gnu.org; 11 Dec 2022 22:26:00 +0000 Received: from localhost ([127.0.0.1]:48561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulk-0003xP-3s for submit@debbugs.gnu.org; Sun, 11 Dec 2022 17:26:00 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:35429) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulf-0003wl-Ji for 59978@debbugs.gnu.org; Sun, 11 Dec 2022 17:25:56 -0500 Received: by mail-wm1-f52.google.com with SMTP id h8-20020a1c2108000000b003d1efd60b65so3765037wmh.0 for <59978@debbugs.gnu.org>; Sun, 11 Dec 2022 14:25:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yxhPbmHXUsQdGKrfERmvAllCCvt6lIsnV3vTNiQvw1s=; b=BWv21iDZ5fBjd+/ncIOonYN6ZuxypljqUalphL9jqg+dsa54AyQFz0BwUgqbF+KO70 rmz68CWCd/ZhEmHFciwJgfbss1vCxUq+d/6tE4JhIE7UDKdQaJJLiEYaUaI9jBNKvcrY sO4TVeF9UV7UTXkzQznYeYjRveQ9yhlVDttNqqzn0FOXDwwwOhSL/fAXeYEBXm8d5Uef rI7NmbhijAlSYoeLYJZthSZr84wkPwgAcjWwN4SSObJJ2oOAyCyk1s281m2NLHjxczrH VgcipXT/hC7KwdOWS2WshK9IOxs4qwV0LAbTDPcaoO4iIqrOe1W+xqS0vQkN0652uX+h bPJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yxhPbmHXUsQdGKrfERmvAllCCvt6lIsnV3vTNiQvw1s=; b=yEMGJSm706ybJtbw80oeeQr92iIpPUsyIr3qPXuJpyscss+wW2EpokaZ94xvG5GX7R PNPCUmf/dnX8sx4GzYHiJT4B7oIa8afZsNSkEAi6SfZulph8GXdr8eHzZz3kp8RZhjX+ Ro43tU0yA5tJr63hWWjUxvpivNKpak7cjpF6dgQ4EEeh6Uo3qY/Jpp1YTg3xGLyyhkzj a5YUl9c+1Fd+QkaEQnwNdScI98nPrGcrEHTD0Kx4qrvlsVn7x1YbEkmK9IpadZmlMLWu h34n/sxNeIuhj3HDIW8IGjlC/I0CcORZxKcbVbo9igbQFNhhetvmy3ZFoP4SmZ6SFXrE ousg== X-Gm-Message-State: ANoB5pn7+ZvNxn8vhJXkUf+osYWZWvqGWy+14/aZj+P0vb7bISRnjq80 oMDOIMoaxNRico95gszho1PJtk2D7JE= X-Google-Smtp-Source: AA0mqf4aKK6Zfog0XcMz/++cmimA4K2p3QU6846qrc4svNa3ULJf0Vr7Weh/qPTS1wOhv+Bli8qhlA== X-Received: by 2002:a05:600c:3b84:b0:3cf:8762:22c2 with SMTP id n4-20020a05600c3b8400b003cf876222c2mr11012926wms.38.1670797550055; Sun, 11 Dec 2022 14:25:50 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id r11-20020a05600c424b00b003d1e34bcbb2sm6758967wmm.13.2022.12.11.14.25.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 14:25:49 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Dec 2022 22:25:41 +0000 Message-Id: <20221211222545.32318-2-sharlatanus@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221211222545.32318-1-sharlatanus@gmail.com> References: <20221211222545.32318-1-sharlatanus@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/astronomy.scm (cfitsio): [arguments](configure-flags): Add bzip2 option. [inputs]: Add bzip2. --- gnu/packages/astronomy.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 8d9cce5158..794e5ca2b9 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -368,6 +368,8 @@ (define-public cfitsio (build-system gnu-build-system) (arguments (list + #:configure-flags + #~(list (string-append "--with-bzip2=" #$(this-package-input "bzip2"))) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths @@ -384,7 +386,7 @@ (define-public cfitsio (invoke "diff" "-r" "testprog.lis" "testprog.out") (invoke "cmp" "-l" "testprog.fit" "testprog.std"))))))) (native-inputs (list gfortran)) - (inputs (list curl zlib)) + (inputs (list bzip2 curl zlib)) (home-page "https://heasarc.gsfc.nasa.gov/fitsio/fitsio.html") (synopsis "Library for reading and writing FITS files") (description "CFITSIO provides simple high-level routines for reading and From patchwork Sun Dec 11 22:25:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 45176 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8D8BB27BBEC; Sun, 11 Dec 2022 22:26:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 06A5A27BBE9 for ; Sun, 11 Dec 2022 22:26:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4Ulp-0005Dt-O0; Sun, 11 Dec 2022 17:26:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4Uln-0005Co-NX for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4Uln-0004DJ-Dp for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4Uln-0003y7-9f for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59978] [PATCH 3/6] gnu: python-fitsio: Update to 1.1.8. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Dec 2022 22:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59978 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59978@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 59978-submit@debbugs.gnu.org id=B59978.167079756115234 (code B ref 59978); Sun, 11 Dec 2022 22:26:03 +0000 Received: (at 59978) by debbugs.gnu.org; 11 Dec 2022 22:26:01 +0000 Received: from localhost ([127.0.0.1]:48563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulk-0003xZ-J6 for submit@debbugs.gnu.org; Sun, 11 Dec 2022 17:26:00 -0500 Received: from mail-wm1-f45.google.com ([209.85.128.45]:35423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulg-0003wm-9r for 59978@debbugs.gnu.org; Sun, 11 Dec 2022 17:25:56 -0500 Received: by mail-wm1-f45.google.com with SMTP id h8-20020a1c2108000000b003d1efd60b65so3765050wmh.0 for <59978@debbugs.gnu.org>; Sun, 11 Dec 2022 14:25:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wtMnZqFDr68/Qy12rl0LSNX8ypI38R44gKqcobTM6Qg=; b=SS2oCSgu4tyzuoTvooWT0NtHMHGBQ7Xfr37Pc6sxBTK4mE4Kr3MzLeHwLVw3XaXGP7 sAgMPTwR1sxzPvv5UhqnHyxeMMPAgXm/LNe0OiR+HTYiKSJ+Y/JeJS9Sud11V96Y8JCU ooWaTjJkntq9H4eemOM0wS3YWHCaUY/QECPwfW5pORn/nli8B+tdCCzY4RpjBdQou0s+ 7mAnzBjymzXlRNihj6h4RSRaZJla3/O//CZ5z2yL0m0dqru5s74fUxoF+tZMl0EhyCkc W+RGfkg6xErcSOblcWSbxBWp0hrE511cRWmoDeUZRKaKvHCYr8xh1AQtKUPhoJFUTJxv a52Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wtMnZqFDr68/Qy12rl0LSNX8ypI38R44gKqcobTM6Qg=; b=MjSRy2UINFZYXj4uyH6xCdyNoqEgd84iyKtyMPEL16VGZoAiF/p6fpc17Cs4rALsc2 55pHe6ZOCxUI3ZrTbVwcPU5e4R4AK1f5I+E5Qg91BtBfRpunr8KZIP/S/a5i0WyXLP9N mr+L+J809zCx/NH3EJBY4Ru+ulUW6coAMx3UuRh6+kbbL8ixxaIaMx46DUjOalQu155s JVKX7p/UxfWOsOkHU355zHdkWOrdTtyDE9qPkkyy8y5kQU9s8jUBw7jWrJAWx2tZiUIL vaA1VBHmXfFb3vc5bSK1I4/I7dI4tA4gz09z8Uu5FwTb253SN3YbS/x8w+75aOupr1vh M5Ww== X-Gm-Message-State: ANoB5pmqtzhSp1E/hlCCy5kSU7GHVL8XlsA/JmmQ8F+NzMPhPJ16yNxn lpk5P6hbAYpANqqSxLkf8smurO8z9O8= X-Google-Smtp-Source: AA0mqf5H9dCIzGX16aG05UAaZ82ziCdhaalOqoDF/N03+ocScQTo3cKgXxRqLjzFwiws6NA04iPROA== X-Received: by 2002:a05:600c:6899:b0:3d1:cf66:3afa with SMTP id fn25-20020a05600c689900b003d1cf663afamr10650985wmb.19.1670797550656; Sun, 11 Dec 2022 14:25:50 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id r11-20020a05600c424b00b003d1e34bcbb2sm6758967wmm.13.2022.12.11.14.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 14:25:50 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Dec 2022 22:25:42 +0000 Message-Id: <20221211222545.32318-3-sharlatanus@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221211222545.32318-1-sharlatanus@gmail.com> References: <20221211222545.32318-1-sharlatanus@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/astronomy.scm (python-fitsio): Update to 1.1.8. [arguments]{phases}: skip-bzip2-test remove redundant phase as cfitsio built with bzip2 support. [inputs]: Add curl-minimal. --- gnu/packages/astronomy.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 794e5ca2b9..5ce94a1f07 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -400,13 +400,13 @@ (define-public cfitsio (define-public python-fitsio (package (name "python-fitsio") - (version "1.1.7") + (version "1.1.8") (source (origin (method url-fetch) (uri (pypi-uri "fitsio" version)) (sha256 - (base32 "0q8siijys9kmjnqvyipjgh6hkhf4fwvr1swhsf4if211i9b0m1xy")) + (base32 "1y80hgvlkjz1bijfyb2j03853yc1kc63yrf9ab7as31ad2r6kxb1")) (modules '((guix build utils))) (snippet ;; Remove the bundled cfitsio @@ -430,13 +430,8 @@ (define-public python-fitsio (("self.system_fitsio_libdir = None") "pass") (("self.use_system_fitsio") "True") (("self.system_fitsio_includedir") includedir) - (("self.system_fitsio_libdir") libdir))))) - (add-after 'unpack 'skip-bzip2-test - (lambda* (#:key inputs #:allow-other-keys) - ;; The bzip2 test fails because Guix' cfitsio - ;; is built without bzip2 support. - (substitute* "fitsio/test.py" - (("'SKIP_BZIP_TEST' in os.environ") "True"))))))) + (("self.system_fitsio_libdir") libdir)))))))) + (inputs (list curl-minimal)) (propagated-inputs (list python-numpy cfitsio)) (home-page "https://github.com/esheldon/fitsio") From patchwork Sun Dec 11 22:25:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 45179 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 91D1827BBEB; Sun, 11 Dec 2022 22:27:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3042B27BBE9 for ; Sun, 11 Dec 2022 22:27:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4Uml-0005UB-Ff; Sun, 11 Dec 2022 17:27:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4Umk-0005Tk-7k for guix-patches@gnu.org; Sun, 11 Dec 2022 17:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4Umk-0004Qz-0Q for guix-patches@gnu.org; Sun, 11 Dec 2022 17:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4Umj-0003yx-S7 for guix-patches@gnu.org; Sun, 11 Dec 2022 17:27:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59978] [PATCH 4/6] gnu: wcslib: Update to 7.12. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Dec 2022 22:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59978 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59978@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 59978-submit@debbugs.gnu.org id=B59978.167079756315269 (code B ref 59978); Sun, 11 Dec 2022 22:27:01 +0000 Received: (at 59978) by debbugs.gnu.org; 11 Dec 2022 22:26:03 +0000 Received: from localhost ([127.0.0.1]:48567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulm-0003y5-Vh for submit@debbugs.gnu.org; Sun, 11 Dec 2022 17:26:03 -0500 Received: from mail-wm1-f43.google.com ([209.85.128.43]:34813) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulg-0003wn-QJ for 59978@debbugs.gnu.org; Sun, 11 Dec 2022 17:25:58 -0500 Received: by mail-wm1-f43.google.com with SMTP id ay8-20020a05600c1e0800b003d0808d2826so8453999wmb.1 for <59978@debbugs.gnu.org>; Sun, 11 Dec 2022 14:25:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AaoBg4xKZ2rI9RHHuCdpxw1vlc/yJcnZIWNHj2qm2FQ=; b=a+E7G+VziwI1Qi06l+BE1S/pRdKruF1Z9TZO6BCAa3xD+caOSrbnKLBXaNekzRJz0W ykJcWZ18DosJ6w5ZxUbZgVm4wTsocnDkAyHAFilo6kMIIw8y1LMaodZIMzcAWjnNX3UT oYr3QwlVExYVPHI59LqfZS+lDEe+FW4PkgZd4sHPPVXYS+9zAECzuDPc7jQng3UTXMSt C3XZb+vaISBpUOdrGnFmr9SmIenCTL968TkHN4Jbqd4AxfoEab4Lgx1XpCQ1Az8cYp96 VnETdprFIOXuqAYoLCryxw72HucjPBJoYR0u6xiATbUwoLk3W7M0FSYZjSq7y6UYkwh5 tSxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AaoBg4xKZ2rI9RHHuCdpxw1vlc/yJcnZIWNHj2qm2FQ=; b=DM4T/BCX/tMXJti77LQp7BIomAAzRww/kxah4UEvWTvBWi/ozW+1d8ERJE0Xdz1+qu H8A7V5uTkX2iMymAJY6mFIsEoq04AO7W5nvGvWSzbuONBke3GLXrLj8Ig2D8/NL8/Til s72ax+Tpe1iaGi7iHz9i/VMcEIBTAeIcK3aVdWiZ4YZ5zwtzh4FcIKpYNQsyZt4o6mhq 72Gtnd80oREJFj4fRiQofjbEaFx6Lqzy1RZWY/FL8wko/fMy0UF3XZHEtx/gt1CadvUJ SUSNpBW2yHHkWtKxPtqof8KnwV/8cxGjujQp0WDAqhe4YCThss0Dl4PafQ1Fbr98DzEt sZ2A== X-Gm-Message-State: ANoB5pnltuh+e7UcSw9DF2WxkfcBlObj5sOfBINSPbXcFNhMmXbu28wQ FcGhWAkTGe8Rn6djjNaaPYt0MisdfSU= X-Google-Smtp-Source: AA0mqf4uFGi3bByjz7wvt1zKe50uQJ45iKGfd+d0pzJSpIs57zhrI7Q0MXbrwPzPP+03z2ihCLNSOQ== X-Received: by 2002:a05:600c:3496:b0:3d0:878b:d005 with SMTP id a22-20020a05600c349600b003d0878bd005mr10748942wmq.41.1670797551261; Sun, 11 Dec 2022 14:25:51 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id r11-20020a05600c424b00b003d1e34bcbb2sm6758967wmm.13.2022.12.11.14.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 14:25:50 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Dec 2022 22:25:43 +0000 Message-Id: <20221211222545.32318-4-sharlatanus@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221211222545.32318-1-sharlatanus@gmail.com> References: <20221211222545.32318-1-sharlatanus@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/astronomy.scm (wcslib): Update to 7.12. [arguments]: Use Gexp, enable parallel tests. --- gnu/packages/astronomy.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 5ce94a1f07..1876b0cde0 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -525,7 +525,7 @@ (define-public eye (define-public wcslib (package (name "wcslib") - (version "7.5") + (version "7.12") (source (origin (method url-fetch) @@ -533,26 +533,26 @@ (define-public wcslib "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-" version ".tar.bz2")) (sha256 - (base32 "1536gmcpm6pckn9xrb6j8s4pm1vryjhzvhfaj9wx3jwxcpbdy0dw")))) + (base32 "1m3bx6gh5w3c7vvsqcki0x20mg8lilg13m0i8nh7za89w58dxy4w")))) (inputs (list cfitsio)) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list (string-append "--with-cfitsiolib=" - (assoc-ref %build-inputs "cfitsio") "/lib") - (string-append "--with-cfitsioinc=" - (assoc-ref %build-inputs "cfitsio") "/include")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-/bin/sh - (lambda _ - (substitute* "makedefs.in" - (("/bin/sh") "sh")) - #t)) - (delete 'install-license-files)) ; installed by ‘make install’ - ;; Parallel execution of the test suite is not supported. - #:parallel-tests? #f)) + (list + #:configure-flags + #~(list (string-append "--with-cfitsiolib=" + #$(this-package-input "cfitsio") "/lib") + (string-append "--with-cfitsioinc=" + #$(this-package-input "cfitsio") "/include")) + #:phases + #~(modify-phases %standard-phases + (delete 'install-license-files) ; installed by ‘make install’ + (add-before 'configure 'patch-/bin/sh + (lambda _ + (substitute* "makedefs.in" + (("/bin/sh") "sh"))))))) + ;; TODO: Fix build with gfortran and pack missing optional pgplot. + ;; (inputs (list gfortran pgplot)) (home-page "https://www.atnf.csiro.au/people/mcalabre/WCS") (synopsis "Library which implements the FITS WCS standard") (description "The FITS \"World Coordinate System\" (@dfn{WCS}) standard From patchwork Sun Dec 11 22:25:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 45181 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 786F427BBEC; Sun, 11 Dec 2022 22:27:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B7DB627BBE9 for ; Sun, 11 Dec 2022 22:27:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4Umm-0005Uj-Mk; Sun, 11 Dec 2022 17:27:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4Umk-0005Ts-Kn for guix-patches@gnu.org; Sun, 11 Dec 2022 17:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4Umk-0004R5-DE for guix-patches@gnu.org; Sun, 11 Dec 2022 17:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4Umk-0003z4-98 for guix-patches@gnu.org; Sun, 11 Dec 2022 17:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59978] [PATCH 5/6] gnu: python-astropy: Update to 5.1.1. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Dec 2022 22:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59978 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59978@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 59978-submit@debbugs.gnu.org id=B59978.167079756415287 (code B ref 59978); Sun, 11 Dec 2022 22:27:02 +0000 Received: (at 59978) by debbugs.gnu.org; 11 Dec 2022 22:26:04 +0000 Received: from localhost ([127.0.0.1]:48570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Uln-0003yE-Da for submit@debbugs.gnu.org; Sun, 11 Dec 2022 17:26:03 -0500 Received: from mail-wm1-f47.google.com ([209.85.128.47]:51950) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulh-0003wo-E0 for 59978@debbugs.gnu.org; Sun, 11 Dec 2022 17:25:59 -0500 Received: by mail-wm1-f47.google.com with SMTP id bg10so3874557wmb.1 for <59978@debbugs.gnu.org>; Sun, 11 Dec 2022 14:25:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D0F5GXA+xUa6f+G1l1ZzJR/mg7pexf8LtpDuA0CPkgc=; b=o7fHmtoRHn8N3dXbaZaaNwsh1x5p+1fW4ENbSDDetvaID37MkdpTbQVgXqFas8KE8n pS3jue4BehYI8CmvAJylFKNozEqfI3i9GwtzHQUWRCf6NNnTH+U3rccDlBStvta9Mh27 9teW+kgcGCzX1bAs0I9G/+xV6lJbbf7Xhe3A5ZZapjxAMdxxg9I7bHovvhwk013tYeNf /2TWK7xIQRIfF0etDg1qXB1jbE8S+AjjBvIq+HejRuxmU5dqNzUBgeRZ4KEhNeq3Uc+P GGTDwaTBpvaaKYAqxtrKHYWpMjRTfJA6DIEqQ5v6kPUbHGNQhW4tZnlWAbXt9OfdytrH 7kMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D0F5GXA+xUa6f+G1l1ZzJR/mg7pexf8LtpDuA0CPkgc=; b=zZbx1JWA642wte8lnzbv91U12me0irNvfWaCmQtPR7CgEF0PAy2mZuROO+y/G9lRuB hWiLJk51NM4zs+8YBOAfGG8XmeqziGL/1jB2QPnQryGVyLk4P2gnDaAAipZGV6jYjfgq Nq33HFiNse92aemFu0UOdbWAuyDAmmXKTHJkWW1DEFvZe8cFUyj5/IGm1xJVi9ys4Dp+ Ju7VO/0cxVCiboEHuY+j07EO8+vhFxOssjgbsNjvd8PeFTjs3wcFPNRMYDWZ70QHeiVB 0p3IN0mqF7y2GEzPEe9JGfAyN+55FDvzVPczB+pTgXpiUjIVwCSSstEB2gfahtmSBgpi soAQ== X-Gm-Message-State: ANoB5pnaYjcIldpDk4jybCwgG2osmwD+Y4q4MTOQiUT+3bNgMrdkb1do IwVCid/Ke4fn0N2ONlq7kR7C390ar1Y= X-Google-Smtp-Source: AA0mqf5/V7bwSyyJRhhDJLj094UWW9wnOU6B2qz3mPLRGmmrbutna5NoKP7Juk8jZkX86H1kT4cRcA== X-Received: by 2002:a05:600c:5405:b0:3d0:47c:9fe7 with SMTP id he5-20020a05600c540500b003d0047c9fe7mr10567425wmb.40.1670797551887; Sun, 11 Dec 2022 14:25:51 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id r11-20020a05600c424b00b003d1e34bcbb2sm6758967wmm.13.2022.12.11.14.25.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 14:25:51 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Dec 2022 22:25:44 +0000 Message-Id: <20221211222545.32318-5-sharlatanus@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221211222545.32318-1-sharlatanus@gmail.com> References: <20221211222545.32318-1-sharlatanus@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/astronomy.scm (python-astropy): Update to 5.1.1. [source]{snippet}: Unbundle wcslib. [arguments]{phases}: preparations: Use all system libraries. [inputs]: Add wcslib. --- gnu/packages/astronomy.scm | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 1876b0cde0..030ae9b4ea 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -982,25 +982,23 @@ (define-public celestia-gtk (define-public python-astropy (package (name "python-astropy") - (version "5.1") + (version "5.1.1") (source (origin (method url-fetch) (uri (pypi-uri "astropy" version)) (sha256 - (base32 "0zkv3ddzlxx21i796azfbqxrqnsxn83vsczscv577iyzxp3v5c8x")) + (base32 "10dxjim60ch4qznqa5s63q936mkvy95p0k26kcwzv43hmybdcjxs")) (modules '((guix build utils))) (snippet '(begin ;; Remove Python bundles. (with-directory-excursion "astropy/extern" (for-each delete-file-recursively '("ply" "configobj"))) - ;; Remove cextern bundles and leave the wcslib bundle. Astropy - ;; upgrades to different versions of wcslib every few releases - ;; and tests break every upgrade. - ;; TODO: unbundle wcslib. + ;; Remove cextern bundles. Check bundled versions against available + ;; in Guix in the future update of astropy. (with-directory-excursion "cextern" - (for-each delete-file-recursively '("cfitsio" "expat"))) + (for-each delete-file-recursively '("cfitsio" "expat" "wcslib"))) #t)))) (build-system python-build-system) (arguments @@ -1008,10 +1006,8 @@ (define-public python-astropy (modify-phases %standard-phases (add-after 'unpack 'preparations (lambda _ - ;; Use our own libraries in place of bundles, with the - ;; exception of wcslib. - (setenv "ASTROPY_USE_SYSTEM_CFITSIO" "1") - (setenv "ASTROPY_USE_SYSTEM_EXPAT" "1") + ;; Use our own libraries in place of bundles. + (setenv "ASTROPY_USE_SYSTEM_ALL" "1") ;; Some tests require a writable home. (setenv "HOME" "/tmp") ;; Relax xfail tests. @@ -1058,7 +1054,7 @@ (define-public python-astropy python-sgp4 python-skyfield)) (inputs - (list cfitsio expat)) + (list cfitsio expat wcslib)) (propagated-inputs (list python-configobj python-numpy From patchwork Sun Dec 11 22:25:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 45180 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 68A4D27BBEC; Sun, 11 Dec 2022 22:27:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E29FC27BBE9 for ; Sun, 11 Dec 2022 22:27:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4Umm-0005Uh-J0; Sun, 11 Dec 2022 17:27:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4Uml-0005U1-1M for guix-patches@gnu.org; Sun, 11 Dec 2022 17:27:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4Umk-0004RD-PJ for guix-patches@gnu.org; Sun, 11 Dec 2022 17:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4Umk-0003zB-LN for guix-patches@gnu.org; Sun, 11 Dec 2022 17:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59978] [PATCH 6/6] gnu: indi: Update to 1.9.9. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Dec 2022 22:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59978 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59978@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 59978-submit@debbugs.gnu.org id=B59978.167079756415293 (code B ref 59978); Sun, 11 Dec 2022 22:27:02 +0000 Received: (at 59978) by debbugs.gnu.org; 11 Dec 2022 22:26:04 +0000 Received: from localhost ([127.0.0.1]:48572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulo-0003yW-0N for submit@debbugs.gnu.org; Sun, 11 Dec 2022 17:26:04 -0500 Received: from mail-wm1-f44.google.com ([209.85.128.44]:40726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Uli-0003wp-3l for 59978@debbugs.gnu.org; Sun, 11 Dec 2022 17:25:59 -0500 Received: by mail-wm1-f44.google.com with SMTP id v124-20020a1cac82000000b003cf7a4ea2caso3718991wme.5 for <59978@debbugs.gnu.org>; Sun, 11 Dec 2022 14:25:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RVe/pPlVB1OHGrz0FkdZHr9fJMbap9bbWiSDcZKl7xQ=; b=euyfT62U8kaZPCcmMraMV5yfRL9ueUDpBGWJEJnXbotUlJYTIRNL+AAIIszsLPb5bx ElFQwnRlXwkKD60GV/lsoTQdY0PrvfMX9/WcLhHfUboYdscnTSsZ3nx9RPwAekCIZF/Q fCZB+ERXDbhChcyjHOVp6f+FOTBkS901MflNRzG5QZlqBtFkJHSYtc9gypIpp1LNAMEE nOKY/TPumGTC1VP4mg11zPggBrxTZHuThDKLCrKqBw61VbDfmbPLOAH/G1TQtZuEzl1L /irRNtPNlH0FKJbkBsuE55sLxIlHFJUycVX9jXMlb2+L/fjFI6GeN8DoudIlIKqOdQfB Je4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RVe/pPlVB1OHGrz0FkdZHr9fJMbap9bbWiSDcZKl7xQ=; b=Ily8ISfLxi1Z+6hLLsEwJemEllzUrWDIhMwddu5vrlo5IMLjiTRqHP+PTEwy67jq/+ QbeqGgClPj/38MhVZsqRcEX2oIqajGlYZw9vYAmQZKMzdMguYOuIe8c6Wwj7+jiid1ll lF+aSbyEkbAXOdiwKCJ7x4yF8PGpM0b8wF7d8QB9eSJRytxCXS9DCwJv6gY1XAIhKZJ0 n3kIoCTDGZ8Az3fRQJvy1oO5ho6V0oojjmPzBIAxhEkzg+nVtj8dnjw4U3CMAY7Hms5u V1Z0j3BjL0KX+9SuUbqUDZ+AyFViwX6PO2aBu7goEHTGt7fZUASnojkw5I4OyyKTe84L tJGw== X-Gm-Message-State: ANoB5pkwrfhwcLB7QwMn3xauPSVb25rBbSXB8yjDGiA0zBxyhyzHRJI8 XcgV5r9+nndAxJDmCxel7B6H1ltDDGo= X-Google-Smtp-Source: AA0mqf5vxazkRx6KnXDpuslU/WQWyh1GBzh7nkNobh+R/CDZkrlyipcNgCbmh1YJ8ugFp6tTZ3zHhA== X-Received: by 2002:a05:600c:1ca2:b0:3d2:d72:e8fa with SMTP id k34-20020a05600c1ca200b003d20d72e8famr7515842wms.22.1670797552481; Sun, 11 Dec 2022 14:25:52 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id r11-20020a05600c424b00b003d1e34bcbb2sm6758967wmm.13.2022.12.11.14.25.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 14:25:52 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Dec 2022 22:25:45 +0000 Message-Id: <20221211222545.32318-6-sharlatanus@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221211222545.32318-1-sharlatanus@gmail.com> References: <20221211222545.32318-1-sharlatanus@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/astronomy.scm (indi): Update to 1.9.9. [arguments]{tests}: Silent test on aarch64-linux system. [inputs]: Add libev. --- gnu/packages/astronomy.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 030ae9b4ea..6ddddc358d 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -47,6 +47,7 @@ (define-module (gnu packages astronomy) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages image-processing) + #:use-module (gnu packages libevent) #:use-module (gnu packages libusb) #:use-module (gnu packages lua) #:use-module (gnu packages maths) @@ -1978,7 +1979,7 @@ (define-public imppg (define-public indi (package (name "indi") - (version "1.9.3") + (version "1.9.9") (source (origin (method git-fetch) @@ -1987,10 +1988,12 @@ (define-public indi (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0c7md288d3g2vf0m1ai6x2l4j4rmlasc4rya92phvd4ynf8vcki2")))) + (base32 "1vfcas59nlw8v7n6qhxhcm4isf5wk0crip5rmsallq3bsv3zznfr")))) (build-system cmake-build-system) (arguments - `(#:configure-flags + ;; TODO: fix failing tests on aarch64-system. + `(#:tests? ,(not (or (%current-target-system) (target-aarch64?))) + #:configure-flags (let ((out (assoc-ref %outputs "out"))) (list "-DINDI_BUILD_UNITTESTS=ON" @@ -2015,6 +2018,7 @@ (define-public indi curl fftw gsl + libev libjpeg-turbo libnova libtiff