unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: nixo <anothersms@gmail.com>
To: 38546@debbugs.gnu.org
Subject: [bug#38546] [PATCH 04/11] use wrapper to set JULIA_LOAD_PATH and JULIA_DEPOT_PATH
Date: Sat, 18 Jan 2020 14:23:44 +0100	[thread overview]
Message-ID: <87lfq4vqev.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> (raw)
In-Reply-To: <87v9qpvbyr.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me>


---
 gnu/packages/julia.scm | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index e1c4685227..39c7d6d34f 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -297,7 +297,9 @@
                 ;; running order.  I think it depends on the number of
                 ;; runners, disabling it for now
                 ;; https://github.com/JuliaLang/julia/issues/34330
-                "tests = filter(e->!in(e,[\"backtrace\",\"exceptions\",\"client\",\"stacktraces\"]),testnames)"))
+                "tests = filter(e->!in(e,[\"backtrace\",\"exceptions\",\"client\",
+                                          \"stacktraces\",\"stress\",\"precompile\"]),
+                                testnames)"))
              ;; When HOME is not set, julia calls uv_os_homedir, which in
              ;; turns call getpwuid_r. Add the HOME env variable to the
              ;; external julia call to fix this
@@ -307,11 +309,23 @@
              ;; https://github.com/JuliaLang/julia/issues/32377
              (substitute* "stdlib/REPL/test/replcompletions.jl"
                (("@test count") "@test_broken count"))
