From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
To: guix-devel@gnu.org
Subject: [PATCH 2/2] gnu: julia: Use unbundled release tarball.
Date: Wed, 25 May 2016 17:25:24 +0200 [thread overview]
Message-ID: <1464189924-29167-3-git-send-email-ricardo.wurmus@mdc-berlin.de> (raw)
In-Reply-To: <1464189924-29167-1-git-send-email-ricardo.wurmus@mdc-berlin.de>
* gnu/packages/julia.scm (julia)[source]: Use smaller tarball without
bundled sources.
[inputs]: Add inputs for rmath-julia, suitesparse, objconv, dsfmt, and
virtualenv.
[arguments]: Add phase "prepare-deps" to copy tarballs to their expected
locations.
---
gnu/packages/julia.scm | 62 +++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 59 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index d358a00..d5293e3 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -73,10 +73,10 @@
(method url-fetch)
(uri (string-append
"https://github.com/JuliaLang/julia/releases/download/v"
- version "/julia-" version "-full.tar.gz"))
+ version "/julia-" version ".tar.gz"))
(sha256
(base32
- "1nbi78fav5f4zj5332iwm4mfk0qhd5qh61z881q69rvp7b163wyb"))))
+ "09gc6yf3v4in0qwhrbgjrjgvblp941di0mli4zax22mvf4dzc7s4"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@@ -92,6 +92,19 @@
#:phases
(modify-phases %standard-phases
(delete 'configure)
+ (add-after 'unpack 'prepare-deps
+ (lambda* (#:key inputs #:allow-other-keys)
+ (copy-file (assoc-ref inputs "rmath-julia")
+ "deps/Rmath-julia-0.1.tar.gz")
+ (copy-file (assoc-ref inputs "dsfmt")
+ "deps/dsfmt-2.2.3.tar.gz")
+ (copy-file (assoc-ref inputs "objconv")
+ "deps/objconv.zip")
+ (copy-file (assoc-ref inputs "suitesparse")
+ "deps/SuiteSparse-4.4.2.tar.gz")
+ (copy-file (assoc-ref inputs "virtualenv")
+ "deps/virtualenv-1.11.6.tar.gz")
+ #t))
(add-after 'unpack 'hardcode-soname-map
;; ./src/ccall.cpp creates a map from library names to paths using the
;; output of "/sbin/ldconfig -p". Since ldconfig is not used in Guix,
@@ -249,7 +262,50 @@
("mpfr" ,mpfr)
("wget" ,wget)
("which" ,which)
- ("gmp" ,gmp)))
+ ("gmp" ,gmp)
+ ;; FIXME: The following inputs are downloaded from upstream to allow us
+ ;; to use the lightweight Julia release tarball. Ideally, these inputs
+ ;; would eventually be replaced with proper Guix packages.
+ ("rmath-julia"
+ ,(origin
+ (method url-fetch)
+ (uri "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v0.1")
+ ;;(file-name "rmath-julia-0.1.tar.gz")
+ (sha256
+ (base32
+ "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4"))))
+ ("suitesparse"
+ ,(origin
+ (method url-fetch)
+ (uri "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.2.tar.gz")
+ (sha256
+ (base32
+ "1dg0qsv07n71nbn9cgcvn73933rgy1jnxw5bfqkwfq3bidk44cqc"))))
+ ("objconv"
+ ,(origin
+ (method url-fetch)
+ (uri "http://www.agner.org/optimize/objconv.zip")
+ (sha256
+ (base32
+ "1fi7qa2sd9vb35dvkgripjf0fayzg2qmff215f8agfqfiwd1g8qs"))))
+ ("dsfmt"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append
+ "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/"
+ "SFMT/dSFMT-src-2.2.3.tar.gz"))
+ (sha256
+ (base32
+ "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"))))
+ ("virtualenv"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append "https://pypi.python.org/packages/24/cc/"
+ "a3cdf0a49ffcaef483b7e2511476aa520cf7260c199a6928fda6c43ba916/"
+ "virtualenv-1.11.6.tar.gz"))
+ (sha256
+ (base32
+ "1xq4prmg25n9cz5zcvbqx68lmc3kl39by582vd8pzs9f3qalqyiy"))))))
(native-inputs
`(("perl" ,perl)
("patchelf" ,patchelf)
--
2.7.3
next prev parent reply other threads:[~2016-05-25 15:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 15:25 [PATCH] Update Julia (and use smaller tarball) Ricardo Wurmus
2016-05-25 15:25 ` [PATCH 1/2] gnu: julia: Update to 0.4.5 Ricardo Wurmus
2016-05-28 14:27 ` Ludovic Courtès
2016-05-25 15:25 ` Ricardo Wurmus [this message]
2016-05-25 17:41 ` [PATCH 2/2] gnu: julia: Use unbundled release tarball Efraim Flashner
2016-05-25 18:28 ` Ricardo Wurmus
2016-05-28 14:29 ` Ludovic Courtès
2016-05-25 15:27 ` [PATCH] Update Julia (and use smaller tarball) Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464189924-29167-3-git-send-email-ricardo.wurmus@mdc-berlin.de \
--to=ricardo.wurmus@mdc-berlin.de \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).