From patchwork Fri Jan 13 22:16:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 46097 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 E30A827BBED; Fri, 13 Jan 2023 22:18:35 +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 971A027BBE9 for ; Fri, 13 Jan 2023 22:18:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGSNQ-0006Bv-S5; Fri, 13 Jan 2023 17:18:20 -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 1pGSN8-00068a-5c for guix-patches@gnu.org; Fri, 13 Jan 2023 17:18:15 -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 1pGSN7-0005wk-TS for guix-patches@gnu.org; Fri, 13 Jan 2023 17:18:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGSN7-0006Xq-Os for guix-patches@gnu.org; Fri, 13 Jan 2023 17:18:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60793] [PATCH] gnu: Add julia-cfitsio-jll. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 22:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60793 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60793@debbugs.gnu.org Cc: Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167364822725094 (code B ref -1); Fri, 13 Jan 2023 22:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jan 2023 22:17:07 +0000 Received: from localhost ([127.0.0.1]:52637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGSMF-0006Wf-53 for submit@debbugs.gnu.org; Fri, 13 Jan 2023 17:17:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:43388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGSMD-0006WY-AO for submit@debbugs.gnu.org; Fri, 13 Jan 2023 17:17: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 1pGSMD-00064Y-5U for guix-patches@gnu.org; Fri, 13 Jan 2023 17:17:05 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGSMB-0005rr-06 for guix-patches@gnu.org; Fri, 13 Jan 2023 17:17:04 -0500 Received: by mail-wr1-x42c.google.com with SMTP id z5so21247736wrt.6 for ; Fri, 13 Jan 2023 14:17:02 -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=zjSA4sSaoWiU7t7aNS5kH5UgqxRKdkg+MLFIwF7rBDo=; b=GYBDSis8iJx8S2z9Lz9/3BLK5V58S2nF6qcp9eKGbaGAJT95ibzYCqeziVZohA3nfu pdKTNVW9isnXsY3MV1YFMcTFcQehgRmFNpRpV8TYB74tss3E1ZhfG3w1GkAXW+cpGmUX BTQN4RFDO6XmEnslrpccLmaikq4efClQJxEiMpf28mlaAn8czyB19rAzaFH2PSX9JKlh tFZptmFIgkTiXz9QdxRmLQcTEokCFZqZv9HdyUIbeFzmyL+FclxpEWUKBtQQp9aTi3uz gYw5c35w1qs5qJuUUrxiENEdBi0ERWdCAkW14HirCoRjjLGN93fNhiLXbfe/wobOUKer YQOw== 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=zjSA4sSaoWiU7t7aNS5kH5UgqxRKdkg+MLFIwF7rBDo=; b=AY5OEWzaLzcGFHct6BfMELRktJg5xfBhSQOD1ixJ8+/RVf6dPkMhgvs4co8rfEPWM8 dlcmr1V4eTJgHuaJhd6YsjPsu2zbHUhXI3s8iZxGHvkwUwVL1HVhXLeoKUuUReP9COva XJhkZAP7Z2BwgWFcRIDg0SJGUHO0ugs/uUq7OvEjv5lGW8HZqEPg9STgLkxUzp364+1x A10JfpEyUBz/sulkycQng4bnLRMxy+DQ8jgZfs5skk3vSVsfwTqCGA261/SjKPswPm6K 1CRr05blRUGGaUv7vL2I0acI/gkidWy358KW4qBdUMx39Wc9yuP48U6RDYo7JZ4WWg9s fOgw== X-Gm-Message-State: AFqh2kqKufKvYQ/gG9uADqBbimkcBYHpnjlTuYXpZqUyFTSM5Ic5exQD KLiv09+Zn4ceFCCjDzf0yDskceE5Tfw= X-Google-Smtp-Source: AMrXdXuhZRMiSeBHrVI550T115MKMEyDb1ku+vGbunQngM2RkzeDQGMzcETHUKvcYp6S567FaqZF/A== X-Received: by 2002:adf:ec90:0:b0:2bb:5d8c:9575 with SMTP id z16-20020adfec90000000b002bb5d8c9575mr17593192wrn.12.1673648221184; Fri, 13 Jan 2023 14:17:01 -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 w8-20020adf8bc8000000b002bdc39849d1sm7647241wra.44.2023.01.13.14.17.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 14:17:00 -0800 (PST) From: Sharlatan Hellseher Date: Fri, 13 Jan 2023 22:16:58 +0000 Message-Id: <20230113221658.8158-1-sharlatanus@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=sharlatanus@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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/julia-jll.scm (julia-cfitsio-jll): New variable. --- gnu/packages/julia-jll.scm | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index 2b0f644736..364088c4b0 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. ;;; @@ -21,12 +22,14 @@ (define-module (gnu packages julia-jll) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system julia) #:use-module (gnu packages) #:use-module (gnu packages audio) + #:use-module (gnu packages astronomy) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) @@ -146,6 +149,48 @@ (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 + (list + #: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") "") ; Not require to download cfitsio. + (("using Zlib_jll") "") ; Not require to upnpack 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")