From patchwork Wed Sep 6 20:57:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Johann X-Patchwork-Id: 53618 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 EA19F27BBEA; Wed, 6 Sep 2023 21:59:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no 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 5FC1927BBE9 for ; Wed, 6 Sep 2023 21:59:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdzcA-0001V3-2Q; Wed, 06 Sep 2023 16:59:06 -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 1qdzc5-0001Ud-5b for guix-patches@gnu.org; Wed, 06 Sep 2023 16:59:02 -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 1qdzc4-0006PZ-Tz for guix-patches@gnu.org; Wed, 06 Sep 2023 16:59:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdzc5-00023T-Uq for guix-patches@gnu.org; Wed, 06 Sep 2023 16:59:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65313] [PATCH v2] * gnu/packages/erlang.scm (erlang-lfe): New variable. References: In-Reply-To: Resent-From: Tim Johann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Sep 2023 20:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65313 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65313@debbugs.gnu.org Cc: Tim Johann , maxim.cournoyer@gmail.com Received: via spool by 65313-submit@debbugs.gnu.org id=B65313.16940338887833 (code B ref 65313); Wed, 06 Sep 2023 20:59:01 +0000 Received: (at 65313) by debbugs.gnu.org; 6 Sep 2023 20:58:08 +0000 Received: from localhost ([127.0.0.1]:38002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdzbE-00022H-7W for submit@debbugs.gnu.org; Wed, 06 Sep 2023 16:58:08 -0400 Received: from ms-10.1blu.de ([178.254.4.101]:50848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdzbC-000228-7E for 65313@debbugs.gnu.org; Wed, 06 Sep 2023 16:58:07 -0400 Received: from [176.199.211.189] (helo=dolos.fritz.box) by ms-10.1blu.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qdzb9-00Af1u-Fw; Wed, 06 Sep 2023 22:58:03 +0200 From: Tim Johann Date: Wed, 6 Sep 2023 22:57:53 +0200 Message-ID: <43d67dfca58a7dd9384f5c566a50f3f647ce23ab.1694033873.git.t1m@phrogstar.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Con-Id: 303810 X-Con-U: 0-t1m X-Originating-IP: 176.199.211.189 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 --- gnu/packages/erlang.scm | 72 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) base-commit: 65dcfb3f3865d08467da747041263fd22460d393 diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index a7f161647b..b0ad4ea2a7 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -27,6 +27,7 @@ (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) @@ -738,3 +739,74 @@ (define-public rebar3-proper (description "This plugin allows running PropEr test suites from within rebar3.") (license license:bsd-3))) + +(define-public erlang-lfe + (package + (name "erlang-lfe") + (version "2.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lfe/lfe") + (commit "v2.1.2"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "180hz1p2v3vb6yyzcfwircmljlnd86ln8z80lzy3mwlyrcxblvxy")))) + (build-system gnu-build-system) + (native-inputs (list rebar3 rebar3-proper erlang-proper)) + (propagated-inputs (list erlang)) + (arguments + (list + #:modules '((ice-9 ftw) + (srfi srfi-26) + (guix build gnu-build-system) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + ;; The following is inspired by rebar-build-system.scm + (add-before 'check 'erlang-depends + (lambda* (#:key inputs #:allow-other-keys) + (define input-directories + (list #$(this-package-native-input "rebar3-proper") + #$(this-package-native-input "erlang-proper"))) + (mkdir-p "_checkouts") + (for-each + (lambda (input-dir) + (let ((elibdir (string-append input-dir "/lib/erlang/lib"))) + (when (directory-exists? elibdir) + (for-each + (lambda (dirname) + (let ((src (string-append elibdir "/" dirname)) + (dest (string-append "_checkouts/" dirname))) + (when (not (file-exists? dest)) + ;; symlinking will not work, since rebar3 will + ;; try to overwrite the _build directory several + ;; times with the contents of _checkout, so we + ;; copy the directory tree to _checkout and make + ;; it writeable. + (copy-recursively src dest #:follow-symlinks? #t) + (for-each (cut chmod <> #o777) (find-files dest))))) + (scandir elibdir (lambda (file) + (and (not (member file '("." ".."))) + (file-is-directory? + (string-append elibdir + "/" + file))))))))) + input-directories))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (begin + (setenv "REBAR_CACHE_DIR" "/tmp") + (invoke "make" "-j" "tests")))))) + #:make-flags + #~(list (string-append "PREFIX=" #$output) "CC=gcc"))) + (home-page "https://github.com/lfe/lfe") + (synopsis "Lisp Flavoured Erlang") + (description + "LFE, Lisp Flavoured Erlang, is a lisp syntax front-end to the Erlang +compiler. Code produced with it is compatible with \"normal\" Erlang + code. An LFE evaluator and shell is also included.") + (license license:asl2.0)))