GNU bug report logs - #53681
[PATCH] gnu: guile-fibers: Add version 1.1.0.

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 53681 in the body.
You can then email your comments to 53681 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: Christopher Baines <mail <at> cbaines.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: guile-fibers: Add version 1.1.0.
Date: Tue,  1 Feb 2022 08:53:26 +0000

This release looks to break a few packages, so keep using fibers 1.0 to build
things, and provide the new version to allow switching to when packages are
compatible.

* gnu/packages/guile-xyz.scm (guile-fibers-1.1): New variable.
(guile-fibers): Inherit from guile-fibers-1.1.
(guile2.0-fibers): Rename to guile2.2-fibers, and inherit from
guile-fibers-1.1.
---
 gnu/packages/guile-xyz.scm | 73 ++++++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 38c6def1fc..f35ba43057 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -601,9 +601,55 @@ (define-public guile2.2-dsv
     (inputs (list guile-2.2))
     (propagated-inputs `(("guile-lib" ,guile2.2-lib)))))
 
-(define-public guile-fibers
+(define-public guile-fibers-1.1
   (package
     (name "guile-fibers")
+    (version "1.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/wingo/fibers/releases/download/v"
+                    version "/fibers-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1lqz39shlhif5fhpyv2wili0yzb0nhf5ciiv7mdqsq0vljirhrm0"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (add-after 'install 'mode-guile-objects
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      ;; .go files are installed to "lib/guile/X.Y/cache".
+                      ;; This phase moves them to "…/site-ccache".
+                      (let* ((out (assoc-ref outputs "out"))
+                             (lib (string-append out "/lib/guile"))
+                             (old (car (find-files lib "^ccache$"
+                                                   #:directories? #t)))
+                             (new (string-append (dirname old)
+                                                 "/site-ccache")))
+                        (rename-file old new)
+                        #t))))))
+    (native-inputs
+     (list texinfo pkg-config))
+    (inputs
+     (list guile-3.0))
+    (synopsis "Lightweight concurrency facility for Guile")
+    (description
+     "Fibers is a Guile library that implements a a lightweight concurrency
+facility, inspired by systems like Concurrent ML, Go, and Erlang.  A fiber is
+like a \"goroutine\" from the Go language: a lightweight thread-like
+abstraction.  Systems built with Fibers can scale up to millions of concurrent
+fibers, tens of thousands of concurrent socket connections, and many parallel
+cores.  The Fibers library also provides Concurrent ML-like channels for
+communication between fibers.
+
+Note that Fibers makes use of some Guile 2.1/2.2-specific features and
+is not available for Guile 2.0.")
+    (home-page "https://github.com/wingo/fibers")
+    (license license:lgpl3+)))
+
+(define-public guile-fibers
+  (package
+    (inherit guile-fibers-1.1)
     (version "1.0.0")
     (source (origin
               (method url-fetch)
@@ -637,7 +683,6 @@ (define-public guile-fibers
               (patches
                ;; fixes a resource leak that causes crashes in the tests
                (search-patches "guile-fibers-destroy-peer-schedulers.patch"))))
-    (build-system gnu-build-system)
     (arguments
      '(;; The code uses 'scm_t_uint64' et al., which are deprecated in 3.0.
        #:configure-flags '("CFLAGS=-Wno-error=deprecated-declarations")
@@ -653,29 +698,11 @@ (define-public guile-fibers
                              (new (string-append (dirname old)
                                                  "/site-ccache")))
                         (rename-file old new)
-                        #t))))))
-    (native-inputs
-     (list texinfo pkg-config))
-    (inputs
-     (list guile-3.0))
-    (synopsis "Lightweight concurrency facility for Guile")
-    (description
-     "Fibers is a Guile library that implements a a lightweight concurrency
-facility, inspired by systems like Concurrent ML, Go, and Erlang.  A fiber is
-like a \"goroutine\" from the Go language: a lightweight thread-like
-abstraction.  Systems built with Fibers can scale up to millions of concurrent
-fibers, tens of thousands of concurrent socket connections, and many parallel
-cores.  The Fibers library also provides Concurrent ML-like channels for
-communication between fibers.
-
-Note that Fibers makes use of some Guile 2.1/2.2-specific features and
-is not available for Guile 2.0.")
-    (home-page "https://github.com/wingo/fibers")
-    (license license:lgpl3+)))
+                        #t))))))))
 
-(define-public guile2.0-fibers
+(define-public guile2.2-fibers
   (package
-    (inherit guile-fibers)
+    (inherit guile-fibers-1.1)
     (name "guile2.2-fibers")
     (inputs (list guile-2.2))))
 
-- 
2.34.0

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Christopher Baines <mail <at> cbaines.net>
Cc: 53681 <at> debbugs.gnu.org
Subject: Re: bug#53681: [PATCH] gnu: guile-fibers: Add version 1.1.0.
Date: Tue, 01 Feb 2022 20:19:47 +0100

Hi!

Christopher Baines <mail <at> cbaines.net> skribis:

> This release looks to break a few packages, so keep using fibers 1.0 to build
> things, and provide the new version to allow switching to when packages are
> compatible.
>
> * gnu/packages/guile-xyz.scm (guile-fibers-1.1): New variable.
> (guile-fibers): Inherit from guile-fibers-1.1.
> (guile2.0-fibers): Rename to guile2.2-fibers, and inherit from
> guile-fibers-1.1.

LGTM!

I’m curious to see which ones break with 1.1, though.

Thanks,
Ludo’.

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

From: Christopher Baines <mail <at> cbaines.net>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 53681-done <at> debbugs.gnu.org
Subject: Re: bug#53681: [PATCH] gnu: guile-fibers: Add version 1.1.0.
Date: Wed, 02 Feb 2022 18:42:38 +0000

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

Ludovic Courtès <ludo <at> gnu.org> writes:

> Hi!
>
> Christopher Baines <mail <at> cbaines.net> skribis:
>
>> This release looks to break a few packages, so keep using fibers 1.0 to build
>> things, and provide the new version to allow switching to when packages are
>> compatible.
>>
>> * gnu/packages/guile-xyz.scm (guile-fibers-1.1): New variable.
>> (guile-fibers): Inherit from guile-fibers-1.1.
>> (guile2.0-fibers): Rename to guile2.2-fibers, and inherit from
>> guile-fibers-1.1.
>
> LGTM!
>
> I’m curious to see which ones break with 1.1, though.

Great, pushed as 1d07213d235fa097551cc68834db0237327435fb.

Thanks,

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

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