summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorzimoun <zimon.toutoune@gmail.com>2022-01-04 23:47:40 +0100
committerEfraim Flashner <efraim@flashner.co.il>2022-01-10 15:15:31 +0200
commita2010ac21b020b31a723387d3ab82ef72ee6f64c (patch)
tree54b386bfa9ee67760d7a1582c1fc979ecfa280f0 /guix
parent146e83d380e0ffc6ab89f16f1a5a6a82eb8df3e5 (diff)
build: julia-build-system: Create 'Project.toml' file when missing.
* guix/build/julia-build-system.scm (link-depot): Create 'Project.toml' file when missing using data provided by the user. (julia-create-package-toml): Remove from export. * doc/guix.texi (Build Systems): Update julia-build-system section. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
Diffstat (limited to 'guix')
-rw-r--r--guix/build/julia-build-system.scm33
1 files changed, 21 insertions, 12 deletions
diff --git a/guix/build/julia-build-system.scm b/guix/build/julia-build-system.scm
index b4e0044567..03d669be64 100644
--- a/guix/build/julia-build-system.scm
+++ b/guix/build/julia-build-system.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
-;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -27,8 +27,8 @@
#:use-module (ice-9 regex)
#:use-module (ice-9 rdelim)
#:use-module (ice-9 popen)
+ #:use-module (srfi srfi-1)
#:export (%standard-phases
- julia-create-package-toml
julia-build))
;; Commentary:
@@ -138,6 +138,8 @@ Project.toml)."
(define* (link-depot #:key source inputs outputs
julia-package-name julia-package-uuid #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
+ (name+version (strip-store-file-name out))
+ (version (last (string-split name+version #\-)))
(package-name (or
julia-package-name
(project.toml->name "Project.toml")))
@@ -148,6 +150,14 @@ Project.toml)."
println(Base.version_slug(Base.UUID(\"~a\"),
Base.SHA1(Pkg.GitTools.tree_hash(\".\"))))" uuid)))
(slug (string-trim-right (get-string-all pipe))))
+ ;; Few packages do not have the regular Project.toml file, then when they
+ ;; are propagated, dependencies do not find them and an raise error.
+ (unless (file-exists? "Project.toml")
+ (julia-create-package-toml (getcwd)
+ julia-package-name julia-package-uuid
+ version
+ #:file "Project.toml"))
+
;; When installing a package, julia looks first at in the JULIA_DEPOT_PATH
;; for a path like packages/PACKAGE/XXXX
;; Where XXXX is a slug encoding the package UUID and SHA1 of the files
@@ -157,17 +167,16 @@ println(Base.version_slug(Base.UUID(\"~a\"),
(symlink package-dir (string-append out "/share/julia/packages/"
package-name "/" slug))))
-(define (julia-create-package-toml outputs source
- name uuid version
- deps)
- "Some packages are not using the new Package.toml dependency specifications.
-Write this file manually, so that Julia can find its dependencies."
+(define* (julia-create-package-toml location
+ name uuid version
+ #:optional
+ (deps '())
+ #:key
+ (file "Project.toml"))
+ "Some packages are not using the new Project.toml dependency specifications.
+Write this FILE manually, so that Julia can find its dependencies."
(let ((f (open-file
- (string-append
- (assoc-ref outputs "out")
- %package-path
- (string-append
- name "/Project.toml"))
+ (string-append location "/" file)
"w")))
(display (string-append
"