From patchwork Mon Feb 21 12:51:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 37388 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 D2B7327BBEA; Mon, 21 Feb 2022 13:40:56 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 8097F27BBE9 for ; Mon, 21 Feb 2022 13:40:56 +0000 (GMT) Received: from localhost ([::1]:32844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nM8vv-0007Ml-Dd for patchwork@mira.cbaines.net; Mon, 21 Feb 2022 08:40:55 -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 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" X-getmail-retrieved-from-mailbox: Patches * 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)) From patchwork Mon Feb 21 12:51:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 37389 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 842D827BBEA; Mon, 21 Feb 2022 13:44:49 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 343C927BBE9 for ; Mon, 21 Feb 2022 13:44:49 +0000 (GMT) Received: from localhost ([::1]:39518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nM8zf-0003Yw-QZ for patchwork@mira.cbaines.net; Mon, 21 Feb 2022 08:44:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nM8Bb-0006NO-3Y for guix-patches@gnu.org; Mon, 21 Feb 2022 07:53:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41421) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nM8BZ-0001UC-Vn 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-0007Lt-U4 for guix-patches@gnu.org; Mon, 21 Feb 2022 07:53:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54088] [PATCH 2/2] gnu: julia-media: Use julia-package-dependencies. 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.164544795528221 (code B ref 54088); Mon, 21 Feb 2022 12:53:01 +0000 Received: (at 54088) by debbugs.gnu.org; 21 Feb 2022 12:52:35 +0000 Received: from localhost ([127.0.0.1]:35317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nM8B9-0007L7-5V for submit@debbugs.gnu.org; Mon, 21 Feb 2022 07:52:35 -0500 Received: from flashner.co.il ([178.62.234.194]:37992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nM8B7-0007Ku-Jg for 54088@debbugs.gnu.org; Mon, 21 Feb 2022 07:52:33 -0500 Received: from localhost (unknown [31.210.181.166]) by flashner.co.il (Postfix) with ESMTPSA id D24CB40313; Mon, 21 Feb 2022 12:52:27 +0000 (UTC) From: Efraim Flashner Date: Mon, 21 Feb 2022 14:51:21 +0200 Message-Id: <6ef43f223656ad86c16e1e9bea6fbe8df5febb3f.1645447521.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/julia.scm (julia-media)[arguments]: Remove custom phase, add dependency packages to julia-package-dependencies. --- gnu/packages/julia-xyz.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 4090d6d9c4..daf12e59fe 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -3472,19 +3472,8 @@ (define-public julia-media (arguments '(#:julia-package-name "Media" #:julia-package-uuid "e89f7d12-3494-54d1-8411-f7d8b9ae1f27" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'create-package-toml - (lambda* (#:key julia-package-name julia-package-uuid #:allow-other-keys) - (with-output-to-file "Project.toml" - (lambda _ - (format #t - "name = \"~a\"~@ - uuid = \"~a\"~@ - [deps]~@ - MacroTools = \"1914dd2f-81c6-5fcd-8719-6d5c9610ff09\"~%" - julia-package-name - julia-package-uuid)))))))) + #:julia-package-dependencies + `(("MacroTools" . "1914dd2f-81c6-5fcd-8719-6d5c9610ff09")))) (propagated-inputs (list julia-macrotools)) (home-page "https://github.com/JunoLab/Media.jl")