From: Remco van 't Veer <remco@remworks.net>
To: 56322@debbugs.gnu.org, Maxime Devos <maximedevos@telenet.be>
Cc: Remco van 't Veer <remco@remworks.net>
Subject: bug#56322: [PATCH 2/2] gnu: ruby: fix unbundling of libffi for inheriting rubies
Date: Wed, 24 Aug 2022 17:27:47 +0200 [thread overview]
Message-ID: <20220824152747.6752-3-remco@remworks.net> (raw)
In-Reply-To: <20220824152747.6752-1-remco@remworks.net>
* gnu/packages/ruby.scm (ruby-2.4, ruby-2.5, ruby-3.0, ruby-3.1): Inherit package-source to ensure inclusion of unbundling snippet
---
gnu/packages/ruby.scm | 77 ++++++++++++++++++++-----------------------
1 file changed, 36 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index ad8ef3d390..e98814da6d 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -187,62 +187,57 @@ (define-public ruby-3.0
(package
(inherit ruby-2.7)
(version "3.0.2")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
- (version-major+minor version)
- "/ruby-" version ".tar.xz"))
- (sha256
- (base32
- "0h2w2ms4gx2s96v3lzdr3add94bd2qqkhdjzaycmaqhg21rpf3jp"))))))
+ (source (origin
+ (inherit (package-source ruby-2.7))
+ (method url-fetch)
+ (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
+ (version-major+minor version) "/ruby-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0h2w2ms4gx2s96v3lzdr3add94bd2qqkhdjzaycmaqhg21rpf3jp"))))))
(define-public ruby-3.1
(package
(inherit ruby-2.7)
(version "3.1.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
- (version-major+minor version)
- "/ruby-" version ".tar.xz"))
- (sha256
- (base32
- "1akcl7vhmwfm6ybj7493kzy58ykh2r39ri9f4xfm2xmhg1msmvvs"))))))
+ (source (origin
+ (inherit (package-source ruby-2.7))
+ (method url-fetch)
+ (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
+ (version-major+minor version) "/ruby-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1akcl7vhmwfm6ybj7493kzy58ykh2r39ri9f4xfm2xmhg1msmvvs"))))))
(define-public ruby-2.5
(package
(inherit ruby-2.6)
(version "2.5.9")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
- (version-major+minor version)
- "/ruby-" version ".tar.xz"))
- (sha256
- (base32
- "1w2qncacm7h3f3il1whghdabwnv9fvwmz9f1a9vcg32006ljyzx8"))))))
+ (source (origin
+ (inherit (package-source ruby-2.6))
+ (method url-fetch)
+ (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
+ (version-major+minor version) "/ruby-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1w2qncacm7h3f3il1whghdabwnv9fvwmz9f1a9vcg32006ljyzx8"))))))
(define-public ruby-2.4
(package
(inherit ruby-2.6)
(version "2.4.10")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
- (version-major+minor version)
- "/ruby-" version ".tar.xz"))
- (sha256
- (base32
- "1prhqlgik1zmw9lakl6hkriqslspw48pvhxff17h7ns42p8qwrnm"))
- (modules '((guix build utils)))
- (snippet `(begin
- ;; Remove bundled libffi
- (delete-file-recursively "ext/fiddle/libffi-3.2.1")
- #t))))))
+ (source (origin
+ (inherit (package-source ruby-2.6))
+ (method url-fetch)
+ (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
+ (version-major+minor version) "/ruby-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1prhqlgik1zmw9lakl6hkriqslspw48pvhxff17h7ns42p8qwrnm"))))))
(define-public ruby ruby-2.7)
--
2.37.2
next prev parent reply other threads:[~2022-08-24 15:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-30 11:15 bug#56322: Ruby packaging issues Maxime Devos
2022-08-24 15:24 ` Remco van 't Veer
2022-08-24 18:38 ` Maxime Devos
2022-08-25 10:44 ` Remco van 't Veer
2022-08-24 18:41 ` Maxime Devos
2022-08-24 15:27 ` bug#56322: [PATCH 0/2] " Remco van 't Veer
2022-08-24 15:27 ` bug#56322: [PATCH 1/2] gnu: ruby: trigger autotools bootstrap Remco van 't Veer
2022-08-24 15:27 ` Remco van 't Veer [this message]
2022-08-25 10:45 ` bug#56322: [PATCH] gnu: ruby: regenerate parse.c Remco van 't Veer
2022-10-08 10:01 ` bug#56322: Debbug 56322, Ruby packaging issues, ping? Remco van 't Veer
2022-10-09 9:15 ` Maxime Devos
2022-10-10 5:05 ` Remco van 't Veer
2022-10-10 10:27 ` Maxime Devos
2022-10-12 13:35 ` bug#56322: [PATCH core-updates 0/3] Ruby packaging issues Remco van 't Veer
2022-10-12 13:35 ` bug#56322: [PATCH core-updates 1/3] gnu: ruby: trigger autotools bootstrap Remco van 't Veer
2022-10-12 13:35 ` bug#56322: [PATCH core-updates 2/3] gnu: ruby: fix unbundling of libffi for inheriting rubies Remco van 't Veer
2022-10-12 13:35 ` bug#56322: [PATCH core-updates 3/3] gnu: ruby: regenerate parse.c Remco van 't Veer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220824152747.6752-3-remco@remworks.net \
--to=remco@remworks.net \
--cc=56322@debbugs.gnu.org \
--cc=maximedevos@telenet.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).