From patchwork Sun Jan 29 22:29:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 46524 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 60C0A27BBEB; Sun, 29 Jan 2023 22:30:20 +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 A79D627BBE9 for ; Sun, 29 Jan 2023 22:30:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMGBY-0004fR-85; Sun, 29 Jan 2023 17:30: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 1pMGBW-0004f8-JP for guix-patches@gnu.org; Sun, 29 Jan 2023 17:30: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 1pMGBW-0006dt-9Y for guix-patches@gnu.org; Sun, 29 Jan 2023 17:30:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pMGBW-0004R9-5a for guix-patches@gnu.org; Sun, 29 Jan 2023 17:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60793] [PATCH 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: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Jan 2023 22:30: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 Received: via spool by 60793-submit@debbugs.gnu.org id=B60793.167503137816983 (code B ref 60793); Sun, 29 Jan 2023 22:30:02 +0000 Received: (at 60793) by debbugs.gnu.org; 29 Jan 2023 22:29:38 +0000 Received: from localhost ([127.0.0.1]:45527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMGB7-0004Pq-RF for submit@debbugs.gnu.org; Sun, 29 Jan 2023 17:29:38 -0500 Received: from mail-wm1-f48.google.com ([209.85.128.48]:55163) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMGB5-0004PR-6Q for 60793@debbugs.gnu.org; Sun, 29 Jan 2023 17:29:35 -0500 Received: by mail-wm1-f48.google.com with SMTP id m15so6869879wms.4 for <60793@debbugs.gnu.org>; Sun, 29 Jan 2023 14:29:35 -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=Vp7cmvDwCi6+57Y8o80uALsYQYa8s8/i/rbKpo/XfZ0=; b=keadRzyfpLgJqdgy+LkHEXvJTVeplq5rFU5/XMBcTS7288tNU8EtzbY6wrYUAxhZNE kMyJReYNg6QzzTfgY/NEPa9rh6P3AwC7F0LPNu8jYmc43xqPd7e97BkDJRxpaGzq32/7 jsUEMxLxk+3Rit+tfHmCdYuYsQB2dXJFnbnkCJPU547tz9l2E4lAtBQTZWhtkPjsA2J3 vt5aACymemoAMbGQUkCEKEpfvumCOG+po/6IbCs/aRpdfJzS6Sxs5vcP+eJc267Jy83k 1PHgZdUKrIERUxEWM8/vz+vcV1RWO8GFDTp+y270vy7jAkkU7BrWaT9jLBueYsOvNSDH oxyA== 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=Vp7cmvDwCi6+57Y8o80uALsYQYa8s8/i/rbKpo/XfZ0=; b=52aPfItqeaGAyh1r5yCtRP3gQFuyLlhaiFBrrVOtz8mmpMV1wNH13xA1ALGiCgDDN4 Llc8CFuaqwUG0esnZ+jXjgJUkDRmQ0JJOe5ycj/8FnPxVS4T8z1hSdr3bhJ5j76R1OTa +Cc0JjrQiklJgSKrMNTIz5EfysBLmWLcfzib0C8ozypZGeOdG4qhYTjdh+K7VOFCZ5Z9 tGKXBzh+FGTw8RTX9s3HA0vX7g+ynGCJafbl5yFSU7f8lHMixQNtWQ7aeXScpRvn/ayv VPLkzKtAyZxmbRqFvNOmLeqwQ/CVT/Idt7m4gu8jYNMsXK7O98kxfOl9LtUSPOv6GT6b +tVw== X-Gm-Message-State: AO0yUKUi8skwb8pQitmoCTDD5PUvepABnllDXxSTiXd4JIqtGX0DbSMK e3LbML3Bbw4cWc72LmeAdyQhrlKFK/U= X-Google-Smtp-Source: AK7set+PezKjrEOm7YDk24MkV9T93Uzac9QNCyDXLIePt7/E+Fi7lizGDDjFm0fJLaPEqlvHcpnOOw== X-Received: by 2002:a05:600c:3b07:b0:3dc:5a0b:d256 with SMTP id m7-20020a05600c3b0700b003dc5a0bd256mr988187wms.22.1675031369265; Sun, 29 Jan 2023 14:29:29 -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 l41-20020a05600c08a900b003dc3d9fb09asm7571310wmp.47.2023.01.29.14.29.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 14:29:28 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 29 Jan 2023 22:29:23 +0000 Message-Id: <20230129222925.11361-1-sharlatanus@gmail.com> X-Mailer: git-send-email 2.39.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 * gnu/packages/julia-jll.scm (julia-cfitsio-jll): New variable. --- gnu/packages/julia-jll.scm | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index 2b0f644736..7625ff512a 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 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")