GNU bug report logs - #40984
[PATCH 1/2] gnu: Add guile3.0-ncurses.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 40984 in the body.
You can then email your comments to 40984 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Martin Becze <mjbecze <at> riseup.net>
To: guix-patches <at> gnu.org
Cc: Martin Becze <mjbecze <at> riseup.net>
Subject: [PATCH 1/2] gnu: Add guile3.0-ncurses.
Date: Thu, 30 Apr 2020 11:37:48 -0500

* gnu/packages/guile-xyz.scm (guile3.0-ncurses): new variable.
---
 gnu/packages/guile-xyz.scm | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 6ec1c4c2fc..37511e9bca 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -23,7 +23,7 @@
 ;;; Copyright © 2019 swedebugia <swedebugia <at> riseup.net>
 ;;; Copyright © 2019, 2020 Amar Singh <nly <at> disroot.org>
 ;;; Copyright © 2019 Timothy Sample <samplet <at> ngyro.com>
-;;; Copyright © 2019 Martin Becze <mjbecze <at> riseup.net>
+;;; Copyright © 2019, 2020 Martin Becze <mjbecze <at> riseup.net>
 ;;; Copyright © 2020 Evan Straw <evan.straw99 <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -1858,6 +1858,33 @@ many readers as needed).")
 library.")
     (license license:lgpl3+)))
 
+(define-public guile3.0-ncurses
+  (package
+    (inherit guile-ncurses)
+    (name "guile3.0-ncurses")
+    (version "3.0")
+    (inputs `(("ncurses" ,ncurses)
+              ("guile" ,guile-3.0)))
+    (arguments
+     '(#:configure-flags (list "--with-ncursesw"  ; unicode support
+                               "--with-gnu-filesystem-hierarchy")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'fix-libguile-ncurses-file-name
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "make" "install"
+                     "-c" "src/ncurses"
+                     "-j" (number->string
+                           (parallel-job-count)))
+             (let* ((out   (assoc-ref outputs "out"))
+                    (dir   "src/ncurses")
+                    (files (find-files dir ".scm")))
+               (substitute* files
+                 (("\"libguile-ncurses\"")
+                  (format #f "\"~a/lib/guile/3.0/libguile-ncurses\""
+                          out)))
+               #t))))))))
+
 (define-public guile-ncurses/gpm
   (package
     (inherit guile-ncurses)
-- 
2.26.2

Message #8 received at 40984 <at> debbugs.gnu.org (full text, mbox):

From: Martin Becze <mjbecze <at> riseup.net>
To: 40984 <at> debbugs.gnu.org
Cc: Martin Becze <mjbecze <at> riseup.net>
Subject: [PATCH 2/2] gnu: Add guile3.0-ncurses-with-gpm.
Date: Thu, 30 Apr 2020 12:00:19 -0500

* gnu/packages/guile-xyz.scm (guile3.0-ncurses/gpm): New variable.
---
 gnu/packages/guile-xyz.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 37511e9bca..82a5362637 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1892,6 +1892,13 @@ library.")
     (inputs `(("ncurses" ,ncurses/gpm)
               ("guile" ,guile-2.2)))))
 
+(define-public guile3.0-ncurses/gpm
+  (package
+    (inherit guile3.0-ncurses)
+    (name "guile3.0-ncurses-with-gpm")
+    (inputs `(("ncurses" ,ncurses/gpm)
+              ("guile" ,guile-3.0)))))
+
 (define-public guile-lib
   (package
     (name "guile-lib")
-- 
2.26.2

Message #11 received at 40984 <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <m.othacehe <at> gmail.com>
To: Martin Becze <mjbecze <at> riseup.net>
Cc: 40984 <at> debbugs.gnu.org
Subject: Re: [bug#40984] [PATCH 1/2] gnu: Add guile3.0-ncurses.
Date: Fri, 01 May 2020 12:47:16 +0200

Hello Martin,

Thanks for this patch.

> +               (substitute* files
> +                 (("\"libguile-ncurses\"")
> +                  (format #f "\"~a/lib/guile/3.0/libguile-ncurses\""
> +                          out)))
> +               #t))))))))

I think you could modify guile-ncurses to use "effective-version"
instead of hardcoded "2.2". This way, guile3.0-ncurses would just
inherit from guile-ncurses this way:

--8<---------------cut here---------------start------------->8---
(define-public guile3.0-ncurses
  (package
    (inherit guile-ncurses)
    (name "guile3.0-ncurses")
    (version "3.0")
    (inputs `(("ncurses" ,ncurses)
              ("guile" ,guile-3.0)))))
--8<---------------cut here---------------end--------------->8---

WDYT?

Thanks,

Mathieu

Message #14 received at 40984 <at> debbugs.gnu.org (full text, mbox):

From: Martin Becze <mjbecze <at> riseup.net>
To: Mathieu Othacehe <m.othacehe <at> gmail.com>
Cc: 40984 <at> debbugs.gnu.org
Subject: Re: [bug#40984] [PATCH 1/2] gnu: Add guile3.0-ncurses.
Date: Fri, 1 May 2020 13:16:31 -0500

[Message part 1 (text/plain, inline)]

Ok I think figured it out! Attached is the updated patch. I had to use
(target-guile-effective-version) instead of effective-version.

On 5/1/20 5:47 AM, Mathieu Othacehe wrote:
> 
> Hello Martin,
> 
> Thanks for this patch.
> 
>> +               (substitute* files
>> +                 (("\"libguile-ncurses\"")
>> +                  (format #f "\"~a/lib/guile/3.0/libguile-ncurses\""
>> +                          out)))
>> +               #t))))))))
> 
> I think you could modify guile-ncurses to use "effective-version"
> instead of hardcoded "2.2". This way, guile3.0-ncurses would just
> inherit from guile-ncurses this way:
> 
> --8<---------------cut here---------------start------------->8---
> (define-public guile3.0-ncurses
>   (package
>     (inherit guile-ncurses)
>     (name "guile3.0-ncurses")
>     (version "3.0")
>     (inputs `(("ncurses" ,ncurses)
>               ("guile" ,guile-3.0)))))
> --8<---------------cut here---------------end--------------->8---
> 
> WDYT?
> 
> Thanks,
> 
> Mathieu
> 

[0001-gnu-Add-guile3.0-ncurses.patch (text/x-patch, attachment)]

Message #19 received at 40984-done <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <m.othacehe <at> gmail.com>
To: Martin Becze <mjbecze <at> riseup.net>
Cc: 40984-done <at> debbugs.gnu.org
Subject: Re: [bug#40984] [PATCH 1/2] gnu: Add guile3.0-ncurses.
Date: Sat, 02 May 2020 12:32:36 +0200

Hello Martin,

> Ok I think figured it out! Attached is the updated patch. I had to use
> (target-guile-effective-version) instead of effective-version.

Nice! I pushed those patches to master.

Thanks,

Mathieu

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.