From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +FFbD1GWE2LiBgAAgWs5BA (envelope-from ) for ; Mon, 21 Feb 2022 14:40:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 0JKMC1GWE2K1EwAAauVa8A (envelope-from ) for ; Mon, 21 Feb 2022 14:40:33 +0100 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 92AC13A2F4 for ; Mon, 21 Feb 2022 14:40:30 +0100 (CET) Received: from localhost ([::1]:32844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nM8vT-0007Ml-J1 for larch@yhetil.org; Mon, 21 Feb 2022 08:40:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nM8Bb-0006NN-3A for guix-patches@gnu.org; Mon, 21 Feb 2022 07:53:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nM8BZ-0001UB-Jl for guix-patches@gnu.org; Mon, 21 Feb 2022 07:53:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nM8BZ-0007Lm-I7 for guix-patches@gnu.org; Mon, 21 Feb 2022 07:53:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54088] [PATCH 1/2] build: julia: Add julia-package-dependencies as keyword. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Feb 2022 12:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54088 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54088@debbugs.gnu.org, zimon.toutoune@gmail.com Cc: Efraim Flashner Received: via spool by 54088-submit@debbugs.gnu.org id=B54088.164544792728178 (code B ref 54088); Mon, 21 Feb 2022 12:53:01 +0000 Received: (at 54088) by debbugs.gnu.org; 21 Feb 2022 12:52:07 +0000 Received: from localhost ([127.0.0.1]:35314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nM8Ag-0007KO-Om for submit@debbugs.gnu.org; Mon, 21 Feb 2022 07:52:07 -0500 Received: from flashner.co.il ([178.62.234.194]:37976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nM8Ab-0007Js-8s for 54088@debbugs.gnu.org; Mon, 21 Feb 2022 07:52:05 -0500 Received: from localhost (unknown [31.210.181.166]) by flashner.co.il (Postfix) with ESMTPSA id 5F00C40313; Mon, 21 Feb 2022 12:51:55 +0000 (UTC) From: Efraim Flashner Date: Mon, 21 Feb 2022 14:51:20 +0200 Message-Id: <9cdd299f057aad897abf5d16b28cf2421421f367.1645447521.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645450830; 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: content-transfer-encoding:content-transfer-encoding:resent-cc: 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; bh=PPV37Cx02xTAvAQtf1TioabEc6W4fjnVSClZs1tpkAM=; b=WJ6xA6XaknxMwt+EXjSw48Ek/pfrKDsD1m0B4N6/MvEeaNnsoGmgSfTgenBGTtypCDeW4Q wzM1lHMlgxZFT8K5oRtqUanDxPO5nJjHCIVVV+CW/z2XHweC3K80ChQJoThIuUYGTNy88Q ChTTu6VDNXn+eT+z+RBc3Zck14vJz+qaehu12uL3Iz6pxLu1bYuBsv8tfgA6zm74mh6yBh IENKowGLpM8mznmdNj1wfoWc2t6q6sJKV5Jex2PVKgcOtqPslVzExLQJg1W0hgNrzJ/oKk 355gq2n5qWG6qkd4wst1SPWk4SIjqi69yEV2jct7lXweL/8wAIniV2wWPeLTCQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645450830; a=rsa-sha256; cv=none; b=HSqYZ7ewVbG+3NN+8iFu9kVgCO4i/DOoOAmZ0hjQqnUDbcoRknBv4D6OVzBjSJP1crixzp LblMjeARSTCQKTZ8DHENZz3GIWWxQ2KJ79QquPC2RrGARcRvaELuyNb+NLSaBtPGmaHSC3 zy13RsE5KQInIoYo9fDwnbjpZq973z3TLm9LFstRIINuHjXxgnmOXmyQPgA8hoLi/OLqig vuGRvlu3Q9FN7hb3rBO7+5CAUVoLo/kl45WQFUpLivdgYwx8NE/QOxIXvoujrpd85azg8e Lc+8DVhptCLuC3RuJ1maJGK+aKjbXHdREg274nR3lClpVtPmYUAa44Nb2/yUeg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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: -2.13 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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: 92AC13A2F4 X-Spam-Score: -2.13 X-Migadu-Scanner: scn1.migadu.com X-TUID: FKlQzKzCjC1z * guix/build-system/julia.scm (link-depot): Accept julia-package-dependencies keyword and use it for julia-create-package-toml function. (julia-build): Add julia-pacakge-dependencies. * guix/build/julia-build-system.scm (julia-build): Add julia-package-dependencies keyword. --- guix/build-system/julia.scm | 5 ++++- guix/build/julia-build-system.scm | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm index 6261f8a55a..66eec65ef1 100644 --- a/guix/build-system/julia.scm +++ b/guix/build-system/julia.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Jean-Baptiste Volatier ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2022 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,6 +89,7 @@ (define* (julia-build name inputs (guile #f) (julia-package-name #f) (julia-package-uuid #f) + (julia-package-dependencies #f) (imported-modules %julia-build-system-modules) (modules '((guix build julia-build-system) (guix build utils)))) @@ -108,7 +110,8 @@ (define builder search-paths)) #:inputs #$(input-tuples->gexp inputs) #:julia-package-name #$julia-package-name - #:julia-package-uuid #$julia-package-uuid)))) + #:julia-package-uuid #$julia-package-uuid + #:julia-package-dependencies #$julia-package-dependencies)))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) system #:graft? #f))) diff --git a/guix/build/julia-build-system.scm b/guix/build/julia-build-system.scm index 03d669be64..fb524f03d7 100644 --- a/guix/build/julia-build-system.scm +++ b/guix/build/julia-build-system.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019, 2020 Nicolò Balzarotti ;;; Copyright © 2021 Jean-Baptiste Volatier ;;; Copyright © 2021, 2022 Simon Tournier +;;; Copyright © 2022 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -136,7 +137,8 @@ (define* (check #:key tests? source inputs outputs julia-package-name package "/test/runtests.jl")))))) (define* (link-depot #:key source inputs outputs - julia-package-name julia-package-uuid #:allow-other-keys) + julia-package-name julia-package-uuid + julia-package-dependencies #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (name+version (strip-store-file-name out)) (version (last (string-split name+version #\-))) @@ -156,6 +158,7 @@ (define* (link-depot #:key source inputs outputs (julia-create-package-toml (getcwd) julia-package-name julia-package-uuid version + julia-package-dependencies #:file "Project.toml")) ;; When installing a package, julia looks first at in the JULIA_DEPOT_PATH @@ -207,6 +210,7 @@ (define %standard-phases (delete 'build))) (define* (julia-build #:key inputs julia-package-name julia-package-uuid + julia-package-dependencies (phases %standard-phases) #:allow-other-keys #:rest args) "Build the given Julia package, applying all of PHASES in order." @@ -214,4 +218,5 @@ (define* (julia-build #:key inputs julia-package-name julia-package-uuid #:inputs inputs #:phases phases #:julia-package-name julia-package-name #:julia-package-uuid julia-package-uuid + #:julia-package-dependencies julia-package-dependencies args)) -- 2.34.0