From patchwork Mon Jan 30 11:12:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 46534 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 D3E2F27BBEB; Mon, 30 Jan 2023 11:13:23 +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=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 2B2B227BBE9 for ; Mon, 30 Jan 2023 11:13:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMS5x-0004HH-Qa; Mon, 30 Jan 2023 06:13: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 1pMS5u-0004GC-T3 for guix-patches@gnu.org; Mon, 30 Jan 2023 06:13: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 1pMS5u-00068u-Kc for guix-patches@gnu.org; Mon, 30 Jan 2023 06:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pMS5u-0004Bm-GQ for guix-patches@gnu.org; Mon, 30 Jan 2023 06:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60793] [PATCH v2 1/3] gnu: Add julia-cfitsio-jll. References: <20230113221658.8158-1-sharlatanus@gmail.com> In-Reply-To: <20230113221658.8158-1-sharlatanus@gmail.com> Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Jan 2023 11:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60793 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60793@debbugs.gnu.org Cc: Sharlatan Hellseher , efraim@flashner.co.il Received: via spool by 60793-submit@debbugs.gnu.org id=B60793.167507714716027 (code B ref 60793); Mon, 30 Jan 2023 11:13:02 +0000 Received: (at 60793) by debbugs.gnu.org; 30 Jan 2023 11:12:27 +0000 Received: from localhost ([127.0.0.1]:46533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMS5L-0004AQ-4F for submit@debbugs.gnu.org; Mon, 30 Jan 2023 06:12:27 -0500 Received: from mail-wr1-f51.google.com ([209.85.221.51]:42642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMS5I-00049z-En for 60793@debbugs.gnu.org; Mon, 30 Jan 2023 06:12:25 -0500 Received: by mail-wr1-f51.google.com with SMTP id d14so10671620wrr.9 for <60793@debbugs.gnu.org>; Mon, 30 Jan 2023 03:12:24 -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=pmBx/lkrl3Hk3aKlD+qDsVsrYbChHYCNEH+FFEnWH+o=; b=PrpIHRweaK1jJ90F26sR1aHAVjfkc1HMO1gx3x/gUzVH9zRGj6adwd2Lx5V5pmOQRN z3cKi27Jix9WXi+wuHYSh+GP840OmXTfOTiuQSkO+OAVDj5IZWGlRL4nAoT7GFBXerG/ s8K3uUbaXP0EYlaefX+6OwrQX9nS9RUE49yZvOoUgG/P7EoaXECOJpXzO3Xtt+P1do8/ o813DbsxwZvtfWPAZ8Gf1XOBBFj0iQTZ1E8Zl/8KUvpNZmTLfu/Yw+WInkvZKwdyIZnh dquCy8+CMt1F+qgpxAglaWHnV4dwS7F9TnAQZOzJPzJDksgx3/jx6f4UcgKxL4u4gdEw n25w== 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=pmBx/lkrl3Hk3aKlD+qDsVsrYbChHYCNEH+FFEnWH+o=; b=3UUNOBp3jhWkDn1xAViA3q2W2egePFXr1IPh2xsq4ol+W8OhJH7l1NHiYA8YdOwFah EqBu68PqCktyflUBhVgA3dpuMAzD+TnwvT07muRxL8ktl7WdE3KslkFH3IA2gmFB4YKD EjCq/eYbt1JLNjCpD9W79eZyK+9Kp0u8FA/QXG3VXTP6HzeBhgjniXs7vD59ZXU1qnwm ctEuZMWnR4yc9Q6nmpjcFptLntsC338VDsXZi2leD/Tg6fjTUIMxIMwtOJz+b5fGHlk7 TlkCVN2EupPAJATPIUdUEUOdlNJ6g2+9cI8JXmvn2RpC4wjrNRqCVS4UoP3gA+A0Zt9O efQg== X-Gm-Message-State: AFqh2komBP12QOmgKI5/VH0Tm5bDK8lGXub9oewHE1uh3HRfSfrmcK5U NGWCoFhiXXzBrMypPPBTaAnF/ENoJ5k= X-Google-Smtp-Source: AMrXdXtMOnhsVuEIYJyx8HPjY7/EiFapyliMWPAw9IpcUrV00WJPF5NamFuq1NEkK6kBS2zi35+ejw== X-Received: by 2002:a5d:5d0c:0:b0:2be:5402:18e7 with SMTP id ch12-20020a5d5d0c000000b002be540218e7mr9127477wrb.5.1675077138620; Mon, 30 Jan 2023 03:12:18 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id y17-20020adffa51000000b002238ea5750csm14008853wrr.72.2023.01.30.03.12.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 03:12:18 -0800 (PST) From: Simon Tournier Date: Mon, 30 Jan 2023 12:12:09 +0100 Message-Id: <20230130111211.372932-1-zimon.toutoune@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 From: Sharlatan Hellseher * gnu/packages/julia-jll.scm (julia-cfitsio-jll): New variable. --- gnu/packages/julia-jll.scm | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) base-commit: 595b53b74e3ef57a1c0c96108ba86d38a170a241 diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index 2b0f644736..80e4508196 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2021 Jean-Baptiste Volatier +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (define-module (gnu packages julia-jll) #:use-module (guix utils) #:use-module (guix build-system julia) #:use-module (gnu packages) + #:use-module (gnu packages astronomy) #:use-module (gnu packages audio) #:use-module (gnu packages base) #:use-module (gnu packages compression) @@ -146,6 +148,47 @@ (define-public julia-cairo-jll (description "This package provides a wrapper for the cairo library.") (license license:expat))) +(define-public julia-cfitsio-jll + (package + (name "julia-cfitsio-jll") + (version "4.0.0+0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/CFITSIO_jll.jl") + (commit (string-append "CFITSIO-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1k0mqmpyfjr3ibcmda08llw8m166zw0n3lh5y5aj81q37lrxw990")))) + (build-system julia-build-system) + (arguments + '(#:tests? #f ; no runtests + #:phases + (modify-phases %standard-phases + (add-after 'link-depot 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map + (lambda (wrapper) + (substitute* wrapper + (("using LibCURL_jll") "") ; We use Guix's cfitsio + (("using Zlib_jll") "") ; Not require to unpack not donwloaded archvie. + (("generate_init_header.*") "generate_init_header()\n" ) + (("generate_wrapper_header.*") + (string-append + "generate_wrapper_header(\"CFITSIO\", \"" + (assoc-ref inputs "cfitsio") "\")\n")))) + ;; There's a Julia file for each platform, override them all + (find-files "src/wrappers/" "\\.jl$"))))))) + (inputs + (list cfitsio)) + (propagated-inputs + (list julia-jllwrappers)) + (home-page "https://github.com/JuliaBinaryWrappers/CFITSIO_jll.jl") + (synopsis "CFITSIO library wrappers") + (description "This package provides a wrapper for the cfitsio library.") + (license license:expat))) + (define-public julia-compilersupportlibraries-jll (package (name "julia-compilersupportlibraries-jll")