[PATCH] Gnu: Elixir: Use previous method for detecting sh

Done

Details

3 participants

Ludovic Courtès
Maxime Devos
John Hamelink

Owner: unassigned

Submitted by: John Hamelink

Severity: normal

Merged with

53708

Debbugs page

John Hamelink wrote 3 years ago

Recipients:(address . guix-patches@gnu.org)

Message-ID:878ruwexe3.fsf@johnhame.link

gnu/packages/elixir.scm (elixir)[arguments]: Keep G-expressions, but use

========================================================================

WHICH instead of SEARCH-INPUT-FILES.

Signed-off-by: John Hamelink <me@johnhame.link>

---

gnu/packages/elixir.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Hi there,

While following a tutorial, I found myself struggling to build

elixir. After discussing on #guix, and looking on the build server for

clues, it seems that the SEARCH-INPUT-FILE change in 3da297997d ("gnu:

elixir: Use G-expressions.") was the culprit. Within the

G-expression, I reverted to the use of WHICH for the "sh" binary,

while leaving the others as they are.

I do not understand the differences between these two functions or why

SEARCH-INPUT-FILE is preferential, so there may be additional caveats I'm not

aware of that SEARCH-INPUT-FILE addresses.

Thanks

John

Toggle diff (15 lines)diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index 3fb74a56a5..5df50902ce 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -68,7 +68,7 @@ (define-public elixir
               (substitute* '("lib/mix/lib/mix/release.ex"
                              "lib/mix/lib/mix/tasks/release.init.ex")
                 (("#!/bin/sh")
- (string-append "#!" (search-input-file inputs "sh"))))
+ (string-append "#!" (which "sh"))))
  (substitute* "bin/elixir"
    (("^ERTS_BIN=$")
     (string-append
-- 
2.35.1

Maxime Devos wrote 3 years ago

Recipients:(name . John Hamelink)(address . me@johnhame.link)(address . 53643@debbugs.gnu.org)

Message-ID:1cfa84a32e79af82e0c57bfe11e4601a1db76880.camel@telenet.be

John Hamelink schreef op zo 30-01-2022 om 21:15 [+0000]:

Toggle quote (3 lines)

> - (string-append "#!" (search-input-file inputs "sh"))))

> + (string-append "#!" (which "sh"))))

'which' looks in $PATH, which is formed by native-inputs,

so this change is incorrect when cross-compiling.

Instead, I suggest:

- (string-append "#!" (search-input-file inputs "sh"))))

+ (string-append "#!" (search-input-file inputs "bin/sh"))))

Greetings,

Maxime.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYfcPNhccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7p7cAP4irrzsl+sdH1nvAcS3U5wMAg1F

lKJlLWFbRVDM0fhmWAD/RuhYk0gQ58PxNARynOPeOHvMVAud/zVL1+u1YR42eQY=

=ex28

-----END PGP SIGNATURE-----

Maxime Devos wrote 3 years ago

Recipients:(name . John Hamelink)(address . me@johnhame.link)(address . 53643@debbugs.gnu.org)

Message-ID:73379b4b9c971a9fcfe586a99f584e5fc33c2e23.camel@telenet.be

John Hamelink schreef op zo 30-01-2022 om 21:15 [+0000]:

Toggle quote (9 lines)

> gnu/packages/elixir.scm (elixir)[arguments]: Keep G-expressions, but

> use

> =====================================================================

> ===

> WHICH instead of SEARCH-INPUT-FILES.

> Signed-off-by: John Hamelink <me@johnhame.link>

That's not how Signed-off-by is used in Guix; Guix assigns a different

(albeit slightly related) meaning to Signed-off-by than Linux does, see

(guix)Commit access:

When pushing a commit on behalf of somebody else, please add a

‘Signed-off-by’ line at the end of the commit log message—e.g., with

‘git am --signoff’. This improves tracking of who did what.

Greetings,

Maxime.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYfcPkRccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7lMiAPsEOhCLElrT70bi1zl74PLwXfZE

/5HSnx2+FDyfQBJZIgD+IwN2gKJmXgiwVLxCIXOmn4J03KQAAbrwPkO9V64kzQ8=

=0Jz9

-----END PGP SIGNATURE-----

Maxime Devos wrote 3 years ago

Recipients:(name . John Hamelink)(address . me@johnhame.link)(address . 53643@debbugs.gnu.org)

Message-ID:eef44c42fe66491a0a186a5f7861cadcebede3bd.camel@telenet.be

