From patchwork Sat Jan 18 13:23:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Nicol=C3=B2_Balzarotti?= X-Patchwork-Id: 19863 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5B1F517A2E; Sat, 18 Jan 2020 13:36:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 04DB817A2D for ; Sat, 18 Jan 2020 13:36:16 +0000 (GMT) Received: from localhost ([::1]:40382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isoGt-0001Nc-05 for patchwork@mira.cbaines.net; Sat, 18 Jan 2020 08:36:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42737) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isoGh-0001MR-Cp for guix-patches@gnu.org; Sat, 18 Jan 2020 08:36:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isoGg-0004na-2X for guix-patches@gnu.org; Sat, 18 Jan 2020 08:36:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34725) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isoGf-0004nQ-VL for guix-patches@gnu.org; Sat, 18 Jan 2020 08:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1isoGf-00077n-TN for guix-patches@gnu.org; Sat, 18 Jan 2020 08:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38546] [PATCH 04/11] use wrapper to set JULIA_LOAD_PATH and JULIA_DEPOT_PATH References: <87v9qpvbyr.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> In-Reply-To: <87v9qpvbyr.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Resent-From: nixo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Jan 2020 13:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38546 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38546@debbugs.gnu.org Received: via spool by 38546-submit@debbugs.gnu.org id=B38546.157935451527226 (code B ref 38546); Sat, 18 Jan 2020 13:36:01 +0000 Received: (at 38546) by debbugs.gnu.org; 18 Jan 2020 13:35:15 +0000 Received: from localhost ([127.0.0.1]:40677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isoFu-000753-Mv for submit@debbugs.gnu.org; Sat, 18 Jan 2020 08:35:14 -0500 Received: from mail-wm1-f54.google.com ([209.85.128.54]:37907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isoFr-00074b-U4 for 38546@debbugs.gnu.org; Sat, 18 Jan 2020 08:35:13 -0500 Received: by mail-wm1-f54.google.com with SMTP id u2so10284656wmc.3 for <38546@debbugs.gnu.org>; Sat, 18 Jan 2020 05:35:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=UsOPYVmbJHt8FK74CgycGw9Ov4jBseuNgiDMIBqtb2s=; b=av4+z1aRkRU1iTGjl0dWwGsIPAslta9iJ+9KZwvVemYYE+vjekaI8TiqBeKrxjxG/g omFUMxcvFm0ZL+b+NbcVYLmn/fWdViZkL3bstD2HOenzJ0HtDJoQdqYxax/hQTJvOu/b BEQ9r9Y0cn64b2fdGQ3T64bWFgxcu2kz46lFDbnhj9/l0zHLiqbUEVC3dQKBKhf/smMa HF/LBuckMQg7F3eh9qP+ZxUXNWtFfjvCOmP00sNaCsbuuEmqcJCS6PK2uyq2xuDGpbaI Yi5haay/FHasb56+9NFjc1c6mRQ6cHOAjhvbZFgqdjBd5gJ80g6uJA7UCZU7iPsIH20C cHew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=UsOPYVmbJHt8FK74CgycGw9Ov4jBseuNgiDMIBqtb2s=; b=J6sKu6pKPw433r0mmy0PfW/Uq6bHj8Pgh39poUHVuUQIi6viV1rOEn9tGXugfkmENc sOtgFFkqbG+KFh7qYNEQqcB6NuP2Jm+SBwRFFM9HwH9IoNYivfGrlCHAQ/sloVckUi4Y T5/pugMdqKgOODIApuOv7MzN78IWy13QAs7bzsuvc4e17G6e0lbO/Pp49VsSS4g2qkc6 KTuDqph3Asn45B38HaLzm/z3WQEssCyMyGToTHEcDK3zpVAYHeFC4lEJCu8+DtXSupJF DJpOb5kU/bbIcYJSDPJFR0V2jYZhNmOrVs1cpcwwGab81OLWeBUM2uSDzJYMpuEhBp6P oYEw== X-Gm-Message-State: APjAAAW3WWpPp90GEUOuVvprDtZMoHapWaGx/i8+kZUZEKfN02aIskqg JuhH1KPgiwgBfFxeOu4Ezh9KqCLO X-Google-Smtp-Source: APXvYqyFRTUgwjSWZwqgiuolxUKQX78mtpT7hwP2gcYGEgy2qfNLuHYz6Zt+e3TzGG+K3bWQxKucSw== X-Received: by 2002:a05:600c:2c53:: with SMTP id r19mr9799893wmg.39.1579354505861; Sat, 18 Jan 2020 05:35:05 -0800 (PST) Received: from guixSD (host146-19-dynamic.50-79-r.retail.telecomitalia.it. [79.50.19.146]) by smtp.gmail.com with ESMTPSA id y139sm5787986wmd.24.2020.01.18.05.35.04 for <38546@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2020 05:35:05 -0800 (PST) From: nixo X-Google-Original-From: nixo Date: Sat, 18 Jan 2020 14:23:44 +0100 Message-ID: <87lfq4vqev.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- 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"))