From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH 2/2] gnu: julia: Use unbundled release tarball. Date: Wed, 25 May 2016 20:41:33 +0300 Message-ID: <20160525174133.GA22300@debian-netbook> References: <1464189924-29167-1-git-send-email-ricardo.wurmus@mdc-berlin.de> <1464189924-29167-3-git-send-email-ricardo.wurmus@mdc-berlin.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="AqsLC8rIMeq19msA" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5coX-00070U-5Y for guix-devel@gnu.org; Wed, 25 May 2016 13:41:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5coR-0004yN-Vq for guix-devel@gnu.org; Wed, 25 May 2016 13:41:48 -0400 Received: from flashner.co.il ([178.62.234.194]:55340) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5coR-0004vl-KC for guix-devel@gnu.org; Wed, 25 May 2016 13:41:43 -0400 Content-Disposition: inline In-Reply-To: <1464189924-29167-3-git-send-email-ricardo.wurmus@mdc-berlin.de> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ricardo Wurmus Cc: guix-devel@gnu.org --AqsLC8rIMeq19msA Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, May 25, 2016 at 05:25:24PM +0200, Ricardo Wurmus wrote: > * 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(-) >=20 > 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/downloa= d/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 u= sing 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 al= low 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/tarb= all/v0.1") > + ;;(file-name "rmath-julia-0.1.tar.gz") ^^^ did this not like being renamed? > + (sha256 > + (base32 > + "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4")))) > + ("suitesparse" > + ,(origin > + (method url-fetch) > + (uri "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSpar= se-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" we actually do have virtualenv packaged. I forgot when but at some point they made a massive jump in version numbers. > + ,(origin > + (method url-fetch) > + (uri (string-append "https://pypi.python.org/packages/24/cc/" > + "a3cdf0a49ffcaef483b7e2511476aa520cf7260c= 199a6928fda6c43ba916/" > + "virtualenv-1.11.6.tar.gz")) > + (sha256 > + (base32 > + "1xq4prmg25n9cz5zcvbqx68lmc3kl39by582vd8pzs9f3qalqyiy")))))) > (native-inputs > `(("perl" ,perl) > ("patchelf" ,patchelf) > --=20 > 2.7.3 >=20 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --AqsLC8rIMeq19msA Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJXRePIAAoJEPTB05F+rO6Tq4AQAJL1Fpug0ZKMOMplsXsv7qnR E9FrKDkhDbj+QJ0ovqOOhqdoANLwBaEVLGVXaGdvCfkrt7iuzeIDhXWtkQOfgX7l vMFqk7t/E5JuK8q1d5lRIZ3Fc7CtZ/mdj9QoQrVy4o53y4///ZDoghURwE3u793X NJWTqn6D0EJQ94/mY7rhc8MjBPF+R4CJfhSdbsKY5Tahjhd7mmG4z89fuxtkJt+A Iy1sNVFS7R6jsWRodLvX+0ALcwuFdGKX4zARxPK7E2qmeGrcRrpobe5ajfeyGl/0 mhU7a+dvbkHj0jbQnj8RJWaxoIPQmv4gd6rnSBjDiTY2YBsVxu3vJra363Z6Tdzu MlAfCv3UXejDsTinIDospmSuNv7l+7j1GAPd33+Px5tHWcMExxcRsE+l1LvWJcrK MkU4bn+N9Euw8aBIQlUsdVyh+2M1C0RG3c0wNHSTsqUbSr0jElI9YjokbJVckljq 5E7Wg9+3zrIm3OKIgWMwSMR/7CkfFKH7C41gY2sMVwhm+KVwOJptgO9ahSq/uAG2 REPzQ8gXR8w4gOBb4MpWWueZ5iKtQ/JEnP+TX85pOlU8ltDFrsjI01W7eA0ysnSO 9aR0KD0p/xzNRE4G3y4t2fD3M3aXyurzdtotucoiRfS3jq3OKfdcA8RJD7hQ/772 k4d7SFYqRbkdMTbpdXQT =dNAd -----END PGP SIGNATURE----- --AqsLC8rIMeq19msA--