mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: guile-fibers: Update to 1.1.1.
* gnu/packages/guile-xyz.scm (guile-fibers-1.1): Update to 1.1.1.
This commit is contained in:
parent
413b85ad4f
commit
71388e1fda
1 changed files with 33 additions and 70 deletions
|
@ -607,58 +607,21 @@ Unix-style DSV format and RFC 4180 format.")
|
||||||
(propagated-inputs `(("guile-lib" ,guile2.2-lib)))))
|
(propagated-inputs `(("guile-lib" ,guile2.2-lib)))))
|
||||||
|
|
||||||
(define-public guile-fibers-1.1
|
(define-public guile-fibers-1.1
|
||||||
;; Pick one commit above 1.1.0, which fixes a bug that's critical for the
|
|
||||||
;; Shepherd: <https://github.com/wingo/fibers/pull/57>.
|
|
||||||
(let ((commit "c25dcb9cc4b5b977474ffe555b40ce2f1d0d1edc")
|
|
||||||
(revision "0"))
|
|
||||||
(package
|
(package
|
||||||
(name "guile-fibers")
|
(name "guile-fibers")
|
||||||
(version (git-version "1.1.0" revision commit))
|
(version "1.1.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://github.com/wingo/fibers")
|
(url "https://github.com/wingo/fibers")
|
||||||
(commit commit)))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1jwr0y5x8mv8fm4df2vc3ll38fwwbkrm2iwfsfxa8l783a1a6143"))
|
"0ll63d7202clapg1k4bilbnlmfa4qvpjnsd7chbkka4kxf5klilc"))
|
||||||
(patches
|
(patches
|
||||||
(search-patches "guile-fibers-wait-for-io-readiness.patch"))))
|
(search-patches "guile-fibers-wait-for-io-readiness.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
|
||||||
'(#:phases (modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'support-cross-compilation
|
|
||||||
(lambda* (#:key target #:allow-other-keys)
|
|
||||||
;; Support cross-compilation. These issues are fixed in
|
|
||||||
;; Fibers commit c4756b9c336374546a41ac90a4431fcc8f7e98ee
|
|
||||||
;; and this phase can be removed for 1.1.1.
|
|
||||||
(when target
|
|
||||||
(substitute* "build-aux/guile.am"
|
|
||||||
(("\\$\\(AM_V_GEN\\)" all)
|
|
||||||
(string-append all " FIBERS_CROSS_COMPILING=yes "))
|
|
||||||
(("compile")
|
|
||||||
(string-append "compile --target=" target
|
|
||||||
" -L $(abs_top_srcdir)")))
|
|
||||||
(substitute* "fibers/epoll.scm"
|
|
||||||
(("\\(dynamic-call")
|
|
||||||
"(unless (getenv \"FIBERS_CROSS_COMPILING\") (dynamic-call")
|
|
||||||
(("\\(dynamic-link.*" all)
|
|
||||||
(string-append all ")\n"))
|
|
||||||
(("#,(%sizeof|%offsetof)" _ prefix)
|
|
||||||
prefix)))))
|
|
||||||
(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
|
(native-inputs
|
||||||
(list texinfo pkg-config autoconf automake libtool
|
(list texinfo pkg-config autoconf automake libtool
|
||||||
guile-3.0 ;for 'guild compile
|
guile-3.0 ;for 'guild compile
|
||||||
|
@ -685,7 +648,7 @@ Note that Fibers makes use of some Guile 2.1/2.2-specific features and
|
||||||
is not available for Guile 2.0.")
|
is not available for Guile 2.0.")
|
||||||
(home-page "https://github.com/wingo/fibers")
|
(home-page "https://github.com/wingo/fibers")
|
||||||
(properties '((upstream-name . "fibers")))
|
(properties '((upstream-name . "fibers")))
|
||||||
(license license:lgpl3+))))
|
(license license:lgpl3+)))
|
||||||
|
|
||||||
(define-public guile-fibers
|
(define-public guile-fibers
|
||||||
(package
|
(package
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue