Staging branch (was: Moving forward with teams and feature branches)

  • Done
  • quality assurance status badge
Details
2 participants
  • Andreas Enge
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Andreas Enge
Severity
normal

Debbugs page

Andreas Enge wrote 2 years ago
(name . Josselin Poiret)(address . dev@jpoiret.xyz)(address . bug-guix@gnu.org)
Y+pDWbUwMKFBn+f5@jurong
Am Sun, Feb 12, 2023 at 10:13:35PM +0100 schrieb Josselin Poiret:
Toggle quote (2 lines)
> 4. staging merge happens, and the branch gets deleted.

I tried to build staging for my profile on x86_64, but it failed with
a dependency of ffmpeg, rust-rav1e-0.5.1. There is a newer version 0.6.3,
but I did not simply update it, since the package looks particularly
complicated, containing a phase:
(add-after 'configure 'force-rust-edition-2018
(lambda* (#:key vendor-dir #:allow-other-keys)
;; Force all the dependencies to not be higher than edition 2018.
(with-fluids ((%default-port-encoding #f))
(substitute* (find-files vendor-dir "Cargo.toml")
(("edition = \\\"2021\\\"") "edition = \"2018\"")))))
and many other changes.

If someone who knows rust could have a look and make a suggestion, that
would be great.

Andreas
Maxim Cournoyer wrote 2 years ago
Re: bug#61475: Staging branch (was: Moving forward with teams and feature branches)
(name . Andreas Enge)(address . andreas@enge.fr)
875y90sxmx.fsf_-_@gmail.com
Hi,

Andreas Enge <andreas@enge.fr> writes:

Toggle quote (18 lines)
> Am Sun, Feb 12, 2023 at 10:13:35PM +0100 schrieb Josselin Poiret:
>> 4. staging merge happens, and the branch gets deleted.
>
> I tried to build staging for my profile on x86_64, but it failed with
> a dependency of ffmpeg, rust-rav1e-0.5.1. There is a newer version 0.6.3,
> but I did not simply update it, since the package looks particularly
> complicated, containing a phase:
> (add-after 'configure 'force-rust-edition-2018
> (lambda* (#:key vendor-dir #:allow-other-keys)
> ;; Force all the dependencies to not be higher than edition 2018.
> (with-fluids ((%default-port-encoding #f))
> (substitute* (find-files vendor-dir "Cargo.toml")
> (("edition = \\\"2021\\\"") "edition = \"2018\"")))))
> and many other changes.
>
> If someone who knows rust could have a look and make a suggestion, that
> would be great.

Closing, both staging and the rust branch having been merged.

--
Thanks,
Maxim
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 61475@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 61475
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help