efraim pushed a commit to branch master
in repository guix.
commit 05d469ab9da077ef2e8e3ada4bd1daee59e31312
Author: Efraim Flashner <[email protected]>
AuthorDate: Wed Feb 23 14:47:05 2022 +0100
build: julia: Add 'julia-package-dependencies' as keyword.
* guix/build-system/julia.scm (link-depot): Accept
julia-package-dependencies
keyword and use it for 'julia-create-package-toml' function.
(julia-create-package-toml): Use pattern matching.
(julia-build): Add 'julia-pacakge-dependencies'.
* guix/build/julia-build-system.scm (julia-build): Add
'#:julia-package-dependencies' keyword.
Signed-off-by: Efraim Flashner <[email protected]>
---
guix/build-system/julia.scm | 7 +++++--
guix/build/julia-build-system.scm | 14 ++++++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm
index 6261f8a55a..66e7711bcd 100644
--- a/guix/build-system/julia.scm
+++ b/guix/build-system/julia.scm
@@ -2,7 +2,8 @@
;;; Copyright © 2019 Nicolò Balzarotti <[email protected]>
;;; Copyright © 2021 Ludovic Courtès <[email protected]>
;;; Copyright © 2021 Jean-Baptiste Volatier <[email protected]>
-;;; Copyright © 2021 Simon Tournier <[email protected]>
+;;; Copyright © 2021, 2022 Simon Tournier <[email protected]>
+;;; Copyright © 2022 Efraim Flashner <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -88,6 +89,7 @@
(guile #f)
(julia-package-name #f)
(julia-package-uuid #f)
+ (julia-package-dependencies ''())
(imported-modules %julia-build-system-modules)
(modules '((guix build julia-build-system)
(guix build utils))))
@@ -108,7 +110,8 @@
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..c5ad65d029 100644
--- a/guix/build/julia-build-system.scm
+++ b/guix/build/julia-build-system.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2019, 2020 Nicolò Balzarotti <[email protected]>
;;; Copyright © 2021 Jean-Baptiste Volatier <[email protected]>
;;; Copyright © 2021, 2022 Simon Tournier <[email protected]>
+;;; Copyright © 2022 Efraim Flashner <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -136,7 +137,8 @@ Project.toml)."
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 @@ println(Base.version_slug(Base.UUID(\"~a\"),
(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
@@ -186,9 +189,10 @@ version = \"" version "\"
") f)
(when (not (null? deps))
(display "[deps]\n" f)
- (for-each (lambda dep
- (display (string-append (car (car dep)) " = \"" (cdr (car
dep)) "\"\n")
- f))
+ (for-each (match-lambda
+ ((name . uuid)
+ (display (string-append name " = \"" uuid "\"\n")
+ f)))
deps))
(close-port f)))
@@ -207,6 +211,7 @@ version = \"" version "\"
(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 +219,5 @@ version = \"" version "\"
#:inputs inputs #:phases phases
#:julia-package-name julia-package-name
#:julia-package-uuid julia-package-uuid
+ #:julia-package-dependencies julia-package-dependencies
args))