-             #t)))
+             #t))
+         (add-after 'install 'make-wrapper
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (program "julia"))
+               (with-directory-excursion bin
+                 (wrap-program program
+                   `("JULIA_LOAD_PATH" ":" prefix
+                     ("" "$JULIA_LOAD_PATH")))
+                 (wrap-program program
+                   `("JULIA_DEPOT_PATH" ":" prefix
+                     ("" "$JULIA_DEPOT_PATH"))))
+               #t))))
        #:make-flags
        (list
         (string-append "prefix=" (assoc-ref %outputs "out"))
-        (string-append "PREFIX=" (assoc-ref %outputs "out"))
 
         ;; Passing the MARCH flag is necessary to build binary substitutes for
         ;; the supported architectures.
@@ -435,7 +449,10 @@
     (native-search-paths
      (list (search-path-specification
             (variable "JULIA_LOAD_PATH")
-            (files (list "share/julia/packages/")))))
+            (files (list "share/julia/packages/")))
+           (search-path-specification
+            (variable "JULIA_DEPOT_PATH")
+            (files (list "share/julia/")))))
     ;; Julia is not officially released for ARM and MIPS.
     ;; See https://github.com/JuliaLang/julia/issues/10639
     (supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux"))
-- 
2.24.1

  parent reply	other threads:[~2020-01-18 13:36 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <87pnfgvqgt.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me>
2019-12-09 13:36 ` [bug#38546] [PATCH 0/3] Julia: fix package build and add julia-xyz nixo
2019-10-10 15:49   ` [bug#38546] [PATCH 1/3] gnu: julia: Set to JULIA_LOAD_PATH and JULIA_DEPOT_PATH variables Nicolò Balzarotti
2019-12-15 21:43     ` Ludovic Courtès
2019-10-10 15:49   ` [bug#38546] [PATCH 3/3] gnu: julia-xyz: Add julia-compat Nicolò Balzarotti
2019-12-15 21:46     ` Ludovic Courtès
2019-10-10 15:49   ` [bug#38546] [PATCH 2/3] gnu: julia-build-system: Enable tests Nicolò Balzarotti
2019-12-15 21:45     ` Ludovic Courtès
2019-12-12  8:43   ` [bug#38546] [PATCH 01/11] gnu: julia: Update to 1.3.1 nixo
2019-12-15 21:40   ` [bug#38546] [PATCH 0/3] Julia: fix package build and add julia-xyz Ludovic Courtès
2020-01-10  9:25   ` [bug#38546] [PATCH 03/11] gnu: julia: Adjust indentation nixo
2020-01-17 18:40   ` [bug#38546] [PATCH 05/11] gnu: build: julia-build-system: fix package nixo
2020-01-18 12:58   ` [bug#38546] [PATCH 02/11] gnu: julia: use SOURCE_DATE_EPOCH for precompilation timestamp nixo
2020-01-18 13:05   ` [bug#38546] [PATCH 06/11] gnu: Add julia-compat nixo
2020-01-18 13:06   ` [bug#38546] [PATCH 07/11] gnu: Add julia-inifile nixo
2020-01-18 13:07   ` [bug#38546] [PATCH 08/11] gnu: Add julia-sha nixo
2020-01-18 13:07   ` [bug#38546] [PATCH 09/11] gnu: Add julia-binaryprovider nixo
2020-01-18 13:11   ` [bug#38546] [PATCH 10/11] gnu: Add julia-mbedtls nixo
2020-01-18 13:11   ` [bug#38546] [PATCH 11/11] gnu: Add julia-http nixo
2020-01-18 13:23   ` nixo [this message]
2020-01-18 13:32   ` [bug#38546] [Nicolò Balzarotti] [PATCH 00/11] Update julia to 1.3.1, fix precompilation, add HTTP.jl Nicolò Balzarotti
2020-01-18 13:36   ` [bug#38546] [nixo] [PATCH 01/11] gnu: julia: Update to 1.3.1 Nicolò Balzarotti
2020-01-18 13:42   ` [bug#38546] [Nicolò Balzarotti] [PATCH 00/10] Update julia to 1.3.1, fix precompilation, add HTTP.jl Nicolò Balzarotti
2020-01-18 13:59   ` [bug#38546] [00/11] Update Julia, Fix " Nicolò Balzarotti
2020-01-20 18:49     ` zimoun
2020-01-21 13:45       ` Nicolò Balzarotti
2020-01-22  9:22         ` zimoun
2020-01-22  9:59           ` Nicolò Balzarotti
2020-01-24 17:26             ` zimoun
2020-02-04 18:03               ` zimoun
2020-02-07 12:06                 ` zimoun
2020-02-11 14:51                 ` zimoun
2020-02-11 15:10                   ` Nicolò Balzarotti
2020-02-11 15:19                     ` zimoun
2020-02-11 15:24                       ` Nicolò Balzarotti
2020-01-18 14:35   ` [bug#38546] Julia patches v3 Nicolò Balzarotti
2020-02-11 17:58   ` [bug#38546] [PATCH v4] Update Julia 1.3.1: almost done zimoun
2020-02-24 12:50     ` zimoun
2020-02-24 20:59       ` Nicolò Balzarotti
2020-02-25 16:12         ` zimoun
2020-02-25 18:08           ` Nicolò Balzarotti
2020-02-26 12:32             ` [bug#38546] [PATCH v5] Julia: Update to 1.3.1 Nicolò Balzarotti
2020-03-16 10:06               ` Efraim Flashner
2020-03-17  7:51                 ` Nicolò Balzarotti
2020-03-17  8:12                   ` Efraim Flashner
2020-03-17 12:21                     ` Marius Bakke
2020-03-17 13:37                       ` Nicolò Balzarotti
2020-03-19 12:28                         ` Marius Bakke
2020-04-06  6:09                           ` Efraim Flashner
2020-04-06  8:18                             ` Nicolò Balzarotti
2020-04-06  8:37                               ` Efraim Flashner
2020-04-06 23:18                                 ` Nicolò Balzarotti
2020-04-07  5:41                                   ` Efraim Flashner
2020-04-07  6:05                                     ` Efraim Flashner
2020-04-07 14:35                                   ` bug#38546: " Efraim Flashner

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=87lfq4vqev.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me \
    --to=anothersms@gmail.com \
    --cc=38546@debbugs.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).