John Hamelink schreef op zo 30-01-2022 om 21:15 [+0000]:

Toggle quote (2 lines)

> [bug#53643] [PATCH] Gnu: Elixir: Use previous method for detecting sh

The package is named 'elixir', not 'Elixir'. The directory is

$CHECKOUT/gnu, not $CHECKOUT/Gnu.

Greetings,

Maxime.

-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYfcPzBccbWF4aW1lZGV2

b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7jppAQDnZktn8GbuVfTBQjLo8lp8hs+X

Ys/MZaN1OgqRy34hCgEApvUdM9pQFHPH6puCduo8Q8whG+QixNcTHjd6q0shoQ0=

=2weB

-----END PGP SIGNATURE-----

John Hamelink wrote 3 years ago

Re: [bug#53643] [PATCH] gnu: elixir: Use previous method for detecting sh

Recipients:(name . Maxime Devos)(address . maximedevos@telenet.be)(address . 53643@debbugs.gnu.org)

Message-ID:87k0eg4xvy.fsf@johnhame.link

Hi Maxime,

Thanks for looking over my submission. I agree on all points.

Toggle quote (3 lines)

> - (string-append "#!" (search-input-file inputs "sh"))))

> + (string-append "#!" (search-input-file inputs "bin/sh"))))

The rest of the file's usage of search-input-file involves a

forward-slash before bin. I tried including the forward-slash and

leaving it out in all relevant places, and it doesn't seem like it

makes a difference - I didn't try to cross-compile, though. Regardless,

I made a patch for each option.

---

gnu/packages/elixir.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (49 lines)diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index 3fb74a56a5..fae8279e5c 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -68,7 +68,7 @@ (define-public elixir
               (substitute* '("lib/mix/lib/mix/release.ex"
                              "lib/mix/lib/mix/tasks/release.init.ex")
                 (("#!/bin/sh")
- (string-append "#!" (search-input-file inputs "sh"))))
+ (string-append "#!" (search-input-file inputs "/bin/sh"))))
  (substitute* "bin/elixir"
    (("^ERTS_BIN=$")
     (string-append
-- 
2.35.1

---
 gnu/packages/elixir.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index 3fb74a56a5..2fee929d6a 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -64,11 +64,11 @@ (define-public elixir
                              "lib/mix/lib/mix/scm/git.ex")
                 (("(cmd\\(['\"])git" _ prefix)
                  (string-append prefix
- (search-input-file inputs "/bin/git"))))
+ (search-input-file inputs "bin/git"))))
  (substitute* '("lib/mix/lib/mix/release.ex"
  	       "lib/mix/lib/mix/tasks/release.init.ex")
    (("#!/bin/sh")
- (string-append "#!" (search-input-file inputs "sh"))))
+ (string-append "#!" (search-input-file inputs "bin/sh"))))
  (substitute* "bin/elixir"
    (("^ERTS_BIN=$")
     (string-append
@@ -79,7 +79,7 @@ (define-public elixir
                   ;; 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 (search-input-file inputs "/bin/erl") 3)
+ (string-drop-right (search-input-file inputs "bin/erl") 3)
      "; fi\n")))
  (substitute* "bin/mix"
    (("#!/usr/bin/env elixir")
-- 
2.35.1

Ludovic Courtès wrote 3 years ago

control message for bug #53708

Recipients:(address . control@debbugs.gnu.org)

Message-ID:875yphy3gm.fsf@gnu.org

merge 53708 53643

quit

Ludovic Courtès wrote 3 years ago

Re: bug#53643: [PATCH] Gnu: Elixir: Use previous method for detecting sh

Recipients:(name . John Hamelink)(address . me@johnhame.link)(address . 53643-done@debbugs.gnu.org)(name . Cees de Groot)(address . cg@evrl.com)

Message-ID:87pmnpwlek.fsf@gnu.org

Hi,

Toggle quote (7 lines)

> While following a tutorial, I found myself struggling to build

> elixir. After discussing on #guix, and looking on the build server for

> clues, it seems that the SEARCH-INPUT-FILE change in 3da297997d ("gnu:

> elixir: Use G-expressions.") was the culprit. Within the

> G-expression, I reverted to the use of WHICH for the "sh" binary,

> while leaving the others as they are.

Fixed along the lines of what Maxime and Cees suggested.

Thanks,

Ludo’.

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 53643@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 53643

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags

mumi command -t +confirmed -t +easy

Or, remove the moreinfo tag and set the help tag

mumi command -t -moreinfo -t +help

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date