(address . guix-patches@gnu.org)
aD4b1I2OysPhqJys@jurong
It should be ready.
Andreas
on 2 Jun 14:47 -0700
on 9 Jun 03:03 -0700
on 18 Jun 10:30 -0700
Request for merging "ruby-team" branch
- Done
Details
- 3 participants
- Andreas Enge
- Christopher Baines
- Nicolas Graves
- Owner
- unassigned
- Submitted by
- Andreas Enge
- Severity
- normal
87y0u1kz9n.fsf@ngraves.fr
Hi Andreas,
I've submitted 78683 when I realized Sharlatan created the ruby-check
and ruby-xyz modules.
Is that fine ? Do you expect to merge it or keep it for the next
revision ? Should I split the last patch into parts ?
On 2025-06-02 23:47, Andreas Enge wrote:
Toggle quote (4 lines)
> It should be ready.
>
--
Best regards,
Nicolas Graves
(address . 78676@debbugs.gnu.org)
aEiZHfFHSgB4RANe@jurong
Hello,
Am Mon, Jun 09, 2025 at 12:03:32PM +0200 schrieb Nicolas Graves:
Toggle quote (5 lines)
> I've submitted 78683 when I realized Sharlatan created the ruby-check
> and ruby-xyz modules.
> Is that fine ? Do you expect to merge it or keep it for the next
> revision ? Should I split the last patch into parts ?
it is still time to work on the branch, as it is behind emacs-team,
which has not yet been started by QA. So it is up to the ruby team
(in cc ;-)) what to do. If there are not many rebuilds, it could even
be done later on master.
I have just rebased on commit 5fd4df347e04b6cd3ce3fc91900f773a2e4824e3
(the data service is lagging a bit behind today) to absorb the ruby
updates on master, hopefully without making mistakes...
Andreas
Block
(address . control@debbugs.gnu.org)
aE7zATuaWWbI6_Bb@jurong
unblock 76899 by 78257
block 76899 by 78676
thanks
Block core-packages-team by ruby-team
(address . control@debbugs.gnu.org)
aE_d8F7fmI01_1bd@jurong
block 75518 by 78676
thanks
Re: [bug#78676] Request for merging "ruby-team" branch
(address . 78676@debbugs.gnu.org)
aE_eVjnr36k1dQhX@jurong
Hello,
I have rebased ruby-team on ced31f8dd156e4202a2c7115fc003608a541388c and
let it pass in front of core-packages-team. Please have a look and push
it to master if it is ready, or signal me to do so.
Thanks!
Andreas
(address . 78676@debbugs.gnu.org)
aFKVxjw-tHeqfdjt@jurong
Hello,
there are already a few build failures:
Some ruby issues related to MiniTest vs. Minitest, which look easy to fix.
A problem is the failure of openjdk@11 on x86_64, which will block many
dependent packages; but I do not see how this is related to ruby, in
particular since the same package on i686 suddenly compiles.
If you have fixes, you can push them on top of the ruby-team branch.
Thanks,
Andreas
(address . 78676@debbugs.gnu.org)
877c19qft7.fsf@ngraves.fr
I was surprised for some reason by the number of build failures, I
thought I had made a better job than that.
I submitted a new biiig series in 78826, which is actually quite some
work from the past 2 days.
I'll try and see about the openjdk@11 issue, I hadn't noticed that
locally.
Sorry I still don't have commit rights to push.
Nicolas
On 2025-06-18 12:32, Andreas Enge wrote:
Toggle quote (21 lines)
> Hello,
>
> there are already a few build failures:
> https://qa.guix.gnu.org/branch/ruby-team/package-changes?x86_64-linux-change=broken&x86_64-linux-change=still-failing&x86_64-linux-change=unknown-to-failing&x86_64-linux-change=new-failing
>
> Some ruby issues related to MiniTest vs. Minitest, which look easy to fix.
>
> A problem is the failure of openjdk@11 on x86_64, which will block many
> dependent packages; but I do not see how this is related to ruby, in
> particular since the same package on i686 suddenly compiles.
>
> If you have fixes, you can push them on top of the ruby-team branch.
>
> Thanks,
>
> Andreas
>
>
>
>
--
Best regards,
Nicolas Graves
(name . Nicolas Graves)(address . ngraves@ngraves.fr)
aFLYVYPF-qdBstqC@jurong
Hello,
Am Wed, Jun 18, 2025 at 04:34:28PM +0200 schrieb Nicolas Graves:
Toggle quote (3 lines)
> I submitted a new biiig series in 78826, which is actually quite some
> work from the past 2 days.
well, I do not want to complain, but there we reach the limits of
debbugs, I would say; even more so since the commits do not arrive in
order. Do you have a public branch on some git server (codeberg?) from
which I could fetch the entire series?
Or in the worst case, could you create a .tar.gz of the 88 files
obtained with "git format-patch" and send it to me by private email?
Toggle quote (2 lines)
> Sorry I still don't have commit rights to push.
You should be :)
Thanks!
Andreas
(name . Andreas Enge)(address . andreas@enge.fr)
87v7otarfj.fsf@cbaines.net
Andreas Enge <andreas@enge.fr> writes:
Toggle quote (14 lines)
> Hello,
>
> Am Wed, Jun 18, 2025 at 04:34:28PM +0200 schrieb Nicolas Graves:
>> I submitted a new biiig series in 78826, which is actually quite some
>> work from the past 2 days.
>
> well, I do not want to complain, but there we reach the limits of
> debbugs, I would say; even more so since the commits do not arrive in
> order. Do you have a public branch on some git server (codeberg?) from
> which I could fetch the entire series?
>
> Or in the worst case, could you create a .tar.gz of the 88 files
> obtained with "git format-patch" and send it to me by private email?
There were some things in QA I had to fix, but I don't think there was
any issue with the way the patches were sent.
QA has now applied the patches to a branch which you should be able to
fetch.
In other news, I think we can avoid changing ruby@2.7 on this branch,
which should avoid affecting some texlive and related packages. I'll try
to make this change either later today or tomorrow.
-----BEGIN PGP SIGNATURE-----
iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmhS96BfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XcE0Q//TauRcz0yi1T3asBdgrECl3cNAnyAk+y0
L1e9F7txVxc2ACHH4f4hYqe+bFVFcmBpjaCQL9z9+EvxR198MU2mFcoP4EH2bfUm
gAQ6JyMi9v/H+k6/pIM4JTfYT1aYPIq5gXXpukON/SfwnNMZh3sBawTV9conWHmr
Xhe89YOBG01fNMm4nTD2rheqLXKMZWVGpSQdfUPl6/S2Myy54H0cnkWbwLYpCYvA
uwaEsdI+mrE8i+WwrJrERXfS87Gu0CjBUI3YpdsSaubNhnmmEJU0rKbMF+8Z53xE
uCBydSx5GFz1DA47daciEEmlwlub4czt3phVD/sDUaOwgEWIoPS0i2o+RAO1DDIx
P4s4ndvlzd3yI0P1+owZreQVUiM4014x0K67jMkX5I96SHhr/piYHfYvXrZI9RMj
/1lMZzY9GHxsG8nsv3Q7d55kK/QSNW484Z8/42UI8vGefxdIbAowM1eAFIRHcqgl
I3DZZ/YPuiyRyNOlBdE3jY92FFjQuMX1HSKYhD1FIcHwmniy4jdiSb156U568if/
Yl6DLQxmPVyF5V0YMLcI3hElU5XDsvQmLS/qsM3xGbE/0gb5Ta/U6MeTeIhGDnFU
p0TbqW9K/HRbx9IQyE2dPfLxTIkpe34M/naSQShf7MY5lPjys1kbOGrBy7Xh4D+b
isB/AYeh7F4=
=klQh
-----END PGP SIGNATURE-----
(name . Christopher Baines)(address . mail@cbaines.net)
aFMbbgV9bJ-7zj0p@jurong
Am Wed, Jun 18, 2025 at 06:30:08PM +0100 schrieb Christopher Baines:
Toggle quote (5 lines)
> There were some things in QA I had to fix, but I don't think there was
> any issue with the way the patches were sent.
> QA has now applied the patches to a branch which you should be able to
> fetch.
Good point! After it stopped working some time ago, I had deleted the
corresponding remote. Added again, applied, rebased on master commit
97dd07d24d1880e282ad4200d1f1ae43b9cbff5a
and pushed.
Toggle quote (4 lines)
> In other news, I think we can avoid changing ruby@2.7 on this branch,
> which should avoid affecting some texlive and related packages. I'll try
> to make this change either later today or tomorrow.
Why not! On the other hand, as the branch is almost fully built now,
maybe it does not matter anymore.
Andreas
(name . Andreas Enge)(address . andreas@enge.fr)
87ecvgbl4g.fsf@cbaines.net
Andreas Enge <andreas@enge.fr> writes:
Toggle quote (4 lines)
>> In other news, I think we can avoid changing ruby@2.7 on this branch,
>> which should avoid affecting some texlive and related packages. I'll try
>> to make this change either later today or tomorrow.
I've gone ahead and pushed this now, tweaking a few commits to achieve
the following diff, avoiding changing ruby-hydra-minimal/pinned and
avoiding changing ruby-2.7, which I think removes the majority of the
affected packages on the ruby-team branch. At least this is what guix
weather suggests, we'll see what the data service says.
modified gnu/packages/ruby-xyz.scm
@@ -3531,13 +3531,28 @@ (define-public ruby-hydra-minimal
;; Pinned variant for use by texlive
(define-public ruby-hydra-minimal/pinned
- (hidden-package
- (package
- (inherit ruby-hydra-minimal)
- (arguments
- (list
- #:tests? #f
- #:ruby ruby-2.7)))))
+ (let ((commit "5abfa378743756ae4d9306cc134bcc482f5c9525")
+ (revision "0"))
+ (hidden-package
+ (package
+ (inherit ruby-hydra-minimal)
+ (version (git-version "0.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (commit commit)))
+ (file-name (git-file-name "ruby-hydra-minimal" version))
+ ;; byebug is a non-essential debugging utility that brings in
+ ;; many dependencies.
+ (patches (search-patches "ruby-hydra-minimal-no-byebug.patch"))
+ (sha256
+ (base32
+ "1cik398l2765y3d9sdhjzki3303hkry58ac6jlkiy7iy62nm529f"))))
+ (arguments
+ (list
+ #:tests? #f
+ #:ruby ruby-2.7))))))
(define-public ruby-hydra
(package
modified gnu/packages/ruby.scm
@@ -202,7 +202,12 @@ (define-public ruby-2.7
"/ruby-" version ".tar.gz"))
(sha256
(base32
- "182vni66djmiqagwzfsd0za7x9k3zag43b88c590aalgphybdnn2"))))
+ "182vni66djmiqagwzfsd0za7x9k3zag43b88c590aalgphybdnn2"))
+ (modules '((guix build utils)))
+ (snippet `(begin
+ ;; Remove bundled libffi
+ (delete-file-recursively "ext/fiddle/libffi-3.2.1")
+ #t))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@@ -230,7 +235,8 @@ (define-public ruby-2.7
"test/ruby/test_process.rb"
"test/ruby/test_system.rb"
"tool/rbinstall.rb")
- (("/bin/sh") (which "sh")))))
+ (("/bin/sh") (which "sh")))
+ #t))
,@(if (system-hurd?)
'((add-after 'unpack 'skip-tests
(lambda _
-----BEGIN PGP SIGNATURE-----
iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmhTYU9fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xc9gxAApaEAh3xea58QJNROG49odM0Jlmu9Op5r
fsujCiSlTHhc6hgw03wj0MI12ZSOred1eB91Y/QfYDNLUBl9MTtolo/PO4TilD/G
4YEZRb43TZsJITMl86zJyIVEgKJMQRH+UHOoAF0v0kFsqMDvGCrLLnS4SYGep6ZZ
DS08kIFRxJ4UqeOSn6qKwR8a04enLEBd7vfcn3YAN6a0jnP0rGmAT+0zKC9BU03b
YL1+osvpzm0gUw2D2eRPYJJIm1tEH7QAs1X1qxyotCcLTrqmPPW0gFhOzePyg3hI
HFguYSC01+qU1ac/1Fa5oshHvaozxLTI5Lu8ObgzGVeCqZFkGh/EVHjtpuNELj0c
e1Fb8/jlosaVuux9QyiTFgYt+mxXy5S6/cdWB/RpuNuc/siMWObPDZuSw+W/j4O6
ERpMbFt0z0DZwLx6LNladxehdRWtP+DLua7C7vzjwz7ZL/KOM+T0aB1hN+RHP+Uw
f5Ggzj5ZpiaVN3h0H13n0DTcvoLr1TPep6CZjzf+2JDgxwOzWS0mMrtXL8u84evV
5dJ7tgjikyeuLI6UmcxOOj2E4/rsMOBuEwG5Cwtq4My5OhwVGP6fnYB8AiGKQ1PT
lBERjsIA/E5gPRMrPo4z5sZfQ6tCXphZ9kdMk1XgO76q/lef193fqBmXLkkFOMux
u163fGstZ8k=
=DWbZ
-----END PGP SIGNATURE-----
(name . Andreas Enge)(address . andreas@enge.fr)
8734bwawpo.fsf@cbaines.net
Christopher Baines <mail@cbaines.net> writes:
Toggle quote (12 lines)
> Andreas Enge <andreas@enge.fr> writes:
>
>>> In other news, I think we can avoid changing ruby@2.7 on this branch,
>>> which should avoid affecting some texlive and related packages. I'll try
>>> to make this change either later today or tomorrow.
>
> I've gone ahead and pushed this now, tweaking a few commits to achieve
> the following diff, avoiding changing ruby-hydra-minimal/pinned and
> avoiding changing ruby-2.7, which I think removes the majority of the
> affected packages on the ruby-team branch. At least this is what guix
> weather suggests, we'll see what the data service says.
I think those changes reduceed the affected packages from over 10,000 to
just over 1000. I've just pushed again to remove the change to
utf8proc-2.7.0 which should avoid ~300 julia builds.
I did look at the changes to gst-libav, but that's a bit harder to avoid
since ruby@3.1 is also being changed.
-----BEGIN PGP SIGNATURE-----
iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmhT3ONfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xc8kg//Wps0NUrU5yTj+scZQ46EvzlFPc6rJUBl
gRXDzAyPYvCWEC/8YpcumcQdV+LTryLwXyD7TYvjcVdCUMI2dc4flzzX4xo3tIQn
HwINgtQPyuXG9qNwntnklUrzRFqoaf6246Io2T/2bifX0dbktEFNnLv4KmNcNlp7
YgvCb877GPA80l3kWq4llEAMBugOtgrN9+uWhF7flV+S+Q6HGSdFn3OlAQzviZ3/
tPBUN3olrY2N33MAF0if4QNqraXJkIh4xoN0BKuwN6yiQQbkLvQ6T9Pss5tUgPJs
96f284OuW86lZEoeDsHJ3/xJmRQQMnwaslKIlk6+2B+JNpktVnPwEftVOuJlSWJE
sUMf8ApaJcv3bXV/0jFq7mvllqMBMbk1WAwmK1oRUMhSwm2YYRmeX7mF+/n9fama
jFy7g6GfiZ/ubO7dp8+un5ScihBelMI4EErwrwmtq6IAoAukp3KUKvFDo6GEnmxa
PmtEVAFY688/RWEUBFVic1OnlZAqCL/9b7VS3eSFmylrCOzDhzCShkyqKDH5HOEA
fcho/qadUmXLD/n/TDrZv/eUMBI0neqF4P59VT/RyBupdz/5L1MAiB0vBLNIGvk2
1xHtogl7YoeTy9yyN3AfPxdOFaTgaimrFcrMcBudp5tP3OykSN7uIhdxcEz6Txb2
2RojdwRAXgc=
=sF8p
-----END PGP SIGNATURE-----
(name . Christopher Baines)(address . mail@cbaines.net)
aFVZqQGO83jCqXOm@jurong
Hello,
the ruby branch looks mainly good on QA, except for 32 bits, where there
are more "blocked" packages right now. I do not have time at the moment
to look at it, if one of you does, please go ahead and either push to
master or point out things to work on.
Thanks,
Andreas
(name . Christopher Baines)(address . mail@cbaines.net)
aFWttPRhmoAIpDJv@jurong
Hello,
I have pushed the ruby-team commits to master, thanks for your help in
getting the branch ready!
Now I will wait for the data service to pick up the commit before
rebasing the other branches and deleting this branch and issue.
Andreas
(name . Christopher Baines)(address . mail@cbaines.net)
aFXROy3wcFepI7Pr@jurong
Done.
Andreas
Closed
Unblock
(address . control@debbugs.gnu.org)
aHtJeL6MUvmX85KN@jurong
unblock 76899 by 78689
unblock 76899 by 78676
thanks
?