From patchwork Fri Nov 1 13:45:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?T3NrYXIgS8O2w7Zr?= X-Patchwork-Id: 15913 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 D65F2176B0; Fri, 1 Nov 2019 14:33:16 +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,HTML_MESSAGE, RCVD_IN_MSPIKE_H2,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 85037176AE for ; Fri, 1 Nov 2019 14:33:16 +0000 (GMT) Received: from localhost ([::1]:39696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iQXzH-0003Pq-F1 for patchwork@mira.cbaines.net; Fri, 01 Nov 2019 10:33:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39307) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iQXz7-0003OD-Jt for guix-patches@gnu.org; Fri, 01 Nov 2019 10:33:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iQXz6-0000cN-7p for guix-patches@gnu.org; Fri, 01 Nov 2019 10:33:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47950) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iQXz5-0000c5-Pg for guix-patches@gnu.org; Fri, 01 Nov 2019 10:33:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iQXz5-0004dq-L2 for guix-patches@gnu.org; Fri, 01 Nov 2019 10:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37912] [PATCH] gnu: elixir: Update to 1.9.2. Resent-From: Oskar =?utf-8?b?S8O2w7Zr?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2019 14:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37912 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 37912 <37912@debbugs.gnu.org> Received: via spool by 37912-submit@debbugs.gnu.org id=B37912.157261876717786 (code B ref 37912); Fri, 01 Nov 2019 14:33:03 +0000 Received: (at 37912) by debbugs.gnu.org; 1 Nov 2019 14:32:47 +0000 Received: from localhost ([127.0.0.1]:56766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iQXyo-0004ck-Iw for submit@debbugs.gnu.org; Fri, 01 Nov 2019 10:32:47 -0400 Received: from w4.tutanota.de ([81.3.6.165]:38322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iQXEl-0000tg-AH for 37912@debbugs.gnu.org; Fri, 01 Nov 2019 09:45:12 -0400 Received: from w2.tutanota.de (unknown [192.168.1.163]) by w4.tutanota.de (Postfix) with ESMTP id D0D1B106026C; Fri, 1 Nov 2019 13:45:04 +0000 (UTC) Date: Fri, 1 Nov 2019 14:45:04 +0100 (CET) From: Oskar =?utf-8?b?S8O2w7Zr?= Message-ID: In-Reply-To: <875zk4plty.fsf@devup.no> References: <875zk4plty.fsf@devup.no> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 01 Nov 2019 10:32:43 -0400 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 Thank you for your response! You were right, /bin/sh was the issue. I did some grepping and found Elixir was generating files that depend on /bin/sh. I am now able to build Elixir 1.9.2 on Guix. I am attaching the patch to this e-mail. Please format/fix the code as necessary, I am not too familiar with Guile and other Scheme/Lisp languages. Oskar Nov 1, 2019, 00:54 by mbakke@fastmail.com: > Oskar Köök writes: > >> Sorry, first time using Guix. >> >> Some Elixir tests are failing, caused by a new feature. I have locally fixed most of the issues related to this (I can now manually run the Makefile in the generated Guix folder without any tests failing), but I am stuck on a part where the tests spawn binaries and wait for a certain file to be created in a certain location. This does not work during the Guix build. >> > > Perhaps it requires a network connection? Or /bin/sh? Those are the > most common sources of things failing in the build container but not on > a "regular" system. > >> I will examine further over the weekend. If I can not fix these tests, is it acceptable to disable them? I can verify that the behaviour being tested works manually. >> > > We should find out why they are failing in either case. :-) > From f2eb88f567f93e578e3c2df76046fed4f45645f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20K=C3=B6=C3=B6k?= Date: Thu, 24 Oct 2019 23:37:38 +0300 Subject: [PATCH] gnu: elixir: Update to 1.9.2. * gnu/packages/elixir.scm (elixir): Update to 1.9.2. --- gnu/packages/elixir.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 88ada71aea..144a8cc4e7 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -33,7 +33,7 @@ (define-public elixir (package (name "elixir") - (version "1.8.2") + (version "1.9.2") (source (origin (method git-fetch) @@ -42,7 +42,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq")) + (base32 "19yn6nx6r627f5zbyc7ckgr96d6b45sgwx95n2gp2imqwqvpj8wc")) (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments @@ -63,9 +63,21 @@ "lib/mix/lib/mix/scm/git.ex") (("(cmd\\(['\"])git" _ prefix) (string-append prefix (which "git")))) + (substitute* '("lib/mix/lib/mix/release.ex" + "lib/mix/lib/mix/tasks/release.init.ex") + (("#!/bin/sh") + (string-append "#!" (which "sh")))) (substitute* "bin/elixir" - (("ERL_EXEC=\"erl\"") - (string-append "ERL_EXEC=" (which "erl")))) + (("ERTS_BIN=") + (string-append + "ERTS_BIN=" + ;; Elixir Releases will prepend to ERTS_BIN the path of a copy of erl. + ;; We detect if a release is being generated by checking the initial ERTS_BIN + ;; value: if it's empty, we are not in release mode and can point to the actual + ;; erl binary in Guix store. + "\nif [ -z \"$ERTS_BIN\" ]; then ERTS_BIN=" + (string-drop-right (which "erl") 3) + "; fi"))) (substitute* "bin/mix" (("#!/usr/bin/env elixir") (string-append "#!" out "/bin/elixir")))) -- 2.21.0