[bug#75172] [PATCH] gnu: fennel: Update to 1.5.1.

[bug#75172] [PATCH] gnu: fennel: Update to 1.5.1.

[Yovan Naumovski]

* gnu/packages/lua.scm (fennel): Update to 1.5.1.

Change-Id: I6775e34e470a957a741a2b079d5e8040c98921d2
---
 gnu/packages/lua.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 074ab6a0aa..7d060ed3e4 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -1396,7 +1396,7 @@ (define-public emilua
 (define-public fennel
   (package
     (name "fennel")
-    (version "1.5.0")
+    (version "1.5.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1405,7 +1405,7 @@ (define-public fennel
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0d25v7swq3msxsdzv91wwxy89y3qgw4bvzq1px89qsjzbbd7ccg2"))))
+                "09m7v62qw058llfrfqja14yx8ngjzrfx10hf2h1cc5zz0nbw89bj"))))
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags #~(list (string-append "PREFIX="
@@ -1416,6 +1416,11 @@ (define-public fennel
                         (delete 'configure)
                         (add-after 'build 'patch-fennel
                           (lambda* (#:key inputs #:allow-other-keys)
+                            ;; Skip IRC CI build status reporting, it's not
+                            ;; used here.
+                            (substitute* "test/irc.lua"
+                              (("local is_origin")
+                               "if remote == nil then\nreturn function() end\nend\nlocal is_origin"))
                             (substitute* "fennel"
                               (("/usr/bin/env .*lua")
                                (search-input-file inputs "/bin/lua")))))

base-commit: a34d8e2721d458e09f63b654dfe79e78589ac9a9
-- 
2.46.0

[bug#75172] QA review for 75172

[Noé Lopez via Guix-patches via]

user guix
usertag 75172 + reviewed-looks-good
thanks

Guix QA review form submission:
Thanks for the patch, it builds and works well.

The line you added in substitute* is a bit too long, but I think you can
just replace the \n with an actual line break:

                            (substitute* "test/irc.lua"
                              (("local is_origin")
                               "if remote == nil then
return function() end\nend\nlocal is_origin"))

Have a nice day,
Noé Lopez

Items marked as checked: Package builds, Commit messages

[bug#75172] [PATCH] gnu: fennel: Update to 1.5.1.

[Yovan Naumovski]

* gnu/packages/lua.scm (fennel): Update to 1.5.1.

Thanks Noé, I split the long line as suggested.

Change-Id: I6775e34e470a957a741a2b079d5e8040c98921d2
---
 gnu/packages/lua.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 074ab6a0aa..24ec843cd4 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -1396,7 +1396,7 @@ (define-public emilua
 (define-public fennel
   (package
     (name "fennel")
-    (version "1.5.0")
+    (version "1.5.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1405,7 +1405,7 @@ (define-public fennel
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0d25v7swq3msxsdzv91wwxy89y3qgw4bvzq1px89qsjzbbd7ccg2"))))
+                "09m7v62qw058llfrfqja14yx8ngjzrfx10hf2h1cc5zz0nbw89bj"))))
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags #~(list (string-append "PREFIX="
@@ -1416,6 +1416,12 @@ (define-public fennel
                         (delete 'configure)
                         (add-after 'build 'patch-fennel
                           (lambda* (#:key inputs #:allow-other-keys)
+                            ;; Skip IRC CI build status reporting, it's not
+                            ;; used here.
+                            (substitute* "test/irc.lua"
+                              (("local is_origin")
+                               "if remote == nil then
+return function() end\nend\nlocal is_origin"))
                             (substitute* "fennel"
                               (("/usr/bin/env .*lua")
                                (search-input-file inputs "/bin/lua")))))

base-commit: a34d8e2721d458e09f63b654dfe79e78589ac9a9
-- 
2.46.0

[bug#75172] [PATCH] gnu: fennel: Update to 1.5.1.

[Ian Eure]

Hi Yovan,

I think it’d be a better approach to remove test/irc.lua from the 
test suite entirely, rather than patch test/irc.lua itself.  I 
believe removing the second argument to t.run in test/init.lua 
will accomplish this.

I’d also suggest to upstream that there should be a clearer 
mechanism to enable/disable IRC reporting, perhaps via an 
environment variable.

  -- Ian

[bug#75172] [PATCH] gnu: fennel: Update to 1.5.1.

[Yovan Naumovski]

* gnu/packages/lua.scm (fennel): Update to 1.5.1.

Hey Ian,

I took that snippet from the main branch [1] and the test phase
probably won't fail there in the next version, but I agree - removing
test/irc.lua is better as the CI build status reporting is not used by
Guix.

Thanks,
Yovan.

[1] - https://git.sr.ht/~technomancy/fennel/tree/main/item/test/irc.lua#L6

Change-Id: I6775e34e470a957a741a2b079d5e8040c98921d2
---
 gnu/packages/lua.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 074ab6a0aa..4c65bcbf12 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -1396,7 +1396,7 @@ (define-public emilua
 (define-public fennel
   (package
     (name "fennel")
-    (version "1.5.0")
+    (version "1.5.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1405,7 +1405,7 @@ (define-public fennel
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0d25v7swq3msxsdzv91wwxy89y3qgw4bvzq1px89qsjzbbd7ccg2"))))
+                "09m7v62qw058llfrfqja14yx8ngjzrfx10hf2h1cc5zz0nbw89bj"))))
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags #~(list (string-append "PREFIX="
@@ -1416,6 +1416,11 @@ (define-public fennel
                         (delete 'configure)
                         (add-after 'build 'patch-fennel
                           (lambda* (#:key inputs #:allow-other-keys)
+                            ;; Remove IRC CI build status reporting
+                            (delete-file "test/irc.lua")
+                            (substitute* "test/init.lua"
+                              ((",\\{hooks=\\{exit=dofile\\(\"test/irc.lua\"\\)\\}\\}")
+                               ""))
                             (substitute* "fennel"
                               (("/usr/bin/env .*lua")
                                (search-input-file inputs "/bin/lua")))))

base-commit: a34d8e2721d458e09f63b654dfe79e78589ac9a9
-- 
2.46.0