From patchwork Sun Oct 29 14:36:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Pierre-Henry_Fr=C3=B6hring?= X-Patchwork-Id: 55529 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 D9C6A27BBE2; Sun, 29 Oct 2023 14:41:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E35EE27BBE2 for ; Sun, 29 Oct 2023 14:41:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qx6yp-00047T-5F; Sun, 29 Oct 2023 10:41:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qx6yn-00046d-OU for guix-patches@gnu.org; Sun, 29 Oct 2023 10:41:29 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qx6yn-0003aj-Fl for guix-patches@gnu.org; Sun, 29 Oct 2023 10:41:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qx6zK-0007eK-1x for guix-patches@gnu.org; Sun, 29 Oct 2023 10:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66801] [PATCH va3e5ae0f..37252e07 02/32] gnu: erlang updated. Resent-From: Pierre-Henry =?utf-8?b?RnLDtmhyaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Oct 2023 14:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66801 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66801@debbugs.gnu.org Cc: Pierre-Henry =?utf-8?b?RnLDtmhyaW5n?= Received: via spool by 66801-submit@debbugs.gnu.org id=B66801.169859046328969 (code B ref 66801); Sun, 29 Oct 2023 14:42:02 +0000 Received: (at 66801) by debbugs.gnu.org; 29 Oct 2023 14:41:03 +0000 Received: from localhost ([127.0.0.1]:42978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qx6yM-0007XA-Nu for submit@debbugs.gnu.org; Sun, 29 Oct 2023 10:41:03 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:50386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qx6yH-0007W1-7v for 66801@debbugs.gnu.org; Sun, 29 Oct 2023 10:40:58 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40790b0a224so26922705e9.0 for <66801@debbugs.gnu.org>; Sun, 29 Oct 2023 07:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=deeplinks-com.20230601.gappssmtp.com; s=20230601; t=1698590418; x=1699195218; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d8/+t1Wn3xaNr0a1Y4hypvWCjpYURJDzN9UK9/wYiss=; b=uxF8Ktogjc8/mlK3aKv2A/V4rCMgABmFZRr67D7NIzcrYxqT9h/o7lRAkwjgJf7FRT e4TeA70PQrhAYJBIvdLoEc5UIFuzNItRgMlTwmV0jARGy+uOCT6eHAnfIxma98aSUOyz O8Ks3xySVwWi1WvkSARgGN3idtJmzmtAoa6aqzRWr8vDuviJ4viw8HB0cAXbN19VxJfW gWOPcuMDJLwpNVVUUNfWqGcVDXcl0b8vMZmc12cxmIRsA0f9Mp5vqPoxlZGtr8JCzUKi UaTTY4MIRx3sSITLWO+eXH8oAnA+f6A8xsS4le9rjGwDdLfCluBT7OIPR+NH9fxlD6rK R+UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698590418; x=1699195218; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d8/+t1Wn3xaNr0a1Y4hypvWCjpYURJDzN9UK9/wYiss=; b=msNOslhsFF6vmW30yF8TSHu7MpS8ELPsfV3kk98Vio+kzsrBKRcUq3sH7Eiu+ykuOK 4nPDUNpc87yHiPDpylQuZuB/cl8l0BLYDqoeFCH64UDKoE3L6gemlLhXjNcqfiMDPRyW SdLaLdTUKuSZXTak8rqm0vPW5GGfsEHoRMFMikvklUFA48GJbqC3l4d/j3vr3P/kWDOm 8gZ0zQpwJUwl+sloJiDE0of80pO3CI/iPg8y/TBUqflEwpfEPY8uz2Jr4/qgtZJfooh/ is/ncoTz75SoT4LfLW6rPxY4ZVYnkIzcMJ2UcvMBPkr+dIne9j+kZeZVB2Gr61OYF590 JJjA== X-Gm-Message-State: AOJu0YxvoqF4gNgmo++Kch736HO53uvzA9tu3jSoCrdGB7Qi9RyZTKYT CbCXHfSu9jyxorYlPkHPTv8OW9RqkpW/pz0J7sw= X-Google-Smtp-Source: AGHT+IEwzdwIUHpDLIvebCogScYeTCItttqgbKgQ8tfkAmdGkN9DqBE7e6wDDYDSmYKbcznutL6Q7w== X-Received: by 2002:a05:600c:354c:b0:408:4cf1:e9d7 with SMTP id i12-20020a05600c354c00b004084cf1e9d7mr6317728wmq.20.1698590418528; Sun, 29 Oct 2023 07:40:18 -0700 (PDT) Received: from doug.com ([2a01:e34:ec69:c8b0:530e:366:bd55:7769]) by smtp.gmail.com with ESMTPSA id s10-20020a5d69ca000000b00323287186aasm6059590wrw.32.2023.10.29.07.40.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 07:40:18 -0700 (PDT) From: Pierre-Henry =?utf-8?b?RnLDtmhyaW5n?= Date: Sun, 29 Oct 2023 15:36:55 +0100 Message-ID: <6e5850df7e25c79f44d9f9038fce595cd209878a.1698590244.git.phfrohring@deeplinks.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Wrapped Erlang programs (`erl`, `erlc`, `escript`) now prepend ERL_LIBS with GUIX_ERL_LIBS. Reference: https://www.erlang.org/doc/man/code#code-path. The `native-search-paths` field in the package specification sets GUIX_ERL_LIBS, which aggregates all compiled libraries for Erlang and Elixir, akin to the functionality of GUIX_PYTHONPATH. Change-Id: I53d0462eb366ebe66422e0b187f4db091a9fe5b5 --- gnu/packages/erlang.scm | 101 ++++++++++++++++++++++++---------------- 1 file changed, 60 insertions(+), 41 deletions(-) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index c53cb72c..dafc0e81 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -28,22 +28,23 @@ (define-module (gnu packages erlang) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix gexp) - #:use-module (guix build-system gnu) - #:use-module (guix build-system emacs) - #:use-module (guix build-system rebar) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (gnu packages) + #:use-module (gnu packages elixir) #:use-module (gnu packages fontutils) #:use-module (gnu packages gl) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) - #:use-module (gnu packages version-control) #:use-module (gnu packages tls) - #:use-module (gnu packages wxwidgets)) + #:use-module (gnu packages version-control) + #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages) + #:use-module (guix build-system emacs) + #:use-module (guix build-system gnu) + #:use-module (guix build-system rebar) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils)) (define-public erlang (package @@ -173,7 +174,16 @@ (define-public erlang (substitute* (string-append out "/bin/erl") (("basename") (which "basename")) (("dirname") (which "dirname")))))) - (add-after 'install 'install-doc + (add-after 'patch-erl 'wrap-programs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (programs '("erl" "erlc" "escript"))) + (for-each + (lambda (program) + (wrap-program (string-append out "/bin/" program) + '("ERL_LIBS" ":" prefix ("${GUIX_ERL_LIBS}")))) + programs)))) + (add-after 'wrap-programs 'install-doc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (manpages (assoc-ref inputs "erlang-manpages")) @@ -181,6 +191,15 @@ (define-public erlang (mkdir-p share) (with-directory-excursion share (invoke "tar" "xvf" manpages)))))))) + (native-search-paths + (list (search-path-specification + (variable "GUIX_ERL_LIBS") + (files + (list + "lib/erlang/lib" + (string-append + "lib/elixir/" + (version-major+minor (package-version elixir)))))))) (home-page "https://www.erlang.org/") (synopsis "The Erlang programming language") (description @@ -219,12 +238,12 @@ (define-public erlang-bbmustache (source (origin (method url-fetch) - (uri (hexpm-uri "bbmustache" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "0fvvaxdpziygxl30j59g98qkh2n47xlb7w5dfpsm2bfcsnj372v8")))) (build-system rebar-build-system) (inputs - (list erlang-getopt rebar3-git-vsn + (list erlang-getopt erlang-rebar3-git-vsn erlang-edown)) ; for building the docs (arguments `(#:tests? #f ;; requires mustache specification file @@ -251,7 +270,7 @@ (define-public erlang-certifi (source (origin (method url-fetch) - (uri (hexpm-uri "certifi" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "0ha6vmf5p3xlbf5w1msa89frhvfk535rnyfybz9wdmh6vdms8v96")))) (build-system rebar-build-system) @@ -275,7 +294,7 @@ (define-public erlang-cf (source (origin (method url-fetch) - (uri (hexpm-uri "cf" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "0wknz4xkqkhgvlx4vx5619p8m65v7g87lfgsvfy04jrsgm28spii")))) (build-system rebar-build-system) @@ -314,7 +333,7 @@ (define-public erlang-covertool (source (origin (method url-fetch) - (uri (hexpm-uri "covertool" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "1p0c1n3nl4063xwi1sv176l1x68xqf07qwvj444a5z888fx6i5aw")))) (build-system rebar-build-system) @@ -335,7 +354,7 @@ (define-public erlang-cth-readable (source (origin (method url-fetch) - (uri (hexpm-uri "cth_readable" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "104xgybb6iciy6i28pyyrarqzliddi8kjyq43ajaav7y5si42rb8")))) (build-system rebar-build-system) @@ -356,7 +375,7 @@ (define-public erlang-edown (source (origin (method url-fetch) - (uri (hexpm-uri "edown" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "0ij47gvgs6yfqphj0f54qjzj18crj8y1dsjjlzpp3dp8pscqzbqw")))) (build-system rebar-build-system) @@ -373,7 +392,7 @@ (define-public erlang-erlware-commons (source (origin (method url-fetch) - (uri (hexpm-uri "erlware_commons" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "18qam9xdzi74wppb0cj4zc8161i0i8djr79z8662m6d276f2jz5m")))) (build-system rebar-build-system) @@ -400,7 +419,7 @@ (define-public erlang-eunit-formatters (source (origin (method url-fetch) - (uri (hexpm-uri "eunit_formatters" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n")))) (build-system rebar-build-system) @@ -416,7 +435,7 @@ (define-public erlang-getopt (source (origin (method url-fetch) - (uri (hexpm-uri "getopt" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "09pasi7ki1rivw9sl7xndj5qgjbdqvcscxk83yk85yr28gm9l0m0")))) (build-system rebar-build-system) @@ -433,7 +452,7 @@ (define-public erlang-hex-core (source (origin (method url-fetch) - (uri (hexpm-uri "hex_core" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "06p65hlm29ky03vs3fq3qz6px2ylwp8b0f2y75wdf5cm0kx2332b")))) (build-system rebar-build-system) @@ -445,7 +464,7 @@ (define-public erlang-hex-core (when tests? (invoke "rebar3" "as" "test" "proper"))))))) (inputs - (list erlang-proper rebar3-proper)) + (list erlang-proper erlang-rebar3-proper)) (home-page "https://github.com/hexpm/hex_core") (synopsis "Reference implementation of Hex specifications") (description "This package provides the reference implementation of Hex @@ -459,7 +478,7 @@ (define-public erlang-jsone (source (origin (method url-fetch) - (uri (hexpm-uri "jsone" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "1gaxiw76syjp3s9rygskm32y9799b917q752rw8bxj3bxq93g8x3")))) (build-system rebar-build-system) @@ -483,7 +502,7 @@ (define-public erlang-parse-trans (source (origin (method url-fetch) - (uri (hexpm-uri "parse_trans" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "16p4c2xjrvz16kzpr9pmcvi6nxq6rwckqi9fp0ksibaxwxn402k2")))) (build-system rebar-build-system) @@ -506,7 +525,7 @@ (define-public erlang-proper (source (origin (method url-fetch) - (uri (hexpm-uri "proper" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "1fwcas4a9kz3w3z1jqdk9lw8822srfjk9lcpvbxkxlsv3115ha0q")))) (build-system rebar-build-system) @@ -532,7 +551,7 @@ (define-public erlang-jsx (version "3.1.0") (source (origin (method url-fetch) - (uri (hexpm-uri "jsx" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "1wr7jkxm6nlgvd52xhniav64xr9rml2ngb35rwjwqlqvq7ywhp0c")))) @@ -550,7 +569,7 @@ (define-public erlang-providers (source (origin (method url-fetch) - (uri (hexpm-uri "providers" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "05y0kz3xgx77hzn1l05byaisvmk8bgds7c22hrh0a5ba81sfi1yj")))) (build-system rebar-build-system) @@ -568,7 +587,7 @@ (define-public erlang-relx (source (origin (method url-fetch) - (uri (hexpm-uri "relx" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "02gmfx1vxg9m3mq4njsqhs4972l4nb8m5p1pdcf64g09ccf17y1g")))) (build-system rebar-build-system) @@ -590,7 +609,7 @@ (define-public erlang-ssl-verify-fun (source (origin (method url-fetch) - (uri (hexpm-uri "ssl_verify_fun" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x")))) (build-system rebar-build-system) @@ -676,14 +695,14 @@ (define-public rebar3 of locations (git, hg, etc).") (license license:asl2.0))) -(define-public rebar3-raw-deps +(define-public erlang-rebar3-raw-deps (package - (name "rebar3-raw-deps") + (name "erlang-rebar3-raw-deps") (version "2.0.0") (source (origin (method url-fetch) - (uri (hexpm-uri "rebar3_raw_deps" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "1pzmm3m8gb2s9jn8fp6shzgfmy4mvh2vdci0z6nsm74ma3ffh1i3")))) (build-system rebar-build-system) @@ -693,14 +712,14 @@ (define-public rebar3-raw-deps applications as a dependent libraries.") (license license:expat))) -(define-public rebar3-git-vsn +(define-public erlang-rebar3-git-vsn (package - (name "rebar3-git-vsn") + (name "erlang-rebar3-git-vsn") (version "1.1.1") (source (origin (method url-fetch) - (uri (hexpm-uri "rebar3_git_vsn" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "1dfz56034pa25axly9vqdzv3phkn8ll0qwrkws96pbgcprhky1hx")))) (build-system rebar-build-system) @@ -724,14 +743,14 @@ (define-public rebar3-git-vsn a git checkout.") (license license:expat))) -(define-public rebar3-proper +(define-public erlang-rebar3-proper (package - (name "rebar3-proper") + (name "erlang-rebar3-proper") (version "0.12.1") (source (origin (method url-fetch) - (uri (hexpm-uri "rebar3_proper" version)) + (uri (hexpm-uri name version)) (sha256 (base32 "1f174fb6h2071wr7qbw9aqqvnglzsjlylmyi8215fhrmi38w94b6")))) (build-system rebar-build-system) @@ -803,7 +822,7 @@ (define-public erlang-lfe (setenv "REBAR_CACHE_DIR" "/tmp") (invoke "make" "-j" (number->string (parallel-job-count)) "tests")))))))) - (native-inputs (list rebar3 rebar3-proper erlang-proper)) + (native-inputs (list rebar3 erlang-rebar3-proper erlang-proper)) (propagated-inputs (list erlang)) (home-page "https://github.com/lfe/lfe") (synopsis "Lisp Flavoured Erlang")