diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-05-22 18:13:53 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-05-22 21:56:39 +0200 |
commit | b25b029a3cc249c970b718d23e9b0a3737234212 (patch) | |
tree | d0848cb5ae5cb8d09c73d17618d0c3053c51ea1d | |
parent | gnu: sbcl: Improve reproducilbility. (diff) | |
download | guix-b25b029a3cc249c970b718d23e9b0a3737234212.tar.gz guix-b25b029a3cc249c970b718d23e9b0a3737234212.tar.bz2 guix-b25b029a3cc249c970b718d23e9b0a3737234212.tar.xz |
gnu: guile-fibers@1.1: Update to c25dcb9.
* gnu/packages/guile-xyz.scm (guile-fibers-1.1): Update to c25dcb9.
[arguments]: Remove 'regenerate-autotools' phase.
-rw-r--r-- | gnu/packages/guile-xyz.scm | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 06e3ffb485..6e0ba891bf 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm | |||
@@ -607,73 +607,73 @@ Unix-style DSV format and RFC 4180 format.") | |||
607 | (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) | 607 | (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) |
608 | 608 | ||
609 | (define-public guile-fibers-1.1 | 609 | (define-public guile-fibers-1.1 |
610 | (package | 610 | ;; Pick one commit above 1.1.0, which fixes a bug that's critical for the |
611 | (name "guile-fibers") | 611 | ;; Shepherd: <https://github.com/wingo/fibers/pull/57>. |
612 | (version "1.1.0") | 612 | (let ((commit "c25dcb9cc4b5b977474ffe555b40ce2f1d0d1edc") |
613 | (source (origin | 613 | (revision "0")) |
614 | (method url-fetch) | 614 | (package |
615 | (uri (string-append | 615 | (name "guile-fibers") |
616 | "https://github.com/wingo/fibers/releases/download/v" | 616 | (version (git-version "1.1.0" revision commit)) |
617 | version "/fibers-" version ".tar.gz")) | 617 | (source (origin |
618 | (sha256 | 618 | (method git-fetch) |
619 | (base32 | 619 | (uri (git-reference |
620 | "1lqz39shlhif5fhpyv2wili0yzb0nhf5ciiv7mdqsq0vljirhrm0")) | 620 | (url "https://github.com/wingo/fibers") |
621 | (patches | 621 | (commit commit))) |
622 | (search-patches "guile-fibers-wait-for-io-readiness.patch")))) | 622 | (file-name (git-file-name name version)) |
623 | (build-system gnu-build-system) | 623 | (sha256 |
624 | (arguments | 624 | (base32 |
625 | '(#:phases (modify-phases %standard-phases | 625 | "1jwr0y5x8mv8fm4df2vc3ll38fwwbkrm2iwfsfxa8l783a1a6143")) |
626 | ;; This is required to make | 626 | (patches |
627 | ;; "guile-fibers-wait-for-io-readiness.patch" work. | 627 | (search-patches "guile-fibers-wait-for-io-readiness.patch")))) |
628 | (add-after 'unpack 'regenerate-autotools | 628 | (build-system gnu-build-system) |
629 | (lambda _ | 629 | (arguments |
630 | (delete-file "configure"))) | 630 | '(#:phases (modify-phases %standard-phases |
631 | (add-after 'unpack 'support-cross-compilation | 631 | (add-after 'unpack 'support-cross-compilation |
632 | (lambda* (#:key target #:allow-other-keys) | 632 | (lambda* (#:key target #:allow-other-keys) |
633 | ;; Support cross-compilation. These issues are fixed in | 633 | ;; Support cross-compilation. These issues are fixed in |
634 | ;; Fibers commit c4756b9c336374546a41ac90a4431fcc8f7e98ee | 634 | ;; Fibers commit c4756b9c336374546a41ac90a4431fcc8f7e98ee |
635 | ;; and this phase can be removed for 1.1.1. | 635 | ;; and this phase can be removed for 1.1.1. |
636 | (when target | 636 | (when target |
637 | (substitute* "build-aux/guile.am" | 637 | (substitute* "build-aux/guile.am" |
638 | (("\\$\\(AM_V_GEN\\)" all) | 638 | (("\\$\\(AM_V_GEN\\)" all) |
639 | (string-append all " FIBERS_CROSS_COMPILING=yes ")) | 639 | (string-append all " FIBERS_CROSS_COMPILING=yes ")) |
640 | (("compile") | 640 | (("compile") |
641 | (string-append "compile --target=" target | 641 | (string-append "compile --target=" target |
642 | " -L $(abs_top_srcdir)"))) | 642 | " -L $(abs_top_srcdir)"))) |
643 | (substitute* "fibers/epoll.scm" | 643 | (substitute* "fibers/epoll.scm" |
644 | (("\\(dynamic-call") | 644 | (("\\(dynamic-call") |
645 | "(unless (getenv \"FIBERS_CROSS_COMPILING\") (dynamic-call") | 645 | "(unless (getenv \"FIBERS_CROSS_COMPILING\") (dynamic-call") |
646 | (("\\(dynamic-link.*" all) | 646 | (("\\(dynamic-link.*" all) |
647 | (string-append all ")\n")) | 647 | (string-append all ")\n")) |
648 | (("#,(%sizeof|%offsetof)" _ prefix) | 648 | (("#,(%sizeof|%offsetof)" _ prefix) |
649 | prefix))))) | 649 | prefix))))) |
650 | (add-after 'install 'mode-guile-objects | 650 | (add-after 'install 'mode-guile-objects |
651 | (lambda* (#:key outputs #:allow-other-keys) | 651 | (lambda* (#:key outputs #:allow-other-keys) |
652 | ;; .go files are installed to "lib/guile/X.Y/cache". | 652 | ;; .go files are installed to "lib/guile/X.Y/cache". |
653 | ;; This phase moves them to "…/site-ccache". | 653 | ;; This phase moves them to "…/site-ccache". |
654 | (let* ((out (assoc-ref outputs "out")) | 654 | (let* ((out (assoc-ref outputs "out")) |
655 | (lib (string-append out "/lib/guile")) | 655 | (lib (string-append out "/lib/guile")) |
656 | (old (car (find-files lib "^ccache$" | 656 | (old (car (find-files lib "^ccache$" |
657 | #:directories? #t))) | 657 | #:directories? #t))) |
658 | (new (string-append (dirname old) | 658 | (new (string-append (dirname old) |
659 | "/site-ccache"))) | 659 | "/site-ccache"))) |
660 | (rename-file old new) | 660 | (rename-file old new) |
661 | #t)))))) | 661 | #t)))))) |
662 | (native-inputs | 662 | (native-inputs |
663 | (list texinfo pkg-config autoconf automake libtool | 663 | (list texinfo pkg-config autoconf automake libtool |
664 | guile-3.0 ;for 'guild compile | 664 | guile-3.0 ;for 'guild compile |
665 | ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS' | 665 | ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS' |
666 | gettext-minimal)) | 666 | gettext-minimal)) |
667 | (inputs | 667 | (inputs |
668 | (list guile-3.0)) ;for libguile-3.0.so | 668 | (list guile-3.0)) ;for libguile-3.0.so |
669 | (supported-systems | 669 | (supported-systems |
670 | ;; This version requires 'epoll' and is thus limited to Linux-based | 670 | ;; This version requires 'epoll' and is thus limited to Linux-based |
671 | ;; systems, but this may change soon: | 671 | ;; systems, but this may change soon: |
672 | ;; <https://github.com/wingo/fibers/pull/53>. | 672 | ;; <https://github.com/wingo/fibers/pull/53>. |
673 | (filter (cut string-suffix? "-linux" <>) %supported-systems)) | 673 | (filter (cut string-suffix? "-linux" <>) %supported-systems)) |
674 | (synopsis "Lightweight concurrency facility for Guile") | 674 | (synopsis "Lightweight concurrency facility for Guile") |
675 | (description | 675 | (description |
676 | "Fibers is a Guile library that implements a a lightweight concurrency | 676 | "Fibers is a Guile library that implements a a lightweight concurrency |
677 | facility, inspired by systems like Concurrent ML, Go, and Erlang. A fiber is | 677 | facility, inspired by systems like Concurrent ML, Go, and Erlang. A fiber is |
678 | like a \"goroutine\" from the Go language: a lightweight thread-like | 678 | like a \"goroutine\" from the Go language: a lightweight thread-like |
679 | abstraction. Systems built with Fibers can scale up to millions of concurrent | 679 | abstraction. Systems built with Fibers can scale up to millions of concurrent |
@@ -683,8 +683,8 @@ communication between fibers. | |||
683 | 683 | ||
684 | Note that Fibers makes use of some Guile 2.1/2.2-specific features and | 684 | Note that Fibers makes use of some Guile 2.1/2.2-specific features and |
685 | is not available for Guile 2.0.") | 685 | is not available for Guile 2.0.") |
686 | (home-page "https://github.com/wingo/fibers") | 686 | (home-page "https://github.com/wingo/fibers") |
687 | (license license:lgpl3+))) | 687 | (license license:lgpl3+)))) |
688 | 688 | ||
689 | (define-public guile-fibers | 689 | (define-public guile-fibers |
690 | (package | 690 | (package |